Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ac962ee61a
63 changed files with 1304 additions and 2449 deletions
|
|
@ -35,6 +35,8 @@ rec {
|
|||
("generators.mkValueStringDefault: " +
|
||||
"${t} not supported: ${toPretty {} v}");
|
||||
in if isInt v then toString v
|
||||
# convert derivations to store paths
|
||||
else if lib.isDerivation v then toString v
|
||||
# we default to not quoting strings
|
||||
else if isString v then v
|
||||
# isString returns "1", which is not a good default
|
||||
|
|
@ -169,7 +171,7 @@ rec {
|
|||
# converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI
|
||||
gitFlattenAttrs = let
|
||||
recurse = path: value:
|
||||
if isAttrs value then
|
||||
if isAttrs value && !lib.isDerivation value then
|
||||
lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value
|
||||
else if length path > 1 then {
|
||||
${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value;
|
||||
|
|
|
|||
|
|
@ -927,6 +927,19 @@ Superuser created successfully.
|
|||
file</link> format.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>datadog-agent</literal>,
|
||||
<literal>datadog-integrations-core</literal> and
|
||||
<literal>datadog-process-agent</literal> packages were
|
||||
upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and
|
||||
6.11.1 to 7.30.2, respectively. As a result
|
||||
<literal>services.datadog-agent</literal> has had breaking
|
||||
changes to the configuration file. For details, see the
|
||||
<link xlink:href="https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst">upstream
|
||||
changelog</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -271,6 +271,11 @@ To be able to access the web UI this port needs to be opened in the firewall.
|
|||
|
||||
- The `todoman` package was upgraded from 3.9.0 to 4.0.0. This introduces breaking changes in the [configuration file](https://todoman.readthedocs.io/en/stable/configure.html#configuration-file) format.
|
||||
|
||||
- The `datadog-agent`, `datadog-integrations-core` and `datadog-process-agent` packages
|
||||
were upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and 6.11.1 to 7.30.2,
|
||||
respectively. As a result `services.datadog-agent` has had breaking changes to the
|
||||
configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst).
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
- The linux kernel package infrastructure was moved out of `all-packages.nix`, and restructured. Linux related functions and attributes now live under the `pkgs.linuxKernel` attribute set.
|
||||
|
|
|
|||
|
|
@ -383,6 +383,8 @@
|
|||
./services/display-managers/greetd.nix
|
||||
./services/editors/emacs.nix
|
||||
./services/editors/infinoted.nix
|
||||
./services/games/crossfire-server.nix
|
||||
./services/games/deliantra-server.nix
|
||||
./services/games/factorio.nix
|
||||
./services/games/freeciv.nix
|
||||
./services/games/minecraft-server.nix
|
||||
|
|
|
|||
177
nixos/modules/services/games/crossfire-server.nix
Normal file
177
nixos/modules/services/games/crossfire-server.nix
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.crossfire-server;
|
||||
serverPort = 13327;
|
||||
in {
|
||||
options.services.crossfire-server = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If enabled, the Crossfire game server will be started at boot.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.crossfire-server;
|
||||
defaultText = "pkgs.crossfire-server";
|
||||
description = ''
|
||||
The package to use for the Crossfire server (and map/arch data, if you
|
||||
don't change dataDir).
|
||||
'';
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${cfg.package}/share/crossfire";
|
||||
defaultText = "\${config.services.crossfire.package}/share/crossfire";
|
||||
description = ''
|
||||
Where to load readonly data from -- maps, archetypes, treasure tables,
|
||||
and the like. If you plan to edit the data on the live server (rather
|
||||
than overlaying the crossfire-maps and crossfire-arch packages and
|
||||
nixos-rebuilding), point this somewhere read-write and copy the data
|
||||
there before starting the server.
|
||||
'';
|
||||
};
|
||||
|
||||
stateDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/crossfire";
|
||||
description = ''
|
||||
Where to store runtime data (save files, persistent items, etc).
|
||||
|
||||
If left at the default, this will be automatically created on server
|
||||
startup if it does not already exist. If changed, it is the admin's
|
||||
responsibility to make sure that the directory exists and is writeable
|
||||
by the `crossfire` user.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to open ports in the firewall for the server.
|
||||
'';
|
||||
};
|
||||
|
||||
configFiles = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
description = ''
|
||||
Text to append to the corresponding configuration files. Note that the
|
||||
files given in the example are *not* the complete set of files available
|
||||
to customize; look in /etc/crossfire after enabling the server to see
|
||||
the available files, and read the comments in each file for detailed
|
||||
documentation on the format and what settings are available.
|
||||
|
||||
Note that the motd, rules, and news files, if configured here, will
|
||||
overwrite the example files that come with the server, rather than being
|
||||
appended to them as the other configuration files are.
|
||||
'';
|
||||
example = literalExample ''
|
||||
dm_file = '''
|
||||
admin:secret_password:localhost
|
||||
jane:xyzzy:*
|
||||
''';
|
||||
ban_file = '''
|
||||
# Bob is a jerk
|
||||
bob@*
|
||||
# So is everyone on 192.168.86.255/24
|
||||
*@192.168.86.
|
||||
''';
|
||||
metaserver2 = '''
|
||||
metaserver2_notification on
|
||||
localhostname crossfire.example.net
|
||||
''';
|
||||
motd = "Welcome to CrossFire!";
|
||||
news = "No news yet.";
|
||||
rules = "Don't be a jerk.";
|
||||
settings = '''
|
||||
# be nicer to newbies and harsher to experienced players
|
||||
balanced_stat_loss true
|
||||
# don't let players pick up and use admin-created items
|
||||
real_wiz false
|
||||
''';
|
||||
'';
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.crossfire = {
|
||||
description = "Crossfire server daemon user";
|
||||
home = cfg.stateDir;
|
||||
createHome = false;
|
||||
isSystemUser = true;
|
||||
group = "crossfire";
|
||||
};
|
||||
users.groups.crossfire = {};
|
||||
|
||||
# Merge the cfg.configFiles setting with the default files shipped with
|
||||
# Crossfire.
|
||||
# For most files this consists of reading ${crossfire}/etc/crossfire/${name}
|
||||
# and appending the user setting to it; the motd, news, and rules are handled
|
||||
# specially, with user-provided values completely replacing the original.
|
||||
environment.etc = lib.attrsets.mapAttrs'
|
||||
(name: value: lib.attrsets.nameValuePair "crossfire/${name}" {
|
||||
mode = "0644";
|
||||
text =
|
||||
(optionalString (!elem name ["motd" "news" "rules"])
|
||||
(fileContents "${cfg.package}/etc/crossfire/${name}"))
|
||||
+ "\n${value}";
|
||||
}) ({
|
||||
ban_file = "";
|
||||
dm_file = "";
|
||||
exp_table = "";
|
||||
forbid = "";
|
||||
metaserver2 = "";
|
||||
motd = (fileContents "${cfg.package}/etc/crossfire/motd");
|
||||
news = (fileContents "${cfg.package}/etc/crossfire/news");
|
||||
rules = (fileContents "${cfg.package}/etc/crossfire/rules");
|
||||
settings = "";
|
||||
stat_bonus = "";
|
||||
} // cfg.configFiles);
|
||||
|
||||
systemd.services.crossfire-server = {
|
||||
description = "Crossfire Server Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = mkMerge [
|
||||
{
|
||||
ExecStart = "${cfg.package}/bin/crossfire-server -conf /etc/crossfire -local '${cfg.stateDir}' -data '${cfg.dataDir}'";
|
||||
Restart = "always";
|
||||
User = "crossfire";
|
||||
Group = "crossfire";
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
}
|
||||
(mkIf (cfg.stateDir == "/var/lib/crossfire") {
|
||||
StateDirectory = "crossfire";
|
||||
})
|
||||
];
|
||||
|
||||
# The crossfire server needs access to a bunch of files at runtime that
|
||||
# are not created automatically at server startup; they're meant to be
|
||||
# installed in $PREFIX/var/crossfire by `make install`. And those files
|
||||
# need to be writeable, so we can't just point at the ones in the nix
|
||||
# store. Instead we take the approach of copying them out of the store
|
||||
# on first run. If `bookarch` already exists, we assume the rest of the
|
||||
# files do as well, and copy nothing -- otherwise we risk ovewriting
|
||||
# server state information every time the server is upgraded.
|
||||
preStart = ''
|
||||
if [ ! -e "${cfg.stateDir}"/bookarch ]; then
|
||||
${pkgs.rsync}/bin/rsync -a --chmod=u=rwX,go=rX \
|
||||
"${cfg.package}/var/crossfire/" "${cfg.stateDir}/"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ serverPort ];
|
||||
};
|
||||
};
|
||||
}
|
||||
170
nixos/modules/services/games/deliantra-server.nix
Normal file
170
nixos/modules/services/games/deliantra-server.nix
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.deliantra-server;
|
||||
serverPort = 13327;
|
||||
in {
|
||||
options.services.deliantra-server = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If enabled, the Deliantra game server will be started at boot.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.deliantra-server;
|
||||
defaultText = "pkgs.deliantra-server";
|
||||
description = ''
|
||||
The package to use for the Deliantra server (and map/arch data, if you
|
||||
don't change dataDir).
|
||||
'';
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${pkgs.deliantra-data}";
|
||||
defaultText = "\${pkgs.deliantra-data}";
|
||||
description = ''
|
||||
Where to store readonly data (maps, archetypes, sprites, etc).
|
||||
Note that if you plan to use the live map editor (rather than editing
|
||||
the maps offline and then nixos-rebuilding), THIS MUST BE WRITEABLE --
|
||||
copy the deliantra-data someplace writeable (say,
|
||||
/var/lib/deliantra/data) and update this option accordingly.
|
||||
'';
|
||||
};
|
||||
|
||||
stateDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/deliantra";
|
||||
description = ''
|
||||
Where to store runtime data (save files, persistent items, etc).
|
||||
|
||||
If left at the default, this will be automatically created on server
|
||||
startup if it does not already exist. If changed, it is the admin's
|
||||
responsibility to make sure that the directory exists and is writeable
|
||||
by the `crossfire` user.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to open ports in the firewall for the server.
|
||||
'';
|
||||
};
|
||||
|
||||
configFiles = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
description = ''
|
||||
Contents of the server configuration files. These will be appended to
|
||||
the example configurations the server comes with and overwrite any
|
||||
default settings defined therein.
|
||||
|
||||
The example here is not comprehensive. See the files in
|
||||
/etc/deliantra-server after enabling this module for full documentation.
|
||||
'';
|
||||
example = literalExample ''
|
||||
dm_file = '''
|
||||
admin:secret_password:localhost
|
||||
jane:xyzzy:*
|
||||
''';
|
||||
motd = "Welcome to Deliantra!";
|
||||
settings = '''
|
||||
# Settings for game mechanics.
|
||||
stat_loss_on_death true
|
||||
armor_max_enchant 7
|
||||
''';
|
||||
config = '''
|
||||
# Settings for the server daemon.
|
||||
hiscore_url https://deliantra.example.net/scores/
|
||||
max_map_reset 86400
|
||||
''';
|
||||
'';
|
||||
default = {
|
||||
motd = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.deliantra = {
|
||||
description = "Deliantra server daemon user";
|
||||
home = cfg.stateDir;
|
||||
createHome = false;
|
||||
isSystemUser = true;
|
||||
group = "deliantra";
|
||||
};
|
||||
users.groups.deliantra = {};
|
||||
|
||||
# Merge the cfg.configFiles setting with the default files shipped with
|
||||
# Deliantra.
|
||||
# For most files this consists of reading
|
||||
# ${deliantra}/etc/deliantra-server/${name} and appending the user setting
|
||||
# to it.
|
||||
environment.etc = lib.attrsets.mapAttrs'
|
||||
(name: value: lib.attrsets.nameValuePair "deliantra-server/${name}" {
|
||||
mode = "0644";
|
||||
text =
|
||||
# Deliantra doesn't come with a motd file, but respects it if present
|
||||
# in /etc.
|
||||
(optionalString (name != "motd")
|
||||
(fileContents "${cfg.package}/etc/deliantra-server/${name}"))
|
||||
+ "\n${value}";
|
||||
}) ({
|
||||
motd = "";
|
||||
settings = "";
|
||||
config = "";
|
||||
dm_file = "";
|
||||
} // cfg.configFiles);
|
||||
|
||||
systemd.services.deliantra-server = {
|
||||
description = "Deliantra Server Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
environment = {
|
||||
DELIANTRA_DATADIR="${cfg.dataDir}";
|
||||
DELIANTRA_LOCALDIR="${cfg.stateDir}";
|
||||
DELIANTRA_CONFDIR="/etc/deliantra-server";
|
||||
};
|
||||
|
||||
serviceConfig = mkMerge [
|
||||
{
|
||||
ExecStart = "${cfg.package}/bin/deliantra-server";
|
||||
Restart = "always";
|
||||
User = "deliantra";
|
||||
Group = "deliantra";
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
}
|
||||
(mkIf (cfg.stateDir == "/var/lib/deliantra") {
|
||||
StateDirectory = "deliantra";
|
||||
})
|
||||
];
|
||||
|
||||
# The deliantra server needs access to a bunch of files at runtime that
|
||||
# are not created automatically at server startup; they're meant to be
|
||||
# installed in $PREFIX/var/deliantra-server by `make install`. And those
|
||||
# files need to be writeable, so we can't just point at the ones in the
|
||||
# nix store. Instead we take the approach of copying them out of the store
|
||||
# on first run. If `bookarch` already exists, we assume the rest of the
|
||||
# files do as well, and copy nothing -- otherwise we risk ovewriting
|
||||
# server state information every time the server is upgraded.
|
||||
preStart = ''
|
||||
if [ ! -e "${cfg.stateDir}"/bookarch ]; then
|
||||
${pkgs.rsync}/bin/rsync -a --chmod=u=rwX,go=rX \
|
||||
"${cfg.package}/var/deliantra-server/" "${cfg.stateDir}/"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ serverPort ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ in {
|
|||
options.services.datadog-agent = {
|
||||
enable = mkOption {
|
||||
description = ''
|
||||
Whether to enable the datadog-agent v6 monitoring service
|
||||
Whether to enable the datadog-agent v7 monitoring service
|
||||
'';
|
||||
default = false;
|
||||
type = types.bool;
|
||||
|
|
@ -61,7 +61,7 @@ in {
|
|||
default = pkgs.datadog-agent;
|
||||
defaultText = "pkgs.datadog-agent";
|
||||
description = ''
|
||||
Which DataDog v6 agent package to use. Note that the provided
|
||||
Which DataDog v7 agent package to use. Note that the provided
|
||||
package is expected to have an overridable `pythonPackages`-attribute
|
||||
which configures the Python environment with the Datadog
|
||||
checks.
|
||||
|
|
@ -274,7 +274,7 @@ in {
|
|||
path = [ ];
|
||||
script = ''
|
||||
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
|
||||
${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
|
||||
${pkgs.datadog-process-agent}/bin/process-agent --config /etc/datadog-agent/datadog.yaml
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ in
|
|||
path = with pkgs; [ openssl ];
|
||||
environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg";
|
||||
preStart = let
|
||||
pi-manage = "${pkgs.sudo}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage";
|
||||
pi-manage = "${config.security.sudo.package}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage";
|
||||
pgsu = config.services.postgresql.superUser;
|
||||
psql = config.services.postgresql.package;
|
||||
in ''
|
||||
|
|
@ -239,8 +239,8 @@ in
|
|||
-i "${piCfgFile}"
|
||||
chown ${cfg.user}:${cfg.group} ${cfg.stateDir}/privacyidea.cfg
|
||||
if ! test -e "${cfg.stateDir}/db-created"; then
|
||||
${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user}
|
||||
${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea
|
||||
${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user}
|
||||
${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea
|
||||
${pi-manage} create_enckey
|
||||
${pi-manage} create_audit_keys
|
||||
${pi-manage} createdb
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ let
|
|||
linuxPackages_5_4
|
||||
linuxPackages_5_10
|
||||
linuxPackages_5_13
|
||||
linuxPackages_5_14
|
||||
|
||||
linuxPackages_4_14_hardened
|
||||
linuxPackages_4_19_hardened
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "charge-lnd";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accumulator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1cj8ggahnbn55wlkxzf5b9n8rvm30mc95vgcw8b60pzs47q6vncp";
|
||||
sha256 = "1d1cbpmpppp7z1bmsarwfs314c7ypchlyr4calx0fzxfpxzfks5k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megapixels";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~martijnbraam";
|
||||
repo = "megapixels";
|
||||
rev = version;
|
||||
sha256 = "0jnfzwvq58p4ksyifma10i158r2fb7fv72ymibgcxbnx596xpjb2";
|
||||
sha256 = "0dagp1sh5whnnllrydk7ijjid0hmvcbdm8kkzq2g168khdfn80jm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.8.5";
|
||||
version = "0.9.0";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
|
||||
sha256 = "sha256-H895fyI6fdrrqhcgKMxzGSxO5BFuuizjfjBEwvl1yyg=";
|
||||
sha256 = "sha256-wk8kk+PG0nw2OE7mccGjP435SEytStRy1unxg6EqP/8=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "2.9.3";
|
||||
version = "3.0.1";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
|
@ -68,7 +68,7 @@ mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ZmhgBL5nbgrNLRmCHocqVNC3KtaLm4LUY1f4Xl8CvB4=";
|
||||
sha256 = "196w82a92jahz7caqv2cyhhq53xm3figa7kiq59kid5wbqg33c9x";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -81,6 +81,8 @@ mkDerivation rec {
|
|||
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
|
||||
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
|
||||
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \
|
||||
--replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"'
|
||||
'';
|
||||
|
||||
# We want to run wrapProgram manually (with additional parameters)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kitsas";
|
||||
version = "2.3";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artoh";
|
||||
repo = "kitupiikki";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qac6cxkb45rs5pschsf2rvpa789g27shmrwpshwahqzhw42xvgl";
|
||||
sha256 = "sha256-UH2bFJZd83APRjlv6JR+Uy+ng4DWnnLmavAgjgSOiRo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{ lib, fetchFromGitHub, pythonPackages, installShellFiles }:
|
||||
|
||||
with pythonPackages;
|
||||
{ lib, fetchFromGitHub, python3, installShellFiles }:
|
||||
|
||||
let
|
||||
# Watson is currently not compatible with Click 8. See the following
|
||||
|
|
@ -10,11 +8,12 @@ let
|
|||
# https://github.com/TailorDev/Watson/pull/432
|
||||
#
|
||||
# Workaround the issue by providing click 7 explicitly.
|
||||
click7 = pythonPackages.callPackage ../../../development/python-modules/click/7.nix {};
|
||||
click7-didyoumean = click-didyoumean.override {
|
||||
click = click7;
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
click = self.callPackage ../../../development/python-modules/click/7.nix { };
|
||||
};
|
||||
};
|
||||
in buildPythonApplication rec {
|
||||
in with python.pkgs; buildPythonApplication rec {
|
||||
pname = "watson";
|
||||
|
||||
# When you update Watson, please check whether the Click 7
|
||||
|
|
@ -34,7 +33,7 @@ in buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
|
||||
propagatedBuildInputs = [ arrow click7 click7-didyoumean requests ];
|
||||
propagatedBuildInputs = [ arrow click click-didyoumean requests ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tqsl";
|
||||
version = "2.5.1";
|
||||
version = "2.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
|
||||
sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0";
|
||||
sha256 = "sha256-0QlTUNwKeuuR+n8eT04kiywAsY3hrPGPYH1A84MmxIs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "MAVProxy";
|
||||
version = "1.8.41";
|
||||
version = "1.8.42";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3dffb9b5b1e23c8dcb54bb8bdf1435337c01a4ab9faf34ffdfcb1dd26a4d8890";
|
||||
sha256 = "787f29f10d2cb7572206f874a255949d0da9a4e2ffd2bc28b94b78bb73cf05d8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,30 +1,19 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, gnome
|
||||
, gnome-icon-theme
|
||||
, hicolor-icon-theme
|
||||
}:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, hicolor-icon-theme }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "Whitesur-icon-theme";
|
||||
version = "2021-05-20";
|
||||
version = "2021-08-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "KboUYozTleOBKNun66g2oj7u/36hyQsPtRSk/x/LAWo=";
|
||||
sha256 = "O7nb6X20HvnzldijP/fXqAs/2qE5JUg3DEMb84ZMQp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
buildInputs = [
|
||||
gnome-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
hicolor-icon-theme
|
||||
];
|
||||
buildInputs = [ hicolor-icon-theme ];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, gtk-engine-murrine
|
||||
|
|
@ -8,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "venta";
|
||||
version = "2020-08-20";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca";
|
||||
sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb";
|
||||
rev = version;
|
||||
sha256 = "1fhiq1kji5qmwsh8335rzilvhs30g5jp126czf2rf532iba0ivd7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cp -a Venta* $out/share/themes
|
||||
rm $out/share/themes/*/COPYING
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
67
pkgs/development/libraries/blitz/default.nix
Normal file
67
pkgs/development/libraries/blitz/default.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkg-config, gfortran, texinfo, python, boost
|
||||
# Select SIMD alignment width (in bytes) for vectorization.
|
||||
, simdWidth ? 1
|
||||
# Pad arrays to simdWidth by default?
|
||||
# Note: Only useful if simdWidth > 1
|
||||
, enablePadding ? false
|
||||
# Activate serialization through Boost.Serialize?
|
||||
, enableSerialization ? true
|
||||
# Activate test-suite?
|
||||
# WARNING: Some of the tests require up to 1700MB of memory to compile.
|
||||
, doCheck ? true
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blitz++";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blitzpp";
|
||||
repo = "blitz";
|
||||
rev = "1.0.1";
|
||||
sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python texinfo ];
|
||||
buildInputs = [ gfortran texinfo boost ];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-shared"
|
||||
"--disable-static"
|
||||
"--enable-fortran"
|
||||
"--enable-optimize"
|
||||
"--with-pic=yes"
|
||||
"--enable-html-docs"
|
||||
"--disable-doxygen"
|
||||
"--disable-dot"
|
||||
"--disable-latex-docs"
|
||||
"--enable-simd-width=${toString simdWidth}"
|
||||
"--with-boost=${boost.dev}"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
] ++ optional enablePadding "--enable-array-length-padding"
|
||||
++ optional enableSerialization "--enable-serialization"
|
||||
++ optional stdenv.is64bit "--enable-64bit";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
inherit doCheck;
|
||||
checkTarget = "check-testsuite check-examples";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast multi-dimensional array library for C++";
|
||||
homepage = https://sourceforge.net/projects/blitz/;
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
longDescription = ''
|
||||
Blitz++ is a C++ class library for scientific computing which provides
|
||||
performance on par with Fortran 77/90. It uses template techniques to
|
||||
achieve high performance. Blitz++ provides dense arrays and vectors,
|
||||
random number generators, and small vectors (useful for representing
|
||||
multicomponent or vector fields).
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gvm-libs";
|
||||
version = "21.4.1";
|
||||
version = "21.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ap3m7f1gyv9p96czi8mzryhjijgaqcbdyr8lwvnw8ynzskx8s3y";
|
||||
sha256 = "14v7z8ynd20s4pkhp2nc19n6gbmbh8yrn39yi2fbfm7gj28b52sx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnbd";
|
||||
version = "1.9.3";
|
||||
version = "1.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-qF9IFZGj+9Zuw00+9pbgAhBUk+eUIAxhYNJAMWxmWo0=";
|
||||
hash = "sha256-BnMoxIiuwhqcwVr3AwAIFgZPcFsIg55N66ZwWMTUnCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxsmm";
|
||||
version = "1.16.1";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hfp";
|
||||
repo = "libxsmm";
|
||||
rev = version;
|
||||
sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0";
|
||||
sha256 = "sha256-gmv5XHBRztcF7+ZKskQMloytJ53k0eJg0HJmUhndq70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,35 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, html5lib
|
||||
, lxml
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, soupsieve
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beautifulsoup4";
|
||||
version = "4.9.3";
|
||||
version = "4.10.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25";
|
||||
sha256 = "sha256-wjrSPFIdgYlVpBUaZ9gVgDGdS/VI09SfQiOuBB/5iJE=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkPhase = ''
|
||||
py.test $out/${python.sitePackages}/bs4/tests
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
html5lib
|
||||
lxml
|
||||
soupsieve
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ soupsieve ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "bs4" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://crummy.com/software/BeautifulSoup/bs4/";
|
||||
|
|
|
|||
|
|
@ -2,32 +2,34 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, capstone
|
||||
, packaging
|
||||
, pyelftools
|
||||
, tlsh
|
||||
, nose
|
||||
}:
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "telfhash";
|
||||
version = "unstable-2021-01-29";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trendmicro";
|
||||
repo = "telfhash";
|
||||
rev = "b5e398e59dc25a56a28861751c1fccc74ef71617";
|
||||
sha256 = "jNu6qm8Q/UyJVaCqwFOPX02xAR5DwvCK3PaH6Fvmakk=";
|
||||
rev = "v${version}";
|
||||
sha256 = "124zajv43wx9l8rvdvmzcnbh0xpzmbn253pznpbjwvygfx16gq02";
|
||||
};
|
||||
|
||||
patches = [ ./telfhash-new-tlsh-hash.patch ];
|
||||
|
||||
# The tlsh library's name is just "tlsh"
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt --replace "python-tlsh" "tlsh"
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "python-tlsh" "tlsh" \
|
||||
--replace "py-tlsh" "tlsh"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
capstone
|
||||
pyelftools
|
||||
tlsh
|
||||
packaging
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
diff --git a/telfhash/grouping.py b/telfhash/grouping.py
|
||||
index c62f8d9..4ee9f0b 100644
|
||||
--- a/telfhash/grouping.py
|
||||
+++ b/telfhash/grouping.py
|
||||
@@ -32,10 +32,10 @@ import tlsh
|
||||
def get_combination(telfhash_data):
|
||||
|
||||
#
|
||||
- # TLSH hash is 70 characters long. if the telfhash is not 70
|
||||
+ # The new TLSH hash is 72 characters long. if the telfhash is not 72
|
||||
# characters in length, exclude from the list
|
||||
#
|
||||
- files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 70]
|
||||
+ files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 72]
|
||||
|
||||
#
|
||||
# get the combination of all the possible pairs of filenames
|
||||
diff --git a/telfhash/telfhash.py b/telfhash/telfhash.py
|
||||
index f2bbd25..c6e346c 100755
|
||||
--- a/telfhash/telfhash.py
|
||||
+++ b/telfhash/telfhash.py
|
||||
@@ -132,7 +132,7 @@ def get_hash(symbols_list):
|
||||
symbol_string = ",".join(symbols_list)
|
||||
encoded_symbol_string = symbol_string.encode("ascii")
|
||||
|
||||
- return tlsh.forcehash(encoded_symbol_string).lower()
|
||||
+ return tlsh.forcehash(encoded_symbol_string)
|
||||
|
||||
|
||||
def elf_get_imagebase(elf):
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "konstraint";
|
||||
version = "0.14.2";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plexsystems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ESkRycS+ObLaDkb28kvi9Wtc4Lc66qHFz0DYMjEa5eE=";
|
||||
sha256 = "sha256-lnbci3SUVp/vyArrfRF1dgv0KnqcmGIalhsZjDOhpSg=";
|
||||
};
|
||||
vendorSha256 = "sha256-uvDYUm6REL1hvj77P/+1fMCE1n6ZUP6rp0ma8O2bVkU=";
|
||||
vendorSha256 = "sha256-hfnpZgGIEpfHjM5J93D/aljN6j5XHGknpYXWeRV4Y4Q=";
|
||||
|
||||
# Exclude go within .github folder
|
||||
excludedPackages = ".github";
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ let
|
|||
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "php-blackfire";
|
||||
version = "1.53.0";
|
||||
version = "1.66.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
|
||||
sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54=";
|
||||
sha256 = "kfCIjsGSvaGCZtOIBdKcaeS+TJdVHICo7MSW8YxQ+/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2021.07.12-12.30.59";
|
||||
version = "2021.09.04-17.11.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0iky3yh548xn28285x8gnjzc00f3i2b415wb2dhd9p9y2bgzhkld";
|
||||
sha256 = "1i12vxg3yb1051q7j6yqlsdy4lc4xl7n4lqssp8w634fpx1p0rgv";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar";
|
||||
sha256 = "02k1k0slh1lm7k43d52jvgl0fdyp9gcr8csbr6yi71qbhy0axrmp";
|
||||
sha256 = "0ahrlqzyz3mgfx8w9w49172pb3dipq0hwwzk2yasqzcp1fi6jm80";
|
||||
};
|
||||
|
||||
GRAALVM_HOME = graalvm11-ce;
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
export HOME="$(mktemp -d)"
|
||||
./clojure-lsp --version | fgrep -q '${version}'
|
||||
${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp
|
||||
${babashka}/bin/bb integration-test ./clojure-lsp
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
|||
27
pkgs/games/crossfire/crossfire-arch.nix
Normal file
27
pkgs/games/crossfire/crossfire-arch.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, lib, fetchsvn,
|
||||
version, rev, sha256 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crossfire-arch";
|
||||
version = "r${toString rev}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.code.sf.net/p/crossfire/code/arch/trunk/";
|
||||
sha256 = sha256;
|
||||
rev = rev;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"
|
||||
cp -a . "$out/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Archetype data for the Crossfire free MMORPG";
|
||||
homepage = "http://crossfire.real-time.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
32
pkgs/games/crossfire/crossfire-client.nix
Normal file
32
pkgs/games/crossfire/crossfire-client.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, lib, fetchsvn
|
||||
, cmake, pkg-config, perl, vala
|
||||
, gtk2, pcre, zlib, libpng, fribidi, harfbuzzFull, xorg, util-linux, curl
|
||||
, SDL, SDL_image, SDL_mixer, libselinux, libsepol
|
||||
, version, rev, sha256
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crossfire-client";
|
||||
version = "r${toString rev}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.code.sf.net/p/crossfire/code/client/trunk/";
|
||||
sha256 = sha256;
|
||||
rev = rev;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config perl vala ];
|
||||
buildInputs = [
|
||||
gtk2 pcre zlib libpng fribidi harfbuzzFull xorg.libpthreadstubs
|
||||
xorg.libXdmcp curl SDL SDL_image SDL_mixer util-linux libselinux libsepol
|
||||
];
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTKv2 client for the Crossfire free MMORPG";
|
||||
homepage = "http://crossfire.real-time.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
27
pkgs/games/crossfire/crossfire-maps.nix
Normal file
27
pkgs/games/crossfire/crossfire-maps.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, lib, fetchsvn,
|
||||
version, rev, sha256 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crossfire-maps";
|
||||
version = "r${toString rev}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.code.sf.net/p/crossfire/code/maps/trunk/";
|
||||
sha256 = sha256;
|
||||
rev = rev;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"
|
||||
cp -a . "$out/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Map data for the Crossfire free MMORPG";
|
||||
homepage = "http://crossfire.real-time.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
37
pkgs/games/crossfire/crossfire-server.nix
Normal file
37
pkgs/games/crossfire/crossfire-server.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv, lib, fetchsvn, autoreconfHook,
|
||||
autoconf, automake, libtool, flex, perl, check, pkg-config, python3,
|
||||
version, rev, sha256, maps, arch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crossfire-server";
|
||||
version = "r${toString rev}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.code.sf.net/p/crossfire/code/server/trunk/";
|
||||
sha256 = sha256;
|
||||
rev = rev;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python3 ];
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preConfigure = ''
|
||||
ln -s ${arch} lib/arch
|
||||
ln -s ${maps} lib/maps
|
||||
sh autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-python=${python3}" ];
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${maps} "$out/share/crossfire/maps"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Server for the Crossfire free MMORPG";
|
||||
homepage = "http://crossfire.real-time.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
28
pkgs/games/crossfire/default.nix
Normal file
28
pkgs/games/crossfire/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ callPackage, ... }:
|
||||
|
||||
rec {
|
||||
crossfire-client = callPackage ./crossfire-client.nix {
|
||||
version = "1.75.0";
|
||||
rev = 21760;
|
||||
sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d";
|
||||
};
|
||||
|
||||
crossfire-server = callPackage ./crossfire-server.nix {
|
||||
version = "latest";
|
||||
rev = 22111;
|
||||
sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7";
|
||||
maps = crossfire-maps; arch = crossfire-arch;
|
||||
};
|
||||
|
||||
crossfire-arch = callPackage ./crossfire-arch.nix {
|
||||
version = "latest";
|
||||
rev = 22111;
|
||||
sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms";
|
||||
};
|
||||
|
||||
crossfire-maps = callPackage ./crossfire-maps.nix {
|
||||
version = "latest";
|
||||
rev = 22111;
|
||||
sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap";
|
||||
};
|
||||
}
|
||||
17
pkgs/games/deliantra/0001-abs.patch
Normal file
17
pkgs/games/deliantra/0001-abs.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
--- a/utils/cfhq2xa.C
|
||||
+++ b/utils/cfhq2xa.C
|
||||
@@ -182,10 +182,10 @@ static inline bool Diff (pixel w1, pixel w2)
|
||||
pixel YUV1 = RGBAtoYUVA (w1);
|
||||
pixel YUV2 = RGBAtoYUVA (w2);
|
||||
|
||||
- return ((abs (((YUV1 >> Rshift) & Cmask) - ((YUV2 >> Rshift) & Cmask)) > trY) ||
|
||||
- (abs (((YUV1 >> Gshift) & Cmask) - ((YUV2 >> Gshift) & Cmask)) > trU) ||
|
||||
- (abs (((YUV1 >> Bshift) & Cmask) - ((YUV2 >> Bshift) & Cmask)) > trV) ||
|
||||
- (abs (((YUV1 >> Ashift) & Cmask) - ((YUV2 >> Ashift) & Cmask)) > trA) );
|
||||
+ return ((abs ((signed int)((YUV1 >> Rshift) & Cmask) - (signed int)((YUV2 >> Rshift) & Cmask)) > trY) ||
|
||||
+ (abs ((signed int)((YUV1 >> Gshift) & Cmask) - (signed int)((YUV2 >> Gshift) & Cmask)) > trU) ||
|
||||
+ (abs ((signed int)((YUV1 >> Bshift) & Cmask) - (signed int)((YUV2 >> Bshift) & Cmask)) > trV) ||
|
||||
+ (abs ((signed int)((YUV1 >> Ashift) & Cmask) - (signed int)((YUV2 >> Ashift) & Cmask)) > trA) );
|
||||
}
|
||||
|
||||
static void
|
||||
11
pkgs/games/deliantra/0002-datadir.patch
Normal file
11
pkgs/games/deliantra/0002-datadir.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/utils/cfutil.in
|
||||
+++ b/utils/cfutil.in
|
||||
@@ -27,7 +27,7 @@ use common::sense;
|
||||
my $prefix = "@prefix@";
|
||||
my $exec_prefix = "@exec_prefix@";
|
||||
my $datarootdir = "@datarootdir@";
|
||||
-my $DATADIR = "@datadir@/@PACKAGE@";
|
||||
+my $DATADIR = $ENV{'DELIANTRA_DATADIR'} || "@datadir@/@PACKAGE@";
|
||||
|
||||
my $CONVERT = "@CONVERT@";
|
||||
my $IDENTIFY = "@IDENTIFY@";
|
||||
10
pkgs/games/deliantra/default.nix
Normal file
10
pkgs/games/deliantra/default.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
pkgs:
|
||||
|
||||
let
|
||||
callPackage = pkgs.callPackage;
|
||||
in {
|
||||
deliantra-server = callPackage ./deliantra-server.nix {};
|
||||
deliantra-arch = callPackage ./deliantra-arch.nix {};
|
||||
deliantra-maps = callPackage ./deliantra-maps.nix {};
|
||||
deliantra-data = callPackage ./deliantra-data.nix {};
|
||||
}
|
||||
25
pkgs/games/deliantra/deliantra-arch.nix
Normal file
25
pkgs/games/deliantra/deliantra-arch.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, lib, fetchurl, deliantra-server }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deliantra-arch";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz";
|
||||
sha256 = "1xzhv48g90hwkzgx9nfjm81ivg6hchkik9ldimi8ijb4j393kvsz";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"
|
||||
export DELIANTRA_DATADIR="$out"
|
||||
${deliantra-server}/bin/cfutil --install-arch .
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Archetype data for the Deliantra free MMORPG";
|
||||
homepage = "http://www.deliantra.net/";
|
||||
license = with licenses; [ gpl2Plus agpl3Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
21
pkgs/games/deliantra/deliantra-data.nix
Normal file
21
pkgs/games/deliantra/deliantra-data.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ stdenv, lib, fetchurl, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }:
|
||||
|
||||
symlinkJoin rec {
|
||||
name = "deliantra-data-${version}";
|
||||
version = "M${deliantra-maps.version}+A${deliantra-arch.version}";
|
||||
|
||||
paths = [
|
||||
deliantra-maps
|
||||
deliantra-arch
|
||||
"${deliantra-server}/share/deliantra-server"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Combined game data (maps + archetypes) for the Deliantra free MMORPG";
|
||||
homepage = "http://www.deliantra.net/";
|
||||
license = with licenses; [ gpl2Plus agpl3Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
25
pkgs/games/deliantra/deliantra-maps.nix
Normal file
25
pkgs/games/deliantra/deliantra-maps.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, lib, fetchurl, deliantra-server }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deliantra-maps";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz";
|
||||
sha256 = "0zbwzya28s1xpnbrmqkqvfrzns03zdjd8a9w9nk665aif6rw2zbz";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/maps"
|
||||
export DELIANTRA_DATADIR="$out"
|
||||
${deliantra-server}/bin/cfutil --install-maps .
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Map data for the Deliantra free MMORPG";
|
||||
homepage = "http://www.deliantra.net/";
|
||||
license = with licenses; [ gpl2Plus agpl3Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
48
pkgs/games/deliantra/deliantra-server.nix
Normal file
48
pkgs/games/deliantra/deliantra-server.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv, lib, fetchurl, perlPackages
|
||||
, autoconf, perl, gperf, optipng, pngnq, rsync, imagemagick, blitz
|
||||
, pkg-config, glib, boost, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
perl-deps = with perlPackages; [
|
||||
AnyEvent AnyEventAIO AnyEventBDB AnyEventIRC
|
||||
CompressLZF commonsense Coro CoroEV
|
||||
Deliantra DigestSHA1 EV PodPOM SafeHole URI YAMLLibYAML
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deliantra-server";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz";
|
||||
sha256 = "0v0m2m9fxq143aknh7jb3qj8bnpjrs3bpbbx07c18516y3izr71d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf perl gperf optipng pngnq rsync imagemagick
|
||||
pkg-config makeWrapper
|
||||
];
|
||||
propagatedBuildInputs = perl-deps;
|
||||
buildInputs = [
|
||||
blitz boost glib
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
patches = [
|
||||
./0001-abs.patch
|
||||
./0002-datadir.patch
|
||||
];
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB
|
||||
wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Server for the Deliantra free MMORPG";
|
||||
homepage = "http://www.deliantra.net/";
|
||||
license = with licenses; [ gpl2Plus agpl3Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
|
|
@ -44,9 +44,9 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.16";
|
||||
version = "6.17";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-aVCSBQ2YoSnE1/MVPLDkkjJIuuXz2SBjn6SrGnP4+ug=";
|
||||
sha256 = "sha256-nbHyQ12AJiw3dzF98HWFWu6j5qUst3xjDsGysfuUjwg=";
|
||||
inherit (stable) gecko32 gecko64;
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
|
|
@ -65,7 +65,7 @@ in rec {
|
|||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-TvTx3vSOyudyC7aravQGcj5KGqI8uHkgHroIJww5buQ=";
|
||||
sha256 = "sha256-rR5m6D8M3vTXXIHzsF8+o2G5rlRS2HLfCHoatbJwlrQ=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper
|
||||
, python2Packages
|
||||
, python3Packages
|
||||
|
||||
# Extra options
|
||||
, device ? "fsij", vid ? "234b", pid ? "0000"
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
|||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ];
|
||||
buildInputs = with python2Packages; [ python pyusb colorama ];
|
||||
buildInputs = with python3Packages; [ python pyusb colorama ];
|
||||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.fsij.org/pages/gnuk";
|
||||
homepage = "https://www.fsij.org/doc-gnuk/";
|
||||
description = "An implementation of USB cryptographic token for gpg";
|
||||
license = licenses.gpl3;
|
||||
platforms = with platforms; linux;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -480,9 +480,11 @@ self: super: {
|
|||
});
|
||||
|
||||
sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
postPatch = let
|
||||
libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
in ''
|
||||
substituteInPlace lua/sqlite/defs.lua \
|
||||
--replace "vim.g.sqlite_clib_path" "vim.g.sqlite_clib_path or '${sqlite.out}/lib/libsqlite3.so'"
|
||||
--replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@ esneider/YUNOcommit.vim
|
|||
euclidianAce/BetterLua.vim
|
||||
euclio/vim-markdown-composer
|
||||
f-person/git-blame.nvim
|
||||
f3fora/cmp-spell
|
||||
famiu/bufdelete.nvim
|
||||
famiu/feline.nvim
|
||||
farmergreg/vim-lastplace
|
||||
|
|
@ -327,6 +328,7 @@ karb94/neoscroll.nvim
|
|||
kassio/neoterm
|
||||
kbenzie/vim-spirv
|
||||
kchmck/vim-coffee-script
|
||||
kdheepak/cmp-latex-symbols@main
|
||||
kdheepak/lazygit.nvim
|
||||
KeitaNakamura/neodark.vim
|
||||
keith/investigate.vim
|
||||
|
|
@ -344,6 +346,7 @@ kosayoda/nvim-lightbulb
|
|||
kristijanhusak/defx-git
|
||||
kristijanhusak/defx-icons
|
||||
kristijanhusak/deoplete-phpactor
|
||||
kristijanhusak/orgmode.nvim
|
||||
kristijanhusak/vim-carbon-now-sh
|
||||
kristijanhusak/vim-dadbod-completion
|
||||
kristijanhusak/vim-dadbod-ui
|
||||
|
|
@ -589,6 +592,7 @@ raghur/vim-ghost
|
|||
Raimondi/delimitMate
|
||||
rakr/vim-one
|
||||
ray-x/aurora
|
||||
ray-x/cmp-treesitter
|
||||
ray-x/lsp_signature.nvim
|
||||
rbgrouleff/bclose.vim
|
||||
rbong/vim-flog
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.63";
|
||||
version = "5.10.64";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0bnbkd4vbf43m37wab4zwvcv3wy3ixh4x1zrwlfhi845i21mx88r";
|
||||
sha256 = "02p36mf41nsa4bamw18vhgbca094q2blbqqljdsb9qid9b94pf1y";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.13.15";
|
||||
version = "5.13.16";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "06v2jgzq2l56bjbymcrnaybqvvr1q44c0k534v77b3l5bwwlq2rk";
|
||||
sha256 = "1ljigvcg4q6ckr8kna3q5iyjsy7x5mrf1ycqfy0ibbhn9hbqjna9";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.14.2";
|
||||
version = "5.14.3";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "05yw3i2c21dabdn5khyk60ds4h8krg5iyxk4zq1msv0igdfqf6gl";
|
||||
sha256 = "1n5808v3vb2c27pv4f8r4avqzqp20dylclbc83cj2872d6z41hy6";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.144";
|
||||
version = "5.4.145";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw";
|
||||
sha256 = "1yb8vk5sbnyswylkpqw5i4n9cmnmlrfmbrnmy3nif579q8p7ixsw";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.4.143-rt63"; # updated by ./update-rt.sh
|
||||
version = "5.4.143-rt64"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -21,7 +21,7 @@ in buildLinux (args // {
|
|||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "13d9sx6vw3hlh0cpccfsfqkjj6yfjmbh4wp4x6ry84i39lrfbwg3";
|
||||
sha256 = "0prfrvk2ds20sclikizzgg5qf4mfcyaymp9r272d5nj35293622n";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.13.13";
|
||||
version = "5.14.3";
|
||||
release = "1";
|
||||
suffix = "xanmod${release}-cacule";
|
||||
in
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-qRJuTkTmsKbCCGrzq62o+1RrvTGM74p4mqy9AQ8hvD0=";
|
||||
sha256 = "sha256-nl8DktW2TsV20ii/f41TsSotE/yBRBH3SYlWKLsfT50=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
|
@ -53,7 +53,7 @@ buildLinux (args // rec {
|
|||
};
|
||||
|
||||
extraMeta = {
|
||||
branch = "5.13-cacule";
|
||||
branch = "5.14-cacule";
|
||||
maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ];
|
||||
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
|
||||
broken = stdenv.isAarch64;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgmatic";
|
||||
version = "1.5.13";
|
||||
version = "1.5.18";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12390ffdg30ncc5k92pvagwbvnsh42xl35a3nagbskznyfd23mw3";
|
||||
sha256 = "sha256-dX1U1zza8zMhDiTLE+DgtN6RLRciLks4NDOukpKH/po=";
|
||||
};
|
||||
|
||||
checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];
|
||||
|
|
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3Packages; [
|
||||
borgbackup
|
||||
colorama
|
||||
pykwalify
|
||||
jsonschema
|
||||
ruamel_yaml
|
||||
requests
|
||||
setuptools
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mcfly.bash --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.zsh --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.fish --replace '(which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
'';
|
||||
|
||||
cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
To update datadog-agent v6 (v5 is deprecated and should be removed):
|
||||
|
||||
1. Bump `version`, `rev`, `sha256` and `payloadVersion` in `datadog-agent.nix`
|
||||
2. `git clone https://github.com/DataDog/datadog-agent.git && cd datadog-agent`
|
||||
3. `git checkout <tag>`
|
||||
4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz`
|
||||
5. `dep2nix`
|
||||
6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix`
|
||||
|
||||
To update datadog-process-agent:
|
||||
|
||||
1. Bump `version`, `rev` and `sha256` in `datadog-process-agent.nix`
|
||||
2. `git clone https://github.com/DataDog/datadog-process-agent.git && cd datadog-process-agent`
|
||||
3. `git checkout <tag>`
|
||||
4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz`
|
||||
5. `dep2nix`
|
||||
6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix`
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,22 +1,25 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
|
||||
{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
|
||||
|
||||
let
|
||||
# keep this in sync with github.com/DataDog/agent-payload dependency
|
||||
payloadVersion = "4.7.1";
|
||||
payloadVersion = "4.78.0";
|
||||
python = pythonPackages.python;
|
||||
|
||||
in buildGoPackage rec {
|
||||
pname = "datadog-agent";
|
||||
version = "6.11.2";
|
||||
owner = "DataDog";
|
||||
repo = "datadog-agent";
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
version = "7.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z";
|
||||
rev = version;
|
||||
sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd";
|
||||
};
|
||||
|
||||
vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi";
|
||||
|
||||
subPackages = [
|
||||
"cmd/agent"
|
||||
"cmd/cluster-agent"
|
||||
|
|
@ -24,15 +27,12 @@ in buildGoPackage rec {
|
|||
"cmd/py-launcher"
|
||||
"cmd/trace-agent"
|
||||
];
|
||||
goDeps = ./datadog-agent-deps.nix;
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ systemd ];
|
||||
PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
|
||||
|
||||
|
||||
preBuild = let
|
||||
ldFlags = lib.concatStringsSep " " [
|
||||
"-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
|
||||
|
|
@ -43,6 +43,8 @@ in buildGoPackage rec {
|
|||
];
|
||||
in ''
|
||||
buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}")
|
||||
# Keep directories to generate in sync with tasks/go.py
|
||||
go generate ./pkg/status ./cmd/agent/gui
|
||||
'';
|
||||
|
||||
# DataDog use paths relative to the agent binary, so fix these.
|
||||
|
|
@ -61,7 +63,7 @@ in buildGoPackage rec {
|
|||
cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent
|
||||
cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
|
||||
|
||||
cp -R $src/pkg/status/dist/templates $out/share/datadog-agent
|
||||
cp -R $src/pkg/status/templates $out/share/datadog-agent
|
||||
|
||||
wrapProgram "$out/bin/agent" \
|
||||
--set PYTHONPATH "$out/${python.sitePackages}" \
|
||||
|
|
|
|||
|
|
@ -1,669 +0,0 @@
|
|||
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "bitbucket.org/ww/goautoneg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/adjust/goautoneg";
|
||||
rev = "d788f35a0315672bc90f50a6145d1252a230ee0d";
|
||||
sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/agent-payload";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/agent-payload";
|
||||
rev = "f0521943f60221829c6bb5de1c7f788cd4411372";
|
||||
sha256 = "19m3kiwi0g2a0rysjabrb2nkkz7yx632g7s05mylv1x2ixparhrg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/datadog-agent";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/datadog-agent";
|
||||
rev = "d7712d570b91f4f97af9f155ad1c676921d8325d";
|
||||
sha256 = "1gi921z79la4hjhm8xhl4jz167200qljvhhsy4blj4vinkgfpm8w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/datadog-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/datadog-go";
|
||||
rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d";
|
||||
sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/gopsutil";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/gopsutil";
|
||||
rev = "233cd0cf42c26d835ed6f0e46f2103432a88b526";
|
||||
sha256 = "0rvxs1jjzv3j834dns28zr25bznarjmpgdy0z6gpimnq5nyicys5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/viper";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/viper";
|
||||
rev = "v1.5.0";
|
||||
sha256 = "1sv0xvmfaif7zpfwk0j6qf11hxnfdsb2zfj63b9zx7l0zzhjzh06";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/zstd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/zstd";
|
||||
rev = "2b373cbe6ac0c8e6960bbd18026ceb269eef89f5";
|
||||
sha256 = "157kh7w173igxbypknmr8hc8934ykmnb02pkb76k1jwq4sphn8qj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/Microsoft/go-winio";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Microsoft/go-winio";
|
||||
rev = "97e4973ce50b2ff5f09635a57e2b88a037aae829";
|
||||
sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/StackExchange/wmi";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/StackExchange/wmi";
|
||||
rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
|
||||
sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/aws/aws-sdk-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "bff41fb23b7550368282029f6478819d6a99ae0f";
|
||||
sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/beorn7/perks";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/beorn7/perks";
|
||||
rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4";
|
||||
sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cenkalti/backoff";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cenkalti/backoff";
|
||||
rev = "b7325b0f3f1097c6546ea5e83c4a23267e58ad71";
|
||||
sha256 = "0vx4ggryxd9w111mf1bi2g51559r8sh99gdqah72k4dfj3vrv19d";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cihub/seelog";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cihub/seelog";
|
||||
rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115";
|
||||
sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
|
||||
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/distribution";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/distribution";
|
||||
rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89";
|
||||
sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/docker";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/docker";
|
||||
rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363";
|
||||
sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/go-connections";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/go-connections";
|
||||
rev = "97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e";
|
||||
sha256 = "11szydahzjz7zia3hr8kplnlxsg9papbvc2mgr1vlwrahxpdx7l7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/go-units";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/go-units";
|
||||
rev = "47565b4f722fb6ceae66b95f853feed578a4a51c";
|
||||
sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/emicklei/go-restful";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/emicklei/go-restful";
|
||||
rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
|
||||
sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fsnotify/fsnotify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "ccc981bf80385c528a65fbfdd49bf2d8da22aa23";
|
||||
sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ghodss/yaml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ghodss/yaml";
|
||||
rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
|
||||
sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/go-ini/ini";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-ini/ini";
|
||||
rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
|
||||
sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/go-ole/go-ole";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-ole/go-ole";
|
||||
rev = "7a0fa49edf48165190530c675167e2f319a05268";
|
||||
sha256 = "00v6fixm35pj8jyqbj0z3kyv7bhrqa2dr2fgmlc9xqwbf0nayssy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gogo/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gogo/protobuf";
|
||||
rev = "d76fbc1373015ced59b43ac267f28d546b955683";
|
||||
sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/glog";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/glog";
|
||||
rev = "44145f04b68cf362d9c4df2182967c2275eaefed";
|
||||
sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
|
||||
sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/google/gofuzz";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/google/gofuzz";
|
||||
rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c";
|
||||
sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/googleapis/gnostic";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/googleapis/gnostic";
|
||||
rev = "0c5108395e2debce0d731cf0287ddf7242066aba";
|
||||
sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/golang-lru";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/golang-lru";
|
||||
rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4";
|
||||
sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "65a6292f0157eff210d03ed1bf6c59b190b8b906";
|
||||
sha256 = "00qgmygfa4vgf9v3lpz4vp1ca1hcfcxnjqjrvp6z4jjklc8x4mqf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hectane/go-acl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hectane/go-acl";
|
||||
rev = "7f56832555fc229dad908c67d65ed3ce6156b70c";
|
||||
sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/howeyc/gopass";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/howeyc/gopass";
|
||||
rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
|
||||
sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/imdario/mergo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/imdario/mergo";
|
||||
rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc";
|
||||
sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/iovisor/gobpf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/iovisor/gobpf";
|
||||
rev = "98ebf56442afb10e1b43145127de3c1777ed7e95";
|
||||
sha256 = "0m2aah77b1k2yf31za975mcix5n0jijqkqmhgakip00klihx383k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jmespath/go-jmespath";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jmespath/go-jmespath";
|
||||
rev = "0b12d6b5";
|
||||
sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/json-iterator/go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/json-iterator/go";
|
||||
rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682";
|
||||
sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kardianos/osext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kardianos/osext";
|
||||
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
|
||||
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
|
||||
rev = "bb8bae16c5550f2aeef3151259a1b36078a0e544";
|
||||
sha256 = "1f1n4dh9w2qfs704yw8nhbv50n6f9fxy8ndir96l37lnwd2dvj8p";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/magiconair/properties";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/magiconair/properties";
|
||||
rev = "c2353362d570a7bfa228149c62842019201cfb71";
|
||||
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mailru/easyjson";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mailru/easyjson";
|
||||
rev = "60711f1a8329503b04e1c88535f419d0bb440bff";
|
||||
sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/matttproud/golang_protobuf_extensions";
|
||||
rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
|
||||
sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/mapstructure";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8";
|
||||
sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/modern-go/concurrent";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/modern-go/concurrent";
|
||||
rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
|
||||
sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/modern-go/reflect2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/modern-go/reflect2";
|
||||
rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
|
||||
sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/patrickmn/go-cache";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/patrickmn/go-cache";
|
||||
rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
|
||||
sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pborman/uuid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pborman/uuid";
|
||||
rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
|
||||
sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
|
||||
sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
|
||||
sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_golang";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_golang";
|
||||
rev = "e7e903064f5e9eb5da98208bae10b475d4db0f8c";
|
||||
sha256 = "0mn6x6za7br81vc9s8d58ivylpx5j4xdq72n7kz3aybniif49r3i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_model";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_model";
|
||||
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
|
||||
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/common";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/common";
|
||||
rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207";
|
||||
sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/procfs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/procfs";
|
||||
rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259";
|
||||
sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shirou/gopsutil";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shirou/gopsutil";
|
||||
rev = "071446942108a03a13cf0717275ad3bdbcb691b4";
|
||||
sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shirou/w32";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shirou/w32";
|
||||
rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
|
||||
sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/afero";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/afero";
|
||||
rev = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd";
|
||||
sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cast";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cast";
|
||||
rev = "8965335b8c7107321228e3e3702cab9832751bac";
|
||||
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/jwalterweatherman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/jwalterweatherman";
|
||||
rev = "4a4406e478ca629068e7768fc33f3f044173c0a6";
|
||||
sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
|
||||
sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
|
||||
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "c10c31b5e94b6f7a0283272dc2bb27163dcea24b";
|
||||
sha256 = "1a4k61xrwmr99fib2m1rcavbaxihnsmy1bgqhff5hkcv4n7bpsl2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/mobile";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/mobile";
|
||||
rev = "0ff817254b04da935cce10d2d1270ccf047fbbd7";
|
||||
sha256 = "0hzsis106xh3hcydjribcar75va3ghp4hwbj9982h2msi27v54x4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "1c05540f6879653db88113bc4a2b70aec4bd491f";
|
||||
sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "a9d3bda3a223baa6bba6ef412cb273f0fd163c05";
|
||||
sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "b19bf474d317b857955b12035d2c5acb57ce8b01";
|
||||
sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/time";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/time";
|
||||
rev = "a4bde12657593d5e90d0533a3e4fd95e635124cb";
|
||||
sha256 = "07r227rrqgwkchm63dzmdyv5yplbla1vnwkn6qrr940l4psy15aw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/inf.v0";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-inf/inf";
|
||||
rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
|
||||
sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-yaml/yaml";
|
||||
rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
|
||||
sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zorkian/go-datadog-api";
|
||||
rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a";
|
||||
sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/api";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/api";
|
||||
rev = "9e5ffd1f1320950b238cfce291b926411f0af722";
|
||||
sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/apimachinery";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/apimachinery";
|
||||
rev = "e386b2658ed20923da8cc9250e552f082899a1ee";
|
||||
sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/apiserver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/apiserver";
|
||||
rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3";
|
||||
sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/client-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/client-go";
|
||||
rev = "23781f4d6632d88e869066eaebb743857aa1ef9b";
|
||||
sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/metrics";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/metrics";
|
||||
rev = "0d9ea2ac660031c8f2726a735dda29441f396f99";
|
||||
sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -1,24 +1,11 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage }:
|
||||
|
||||
buildGoPackage rec {
|
||||
{ lib, datadog-agent }:
|
||||
datadog-agent.overrideAttrs (attrs: {
|
||||
pname = "datadog-process-agent";
|
||||
version = "6.11.1";
|
||||
owner = "DataDog";
|
||||
repo = "datadog-process-agent";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf";
|
||||
};
|
||||
|
||||
goDeps = ./datadog-process-agent-deps.nix;
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Live process collector for the DataDog Agent v6";
|
||||
homepage = "https://www.datadoghq.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ domenkozar rvl ];
|
||||
};
|
||||
}
|
||||
meta = with lib;
|
||||
attrs.meta // {
|
||||
description = "Live process collector for the DataDog Agent v7";
|
||||
maintainers = with maintainers; [ domenkozar rvl ];
|
||||
};
|
||||
subPackages = [ "cmd/process-agent" ];
|
||||
postInstall = null;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ let
|
|||
src = pkgs.fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = "integrations-core";
|
||||
rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4";
|
||||
sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb";
|
||||
rev = version;
|
||||
sha256 = "0424zsnf747s10kfzv5y0m0ac9sgczip78yvghhrc2i089i5z2h4";
|
||||
};
|
||||
version = "git-2018-09-18";
|
||||
version = "7.30.1";
|
||||
|
||||
# Build helper to build a single datadog integration package.
|
||||
buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // {
|
||||
|
|
@ -65,7 +65,7 @@ let
|
|||
pname = "checks-base";
|
||||
sourceRoot = "datadog_checks_base";
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
requests protobuf prometheus-client uuid simplejson uptime
|
||||
requests protobuf prometheus-client simplejson uptime
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -76,6 +76,7 @@ let
|
|||
network = (ps: [ ps.psutil ]);
|
||||
nginx = (ps: []);
|
||||
postgres = (ps: with ps; [ pg8000 psycopg2 ]);
|
||||
process = (ps: []);
|
||||
};
|
||||
|
||||
# All integrations (default + extra):
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pass-tomb";
|
||||
version = "1.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "pass-tomb";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596";
|
||||
sha256 = "sha256-kbbMHmYmeyt7HM8YiNhknePm1vUaXWWXPWePKGpbU+o=";
|
||||
};
|
||||
|
||||
buildInputs = [ tomb ];
|
||||
|
|
|
|||
|
|
@ -2001,6 +2001,8 @@ with pkgs;
|
|||
|
||||
blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
|
||||
|
||||
blitz = callPackage ../development/libraries/blitz { };
|
||||
|
||||
blockbook = callPackage ../servers/blockbook { };
|
||||
|
||||
blockhash = callPackage ../tools/graphics/blockhash { };
|
||||
|
|
@ -23540,7 +23542,9 @@ with pkgs;
|
|||
inherit (gnome2) libgnomeui GConf;
|
||||
};
|
||||
|
||||
corrscope = libsForQt5.callPackage ../applications/video/corrscope { };
|
||||
corrscope = libsForQt5.callPackage ../applications/video/corrscope {
|
||||
ffmpeg = ffmpeg-full;
|
||||
};
|
||||
|
||||
coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { };
|
||||
|
||||
|
|
@ -23640,7 +23644,7 @@ with pkgs;
|
|||
};
|
||||
datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
|
||||
datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
|
||||
python = python27;
|
||||
python = python3;
|
||||
extraIntegrations = extras;
|
||||
};
|
||||
|
||||
|
|
@ -27999,9 +28003,7 @@ with pkgs;
|
|||
imlib2 = imlib2-nox;
|
||||
};
|
||||
|
||||
watson = callPackage ../applications/office/watson {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
watson = callPackage ../applications/office/watson { };
|
||||
|
||||
wapiti = callPackage ../tools/security/wapiti { };
|
||||
|
||||
|
|
@ -28999,6 +29001,9 @@ with pkgs;
|
|||
|
||||
crawl = callPackage ../games/crawl { };
|
||||
|
||||
inherit (import ../games/crossfire pkgs)
|
||||
crossfire-server crossfire-arch crossfire-maps crossfire-client;
|
||||
|
||||
crrcsim = callPackage ../games/crrcsim {};
|
||||
|
||||
curseofwar = callPackage ../games/curseofwar { SDL = null; };
|
||||
|
|
@ -29008,6 +29013,9 @@ with pkgs;
|
|||
|
||||
cuyo = callPackage ../games/cuyo { };
|
||||
|
||||
inherit (import ../games/deliantra pkgs)
|
||||
deliantra-server deliantra-arch deliantra-maps deliantra-data;
|
||||
|
||||
devilutionx = callPackage ../games/devilutionx {};
|
||||
|
||||
dhewm3 = callPackage ../games/dhewm3 {};
|
||||
|
|
|
|||
|
|
@ -392,6 +392,20 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
AnyEventBDB = buildPerlPackage rec {
|
||||
pname = "AnyEvent-BDB";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz";
|
||||
sha256 = "93e36010940464626e5f31b9faedd65e12ed8d1abf16ce052febf23f495aefc8";
|
||||
};
|
||||
buildInputs = [ CanaryStability ];
|
||||
propagatedBuildInputs = [ BDB AnyEvent ];
|
||||
meta = {
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
AnyEventCacheDNS = buildPerlModule {
|
||||
pname = "AnyEvent-CacheDNS";
|
||||
version = "0.08";
|
||||
|
|
@ -444,6 +458,20 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
AnyEventIRC = buildPerlPackage rec {
|
||||
pname = "AnyEvent-IRC";
|
||||
version = "0.97";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/EL/ELMEX/${pname}-${version}.tar.gz";
|
||||
sha256 = "bfd7cf645c3c8c611471057128611447e20f1adf01516c69624cbd8bc77f5bf0";
|
||||
};
|
||||
propagatedBuildInputs = [ AnyEvent ObjectEvent commonsense ];
|
||||
meta = {
|
||||
description = "An event based IRC protocol client API";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
AnyEventRabbitMQ = buildPerlPackage {
|
||||
pname = "AnyEvent-RabbitMQ";
|
||||
version = "1.22";
|
||||
|
|
@ -1311,6 +1339,22 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
BDB = buildPerlPackage rec {
|
||||
pname = "BDB";
|
||||
version = "1.92";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz";
|
||||
sha256 = "a3f2ca9d2baefc1aaa40908b2f9cb9292fda3e7d797e38bbd78eabb9d9daeb6b";
|
||||
};
|
||||
NIX_CFLAGS_COMPILE = "-I${pkgs.db4.dev}/include";
|
||||
NIX_CFLAGS_LINK = "-L${pkgs.db4.out}/lib -ldb";
|
||||
buildInputs = [ pkgs.db4 ];
|
||||
propagatedBuildInputs = [ commonsense ];
|
||||
meta = {
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
BHooksEndOfScope = buildPerlPackage {
|
||||
pname = "B-Hooks-EndOfScope";
|
||||
version = "0.24";
|
||||
|
|
@ -3309,6 +3353,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
CompressLZF = buildPerlPackage rec {
|
||||
pname = "Compress-LZF";
|
||||
version = "3.8";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz";
|
||||
sha256 = "5d1f5df48ce13b4dee1cc9f278ecdbf8177877b0b98815a4eb3c91c3466716f2";
|
||||
};
|
||||
meta = {
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
CompressRawBzip2 = buildPerlPackage {
|
||||
pname = "Compress-Raw-Bzip2";
|
||||
version = "2.096";
|
||||
|
|
@ -3798,6 +3854,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
CoroEV = buildPerlPackage rec {
|
||||
pname = "CoroEV";
|
||||
version = "6.55";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-${version}.tar.gz";
|
||||
sha256 = "43d79c027170fcda4ca0ee92734605bc95e122686f5071b94d90764c81ae8a30";
|
||||
};
|
||||
buildInputs = [ CanaryStability ];
|
||||
propagatedBuildInputs = [ AnyEvent Coro EV Guard commonsense ];
|
||||
meta = {
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
preConfigure = ''
|
||||
cd EV
|
||||
'';
|
||||
};
|
||||
|
||||
Corona = buildPerlPackage {
|
||||
pname = "Corona";
|
||||
version = "0.1004";
|
||||
|
|
@ -5621,6 +5694,19 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
Deliantra = buildPerlPackage rec {
|
||||
pname = "Deliantra";
|
||||
version = "2.01";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz";
|
||||
sha256 = "2716d9b1f05627d60942ce0634b9c1a25109b164818285d45b609ae8596e2b17";
|
||||
};
|
||||
propagatedBuildInputs = [ AnyEvent CompressLZF JSONXS commonsense ];
|
||||
meta = {
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
DevelCaller = buildPerlPackage {
|
||||
pname = "Devel-Caller";
|
||||
version = "2.06";
|
||||
|
|
@ -6473,6 +6559,19 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
DigestMD5 = buildPerlPackage rec {
|
||||
pname = "Digest-MD5";
|
||||
version = "2.55";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/G/GA/GAAS/${pname}-${version}.tar.gz";
|
||||
sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c";
|
||||
};
|
||||
meta = {
|
||||
description = "Perl interface to the MD-5 algorithm";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
DigestMD5File = buildPerlPackage {
|
||||
pname = "Digest-MD5-File";
|
||||
version = "0.08";
|
||||
|
|
@ -16248,6 +16347,20 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ObjectEvent = buildPerlPackage rec {
|
||||
pname = "Object-Event";
|
||||
version = "1.23";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/EL/ELMEX/${pname}-${version}.tar.gz";
|
||||
sha256 = "ab6bb80508f4fddaf2d51b20ca876aab038582a86b5228e6435411348af53c82";
|
||||
};
|
||||
propagatedBuildInputs = [ AnyEvent commonsense ];
|
||||
meta = {
|
||||
description = "A class that provides an event callback interface";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
ObjectInsideOut = buildPerlModule {
|
||||
pname = "Object-InsideOut";
|
||||
version = "4.05";
|
||||
|
|
|
|||
Loading…
Reference in a new issue