mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
49f21e06d9
57 changed files with 2595 additions and 1404 deletions
|
|
@ -178,6 +178,15 @@ args.stdenv.mkDerivation (args // {
|
|||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Prefer using the top-level <varname>lib</varname> over its alias
|
||||
<literal>stdenv.lib</literal>. <varname>lib</varname> is unrelated to
|
||||
<varname>stdenv</varname>, and so <literal>stdenv.lib</literal> should only
|
||||
be used as a convenience alias when developing to avoid having to modify
|
||||
the function inputs just to test something out.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-package-naming">
|
||||
|
|
|
|||
|
|
@ -5911,6 +5911,12 @@
|
|||
githubId = 1387206;
|
||||
name = "Mike Sperber";
|
||||
};
|
||||
milesbreslin = {
|
||||
email = "milesbreslin@gmail.com";
|
||||
github = "milesbreslin";
|
||||
githubId = 38543128;
|
||||
name = "Miles Breslin";
|
||||
};
|
||||
millerjason = {
|
||||
email = "mailings-github@millerjason.com";
|
||||
github = "millerjason";
|
||||
|
|
|
|||
|
|
@ -107,6 +107,15 @@
|
|||
user D-Bus session available also for non-graphical logins.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <varname>networking.wireless.iwd</varname> module now installs
|
||||
the upstream-provided 80-iwd.link file, which sets the NamePolicy=
|
||||
for all wlan devices to "keep kernel", to avoid race conditions
|
||||
between iwd and networkd. If you don't want this, you can set
|
||||
<literal>systemd.network.links."80-iwd" = lib.mkForce {}</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>rubyMinimal</literal> was removed due to being unused and
|
||||
|
|
@ -321,8 +330,8 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<package>fish-foreign-env</package> is now an alias for the
|
||||
<package>fishPlugins.foreign-env</package> package, in which the fish
|
||||
The <package>fish-foreign-env</package> package has been replaced with
|
||||
<package>fishPlugins.foreign-env</package>, in which the fish
|
||||
functions have been relocated to the
|
||||
<literal>vendor_functions.d</literal> directory to be loaded automatically.
|
||||
</para>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ in
|
|||
options.i18n = {
|
||||
inputMethod = {
|
||||
enabled = mkOption {
|
||||
type = types.nullOr (types.enum [ "ibus" "fcitx" "nabi" "uim" "hime" ]);
|
||||
type = types.nullOr (types.enum [ "ibus" "fcitx" "fcitx5" "nabi" "uim" "hime" ]);
|
||||
default = null;
|
||||
example = "fcitx";
|
||||
description = ''
|
||||
|
|
|
|||
33
nixos/modules/i18n/input-method/fcitx5.nix
Normal file
33
nixos/modules/i18n/input-method/fcitx5.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
im = config.i18n.inputMethod;
|
||||
cfg = im.fcitx5;
|
||||
fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
|
||||
in
|
||||
{
|
||||
options = {
|
||||
i18n.inputMethod.fcitx5 = {
|
||||
addons = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = [];
|
||||
example = with pkgs; [ fcitx5-rime ];
|
||||
description = ''
|
||||
Enabled Fcitx5 addons.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf (im.enabled == "fcitx5") {
|
||||
i18n.inputMethod.package = fcitx5Package;
|
||||
|
||||
environment.variables = {
|
||||
GTK_IM_MODULE = "fcitx";
|
||||
QT_IM_MODULE = "fcitx";
|
||||
XMODIFIERS = "@im=fcitx";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -82,6 +82,7 @@
|
|||
./hardware/xpadneo.nix
|
||||
./i18n/input-method/default.nix
|
||||
./i18n/input-method/fcitx.nix
|
||||
./i18n/input-method/fcitx5.nix
|
||||
./i18n/input-method/hime.nix
|
||||
./i18n/input-method/ibus.nix
|
||||
./i18n/input-method/nabi.nix
|
||||
|
|
@ -101,6 +102,7 @@
|
|||
./misc/version.nix
|
||||
./misc/nixops-autoluks.nix
|
||||
./programs/adb.nix
|
||||
./programs/appgate-sdp.nix
|
||||
./programs/atop.nix
|
||||
./programs/autojump.nix
|
||||
./programs/bandwhich.nix
|
||||
|
|
@ -226,6 +228,7 @@
|
|||
./services/audio/icecast.nix
|
||||
./services/audio/liquidsoap.nix
|
||||
./services/audio/mpd.nix
|
||||
./services/audio/mpdscribble.nix
|
||||
./services/audio/mopidy.nix
|
||||
./services/audio/roon-server.nix
|
||||
./services/audio/slimserver.nix
|
||||
|
|
|
|||
202
nixos/modules/services/audio/mpdscribble.nix
Normal file
202
nixos/modules/services/audio/mpdscribble.nix
Normal file
|
|
@ -0,0 +1,202 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.mpdscribble;
|
||||
mpdCfg = config.services.mpd;
|
||||
|
||||
endpointUrls = {
|
||||
"last.fm" = "http://post.audioscrobbler.com";
|
||||
"libre.fm" = "http://turtle.libre.fm";
|
||||
"jamendo" = "http://postaudioscrobbler.jamendo.com";
|
||||
"listenbrainz" = "http://proxy.listenbrainz.org";
|
||||
};
|
||||
|
||||
mkSection = secname: secCfg: ''
|
||||
[${secname}]
|
||||
url = ${secCfg.url}
|
||||
username = ${secCfg.username}
|
||||
password = {{${secname}_PASSWORD}}
|
||||
journal = /var/lib/mpdscribble/${secname}.journal
|
||||
'';
|
||||
|
||||
endpoints = concatStringsSep "\n" (mapAttrsToList mkSection cfg.endpoints);
|
||||
cfgTemplate = pkgs.writeText "mpdscribble.conf" ''
|
||||
## This file was automatically genenrated by NixOS and will be overwritten.
|
||||
## Do not edit. Edit your NixOS configuration instead.
|
||||
|
||||
## mpdscribble - an audioscrobbler for the Music Player Daemon.
|
||||
## http://mpd.wikia.com/wiki/Client:mpdscribble
|
||||
|
||||
# HTTP proxy URL.
|
||||
${optionalString (cfg.proxy != null) "proxy = ${cfg.proxy}"}
|
||||
|
||||
# The location of the mpdscribble log file. The special value
|
||||
# "syslog" makes mpdscribble use the local syslog daemon. On most
|
||||
# systems, log messages will appear in /var/log/daemon.log then.
|
||||
# "-" means log to stderr (the current terminal).
|
||||
log = -
|
||||
|
||||
# How verbose mpdscribble's logging should be. Default is 1.
|
||||
verbose = ${toString cfg.verbose}
|
||||
|
||||
# How often should mpdscribble save the journal file? [seconds]
|
||||
journal_interval = ${toString cfg.journalInterval}
|
||||
|
||||
# The host running MPD, possibly protected by a password
|
||||
# ([PASSWORD@]HOSTNAME).
|
||||
host = ${(optionalString (cfg.passwordFile != null) "{{MPD_PASSWORD}}@") + cfg.host}
|
||||
|
||||
# The port that the MPD listens on and mpdscribble should try to
|
||||
# connect to.
|
||||
port = ${toString cfg.port}
|
||||
|
||||
${endpoints}
|
||||
'';
|
||||
|
||||
cfgFile = "/run/mpdscribble/mpdscribble.conf";
|
||||
|
||||
replaceSecret = secretFile: placeholder: targetFile:
|
||||
optionalString (secretFile != null) ''
|
||||
${pkgs.replace}/bin/replace-literal -ef ${placeholder} "$(cat ${secretFile})" ${targetFile}'';
|
||||
|
||||
preStart = pkgs.writeShellScript "mpdscribble-pre-start" ''
|
||||
cp -f "${cfgTemplate}" "${cfgFile}"
|
||||
${replaceSecret cfg.passwordFile "{{MPD_PASSWORD}}" cfgFile}
|
||||
${concatStringsSep "\n" (mapAttrsToList (secname: cfg:
|
||||
replaceSecret cfg.passwordFile "{{${secname}_PASSWORD}}" cfgFile)
|
||||
cfg.endpoints)}
|
||||
'';
|
||||
|
||||
localMpd = (cfg.host == "localhost" || cfg.host == "127.0.0.1");
|
||||
|
||||
in {
|
||||
###### interface
|
||||
|
||||
options.services.mpdscribble = {
|
||||
|
||||
enable = mkEnableOption "mpdscribble";
|
||||
|
||||
proxy = mkOption {
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
description = ''
|
||||
HTTP proxy URL.
|
||||
'';
|
||||
};
|
||||
|
||||
verbose = mkOption {
|
||||
default = 1;
|
||||
type = types.int;
|
||||
description = ''
|
||||
Log level for the mpdscribble daemon.
|
||||
'';
|
||||
};
|
||||
|
||||
journalInterval = mkOption {
|
||||
default = 600;
|
||||
example = 60;
|
||||
type = types.int;
|
||||
description = ''
|
||||
How often should mpdscribble save the journal file? [seconds]
|
||||
'';
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
default = (if mpdCfg.network.listenAddress != "any" then
|
||||
mpdCfg.network.listenAddress
|
||||
else
|
||||
"localhost");
|
||||
type = types.str;
|
||||
description = ''
|
||||
Host for the mpdscribble daemon to search for a mpd daemon on.
|
||||
'';
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
default = if localMpd then
|
||||
(findFirst
|
||||
(c: any (x: x == "read") c.permissions)
|
||||
{ passwordFile = null; }
|
||||
mpdCfg.credentials).passwordFile
|
||||
else
|
||||
null;
|
||||
type = types.nullOr types.str;
|
||||
description = ''
|
||||
File containing the password for the mpd daemon.
|
||||
If there is a local mpd configured using <option>services.mpd.credentials</option>
|
||||
the default is automatically set to a matching passwordFile of the local mpd.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
default = mpdCfg.network.port;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Port for the mpdscribble daemon to search for a mpd daemon on.
|
||||
'';
|
||||
};
|
||||
|
||||
endpoints = mkOption {
|
||||
type = (let
|
||||
endpoint = { name, ... }: {
|
||||
options = {
|
||||
url = mkOption {
|
||||
type = types.str;
|
||||
default = endpointUrls.${name} or "";
|
||||
description =
|
||||
"The url endpoint where the scrobble API is listening.";
|
||||
};
|
||||
username = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
Username for the scrobble service.
|
||||
'';
|
||||
};
|
||||
passwordFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
description =
|
||||
"File containing the password, either as MD5SUM or cleartext.";
|
||||
};
|
||||
};
|
||||
};
|
||||
in types.attrsOf (types.submodule endpoint));
|
||||
default = { };
|
||||
example = {
|
||||
"last.fm" = {
|
||||
username = "foo";
|
||||
passwordFile = "/run/secrets/lastfm_password";
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
Endpoints to scrobble to.
|
||||
If the endpoint is one of "${
|
||||
concatStringsSep "\", \"" (attrNames endpointUrls)
|
||||
}" the url is set automatically.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.mpdscribble = {
|
||||
after = [ "network.target" ] ++ (optional localMpd "mpd.service");
|
||||
description = "mpdscribble mpd scrobble client";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
StateDirectory = "mpdscribble";
|
||||
RuntimeDirectory = "mpdscribble";
|
||||
RuntimeDirectoryMode = "700";
|
||||
# TODO use LoadCredential= instead of running preStart with full privileges?
|
||||
ExecStartPre = "+${preStart}";
|
||||
ExecStart =
|
||||
"${pkgs.mpdscribble}/bin/mpdscribble --no-daemon --conf ${cfgFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -605,5 +605,5 @@ in
|
|||
timerConfig.OnCalendar = cfg.dump.interval;
|
||||
};
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ srhb ];
|
||||
meta.maintainers = with lib.maintainers; [ srhb ma27 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,11 @@ in {
|
|||
|
||||
systemd.packages = [ pkgs.iwd ];
|
||||
|
||||
systemd.network.links."80-iwd" = {
|
||||
matchConfig.Type = "wlan";
|
||||
linkConfig.NamePolicy = "keep kernel";
|
||||
};
|
||||
|
||||
systemd.services.iwd.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,20 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libiconv, libogg
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libiconv, libogg
|
||||
, ffmpeg, glibcLocales, perl, perlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opustags";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fmang";
|
||||
repo = "opustags";
|
||||
rev = version;
|
||||
sha256 = "1dicv4s395b9gb4jpr0rnxdq9azr45pid62q3x08lb7cvyq3yxbh";
|
||||
sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix building on darwin
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fmang/opustags/commit/64fc6f8f6d20e034892e89abff0236c85cae98dc.patch";
|
||||
sha256 = "1djifzqhf1w51gbpqbndsh3gnl9iizp6hppxx8x2a92i9ns22zpg";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fmang/opustags/commit/f98208c1a1d10c15f98b127bbfdf88a7b15b08dc.patch";
|
||||
sha256 = "1h3v0r336fca0y8zq1vl2wr8gaqs3vvrrckx7pvji4k1jpiqvp38";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libogg ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
|
||||
nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
@ -38,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
make check
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fmang/opustags";
|
||||
description = "Ogg Opus tags editor";
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.79.0";
|
||||
version = "0.80.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0i9c12w0jlfrqb5gygfn20rn41m7qy6ab03n779wbzwfqqz85mj6";
|
||||
sha256 = "0xs9y5lj0mya6ag625x8j91mn9l9r13gxaqxyvl1fl40y2yjz1zm";
|
||||
};
|
||||
|
||||
vendorSha256 = "0jb6aqdv9yx7fxbkgd73rx6kvxagxscrin5b5bal3ig7ys1ghpsp";
|
||||
vendorSha256 = "172mcs8p43bsdkd2hxg9qn6018fh8f36kxx0vgnq5q6fqsb6s1f6";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ sub getDeps {
|
|||
# virtual dependencies.
|
||||
my %provides;
|
||||
|
||||
foreach my $cdata (values %packages) {
|
||||
foreach my $cdata (sort {$a->{Package} cmp $b->{Package}} (values %packages)) {
|
||||
if (defined $cdata->{Provides}) {
|
||||
my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides}));
|
||||
foreach my $name (@provides) {
|
||||
|
|
|
|||
|
|
@ -7,12 +7,13 @@ in fetchzip {
|
|||
|
||||
url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip";
|
||||
|
||||
# only extract the variable font because everything else is a duplicate
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
sha256 = "16v62wj872ba4w7qxn4l6zjgqh7lrpwh1xax1bp1x9dpz08mnq06";
|
||||
sha256 = "1wbfjgvr9m5azl5w49y0hpqzgcraw6spd1wnxgxlzfx57x6gcw0k";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/tonsky/FiraCode";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
|
||||
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
|
||||
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
|
||||
, gmp, readline, file, numactl, xen, libapparmor, jansson
|
||||
, gmp, readline, file, numactl, libapparmor, jansson
|
||||
, getopt, perlPackages, ocamlPackages
|
||||
, libtirpc
|
||||
, appliance ? null
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
ncurses cpio gperf jansson
|
||||
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
|
||||
systemd fuse yajl libvirt gmp readline file hivex db
|
||||
numactl xen libapparmor getopt perlPackages.ModuleBuild
|
||||
numactl libapparmor getopt perlPackages.ModuleBuild
|
||||
libtirpc
|
||||
] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
|
||||
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ])
|
||||
|
|
|
|||
63
pkgs/development/libraries/libime/default.nix
Normal file
63
pkgs/development/libraries/libime/default.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, boost
|
||||
, python3
|
||||
, fcitx5
|
||||
}:
|
||||
|
||||
let
|
||||
table = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/table.tar.gz";
|
||||
sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1";
|
||||
};
|
||||
arpaVer = "20140820";
|
||||
arpa = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2";
|
||||
sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm";
|
||||
};
|
||||
dictVer = "20200715";
|
||||
dict = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz";
|
||||
sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libime";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "libime";
|
||||
rev = version;
|
||||
sha256 = "hDfxuDIj9qx5d+UFwxDdP2PCboPnUV1n+VVoEIGsucM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
ln -s ${table} data/$(stripHash ${table})
|
||||
ln -s ${arpa} data/$(stripHash ${arpa})
|
||||
ln -s ${dict} data/$(stripHash ${dict})
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
fcitx5
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to support generic input method implementation";
|
||||
homepage = "https://github.com/fcitx/libime";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentencepiece";
|
||||
version = "0.1.95";
|
||||
version = "0.1.94";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xpVihdSpjO/mJWM5nzVg9CND3oAEdfCwXQW0jqLVDBA=";
|
||||
sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
41
pkgs/development/libraries/xcb-imdkit/default.nix
Normal file
41
pkgs/development/libraries/xcb-imdkit/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, uthash
|
||||
, xcbutil
|
||||
, xcbutilkeysyms
|
||||
, xorgproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xcb-imdkit";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "xcb-imdkit";
|
||||
rev = version;
|
||||
sha256 = "dvax+Wj8+tHdiL6txcuugrOlRnxdIW25DYO4iNAYK8M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
xorgproto
|
||||
uthash
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xcbutil
|
||||
xcbutilkeysyms
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "input method development support for xcb";
|
||||
homepage = "https://github.com/fcitx/xcb-imdkit";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,8 @@
|
|||
{ buildPecl, lib, pkgs }:
|
||||
|
||||
{ buildPecl, lib, pkgs, version, sha256 }:
|
||||
buildPecl {
|
||||
pname = "oci8";
|
||||
|
||||
version = "2.2.0";
|
||||
sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
|
||||
inherit version sha256;
|
||||
|
||||
buildInputs = [ pkgs.oracle-instantclient ];
|
||||
configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -27,6 +28,10 @@ buildPythonPackage rec {
|
|||
pytest-asyncio
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
"test_multiprocessing"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Reference ASGI adapters and channel layers";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward0";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "awkward-0.x";
|
||||
rev = version;
|
||||
sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz";
|
||||
sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
|
|
|||
31
pkgs/development/python-modules/ds-store/default.nix
Normal file
31
pkgs/development/python-modules/ds-store/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mac_alias
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ds_store";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "al45tair";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mac_alias ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "ds_store" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/al45tair/ds_store";
|
||||
description = "Manipulate Finder .DS_Store files from Python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene";
|
||||
version = "3.0.0b6";
|
||||
version = "3.0.0b7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
repo = "graphene";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q6qmyc4jbi9cws4d98x7bgi7gppd09dmzijkb19fwbh4giy938r";
|
||||
sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
56
pkgs/development/python-modules/pytile/default.nix
Normal file
56
pkgs/development/python-modules/pytile/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry
|
||||
, pylint
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pytile";
|
||||
version = "5.1.0";
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hdyb8ca4ihqf7yfkr3hbpkwz7g182ycra151y5dxn0319fillc3";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pylint
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
pytestFlagsArray = [ "--ignore examples/" ];
|
||||
pythonImportsCheck = [ "pytile" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = " Python API for Tile Bluetooth trackers";
|
||||
longDescription = ''
|
||||
pytile is a simple Python library for retrieving information on Tile
|
||||
Bluetooth trackers (including last location and more).
|
||||
'';
|
||||
homepage = "https://github.com/bachya/pytile";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "uproot3";
|
||||
version = "3.14.1";
|
||||
version = "3.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "uproot3";
|
||||
rev = version;
|
||||
sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8";
|
||||
sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1";
|
||||
sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn";
|
||||
vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,13 +45,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
|
||||
/* On Darwin, build fails with:
|
||||
|
||||
Undefined symbols:
|
||||
"_argp_program_version", referenced from:
|
||||
_argp_program_version$non_lazy_ptr in libcflow.a(argp-parse.o)
|
||||
ld: symbol(s) not found
|
||||
*/
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGL, openalSoft
|
||||
{ stdenv, fetchFromGitHub, which, pkg-config, SDL2, libGL, openalSoft
|
||||
, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ioquake3-git";
|
||||
version = "2019-05-29";
|
||||
version = "2020-12-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ioquake";
|
||||
repo = "ioq3";
|
||||
rev = "350b8f9c7c88c002dccea4f0350f1919b86d3b4e";
|
||||
sha256 = "17qkqi22f2fyh6bnfcf1zz2lycgv08d6aw52sf0hqw7r3qq86d08";
|
||||
rev = "05180e32dcfb9a4552e1b9652b56127248a9950c";
|
||||
sha256 = "0hcxxa1ambpdwhg7nb5hvb32g49rl5p9dcflpzcv5cax9drn166i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which pkgconfig ];
|
||||
nativeBuildInputs = [ which pkg-config ];
|
||||
buildInputs = [
|
||||
SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg
|
||||
freetype mumble
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation {
|
|||
meta = with stdenv.lib; {
|
||||
homepage = "https://ioquake3.org/";
|
||||
description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ rvolosatovs eelco abbradar ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -93,6 +93,12 @@ python3Packages.buildPythonApplication {
|
|||
# https://bugs.launchpad.net/hplip/+bug/1788706
|
||||
# https://bugs.launchpad.net/hplip/+bug/1787289
|
||||
./image-processor.patch
|
||||
|
||||
# HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS
|
||||
# paths, and hp-setup crashes if none of these paths actually exist (which they
|
||||
# don't on NixOS). Add the equivalent NixOS path, /var/lib/cups/path/share.
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/21796
|
||||
./hplip-3.20.11-nixos-cups-ppd-search-path.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
From: Bryan Gardiner <bog@khumba.net>
|
||||
Date: Sat, 9 Jan 2021 16:51:20 -0800
|
||||
Subject: [PATCH] Add NixOS CUPS PPD search path.
|
||||
|
||||
---
|
||||
base/g.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/base/g.py b/base/g.py
|
||||
index f73e23f..758f339 100644
|
||||
--- a/base/g.py
|
||||
+++ b/base/g.py
|
||||
@@ -283,7 +283,7 @@ prop.max_message_len = 8192
|
||||
prop.max_message_read = 65536
|
||||
prop.read_timeout = 90
|
||||
|
||||
-prop.ppd_search_path = '/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64'
|
||||
+prop.ppd_search_path = '/var/lib/cups/path/share;/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64'
|
||||
prop.ppd_search_pattern = 'HP-*.ppd.*'
|
||||
prop.ppd_download_url = 'http://www.linuxprinting.org/ppd-o-matic.cgi'
|
||||
prop.ppd_file_suffix = '-hpijs.ppd'
|
||||
--
|
||||
2.29.2
|
||||
|
||||
27
pkgs/misc/emulators/oberon-risc-emu/default.nix
Normal file
27
pkgs/misc/emulators/oberon-risc-emu/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchFromGitHub, SDL2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "oberon-risc-emu";
|
||||
version = "unstable-2020-08-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdewacht";
|
||||
repo = "oberon-risc-emu";
|
||||
rev = "26c8ac5737c71811803c87ad51f1f0d6e62e71fe";
|
||||
sha256 = "1iriix3cfcpbkjb5xjb4ysh592xppgprwzp3b6qhwcx44g7kdvxq";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv risc $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/pdewacht/oberon-risc-emu/";
|
||||
description = "Emulator for the Oberon RISC machine";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
};
|
||||
}
|
||||
|
|
@ -309,6 +309,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ryu1kn.partial-diff = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "partial-diff";
|
||||
publisher = "ryu1kn";
|
||||
version = "1.4.1";
|
||||
sha256 = "1r4kg4slgxncdppr4fn7i5vfhvzcg26ljia2r97n6wvwn8534vs9";
|
||||
};
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
scala-lang.scala = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "scala";
|
||||
|
|
|
|||
|
|
@ -838,7 +838,7 @@
|
|||
"threshold" = ps: with ps; [ ];
|
||||
"tibber" = ps: with ps; [ ]; # missing inputs: pyTibber
|
||||
"tikteck" = ps: with ps; [ ]; # missing inputs: tikteck
|
||||
"tile" = ps: with ps; [ ]; # missing inputs: pytile
|
||||
"tile" = ps: with ps; [ pytile ];
|
||||
"time_date" = ps: with ps; [ ];
|
||||
"timer" = ps: with ps; [ ];
|
||||
"tmb" = ps: with ps; [ ]; # missing inputs: tmb
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wireguard-exporter";
|
||||
version = "3.3.0";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MindFlavor";
|
||||
repo = "prometheus_wireguard_exporter";
|
||||
rev = version;
|
||||
sha256 = "1c6zadqnn4b83yglcdn1hw54jj1c4makbdy6fli3cfb7sha1ynml";
|
||||
sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "148982ypkxhab2kmijk9zwwi5l6nk4rcdwaz0r1j9fni47q49f35";
|
||||
cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.16.3";
|
||||
version = "1.17.0";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
|
|
@ -12,10 +12,10 @@ buildGoModule rec {
|
|||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vhxa1sdnkjy86rn2zsyf8kc3nn2fdbym3kw5zxz88mjc8iq3x0d";
|
||||
sha256 = "1j3wi398vcvlnf1q335hhbw6bq69qclak92sg2na05cl4snw68y0";
|
||||
};
|
||||
|
||||
vendorSha256 = "12rh8pggpdjgw9x23qa99cj7i67iqchacgzd11m4ficxv8a4bkyc";
|
||||
vendorSha256 = "0vb1gvmj7pmz4dljyk91smkn8japmv7mc3mgb0s1imvxala8qq83";
|
||||
|
||||
buildFlagsArray = [ ''-ldflags=
|
||||
-w -s -X main.version=${version}
|
||||
|
|
@ -27,6 +27,6 @@ buildGoModule rec {
|
|||
description = "The plugin-driven server agent for collecting & reporting metrics";
|
||||
license = licenses.mit;
|
||||
homepage = "https://www.influxdata.com/time-series-platform/telegraf/";
|
||||
maintainers = with maintainers; [ mic92 roblabla foxit64 ];
|
||||
maintainers = with maintainers; [ mic92 roblabla timstott foxit64 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }:
|
||||
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests
|
||||
, tlsSupport ? true, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.0.6";
|
||||
|
|
@ -18,14 +20,19 @@ stdenv.mkDerivation rec {
|
|||
''}
|
||||
'';
|
||||
|
||||
buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd;
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ lua ]
|
||||
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd
|
||||
++ stdenv.lib.optionals tlsSupport [ openssl ];
|
||||
# More cross-compiling fixes.
|
||||
# Note: this enables libc malloc as a temporary fix for cross-compiling.
|
||||
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
|
||||
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
|
||||
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"];
|
||||
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]
|
||||
++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
33
pkgs/tools/backup/bupstash/default.nix
Normal file
33
pkgs/tools/backup/bupstash/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bupstash";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrewchambers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "013k8pr4865f5rp66fjf3a8069kmd29brxv0l20z571gy2kxs5p9";
|
||||
};
|
||||
|
||||
cargoSha256 = "17cdi93q71wsqqfkpz6mxcaqqhqclsbns0g1r9mni39nikw7amv1";
|
||||
|
||||
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
postBuild = ''
|
||||
RUBYOPT="-KU -E utf-8:utf-8" ronn doc/man/*.md
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/man/*.[1-9]
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Easy and efficient encrypted backups";
|
||||
homepage = "https://bupstash.io";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andrewchambers ];
|
||||
};
|
||||
}
|
||||
24
pkgs/tools/inputmethods/evscript/default.nix
Normal file
24
pkgs/tools/inputmethods/evscript/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evscript";
|
||||
version = "git-${builtins.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "myfreeweb";
|
||||
repo = pname;
|
||||
rev = "47f86f0d15add2af785ea1ff47f24d130026d1b4";
|
||||
sha256 = "1xm8297k0d8d0aq7fxgmibr4qva4d02cb6gnnlzq77jcmnknxv14";
|
||||
};
|
||||
|
||||
cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp";
|
||||
verifyCargoDeps = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/myfreeweb/${pname}";
|
||||
description = "A tiny sandboxed Dyon scripting environment for evdev input devices";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ milesbreslin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
100
pkgs/tools/inputmethods/fcitx5/default.nix
Normal file
100
pkgs/tools/inputmethods/fcitx5/default.nix
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, cairo
|
||||
, cldr-emoji-annotation
|
||||
, pango
|
||||
, fribidi
|
||||
, fmt
|
||||
, wayland
|
||||
, systemd
|
||||
, wayland-protocols
|
||||
, json_c
|
||||
, isocodes
|
||||
, xkeyboard_config
|
||||
, enchant
|
||||
, gdk-pixbuf
|
||||
, libGL
|
||||
, libevent
|
||||
, libuuid
|
||||
, libselinux
|
||||
, libXdmcp
|
||||
, libsepol
|
||||
, libxkbcommon
|
||||
, libthai
|
||||
, libdatrie
|
||||
, xcbutilkeysyms
|
||||
, pcre
|
||||
, xcbutilwm
|
||||
, xcb-imdkit
|
||||
, libxkbfile
|
||||
}:
|
||||
let
|
||||
enDictVer = "20121020";
|
||||
enDict = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/en_dict-${enDictVer}.tar.gz";
|
||||
sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5";
|
||||
rev = version;
|
||||
sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
ln -s ${enDict} src/modules/spell/dict/$(stripHash ${enDict})
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fmt
|
||||
isocodes
|
||||
cairo
|
||||
enchant
|
||||
pango
|
||||
libthai
|
||||
libdatrie
|
||||
fribidi
|
||||
systemd
|
||||
gdk-pixbuf
|
||||
wayland
|
||||
wayland-protocols
|
||||
cldr-emoji-annotation
|
||||
json_c
|
||||
libGL
|
||||
libevent
|
||||
libuuid
|
||||
libselinux
|
||||
libsepol
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
pcre
|
||||
xcbutilwm
|
||||
xcbutilkeysyms
|
||||
xcb-imdkit
|
||||
xkeyboard_config
|
||||
libxkbfile
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Next generation of fcitx";
|
||||
homepage = "https://github.com/fcitx/fcitx5";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
76
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
Normal file
76
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, boost
|
||||
, libime
|
||||
, fcitx5
|
||||
, fcitx5-qt
|
||||
, fcitx5-lua
|
||||
, qtwebengine
|
||||
, opencc
|
||||
, curl
|
||||
, fmt
|
||||
, luaSupport ? true
|
||||
}:
|
||||
|
||||
let
|
||||
pyStrokeVer = "20121124";
|
||||
pyStroke = fetchurl {
|
||||
url = "http://download.fcitx-im.org/data/py_stroke-${pyStrokeVer}.tar.gz";
|
||||
sha256 = "0j72ckmza5d671n2zg0psg7z9iils4gyxz7jgkk54fd4pyljiccf";
|
||||
};
|
||||
pyTableVer = "20121124";
|
||||
pyTable = fetchurl {
|
||||
url = "http://download.fcitx-im.org/data/py_table-${pyTableVer}.tar.gz";
|
||||
sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522";
|
||||
};
|
||||
in
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-chinese-addons";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-chinese-addons";
|
||||
rev = version;
|
||||
sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_WEBKIT=off"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
boost
|
||||
fcitx5-lua
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
ln -s ${pyStroke} modules/pinyinhelper/$(stripHash ${pyStroke})
|
||||
ln -s ${pyTable} modules/pinyinhelper/$(stripHash ${pyTable})
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
fcitx5-qt
|
||||
libime
|
||||
curl
|
||||
opencc
|
||||
qtwebengine
|
||||
fmt
|
||||
] ++ stdenv.lib.optional luaSupport fcitx5-lua;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Addons related to Chinese, including IME previous bundled inside fcitx4";
|
||||
homepage = "https://github.com/fcitx/fcitx5-chinese-addons";
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
60
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
Normal file
60
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, fcitx5-qt
|
||||
, qtx11extras
|
||||
, kwidgetsaddons
|
||||
, kdeclarative
|
||||
, kirigami2
|
||||
, isocodes
|
||||
, xkeyboardconfig
|
||||
, libxkbfile
|
||||
, libXdmcp
|
||||
, kcmSupport ? true
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-configtool";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-configtool";
|
||||
rev = version;
|
||||
sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
fcitx5-qt
|
||||
qtx11extras
|
||||
kirigami2
|
||||
isocodes
|
||||
xkeyboardconfig
|
||||
libxkbfile
|
||||
libXdmcp
|
||||
] ++ stdenv.lib.optionals kcmSupport [
|
||||
kdeclarative
|
||||
kwidgetsaddons
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Configuration Tool for Fcitx5";
|
||||
homepage = "https://github.com/fcitx/fcitx5-configtool";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
71
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
Normal file
71
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, gobject-introspection
|
||||
, gtk2
|
||||
, gtk3
|
||||
, pcre
|
||||
, libuuid
|
||||
, libselinux
|
||||
, libsepol
|
||||
, libthai
|
||||
, libdatrie
|
||||
, libXdmcp
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, dbus
|
||||
, at-spi2-core
|
||||
, libXtst
|
||||
, withGTK2 ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-gtk";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-gtk";
|
||||
rev = version;
|
||||
sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
|
||||
"-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
|
||||
] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
fcitx5
|
||||
pcre
|
||||
libuuid
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libdatrie
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
epoxy
|
||||
dbus
|
||||
at-spi2-core
|
||||
libXtst
|
||||
] ++ stdenv.lib.optional withGTK2 gtk2;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fcitx5 gtk im module and glib based dbus client library";
|
||||
homepage = "https://github.com/fcitx/fcitx5-gtk";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
40
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
Normal file
40
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, lua5_3
|
||||
, luaPackage ? lua5_3
|
||||
, gettext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-lua";
|
||||
rev = "${version}";
|
||||
sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
luaPackage
|
||||
gettext
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lua support for Fcitx 5";
|
||||
homepage = "https://github.com/fcitx/fcitx5-lua";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
46
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
Normal file
46
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, qtx11extras
|
||||
, libxcb
|
||||
, libXdmcp
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-qt";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-qt";
|
||||
rev = version;
|
||||
sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_QT4=0"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
qtx11extras
|
||||
libxcb
|
||||
libXdmcp
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fcitx5 Qt Library";
|
||||
homepage = "https://github.com/fcitx/fcitx5-qt";
|
||||
license = with licenses; [ lgpl21Plus bsd3 ];
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
47
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
Normal file
47
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, gettext
|
||||
, fcitx5
|
||||
, librime
|
||||
, brise
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-rime";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-rime";
|
||||
rev = version;
|
||||
sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRIME_DATA_DIR=${brise}/share/rime-data"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
pkgconfig
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
librime
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "RIME support for Fcitx5";
|
||||
homepage = "https://github.com/fcitx/fcitx5-rime";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
38
pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
Normal file
38
pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, gettext
|
||||
, libime
|
||||
, boost
|
||||
, fcitx5
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-extra";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-table-extra";
|
||||
rev = version;
|
||||
sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
gettext
|
||||
libime
|
||||
boost
|
||||
fcitx5
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick";
|
||||
homepage = "https://github.com/fcitx/fcitx5-table-extra";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
38
pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
Normal file
38
pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, gettext
|
||||
, libime
|
||||
, boost
|
||||
, fcitx5
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-other";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-table-other";
|
||||
rev = version;
|
||||
sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
gettext
|
||||
libime
|
||||
boost
|
||||
fcitx5
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Some other tables for Fcitx";
|
||||
homepage = "https://github.com/fcitx/fcitx5-table-other";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ poscat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
18
pkgs/tools/inputmethods/fcitx5/with-addons.nix
Normal file
18
pkgs/tools/inputmethods/fcitx5/with-addons.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }:
|
||||
|
||||
symlinkJoin {
|
||||
name = "fcitx5-with-addons-${fcitx5.version}";
|
||||
|
||||
paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons;
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/fcitx5 \
|
||||
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share" \
|
||||
--suffix PATH : "$out/bin"
|
||||
'';
|
||||
|
||||
meta = fcitx5.meta;
|
||||
}
|
||||
30
pkgs/tools/security/deepsea/default.nix
Normal file
30
pkgs/tools/security/deepsea/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "deepsea";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dsnezhkov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig";
|
||||
};
|
||||
|
||||
vendorSha256 = "0vpkzykfg1rq4qi1v5lsa0drpil9i6ccfw96k48ppi9hiwzpq94w";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Phishing tool for red teams and pentesters";
|
||||
longDescription = ''
|
||||
DeepSea phishing gear aims to help RTOs and pentesters with the
|
||||
delivery of opsec-tight, flexible email phishing campaigns carried
|
||||
out on the outside as well as on the inside of a perimeter.
|
||||
'';
|
||||
homepage = "https://github.com/dsnezhkov/deepsea";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -23,6 +23,8 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
|
||||
|
||||
configureFlags = [
|
||||
"--with-usbdropdir=${placeholder "out"}/pcsc/drivers"
|
||||
"--bindir=${placeholder "tools"}/bin"
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sn0int";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kpcyrd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10f1wblczxlww09f4dl8i9zzgpr14jj7s329wkvm7lafmwx3qrn5";
|
||||
sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1";
|
||||
};
|
||||
|
||||
cargoSha256 = "1v0q751ylsfpdjwsbl20pvn7g75w503jwjl5kn5kc8xq3g0lnp65";
|
||||
cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Semi-automatic OSINT framework and package manager";
|
||||
homepage = "https://github.com/kpcyrd/sn0int";
|
||||
license = licenses.gpl3;
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sile";
|
||||
version = "0.10.12";
|
||||
version = "0.10.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bxm3vhba289vcgpzbs1hz5fjamf0zgxkr7h8vcsiijjjavmv64a";
|
||||
sha256 = "19k4r7wfszml4dac8cm1hx9rb1im3psigcidz8bdm9j9jzpd01yj";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://sile-typesetter.org/";
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018
|
||||
maintainers = with maintainers; [ doronbehar alerque ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ mapAliases ({
|
|||
firefoxWrapper = firefox; # 2015-09
|
||||
|
||||
firestr = throw "firestr has been removed."; # added 2019-12-08
|
||||
fish-foreign-env = fishPlugins.foreign-env; # added 2020-12-29
|
||||
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
|
||||
flameGraph = flamegraph; # added 2018-04-25
|
||||
flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
|
||||
foldingathome = fahclient; # added 2020-09-03
|
||||
|
|
|
|||
|
|
@ -2888,6 +2888,8 @@ in
|
|||
|
||||
bup = callPackage ../tools/backup/bup { };
|
||||
|
||||
bupstash = callPackage ../tools/backup/bupstash { };
|
||||
|
||||
burp = callPackage ../tools/backup/burp { };
|
||||
|
||||
buku = callPackage ../applications/misc/buku { };
|
||||
|
|
@ -3090,6 +3092,8 @@ in
|
|||
|
||||
evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
|
||||
|
||||
evscript = callPackage ../tools/inputmethods/evscript { };
|
||||
|
||||
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
|
||||
|
||||
libpinyin = callPackage ../development/libraries/libpinyin { };
|
||||
|
|
@ -3944,6 +3948,24 @@ in
|
|||
|
||||
chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { };
|
||||
|
||||
fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { };
|
||||
|
||||
fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { };
|
||||
|
||||
fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
|
||||
|
||||
fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };
|
||||
|
||||
fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { };
|
||||
|
||||
fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { };
|
||||
|
||||
fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { };
|
||||
|
||||
fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { };
|
||||
|
||||
fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };
|
||||
|
||||
fcppt = callPackage ../development/libraries/fcppt { };
|
||||
|
||||
fcrackzip = callPackage ../tools/security/fcrackzip { };
|
||||
|
|
@ -10619,7 +10641,7 @@ in
|
|||
|
||||
dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;
|
||||
|
||||
dhallPackages = callPackages ./dhall-packages.nix { };
|
||||
dhallPackages = callPackage ./dhall-packages.nix { };
|
||||
|
||||
duktape = callPackage ../development/interpreters/duktape { };
|
||||
|
||||
|
|
@ -12474,6 +12496,8 @@ in
|
|||
|
||||
xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
|
||||
|
||||
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
|
||||
|
||||
xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
|
||||
};
|
||||
|
|
@ -14435,8 +14459,13 @@ in
|
|||
libgudev = callPackage ../development/libraries/libgudev { };
|
||||
|
||||
libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
|
||||
libguestfs = callPackage ../development/libraries/libguestfs { };
|
||||
libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; };
|
||||
libguestfs = callPackage ../development/libraries/libguestfs {
|
||||
autoreconfHook = buildPackages.autoreconfHook264;
|
||||
};
|
||||
libguestfs-with-appliance = libguestfs.override {
|
||||
appliance = libguestfs-appliance;
|
||||
autoreconfHook = buildPackages.autoreconfHook264;
|
||||
};
|
||||
|
||||
|
||||
libhangul = callPackage ../development/libraries/libhangul { };
|
||||
|
|
@ -14613,6 +14642,8 @@ in
|
|||
|
||||
libimagequant = callPackage ../development/libraries/libimagequant {};
|
||||
|
||||
libime = callPackage ../development/libraries/libime { };
|
||||
|
||||
libinfinity = callPackage ../development/libraries/libinfinity { };
|
||||
|
||||
libinput = callPackage ../development/libraries/libinput {
|
||||
|
|
@ -15872,6 +15903,8 @@ in
|
|||
|
||||
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
|
||||
|
||||
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
|
||||
|
||||
qgpgme = callPackage ../development/libraries/gpgme { };
|
||||
|
||||
grantlee = callPackage ../development/libraries/grantlee/5 { };
|
||||
|
|
@ -23574,6 +23607,8 @@ in
|
|||
inherit (gnome2) libglade;
|
||||
};
|
||||
|
||||
oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { };
|
||||
|
||||
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
|
||||
|
||||
obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
|
||||
|
|
@ -27039,6 +27074,8 @@ in
|
|||
|
||||
dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
|
||||
|
||||
deepsea = callPackage ../tools/security/deepsea { };
|
||||
|
||||
deeptools = callPackage ../applications/science/biology/deeptools { python = python3; };
|
||||
|
||||
delly = callPackage ../applications/science/biology/delly { };
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ let
|
|||
|
||||
in
|
||||
{ inherit
|
||||
callPackage
|
||||
buildDhallPackage
|
||||
buildDhallGitHubPackage
|
||||
buildDhallDirectoryPackage
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -78,7 +78,13 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
mongodb = callPackage ../development/php-packages/mongodb { };
|
||||
|
||||
oci8 = callPackage ../development/php-packages/oci8 { };
|
||||
oci8 = callPackage ../development/php-packages/oci8 ({
|
||||
version = "2.2.0";
|
||||
sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
|
||||
} // lib.optionalAttrs (lib.versionAtLeast php.version "8.0") {
|
||||
version = "3.0.1";
|
||||
sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";
|
||||
});
|
||||
|
||||
pdlib = callPackage ../development/php-packages/pdlib { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1898,6 +1898,8 @@ in {
|
|||
|
||||
dropbox = callPackage ../development/python-modules/dropbox { };
|
||||
|
||||
ds-store = callPackage ../development/python-modules/ds-store { };
|
||||
|
||||
ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; };
|
||||
|
||||
dtopt = callPackage ../development/python-modules/dtopt { };
|
||||
|
|
@ -6230,6 +6232,8 @@ in {
|
|||
|
||||
pyeverlights = callPackage ../development/python-modules/pyeverlights { };
|
||||
|
||||
pytile = callPackage ../development/python-modules/pytile { };
|
||||
|
||||
pytimeparse = callPackage ../development/python-modules/pytimeparse { };
|
||||
|
||||
pytmx = callPackage ../development/python-modules/pytmx { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue