mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 08:59:32 +03:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
9bb66a318a
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -110,7 +110,7 @@
|
||||
|
||||
# Rust
|
||||
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
|
||||
/pkgs/build-support/rust @andir @danieldk @zowoq
|
||||
/pkgs/build-support/rust @andir @zowoq
|
||||
|
||||
# Darwin-related
|
||||
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
|
||||
|
||||
@ -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">
|
||||
@ -1150,6 +1163,13 @@ Superuser created successfully.
|
||||
other and share data.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>lua</literal> and <literal>luajit</literal>
|
||||
interpreters have been patched to avoid looking into /usr/lib
|
||||
directories, thus increasing the purity of the build.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -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 setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
|
||||
@ -328,3 +333,6 @@ To be able to access the web UI this port needs to be opened in the firewall.
|
||||
- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).
|
||||
|
||||
- ipfs now defaults to not listening on you local network. This setting was change as server providers won't accept port scanning on their private network. If you have several ipfs instances running on a network you own, feel free to change the setting `ipfs.localDiscovery = true;`. localDiscovery enables different instances to discover each other and share data.
|
||||
|
||||
- `lua` and `luajit` interpreters have been patched to avoid looking into /usr/lib
|
||||
directories, thus increasing the purity of the build.
|
||||
|
||||
@ -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 ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -7,6 +7,9 @@ let
|
||||
'';
|
||||
|
||||
allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs;
|
||||
|
||||
allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile;
|
||||
positionsFile = cfg.configuration.positions.filename;
|
||||
in {
|
||||
options.services.promtail = with types; {
|
||||
enable = mkEnableOption "the Promtail ingresser";
|
||||
@ -53,6 +56,7 @@ in {
|
||||
RestrictSUIDSGID = true;
|
||||
PrivateMounts = true;
|
||||
CacheDirectory = "promtail";
|
||||
ReadWritePaths = lib.optional allowPositionsFile (builtins.dirOf positionsFile);
|
||||
|
||||
User = "promtail";
|
||||
Group = "promtail";
|
||||
|
||||
@ -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
|
||||
|
||||
@ -9,7 +9,7 @@ in {
|
||||
name = "handbrake";
|
||||
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ danieldk ];
|
||||
maintainers = with pkgs.lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
|
||||
@ -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; [
|
||||
|
||||
@ -84,6 +84,13 @@ rec {
|
||||
viAlias = true;
|
||||
};
|
||||
|
||||
nvim_with_plug = neovim.override {
|
||||
extraName = "-with-plug";
|
||||
configure.plug.plugins = with pkgs.vimPlugins; [
|
||||
vim-go
|
||||
];
|
||||
};
|
||||
|
||||
# nixpkgs should detect that no wrapping is necessary
|
||||
nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap;
|
||||
|
||||
@ -133,7 +140,7 @@ rec {
|
||||
configure.pathogen.pluginNames = [ "vim-nix" ];
|
||||
};
|
||||
|
||||
nvimWithLuaPackages = wrapNeovim2 "with-lua-packages" (makeNeovimConfig {
|
||||
nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig {
|
||||
extraLuaPackages = ps: [ps.mpack];
|
||||
customRC = ''
|
||||
lua require("mpack")
|
||||
@ -141,6 +148,7 @@ rec {
|
||||
});
|
||||
|
||||
nvim_with_lua_packages = runTest nvimWithLuaPackages ''
|
||||
export HOME=$TMPDIR
|
||||
${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es
|
||||
'';
|
||||
})
|
||||
|
||||
@ -78,8 +78,7 @@ let
|
||||
++ (extraPython3Packages ps)
|
||||
++ (lib.concatMap (f: f ps) pluginPython3Packages));
|
||||
|
||||
lua = neovim-unwrapped.lua;
|
||||
luaEnv = lua.withPackages(ps: extraLuaPackages ps);
|
||||
luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages);
|
||||
|
||||
# Mapping a boolean argument to a key that tells us whether to add or not to
|
||||
# add to nvim's 'embedded rc' this:
|
||||
@ -115,8 +114,8 @@ let
|
||||
] ++ lib.optionals (binPath != "") [
|
||||
"--suffix" "PATH" ":" binPath
|
||||
] ++ lib.optionals (luaEnv != null) [
|
||||
"--prefix" "LUA_PATH" ";" "${luaEnv}/share/lua/${lua.luaversion}/?.lua"
|
||||
"--prefix" "LUA_CPATH" ";" "${luaEnv}/lib/lua/${lua.luaversion}/?.so"
|
||||
"--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaPathAbsStr luaEnv)
|
||||
"--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaCPathAbsStr luaEnv)
|
||||
];
|
||||
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p "$out"/bin
|
||||
cp "${vimPlugins.vimacs}"/share/vim-plugins/vimacs/bin/vim $out/bin/vimacs
|
||||
cp "${vimPlugins.vimacs}"/bin/vim $out/bin/vimacs
|
||||
substituteInPlace "$out"/bin/vimacs \
|
||||
--replace '-vim}' '-@bin@/bin/vim}' \
|
||||
--replace '-gvim}' '-@bin@/bin/vim -g}' \
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem
|
||||
, ncurses, libtermkey, lpeg, lua
|
||||
, ncurses, libtermkey, lua
|
||||
, acl ? null, libselinux ? null
|
||||
}:
|
||||
|
||||
let
|
||||
luaEnv = lua.withPackages(ps: [ ps.lpeg ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vis";
|
||||
version = "0.7";
|
||||
@ -19,8 +22,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libtermkey
|
||||
lua
|
||||
lpeg
|
||||
luaEnv
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
acl
|
||||
libselinux
|
||||
@ -30,16 +32,13 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs ./configure
|
||||
'';
|
||||
|
||||
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
|
||||
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/applications"
|
||||
cp $desktopItem/share/applications/* $out/share/applications
|
||||
echo wrapping $out/bin/vis with runtime environment
|
||||
wrapProgram $out/bin/vis \
|
||||
--prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
|
||||
--prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
|
||||
--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
|
||||
--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \
|
||||
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
|
||||
'';
|
||||
|
||||
|
||||
@ -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,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2021.8.6";
|
||||
version = "2021.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
sha256 = "sha256-dMZu4IRdchPeoYylz1XDZeJsAW+V8HZApNndpeu+RbA=";
|
||||
sha256 = "sha256-Q8Xjo60lR1x7Y9/jcxXX32IxVVlHmkr4ekIwWTgdwps=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeconform";
|
||||
version = "0.4.8";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yannh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XD8xGqtE7eaBxPL4Z0Kw4BEqM2fdgww7wl8wJ1U3u0U=";
|
||||
sha256 = "sha256-D1/ljIOc5vK6HcYmk0WNnIRGBt1vJk9dGxl5GjhKhuA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CwAa2YqJ0R+L+VwxqruQmZJUctP4GgKszY49ZVyyNBE=";
|
||||
sha256 = "sha256-E8oI0qBDS6CcA5ZDGs1YVt/BPEfUzCrt5aaqfHAXukI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tanka";
|
||||
version = "0.17.0";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9UfSKMyapmDyikRqs7UiA4YYcvj/Tin9pRqC9iFLPWE=";
|
||||
sha256 = "sha256-a7utYYuCgFabKILUKnKF0fcrorlV1DYMOFMRkm5QMuU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gmailctl";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrt";
|
||||
repo = "gmailctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UZzpecW4vW1JYUDCcwDIJXCGjw80fgZC4wvCh0DdE98=";
|
||||
sha256 = "sha256-1gOixuOvPHEjnnDNNda9sktnhffovOfeG4XDrLRRMlE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5oVr1qazTzsSNVLvcAsAN8UyrJOeqLjSVinImLOyJlk=";
|
||||
vendorSha256 = "sha256-Yv3OGHFOmenst/ujUgvCaSEjwwBf3W9n+55ztVhuWjo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "semantik";
|
||||
version = "1.2.5";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ita1024";
|
||||
repo = "semantik";
|
||||
rev = "semantik-${version}";
|
||||
sha256 = "0dkg6mbnsbvbis17iz8v59wlhld93nc51abnkbyqvvkyyiqb006c";
|
||||
sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss=";
|
||||
};
|
||||
|
||||
patches = [ ./qt5.patch ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://fasttext.cc/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.danieldk ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Utility for training word and subword embeddings";
|
||||
homepage = "https://github.com/finalfusion/finalfrontier/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Utility for converting, quantizing, and querying word embeddings";
|
||||
homepage = "https://github.com/finalfusion/finalfusion-utils/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -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 = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitstatus";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "gitstatus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA=";
|
||||
sha256 = "sha256-ZTpnT4kuntHdMWK7c/pHS6mJrAHF9T51DydXnWXj8Z0=";
|
||||
};
|
||||
|
||||
buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X/oTL/CfMunGcS3HDoH/g1gZcJWnVU93OkcGC36KuA4=";
|
||||
sha256 = "sha256-UKIT3PfybuQjKxxFbRQSCA8G3R2xIySWEDUKg27u5Rk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
|
||||
{ lib, stdenv, fetchFromGitHub, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
|
||||
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
|
||||
, xcb-util-cursor, makeWrapper, pango, gobject-introspection
|
||||
, which, dbus, nettools, git, doxygen
|
||||
@ -12,10 +12,11 @@
|
||||
# needed for beautiful.gtk to work
|
||||
assert gtk3Support -> gtk3 != null;
|
||||
|
||||
let
|
||||
luaEnv = lua.withPackages(ps: [ ps.lgi ps.ldoc ]);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
lgi = luaPackages.lgi;
|
||||
lua = luaPackages.lua;
|
||||
ldoc = luaPackages.ldoc;
|
||||
pname = "awesome";
|
||||
version = "4.3";
|
||||
|
||||
@ -35,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||
xmlto docbook_xml_dtd_45
|
||||
docbook_xsl findXMLCatalogs
|
||||
asciidoctor
|
||||
ldoc
|
||||
];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedUserEnvPkgs = [ hicolor-icon-theme ];
|
||||
buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection
|
||||
git lgi libpthreadstubs libstartup_notification
|
||||
git luaEnv libpthreadstubs libstartup_notification
|
||||
libxdg_basedir lua nettools pango xcb-util-cursor
|
||||
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
|
||||
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
|
||||
@ -55,14 +55,14 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
#"-DGENERATE_MANPAGES=ON"
|
||||
"-DOVERRIDE_VERSION=${version}"
|
||||
] ++ lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so"
|
||||
] ++ lib.optional lua.pkgs.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so"
|
||||
;
|
||||
|
||||
GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
|
||||
# LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags
|
||||
# below for how awesome finds the libraries it needs at runtime.
|
||||
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
|
||||
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
|
||||
LUA_CPATH = "${luaEnv}/lib/lua/${lua.luaversion}/?.so";
|
||||
LUA_PATH = "${luaEnv}/share/lua/${lua.luaversion}/?.lua;;";
|
||||
|
||||
postInstall = ''
|
||||
# Don't use wrapProgram or the wrapper will duplicate the --search
|
||||
@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
|
||||
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
|
||||
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
|
||||
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
|
||||
--add-flags '--search ${luaEnv}/lib/lua/${lua.luaversion}' \
|
||||
--add-flags '--search ${luaEnv}/share/lua/${lua.luaversion}' \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
|
||||
|
||||
wrapProgram $out/bin/awesome-client \
|
||||
|
||||
@ -38,6 +38,6 @@ python3.pkgs.buildPythonPackage rec {
|
||||
description = "PyO3 word count example";
|
||||
homepage = "https://github.com/PyO3/pyo3";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.danieldk ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -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
|
||||
'';
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend";
|
||||
homepage = "https://llvm.org/";
|
||||
license = with licenses; [ ncsa ];
|
||||
maintainers = with maintainers; [ acowley danieldk lovesegfault ];
|
||||
maintainers = with maintainers; [ acowley lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
description = "ROCm fork of the LLVM Compiler runtime libraries";
|
||||
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
|
||||
license = licenses.ncsa;
|
||||
maintainers = with maintainers; [ acowley danieldk lovesegfault ];
|
||||
maintainers = with maintainers; [ acowley lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
description = "ROCm fork of the LLVM Linker";
|
||||
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
|
||||
license = licenses.ncsa;
|
||||
maintainers = with maintainers; [ acowley danieldk lovesegfault ];
|
||||
maintainers = with maintainers; [ acowley lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -110,7 +110,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "ROCm fork of the LLVM compiler infrastructure";
|
||||
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
|
||||
license = with licenses; [ ncsa ];
|
||||
maintainers = with maintainers; [ acowley danieldk lovesegfault ];
|
||||
maintainers = with maintainers; [ acowley lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -238,7 +238,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
|
||||
inherit externalDeps;
|
||||
} // passthru;
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
meta = {
|
||||
platforms = lua.meta.platforms;
|
||||
# add extra maintainer(s) to every package
|
||||
maintainers = (meta.maintainers or []) ++ [ ];
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, readline
|
||||
, compat ? false
|
||||
, callPackage
|
||||
, packageOverrides ? (self: super: {})
|
||||
, makeWrapper
|
||||
, packageOverrides ? (final: prev: {})
|
||||
, sourceVersion
|
||||
, hash
|
||||
, patches ? []
|
||||
@ -10,7 +11,10 @@
|
||||
, staticOnly ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
let
|
||||
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
|
||||
luaPackages = callPackage ../../lua-modules {
|
||||
lua = self;
|
||||
overrides = packageOverrides;
|
||||
};
|
||||
|
||||
plat = if stdenv.isLinux then "linux"
|
||||
else if stdenv.isDarwin then "macosx"
|
||||
@ -31,21 +35,32 @@ self = stdenv.mkDerivation rec {
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
LuaPathSearchPaths = luaPackages.getLuaPathList luaversion;
|
||||
LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion;
|
||||
LuaPathSearchPaths = luaPackages.lib.luaPathList;
|
||||
LuaCPathSearchPaths = luaPackages.lib.luaCPathList;
|
||||
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ readline ];
|
||||
|
||||
inherit patches;
|
||||
|
||||
postPatch = lib.optionalString (!stdenv.isDarwin && !staticOnly) ''
|
||||
# we can't pass flags to the lua makefile because for portability, everything is hardcoded
|
||||
postPatch = ''
|
||||
{
|
||||
echo -e '
|
||||
#undef LUA_PATH_DEFAULT
|
||||
#define LUA_PATH_DEFAULT "./share/lua/${luaversion}/?.lua;./?.lua;./?/init.lua"
|
||||
#undef LUA_CPATH_DEFAULT
|
||||
#define LUA_CPATH_DEFAULT "./lib/lua/${luaversion}/?.so;./?.so;./lib/lua/${luaversion}/loadall.so"
|
||||
'
|
||||
} >> src/luaconf.h
|
||||
'' + lib.optionalString (!stdenv.isDarwin && !staticOnly) ''
|
||||
# Add a target for a shared library to the Makefile.
|
||||
sed -e '1s/^/LUA_SO = liblua.so/' \
|
||||
-e 's/ALL_T *= */&$(LUA_SO) /' \
|
||||
-i src/Makefile
|
||||
cat ${./lua-dso.make} >> src/Makefile
|
||||
'';
|
||||
'' ;
|
||||
|
||||
# see configurePhase for additional flags (with space)
|
||||
makeFlags = [
|
||||
|
||||
@ -4,16 +4,13 @@
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
# defined in trivial-builders.nix
|
||||
# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
|
||||
makeSetupHook {
|
||||
deps = makeWrapper;
|
||||
substitutions.executable = lua.interpreter;
|
||||
substitutions.lua = lua;
|
||||
substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
|
||||
substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
|
||||
|
||||
deps = makeWrapper;
|
||||
substitutions.executable = lua.interpreter;
|
||||
substitutions.lua = lua;
|
||||
substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
|
||||
substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
|
||||
} ./wrap.sh
|
||||
|
||||
|
||||
@ -11,13 +11,18 @@
|
||||
let
|
||||
env = let
|
||||
paths = requiredLuaModules (extraLibs ++ [ lua ] );
|
||||
in (buildEnv {
|
||||
in buildEnv {
|
||||
name = "${lua.name}-env";
|
||||
|
||||
inherit paths;
|
||||
inherit ignoreCollisions;
|
||||
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
(lua.pkgs.lua-setup-hook lua.LuaPathSearchPaths lua.LuaCPathSearchPaths)
|
||||
];
|
||||
|
||||
# we create wrapper for the binaries in the different packages
|
||||
postBuild = ''
|
||||
if [ -L "$out/bin" ]; then
|
||||
@ -37,7 +42,12 @@ let
|
||||
rm -f "$out/bin/$prg"
|
||||
if [ -x "$prg" ]; then
|
||||
nix_debug "Making wrapper $prg"
|
||||
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs}
|
||||
makeWrapper "$path/bin/$prg" "$out/bin/$prg" \
|
||||
--set-default LUA_PATH ";;" \
|
||||
--suffix LUA_PATH ';' "$LUA_PATH" \
|
||||
--set-default LUA_CPATH ";;" \
|
||||
--suffix LUA_CPATH ';' "$LUA_CPATH" \
|
||||
${lib.concatStringsSep " " makeWrapperArgs}
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@ -62,8 +72,5 @@ let
|
||||
'';
|
||||
};
|
||||
};
|
||||
}).overrideAttrs (_: {
|
||||
# Add extra deps needed for postBuild hook.
|
||||
nativeBuildInputs = [ makeWrapper lua ];
|
||||
});
|
||||
};
|
||||
in env
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, extraMeta ? { }
|
||||
, callPackage
|
||||
, self
|
||||
, packageOverrides ? (self: super: { })
|
||||
, packageOverrides ? (final: prev: {})
|
||||
, enableFFI ? true
|
||||
, enableJIT ? true
|
||||
, enableJITDebugModule ? enableJIT
|
||||
@ -62,6 +62,15 @@ stdenv.mkDerivation rec {
|
||||
# passed by nixpkgs CC wrapper is insufficient on its own
|
||||
substituteInPlace src/Makefile --replace "#CCDEBUG= -g" "CCDEBUG= -g"
|
||||
fi
|
||||
|
||||
{
|
||||
echo -e '
|
||||
#undef LUA_PATH_DEFAULT
|
||||
#define LUA_PATH_DEFAULT "./share/lua/${luaversion}/?.lua;./?.lua;./?/init.lua"
|
||||
#undef LUA_CPATH_DEFAULT
|
||||
#define LUA_CPATH_DEFAULT "./lib/lua/${luaversion}/?.so;./?.so;./lib/lua/${luaversion}/loadall.so"
|
||||
'
|
||||
} >> src/luaconf.h
|
||||
'';
|
||||
|
||||
configurePhase = false;
|
||||
@ -88,15 +97,10 @@ stdenv.mkDerivation rec {
|
||||
ln -s "$out"/bin/luajit-* "$out"/bin/luajit
|
||||
'';
|
||||
|
||||
LuaPathSearchPaths = [
|
||||
"lib/lua/${luaversion}/?.lua"
|
||||
"share/lua/${luaversion}/?.lua"
|
||||
"share/lua/${luaversion}/?/init.lua"
|
||||
"lib/lua/${luaversion}/?/init.lua"
|
||||
"share/${name}/?.lua"
|
||||
];
|
||||
LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ];
|
||||
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
|
||||
LuaPathSearchPaths = luaPackages.lib.luaPathList;
|
||||
LuaCPathSearchPaths = luaPackages.lib.luaCPathList;
|
||||
|
||||
setupHook = luaPackages.lua-setup-hook luaPackages.lib.luaPathList luaPackages.lib.luaCPathList;
|
||||
|
||||
passthru = rec {
|
||||
buildEnv = callPackage ../lua-5/wrapper.nix {
|
||||
|
||||
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).
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "civetweb";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6qBsM9zkN838cMtpE3+c7qcrFpZCS/Av7Ch7EWmlnD4=";
|
||||
sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.oracle.com/database/berkeley-db/xml.html";
|
||||
description = "Embeddable XML database based on Berkeley DB";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "A library for large linear classification";
|
||||
homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.danieldk ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mm-common";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2";
|
||||
sha256 = "6BWWYliZqs8dC/J8zC/Mfzc0BexIc1yhxyc8D7zcHvU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
description = "OpenCL runtime for AMD GPUs, part of the ROCm stack";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ acowley danieldk lovesegfault ];
|
||||
maintainers = with maintainers; [ acowley lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Platform runtime for ROCm";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
|
||||
license = with licenses; [ ncsa ];
|
||||
maintainers = with maintainers; [ danieldk lovesegfault ];
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "BLAS-compatible library optimized for AMD CPUs";
|
||||
homepage = "https://developer.amd.com/amd-aocl/blas-library/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.danieldk ];
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
description = "LAPACK-compatible linear algebra library optimized for AMD CPUs";
|
||||
homepage = "https://developer.amd.com/amd-aocl/blas-library/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "BLAS-compatible linear algebra library";
|
||||
homepage = "https://github.com/flame/blis";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.danieldk ];
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -117,7 +117,7 @@ in stdenv.mkDerivation {
|
||||
description = "C++ API of the PyTorch machine learning framework";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.unfree; # Includes CUDA and Intel MKL.
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Unsupervised text tokenizer for Neural Network-based text generation";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ danieldk pashashocky ];
|
||||
maintainers = with maintainers; [ pashashocky ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# inspired by pkgs/development/haskell-modules/default.nix
|
||||
{ pkgs, lib
|
||||
, lua
|
||||
, overrides ? (self: super: {})
|
||||
, overrides ? (final: prev: {})
|
||||
}:
|
||||
|
||||
let
|
||||
@ -15,7 +15,7 @@ let
|
||||
overridenPackages = import ./overrides.nix { inherit pkgs; };
|
||||
|
||||
generatedPackages = if (builtins.pathExists ./generated-packages.nix) then
|
||||
pkgs.callPackage ./generated-packages.nix { } else (self: super: {});
|
||||
pkgs.callPackage ./generated-packages.nix { } else (final: prev: {});
|
||||
|
||||
extensible-self = lib.makeExtensible
|
||||
(extends overrides
|
||||
@ -24,7 +24,6 @@ let
|
||||
initialPackages
|
||||
)
|
||||
)
|
||||
)
|
||||
;
|
||||
);
|
||||
in
|
||||
extensible-self
|
||||
|
||||
63
pkgs/development/lua-modules/lib.nix
Normal file
63
pkgs/development/lua-modules/lib.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ pkgs, lib, lua }:
|
||||
let
|
||||
requiredLuaModules = drvs: with lib; let
|
||||
modules = filter hasLuaModule drvs;
|
||||
in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules));
|
||||
# Check whether a derivation provides a lua module.
|
||||
hasLuaModule = drv: drv ? luaModule;
|
||||
in
|
||||
rec {
|
||||
inherit hasLuaModule requiredLuaModules;
|
||||
|
||||
luaPathList = [
|
||||
"share/lua/${lua.luaversion}/?.lua"
|
||||
"share/lua/${lua.luaversion}/?/init.lua"
|
||||
];
|
||||
luaCPathList = [
|
||||
"lib/lua/${lua.luaversion}/?.so"
|
||||
];
|
||||
|
||||
/* generate paths without a prefix
|
||||
*/
|
||||
luaPathRelStr = lib.concatStringsSep ";" luaPathList;
|
||||
luaCPathRelStr = lib.concatStringsSep ";" luaCPathList;
|
||||
|
||||
/* generate LUA_(C)PATH value for a specific derivation, i.e., with absolute paths
|
||||
*/
|
||||
genLuaPathAbsStr = drv: lib.concatMapStringsSep ";" (x: "${drv}/${x}") luaPathList;
|
||||
genLuaCPathAbsStr = drv: lib.concatMapStringsSep ";" (x: "${drv}/${x}") luaCPathList;
|
||||
|
||||
/* Generate a LUA_PATH with absolute paths
|
||||
*/
|
||||
# genLuaPathAbs = drv:
|
||||
# lib.concatStringsSep ";" (map (x: "${drv}/x") luaPathList);
|
||||
|
||||
luaAtLeast = lib.versionAtLeast lua.luaversion;
|
||||
luaOlder = lib.versionOlder lua.luaversion;
|
||||
isLua51 = (lib.versions.majorMinor lua.version) == "5.1";
|
||||
isLua52 = (lib.versions.majorMinor lua.version) == "5.2";
|
||||
isLua53 = lua.luaversion == "5.3";
|
||||
isLuaJIT = lib.getName lua == "luajit";
|
||||
|
||||
/* generates the relative path towards the folder where
|
||||
seems stable even when using lua_modules_path = ""
|
||||
|
||||
Example:
|
||||
getDataFolder luaPackages.stdlib
|
||||
=> stdlib-41.2.2-1-rocks/stdlib/41.2.2-1/doc
|
||||
*/
|
||||
getDataFolder = drv:
|
||||
"${drv.pname}-${drv.version}-rocks/${drv.pname}/${drv.version}";
|
||||
|
||||
/* Convert derivation to a lua module.
|
||||
so that luaRequireModules can be run later
|
||||
*/
|
||||
toLuaModule = drv:
|
||||
drv.overrideAttrs( oldAttrs: {
|
||||
# Use passthru in order to prevent rebuilds when possible.
|
||||
passthru = (oldAttrs.passthru or {}) // {
|
||||
luaModule = lua;
|
||||
requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs;
|
||||
};
|
||||
});
|
||||
}
|
||||
@ -363,6 +363,12 @@ with super;
|
||||
'';
|
||||
});
|
||||
|
||||
# TODO just while testing, remove afterwards
|
||||
# toVimPlugin should do it instead
|
||||
gitsigns-nvim = super.gitsigns-nvim.overrideAttrs(oa: {
|
||||
nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.vimUtils.vimGenDocHook ];
|
||||
});
|
||||
|
||||
# aliases
|
||||
cjson = super.lua-cjson;
|
||||
}
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Markups";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d";
|
||||
sha256 = "2954d53656d9ec84f2f6c077e91a1de534e05647f20d327757283bbb5a857770";
|
||||
};
|
||||
|
||||
checkInputs = [ markdown docutils pygments pyyaml ];
|
||||
|
||||
@ -18,12 +18,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncssh";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-GFAT2OZ3R8PA8BtyQWuL14QX2h30jHH3baU8YH71QbY=";
|
||||
sha256 = "8c8852eb00a09e45c403086e10965cb6d13e5cd203a1688d91e9c81aa080d052";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-keyvault";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da";
|
||||
sha256 = "cd35e81c4a3cf812ade4bdcf1f7ccf4b5b78a801ef967340012a6ac9fe61ded2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.0.0";
|
||||
version = "5.0.0";
|
||||
pname = "azure-mgmt-netapp";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42";
|
||||
sha256 = "2d5163c49f91636809ef1cacd48d91130803594855f43afe0f2b31fc5f02d53c";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-rdbms";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "36a508fe40f904723485586e9088092e6f65cdb82bc86efc42d615499c256829";
|
||||
sha256 = "f738d9e6db8f6da6bb4e84e59dd0548c8adef948357a447337e78d1035ac960a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-relay";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "38f6dd9d122a316efa921e72933e01ec4d76ed39d4682655b17a997079e8b20a";
|
||||
sha256 = "c93b7550e64b6734bf23ce57ca974a3ea929b734c58d1fe3669728c4fd2d2eb3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "19.0.0";
|
||||
version = "20.0.0";
|
||||
pname = "azure-mgmt-resource";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100";
|
||||
sha256 = "622dca4484be64f9f5ce335d327dffabf3e71e14e8a3f4a1051dc85a5c3ebbca";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-servicefabric";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913";
|
||||
sha256 = "4c6f3de2526a27af78aecae248604f941c4d059fbcf2265912a380e3c788735d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -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/";
|
||||
|
||||
@ -53,6 +53,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/huggingface/datasets/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
||||
description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension";
|
||||
homepage = "https://github.com/pytries/DAWG-Python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-mailman3";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "368595b3c2623edeaca5beea5f12887424c384edd6f7052cf442443075084313";
|
||||
sha256 = "cd3cb1ac26a3658bd694b82f00eaab98903bd2edff34956e90c187c9ab5c0dae";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
||||
description = "Python module for text classification and representation learning";
|
||||
homepage = "https://fasttext.cc/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python module for using finalfusion, word2vec, and fastText word embeddings";
|
||||
homepage = "https://github.com/finalfusion/finalfusion-python/";
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.blueOak100;
|
||||
};
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flexmock";
|
||||
version = "0.10.8";
|
||||
version = "0.10.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6820031c39b298646194a3f0b2b693322bb7f44b39dbaf1c54b0ae68b3d768fa";
|
||||
sha256 = "9c128b7cf31fac5340062c9c2cf1e0b12c601ee2d5c10ef39cc191036fb2e688";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@ -34,6 +34,6 @@ buildPythonPackage rec {
|
||||
description = "Download and publish models and other files on the huggingface.co hub";
|
||||
changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numcodecs";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3c23803671a3d920efa175af5828870bdff60ba2a3fcbf1d5b48bb81d68219c6";
|
||||
sha256 = "35adbcc746b95e3ac92e949a161811f5aa2602b9eb1ef241b5ea6f09bb220997";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/alimanfoo/numcodecs";
|
||||
homepage = "https://github.com/zarr-developers/numcodecs";
|
||||
license = licenses.mit;
|
||||
description = "Buffer compression and transformation codecs for use in data storage and communication applications";
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
|
||||
@ -30,6 +30,6 @@ buildPythonPackage rec {
|
||||
description = "Morphological analyzer/inflection engine for Russian and Ukrainian";
|
||||
homepage = "https://github.com/kmike/pymorphy2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,6 +18,6 @@ buildPythonPackage rec {
|
||||
description = "Russian dictionaries for pymorphy2";
|
||||
homepage = "https://github.com/kmike/pymorphy2-dicts/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -67,6 +67,6 @@ in buildPythonPackage {
|
||||
changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";
|
||||
license = licenses.unfree; # Includes CUDA and Intel MKL.
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -313,7 +313,7 @@ in buildPythonPackage rec {
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
|
||||
maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
|
||||
# error: use of undeclared identifier 'noU'; did you mean 'no'?
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
@ -23,17 +23,16 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ semantic-version setuptools toml ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "setuptools_rust" ];
|
||||
|
||||
passthru.tests.pyo3 = callPackage ./pyo3-test {};
|
||||
passthru.tests.pyo3 = callPackage ./pyo3-test { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Setuptools plugin for Rust support";
|
||||
homepage = "https://github.com/PyO3/setuptools-rust";
|
||||
changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,6 +21,6 @@ buildPythonPackage rec {
|
||||
description = "Tokenizer and sentence splitter for German and English web texts";
|
||||
homepage = "https://github.com/tsproisl/SoMaJo";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -55,6 +55,6 @@ buildPythonPackage rec {
|
||||
description = "Align tokenizations for spaCy and transformers";
|
||||
homepage = "https://github.com/explosion/spacy-alignments";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -33,6 +33,6 @@ buildPythonPackage rec {
|
||||
description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)";
|
||||
homepage = "https://github.com/explosion/spacy-pkuseg";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,6 +37,6 @@ buildPythonPackage rec {
|
||||
description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2";
|
||||
homepage = "https://github.com/explosion/spacy-transformers";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -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):
|
||||
@ -115,6 +115,6 @@ in buildPythonPackage rec {
|
||||
description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -54,6 +54,6 @@ in buildPythonPackage {
|
||||
changelog = "https://github.com/pytorch/vision/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -55,6 +55,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ danieldk pashashocky ];
|
||||
maintainers = with maintainers; [ pashashocky ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wordfreq";
|
||||
version = "2.5";
|
||||
version = "2.5.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LuminosoInsight";
|
||||
repo = "wordfreq";
|
||||
rev = "v${version}";
|
||||
sha256 = "09wzraddbdw3781pk2sxlz8knax9jrcl24ymz54wx6sk0gvq95i7";
|
||||
sha256 = "1lw7kbsydd89hybassnnhqnj9s5ch9wvgd6pla96198nrq9mj7fw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.11.0";
|
||||
version = "10.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mti93UDFgHQKJt3z1sjCkT71TZtwh2YnhTyUCi5tS5c=";
|
||||
sha256 = "sha256-kujY7Qgis2pie0WVQAokVopD3TYkjjBnqhw6XZTG16o=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-NEW1qXOxFPmDFUTciJkqwutZd3+sVkHgoZgQO8Gsdwk=";
|
||||
vendorSha256 = "sha256-4Jz57VjdQX+LJexEZau4pd8nIQPt0HGzCjHRj7uPox4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -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";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user