diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml
index e587275a6383..cb6d60c2c138 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/doc/contributing/coding-conventions.xml
@@ -178,6 +178,15 @@ args.stdenv.mkDerivation (args // {
+
+
+ Prefer using the top-level lib over its alias
+ stdenv.lib. lib is unrelated to
+ stdenv, and so stdenv.lib should only
+ be used as a convenience alias when developing to avoid having to modify
+ the function inputs just to test something out.
+
+
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 10a0d0588c17..346f7b47db43 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -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";
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 9070957aee4a..e0857e7731ee 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -107,6 +107,15 @@
user D-Bus session available also for non-graphical logins.
+
+
+ The networking.wireless.iwd 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
+ systemd.network.links."80-iwd" = lib.mkForce {}.
+
+
rubyMinimal was removed due to being unused and
@@ -321,8 +330,8 @@
- fish-foreign-env is now an alias for the
- fishPlugins.foreign-env package, in which the fish
+ The fish-foreign-env package has been replaced with
+ fishPlugins.foreign-env, in which the fish
functions have been relocated to the
vendor_functions.d directory to be loaded automatically.
diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 0d6dd3399bfc..2e7cfaab7b7c 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -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 = ''
diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix
new file mode 100644
index 000000000000..44962d202fe1
--- /dev/null
+++ b/nixos/modules/i18n/input-method/fcitx5.nix
@@ -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";
+ };
+ };
+ }
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c2a9e0f32015..84e7c10ff64b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -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
diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix
new file mode 100644
index 000000000000..642d8743935f
--- /dev/null
+++ b/nixos/modules/services/audio/mpdscribble.nix
@@ -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
+ 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}";
+ };
+ };
+ };
+
+}
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index af80e99746be..ac702a05ee8b 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -605,5 +605,5 @@ in
timerConfig.OnCalendar = cfg.dump.interval;
};
};
- meta.maintainers = with lib.maintainers; [ srhb ];
+ meta.maintainers = with lib.maintainers; [ srhb ma27 ];
}
diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index 6be67a8b96f4..99e5e78badd2 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -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" ];
};
diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix
index 4e26c9b77523..83cf44853a5a 100644
--- a/pkgs/applications/audio/opustags/default.nix
+++ b/pkgs/applications/audio/opustags/default.nix
@@ -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;
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 3ded9f013fbc..d614360bf44d 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -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;
diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl
index bed397d6f07e..fe23025df1d8 100644
--- a/pkgs/build-support/vm/deb/deb-closure.pl
+++ b/pkgs/build-support/vm/deb/deb-closure.pl
@@ -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) {
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 4f0fb1e81c16..a3fac2d69d0b 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -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";
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index b875b3579037..d6e45deadcf8 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -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 ])
diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix
new file mode 100644
index 000000000000..476d2419ef31
--- /dev/null
+++ b/pkgs/development/libraries/libime/default.nix
@@ -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;
+ };
+}
diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index 7aeb77a1ece8..bc463aa4010a 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -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 ];
diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix
new file mode 100644
index 000000000000..72ce94d98f12
--- /dev/null
+++ b/pkgs/development/libraries/xcb-imdkit/default.nix
@@ -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;
+ };
+}
diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix
index ea699c2034e8..697ad6740200 100644
--- a/pkgs/development/php-packages/oci8/default.nix
+++ b/pkgs/development/php-packages/oci8/default.nix
@@ -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" ];
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index dc7b160b9432..a14c294bf682 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -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;
diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix
index 4441d131e637..c248c81da751 100644
--- a/pkgs/development/python-modules/awkward0/default.nix
+++ b/pkgs/development/python-modules/awkward0/default.nix
@@ -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 ];
diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix
new file mode 100644
index 000000000000..00d10e749496
--- /dev/null
+++ b/pkgs/development/python-modules/ds-store/default.nix
@@ -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 ];
+ };
+}
diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index 860bb504cf1a..301ffca03477 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -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 = [
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
new file mode 100644
index 000000000000..d2fd99f6d166
--- /dev/null
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -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 ];
+ };
+}
diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix
index 0d0c2365b637..1150c76d2b48 100644
--- a/pkgs/development/python-modules/uproot3/default.nix
+++ b/pkgs/development/python-modules/uproot3/default.nix
@@ -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 ];
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 1f12afe3f748..7f2e65fd9918 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -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;
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index 1215c29c4776..8c271bd76732 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -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;
};
}
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 285fb7e68840..133e679b460c 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -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 ];
};
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index b29463d61ddf..f1688a1b56fc 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -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 = ''
diff --git a/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch b/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
new file mode 100644
index 000000000000..d26e13dd2d63
--- /dev/null
+++ b/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
@@ -0,0 +1,24 @@
+From: Bryan Gardiner
+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
+
diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/misc/emulators/oberon-risc-emu/default.nix
new file mode 100644
index 000000000000..14c213fcc0ae
--- /dev/null
+++ b/pkgs/misc/emulators/oberon-risc-emu/default.nix
@@ -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 ];
+ };
+}
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 137fc4265e19..42983053c1ac 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -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";
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4e7f4ff5d0c1..c961ffe538c6 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -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
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 0f303f669af9..0cbfc89bd5d4 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -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;
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 2080195dc566..76acc2822f40 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -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 ];
};
}
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 38e12010f416..507416be7339 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -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;
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix
new file mode 100644
index 000000000000..9801d8ded9c4
--- /dev/null
+++ b/pkgs/tools/backup/bupstash/default.nix
@@ -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 ];
+ };
+}
diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix
new file mode 100644
index 000000000000..95f322ed8c68
--- /dev/null
+++ b/pkgs/tools/inputmethods/evscript/default.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
new file mode 100644
index 000000000000..5fa85064fa3f
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
new file mode 100644
index 000000000000..2b8a07537b0b
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
new file mode 100644
index 000000000000..e5b55c26cd4b
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
new file mode 100644
index 000000000000..ce157f792535
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
new file mode 100644
index 000000000000..310cae035ba7
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
new file mode 100644
index 000000000000..580082096ece
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
new file mode 100644
index 000000000000..9992e1987589
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
new file mode 100644
index 000000000000..7dcca7e130d0
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
new file mode 100644
index 000000000000..eb9d93d6e7ce
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
@@ -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;
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
new file mode 100644
index 000000000000..854020effeaa
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -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;
+}
diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix
new file mode 100644
index 000000000000..5cd7ed48aa34
--- /dev/null
+++ b/pkgs/tools/security/deepsea/default.nix
@@ -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 ];
+ };
+}
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 7ae062547aa2..015e3938c3ef 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -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"
diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix
index 8b99649e0c9f..ef2f97cfa111 100644
--- a/pkgs/tools/security/sn0int/default.nix
+++ b/pkgs/tools/security/sn0int/default.nix
@@ -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;
};
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 239bafa05c97..9ed6c1de0e91 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -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;
};
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 01c80ea3d804..5b5a91c116a3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16533ce86834..a89dc9351b58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };
@@ -23581,6 +23614,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 { };
@@ -27046,6 +27081,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 { };
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
index c1c2c5f0e3bb..5a3fb04748d0 100644
--- a/pkgs/top-level/dhall-packages.nix
+++ b/pkgs/top-level/dhall-packages.nix
@@ -19,6 +19,7 @@ let
in
{ inherit
+ callPackage
buildDhallPackage
buildDhallGitHubPackage
buildDhallDirectoryPackage
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aaf8988d9101..2f8100bd6fda 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6,15 +6,15 @@
be almost as much code as the function itself. */
{ config
-, stdenv, buildPackages, pkgs
+, stdenv, lib, buildPackages, pkgs
, fetchurl, fetchgit, fetchpatch, fetchFromGitHub
, perl, overrides, buildPerl, shortenPerlShebang
}:
# cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above
-assert stdenv.lib.versionAtLeast perl.version "5.30.3";
+assert lib.versionAtLeast perl.version "5.30.3";
let
- inherit (stdenv.lib) maintainers teams;
+ inherit (lib) maintainers teams;
self = _self // (overrides pkgs);
_self = with self; {
@@ -27,8 +27,8 @@ let
hasPerlModule = drv: drv ? perlModule ;
requiredPerlModules = drvs: let
- modules = stdenv.lib.filter hasPerlModule drvs;
- in stdenv.lib.unique ([perl] ++ modules ++ stdenv.lib.concatLists (stdenv.lib.catAttrs "requiredPerlModules" modules));
+ modules = lib.filter hasPerlModule drvs;
+ in lib.unique ([perl] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPerlModules" modules));
# Convert derivation to a perl module.
toPerlModule = drv:
@@ -77,7 +77,7 @@ let
makePerlPath [ pkgs.perlPackages.libnet ]
=> "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
*/
- makePerlPath = stdenv.lib.makeSearchPathOutput "lib" perl.libPrefix;
+ makePerlPath = lib.makeSearchPathOutput "lib" perl.libPrefix;
/* Construct a perl search path recursively including all dependencies (such as $PERL5LIB)
@@ -86,7 +86,7 @@ let
makeFullPerlPath [ pkgs.perlPackages.CGI ]
=> "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl"
*/
- makeFullPerlPath = deps: makePerlPath (stdenv.lib.misc.closePropagation deps);
+ makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps);
ack = buildPerlPackage {
@@ -100,16 +100,16 @@ let
outputs = ["out" "man"];
- nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
propagatedBuildInputs = [ FileNext ];
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/ack
'';
# tests fails on nixos and hydra because of different purity issues
doCheck = false;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A grep-like tool tailored to working with large trees of source code";
homepage = "https://beyondgrep.com";
license = licenses.artistic2;
@@ -136,7 +136,7 @@ let
};
meta = {
description = "A module for merging hierarchies using the C3 algorithm";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -159,7 +159,7 @@ let
};
propagatedBuildInputs = [ AlgorithmDiff ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -185,7 +185,7 @@ let
buildInputs = [ DevelHide Test2Suite ];
meta = {
description = "Build external dependencies for use in CPAN";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -200,7 +200,7 @@ let
buildInputs = [ pkgs.gmp Alienm4 DevelChecklib IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ];
meta = {
description = "Alien package for the GNU Multiple Precision library.";
- license = with stdenv.lib.licenses; [ lgpl3Plus ];
+ license = with lib.licenses; [ lgpl3Plus ];
};
};
@@ -215,7 +215,7 @@ let
buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ];
meta = {
description = "Install the C libxml2 library on your system";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -238,7 +238,7 @@ let
};
meta = {
description = "Lets your class/object say it works like something else";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -259,7 +259,7 @@ let
meta = {
description = "Get, Build and Use SDL libraries";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -298,7 +298,7 @@ let
buildInputs = [ pkgs.gnum4 Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ];
meta = {
description = "Find or build GNU m4";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -313,7 +313,7 @@ let
buildInputs = [ IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ];
meta = {
description = "Find or build patch";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -328,7 +328,7 @@ let
meta = {
homepage = "https://github.com/danaj/Alt-Crypt-RSA-BigInt";
description = "RSA public-key cryptosystem, using Math::BigInt";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -342,7 +342,7 @@ let
};
buildInputs = [ CanaryStability ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -356,7 +356,7 @@ let
propagatedBuildInputs = [ AnyEvent IOAIO ];
meta = {
description = "Truly asynchronous file and directory I/O";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -372,7 +372,7 @@ let
meta = {
homepage = "https://github.com/potyl/perl-AnyEvent-CacheDNS";
description = "Simple DNS resolver with caching";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -408,7 +408,7 @@ let
propagatedBuildInputs = [ AnyEvent JSONXS ];
meta = {
description = "Communicate with the i3 window manager";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -423,7 +423,7 @@ let
propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ];
meta = {
description = "An asynchronous and multi channel Perl AMQP client";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -467,7 +467,7 @@ let
meta = {
homepage = "https://github.com/mschout/apache-authcookie";
description = "Perl Authentication and Authorization via cookies";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -485,7 +485,7 @@ let
meta = {
homepage = "https://github.com/kazeburo/Apache-LogFormat-Compiler";
description = "Compile a log format string to perl-code";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -499,7 +499,7 @@ let
buildInputs = [ TestDeep TestException ];
meta = {
description = "A persistence framework for session data";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -513,7 +513,7 @@ let
doCheck = false;
meta = {
description = "Test.pm wrapper with helpers for testing Apache";
- license = stdenv.lib.licenses.asl20;
+ license = lib.licenses.asl20;
};
};
@@ -549,7 +549,7 @@ let
'';
meta = {
description = "A container for functions of the ClusterSSH programs";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/duncs/clusterssh/wiki";
};
};
@@ -566,7 +566,7 @@ let
meta = {
homepage = "https://github.com/rjbs/App-Cmd";
description = "Write command line apps with less suffering";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -592,7 +592,7 @@ let
};
meta = {
description = "pack your dependencies onto your script file";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -606,7 +606,7 @@ let
meta = {
homepage = "https://github.com/miyagawa/cpanminus";
description = "Get, unpack, build and install modules from CPAN";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -619,14 +619,14 @@ let
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ];
- nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/cpm
'';
meta = {
homepage = "https://github.com/skaji/cpm";
description = "A fast CPAN module installer";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.zakame ];
};
};
@@ -641,7 +641,7 @@ let
meta = {
homepage = "https://github.com/jhthorsen/applify";
description = "Write object oriented scripts with ease";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
maintainers = [ maintainers.sgo ];
};
};
@@ -655,16 +655,16 @@ let
};
buildInputs = [ PodParser ];
propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ]
- ++ stdenv.lib.optional (!stdenv.isDarwin) [ Wx ];
- nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ ++ lib.optional (!stdenv.isDarwin) [ Wx ];
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/chordpro
rm $out/bin/wxchordpro # Wx not supported on darwin
'';
meta = {
homepage = "http://www.chordpro.org";
description = "A lyrics and chords formatting program";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -677,7 +677,7 @@ let
};
meta = {
description = "Abstraction for Packagers";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -695,7 +695,7 @@ let
meta = {
description = "Manage perl installations in your $HOME";
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
};
};
@@ -710,7 +710,7 @@ let
buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ];
meta = {
description = "simple CPAN package extractor";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -727,7 +727,7 @@ let
meta = {
homepage = "https://sqitch.org/";
description = "Sane database change management";
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
};
};
@@ -744,7 +744,7 @@ let
'';
meta = {
description = "A command that computes simple statistics";
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
homepage = "https://github.com/nferraz/st";
maintainers = [ maintainers.eelco ];
};
@@ -762,7 +762,7 @@ let
doCheck = false;
meta = {
description = "Define validation through subroutine attributes";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -788,7 +788,7 @@ let
propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ];
meta = {
description = "Find the differences between two arrays";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -804,7 +804,7 @@ let
meta = {
homepage = "https://github.com/dwburke/perl-Array-FIFO";
description = "A Simple limitable FIFO array, with sum and average methods";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -817,7 +817,7 @@ let
};
meta = {
description = "ping a huge number of servers in several seconds";
- license = with stdenv.lib.licenses; [ artistic2 ];
+ license = with lib.licenses; [ artistic2 ];
};
};
@@ -831,7 +831,7 @@ let
meta = {
description = "Module for manipulations of cpio archives";
# See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -844,7 +844,7 @@ let
};
meta = {
description = "Generic archive extracting mechanism";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -857,7 +857,7 @@ let
};
meta = {
description = "Manipulates TAR archives";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -884,7 +884,7 @@ let
buildInputs = [ TestMockModule ];
meta = {
description = "Provide an interface to ZIP archive files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -898,7 +898,7 @@ let
meta = {
homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master";
description = "Object-oriented interface to FITS HDUs";
- license = stdenv.lib.licenses.free;
+ license = lib.licenses.free;
};
};
@@ -914,7 +914,7 @@ let
NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz";
meta = {
description = "Fast C metadata and tag reader for all common audio file formats";
- license = stdenv.lib.licenses.gpl2;
+ license = lib.licenses.gpl2;
};
};
@@ -925,11 +925,11 @@ let
url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz";
sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177";
};
- perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
+ perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ];
meta = {
description = "DEC VMS password hashing";
- license = stdenv.lib.licenses.gpl1Plus;
+ license = lib.licenses.gpl1Plus;
};
};
@@ -943,7 +943,7 @@ let
propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ];
meta = {
description = "Interface to read and modify Apache .htpasswd files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -958,7 +958,7 @@ let
propagatedBuildInputs = [ pkgs.libkrb5 ];
meta = {
description = "XS bindings for Kerberos 5";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ DevelChecklib FileWhich PkgConfig ];
};
@@ -987,7 +987,7 @@ let
'';
meta = {
description = "Perl extension for MIT Kerberos 5 admin interface";
- license = stdenv.lib.licenses.bsd3;
+ license = lib.licenses.bsd3;
};
};
@@ -1006,7 +1006,7 @@ let
'';
meta = {
description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1022,7 +1022,7 @@ let
meta = {
homepage = "https://github.com/oalders/authen-oath";
description = "OATH One Time Passwords";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -1037,7 +1037,7 @@ let
propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ];
meta = {
description = "Hashed passwords/passphrases as objects";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1052,7 +1052,7 @@ let
propagatedBuildInputs = [ DataHexDump NetIP ];
meta = {
description = "Provide simple Radius client facilities ";
- license = with stdenv.lib.licenses; [ artistic2 ];
+ license = with lib.licenses; [ artistic2 ];
};
};
@@ -1066,7 +1066,7 @@ let
propagatedBuildInputs = [ DigestHMAC ];
meta = {
description = "SASL Authentication framework";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1081,7 +1081,7 @@ let
propagatedBuildInputs = [ UnicodeStringprep ];
meta = {
description = "A Stringprep Profile for User Names and Passwords (RFC 4013)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -1098,7 +1098,7 @@ let
meta = {
homepage = "https://github.com/dagolden/Authen-SCRAM";
description = "Salted Challenge Response Authentication Mechanism (RFC 5802)";
- license = stdenv.lib.licenses.asl20;
+ license = lib.licenses.asl20;
maintainers = [ maintainers.sgo ];
};
};
@@ -1113,7 +1113,7 @@ let
propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ];
meta = {
description = "Simple Authentication";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1127,7 +1127,7 @@ let
propagatedBuildInputs = [ AuthenSimple ];
meta = {
description = "Simple Passwd authentication";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1141,7 +1141,7 @@ let
propagatedBuildInputs = [ ScopeGuard ];
meta = {
description = "Call methods on native types";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ IPCSystemSimple TestFatal ];
};
@@ -1171,7 +1171,7 @@ let
'';
homepage = "http://www.aarontrevena.co.uk/opensource/autodia/";
- license = stdenv.lib.licenses.gpl2Plus;
+ license = lib.licenses.gpl2Plus;
};
buildInputs = [ DBI ];
};
@@ -1185,7 +1185,7 @@ let
};
meta = {
description = "Lexically disable autovivification";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1200,7 +1200,7 @@ let
meta = {
homepage = "https://github.com/rurban/perl-compiler";
description = "Perl compiler";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
doCheck = false; /* test fails */
};
@@ -1214,7 +1214,7 @@ let
};
meta = {
description = "B::COW additional B helpers to check COW status";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1240,7 +1240,7 @@ let
propagatedBuildInputs = [ ClassAccessor YAMLSyck ];
meta = {
description = "Client to communicate with beanstalkd server";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1269,7 +1269,7 @@ let
propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ];
meta = {
description = "Execute code after a scope finished compilation";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1283,7 +1283,7 @@ let
buildInputs = [ ExtUtilsDepends ];
meta = {
description = "Wrap OP check callbacks";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1306,7 +1306,7 @@ let
};
meta = {
description = "Lists of reserved barewords and symbol names";
- license = with stdenv.lib.licenses; [ artistic1 gpl2 ];
+ license = with lib.licenses; [ artistic1 gpl2 ];
};
};
@@ -1320,7 +1320,7 @@ let
meta = {
homepage = "https://github.com/ingydotnet/boolean-pm";
description = "Boolean support for Perl";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1351,7 +1351,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Bot-Training";
description = "Plain text training material for bots like Hailo and AI::MegaHAL";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1367,7 +1367,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Bot-Training-MegaHAL";
description = "Provide megahal.trn via Bot::Training";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1383,7 +1383,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Bot-Training-StarCraft";
description = "Provide starcraft.trn via Bot::Training";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1397,7 +1397,7 @@ let
meta = {
maintainers = teams.deshaw.members;
description = "BSD process resource limit and priority functions";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -1412,7 +1412,7 @@ let
buildInputs = [ ExtUtilsDepends ];
meta = {
description = "Helper functions for op tree manipulation";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1439,7 +1439,7 @@ let
propagatedBuildInputs = [ BusinessISBNData ];
meta = {
description = "Parse and validate ISBNs";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1452,7 +1452,7 @@ let
};
meta = {
description = "Data pack for Business::ISBN";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1466,7 +1466,7 @@ let
propagatedBuildInputs = [ TieCycle ];
meta = {
description = "Work with International Standard Music Numbers";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1479,7 +1479,7 @@ let
};
meta = {
description = "Work with International Standard Serial Numbers";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1493,7 +1493,7 @@ let
propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ];
meta = {
description = "Perl extension to generate cryptographically-secure random bytes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -1507,7 +1507,7 @@ let
};
meta = {
description = "A tiny Perl extension to generate cryptographically-secure random bytes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -1544,7 +1544,7 @@ let
buildInputs = [ FileWhich TestRequires TestSharedFork TestTCP ];
meta = {
description = "KyotoTycoon client library";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1568,7 +1568,7 @@ let
};
meta = {
description = "Perl client for B, in C language";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1592,7 +1592,7 @@ let
};
meta = {
description = "A lightweight cache with timed expiration";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1607,7 +1607,7 @@ let
meta = {
homepage = "http://gtk2-perl.sourceforge.net/";
description = "Perl interface to the cairo 2D vector graphics library";
- license = stdenv.lib.licenses.lgpl21Plus;
+ license = lib.licenses.lgpl21Plus;
};
propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ];
};
@@ -1622,7 +1622,7 @@ let
buildInputs = [ pkgs.cairo ];
meta = {
description = "Integrate Cairo into the Glib type system";
- license = stdenv.lib.licenses.lgpl21Plus;
+ license = lib.licenses.lgpl21Plus;
};
propagatedBuildInputs = [ Cairo Glib ];
};
@@ -1636,7 +1636,7 @@ let
};
meta = {
description = "Sanity-check calling context";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -1671,7 +1671,7 @@ let
sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea";
};
meta = {
- license = stdenv.lib.licenses.gpl1Plus;
+ license = lib.licenses.gpl1Plus;
};
};
@@ -1694,7 +1694,7 @@ let
};
meta = {
description = "Capture STDOUT and STDERR from Perl, XS or external programs";
- license = stdenv.lib.licenses.asl20;
+ license = lib.licenses.asl20;
};
};
@@ -1707,7 +1707,7 @@ let
};
meta = {
description = "Warns and dies noisily with stack backtraces";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestBase ];
};
@@ -1732,7 +1732,7 @@ let
};
propagatedBuildInputs = [ CarpAssert ];
meta = {
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
buildInputs = [ TestException ];
};
@@ -1746,7 +1746,7 @@ let
};
meta = {
description = "Report errors from perspective of caller of a \"clan\" of modules";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1761,7 +1761,7 @@ let
meta = {
homepage = "https://github.com/perl-carton/carton";
description = "Perl module dependency manager (aka Bundler for Perl)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1775,7 +1775,7 @@ let
propagatedBuildInputs = [ CatalystRuntime DataVisitor ];
meta = {
description = "Sensible default end action";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ HTTPRequestAsCGI ];
};
@@ -1791,7 +1791,7 @@ let
propagatedBuildInputs = [ CatalystRuntime URIFind ];
meta = {
description = "Automated REST Method Dispatching";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1806,7 +1806,7 @@ let
propagatedBuildInputs = [ CatalystPluginAuthentication ClassAccessor DataUUID StringEscape ];
meta = {
description = "HTTP Basic and Digest authentication";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1831,7 +1831,7 @@ let
propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ];
meta = {
description = "A storage class for Catalyst Authentication using DBIx::Class";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestWarn ];
};
@@ -1847,7 +1847,7 @@ let
buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ];
meta = {
description= "Authentication from an LDAP Directory";
- license = with stdenv.lib.licenses; [ artistic1 ];
+ license = with lib.licenses; [ artistic1 ];
};
};
@@ -1861,7 +1861,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ];
meta = {
description = "Moose role to create only one instance of component per context";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1876,7 +1876,7 @@ let
propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFuMultiForm RegexpAssemble ];
meta = {
description = "Catalyst integration for HTML::FormFu";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */
};
@@ -1892,7 +1892,7 @@ let
propagatedBuildInputs = [ CatalystPluginStaticSimple ClassAccessor FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ];
meta = {
description = "Serves PODs right from your Catalyst application";
- license = stdenv.lib.licenses.bsd3;
+ license = lib.licenses.bsd3;
};
};
@@ -1908,7 +1908,7 @@ let
meta = {
homepage = "http://wiki.catalystframework.org/wiki/";
description = "Catalyst Development Tools";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1922,7 +1922,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ];
meta = {
description = "Regex DispatchType";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1935,7 +1935,7 @@ let
};
meta = {
description = "The Catalyst developer's manual";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1950,7 +1950,7 @@ let
propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ];
meta = {
description = "DBIx::Class::Schema Model Class";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1966,7 +1966,7 @@ let
meta = {
homepage = "http://wiki.catalystframework.org/wiki/";
description = "The Catalyst Framework Runtime";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1980,7 +1980,7 @@ let
propagatedBuildInputs = [ CatalystRuntime DateTime ];
meta = {
description = "Request logging from within Catalyst";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1995,7 +1995,7 @@ let
propagatedBuildInputs = [ CatalystPluginSession ];
meta = {
description = "Infrastructure plugin for the Catalyst authentication framework";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2021,7 +2021,7 @@ let
propagatedBuildInputs = [ CatalystPluginAuthentication SetObject UNIVERSALisa ];
meta = {
description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2036,7 +2036,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ];
meta = {
description = "Flexible caching support for Catalyst";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2051,7 +2051,7 @@ let
propagatedBuildInputs = [ ClassAccessor HTTPMessage MROCompat ];
meta = {
description = "HTTP/1.1 cache validators for Catalyst";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2088,7 +2088,7 @@ let
propagatedBuildInputs = [ CatalystRuntime DataFormValidator ];
meta = {
description = "Data::FormValidator";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2101,7 +2101,7 @@ let
};
propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2115,7 +2115,7 @@ let
propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ];
meta = {
description = "Catalyst Plugin for Log::Handler";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2130,7 +2130,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ObjectSignature ];
meta = {
description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2144,7 +2144,7 @@ let
propagatedBuildInputs = [ CatalystPluginSession ];
meta = {
description = "Per-session custom expiry times";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2178,7 +2178,7 @@ let
propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ];
meta = {
description = "File storage backend for session data";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2193,7 +2193,7 @@ let
buildInputs = [ CatalystActionREST TestWarnings TimeOut URISmartURI ];
meta = {
description = "Configurable URIs for Catalyst";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2207,7 +2207,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ];
meta = {
description = "Display a stack trace on the debug screen";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2222,7 +2222,7 @@ let
propagatedBuildInputs = [ CatalystRuntime MIMETypes MooseXTypes ];
meta = {
description = "Make serving static pages painless";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2236,7 +2236,7 @@ let
propagatedBuildInputs = [ CatalystRuntime strictures ];
meta = {
description = "Handle passing of status messages between screens of a web application";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2251,7 +2251,7 @@ let
propagatedBuildInputs = [ CatalystRuntime TextCSV ];
meta = {
description = "CSV view class";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2264,7 +2264,7 @@ let
};
buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2278,7 +2278,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ];
meta = {
description = "JSON view for your data";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2292,7 +2292,7 @@ let
propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ];
meta = {
description = "Template View Class";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2327,7 +2327,7 @@ let
propagatedBuildInputs = [ Moose URI namespaceautoclean ];
meta = {
description = "Replace request base with value passed by HTTP proxy";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2346,7 +2346,7 @@ let
propagatedBuildInputs = [ CatalystRuntime MooseXTypes PodParser Starman ];
meta = {
description = "Replace the development server with Starman";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2360,7 +2360,7 @@ let
meta = {
homepage = "https://github.com/toddr/CDB_File";
description = "Perl extension for access to cdb databases";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestFatal TestWarnings ];
propagatedBuildInputs = [ BCOW ];
@@ -2377,7 +2377,7 @@ let
buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ];
meta = {
description = "a data toolkit";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/LibreCat/Catmandu";
};
};
@@ -2391,7 +2391,7 @@ let
};
meta = {
description = "Get the CDDB info for an audio cd";
- license = stdenv.lib.licenses.artistic1;
+ license = lib.licenses.artistic1;
maintainers = [ maintainers.endgame ];
};
};
@@ -2405,7 +2405,7 @@ let
};
meta = {
description = "Parse a CDDB/freedb data file";
- license = stdenv.lib.licenses.artistic1;
+ license = lib.licenses.artistic1;
};
};
@@ -2421,7 +2421,7 @@ let
propagatedBuildInputs = [ HTMLParser ];
meta = {
description = "Handle Common Gateway Interface requests and responses";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2436,7 +2436,7 @@ let
buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ];
meta = {
description = "Compile .cgi scripts to a code reference like ModPerl::Registry";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/miyagawa/CGI-Compile";
};
};
@@ -2462,7 +2462,7 @@ let
meta = {
homepage = "https://github.com/tokuhirom/p5-cgi-emulate-psgi";
description = "PSGI adapter for CGI";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2489,7 +2489,7 @@ let
propagatedBuildInputs = [ CGI FCGI ];
doCheck = false;
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2513,7 +2513,7 @@ let
};
meta = {
description = "A lightweight CGI form processing package";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2527,7 +2527,7 @@ let
propagatedBuildInputs = [ CGI ];
meta = {
description = "Adapt CGI.pm to the PSGI protocol";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2551,7 +2551,7 @@ let
propagatedBuildInputs = [ IOStringy ];
meta = {
description = "A Simple totally OO CGI interface that is CGI.pm compliant";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestException TestNoWarnings ];
};
@@ -2566,7 +2566,7 @@ let
buildInputs = [ TestDeep ];
meta = {
description = "Build structures from CGI data";
- license = stdenv.lib.licenses.bsd2;
+ license = lib.licenses.bsd2;
};
};
@@ -2585,7 +2585,7 @@ let
propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse ];
meta = {
description = "Unified cache handling interface";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2599,7 +2599,7 @@ let
propagatedBuildInputs = [ GD ];
meta = {
description = "A series of charting modules";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2612,7 +2612,7 @@ let
};
meta = {
description = "Package for creating Cisco IPPhone XML objects";
- license = with stdenv.lib.licenses; [ artistic1 ];
+ license = with lib.licenses; [ artistic1 ];
};
};
@@ -2626,7 +2626,7 @@ let
meta = {
homepage = "https://metacpan.org/pod/CLASS";
description = "Alias for __PACKAGE__";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -2639,7 +2639,7 @@ let
sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz";
};
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2664,7 +2664,7 @@ let
propagatedBuildInputs = [ ModuleRuntime ];
meta = {
description = "Lets you build groups of accessors";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2677,7 +2677,7 @@ let
};
meta = {
description = "A minimalistic variant of Class::Accessor";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2690,7 +2690,7 @@ let
};
meta = {
description = "Run-time load a class the first time you call a method in it";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2714,7 +2714,7 @@ let
propagatedBuildInputs = [ AlgorithmC3 ];
meta = {
description = "A pragma to use the C3 method resolution order algorithm";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2729,7 +2729,7 @@ let
propagatedBuildInputs = [ MROCompat ];
meta = {
description = "Make NEXT suck less";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2743,7 +2743,7 @@ let
buildInputs = [ TestException ];
propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2766,7 +2766,7 @@ let
propagatedBuildInputs = [ ParamsValidate ];
meta = {
description = "Glues object frameworks together transparently";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2797,7 +2797,7 @@ let
};
meta = {
description = "Base class for hierarchally ordered objects";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = teams.deshaw.members;
};
};
@@ -2820,7 +2820,7 @@ let
};
meta = {
description = "Provide utility methods for factory classes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2833,7 +2833,7 @@ let
};
meta = {
description = "another class and object builder";
- license = with stdenv.lib.licenses; [ artistic1 ];
+ license = with lib.licenses; [ artistic1 ];
};
};
@@ -2846,7 +2846,7 @@ let
};
meta = {
description = "Get information about a class and its structure";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2879,7 +2879,7 @@ let
};
meta = {
description = "Load modules and create objects on demand";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2907,7 +2907,7 @@ let
prePatch = "rm configure";
meta = {
description = "A module for creating generic methods";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2922,7 +2922,7 @@ let
meta = {
homepage = "https://github.com/moose/Class-Method-Modifiers";
description = "Provides Moose-like method modifiers";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2936,7 +2936,7 @@ let
propagatedBuildInputs = [ ParamsClassify ];
meta = {
description = "Dynamic class mixing";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2950,7 +2950,7 @@ let
propagatedBuildInputs = [ DevelStackTrace ];
meta = {
description = "A smart return value object";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -2981,7 +2981,7 @@ let
};
meta = {
description = "Minimalist class construction";
- license = with stdenv.lib.licenses; [ asl20 ];
+ license = with lib.licenses; [ asl20 ];
homepage = "https://github.com/dagolden/Class-Tiny";
};
};
@@ -2998,7 +2998,7 @@ let
meta = {
homepage = "https://github.com/moose/Class-Load";
description = "A working (require \"Class::Name\") and more";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3014,7 +3014,7 @@ let
meta = {
homepage = "https://github.com/moose/Class-Load-XS";
description = "XS implementation of parts of Class::Load";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -3037,7 +3037,7 @@ let
};
meta = {
description = "Support for creating standard 'inside-out' classes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3050,7 +3050,7 @@ let
};
propagatedBuildInputs = [ ClassStd ];
checkInputs = [ TestPod TestPodCoverage ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Faster but less secure than Class::Std";
license = with licenses; [ artistic1 gpl1Plus ];
};
@@ -3077,7 +3077,7 @@ let
propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ];
meta = {
description = "Base class for virtual base classes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3090,7 +3090,7 @@ let
};
meta = {
description = "Generate fast XS accessors without runtime compilation";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3106,7 +3106,7 @@ let
meta = {
homepage = "https://github.com/reyjrar/CLI-Helpers";
description = "Subroutines for making simple command line scripts";
- license = stdenv.lib.licenses.bsd3;
+ license = lib.licenses.bsd3;
};
};
@@ -3119,7 +3119,7 @@ let
};
meta = {
description = "Clipboard - Copy and Paste with any OS";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
propagatedBuildInputs = [ CGI ];
# Disable test on darwin because MacPasteboard fails when not logged in interactively.
@@ -3139,7 +3139,7 @@ let
};
meta = {
description = "Recursively copy Perl datatypes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ BCOW ];
};
@@ -3154,7 +3154,7 @@ let
buildInputs = [ Clone ClonePP TestWithoutModule ];
meta = {
description = "Choose appropriate clone utility";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3166,7 +3166,7 @@ let
sha256 = "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p";
};
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3181,7 +3181,7 @@ let
buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ];
meta = {
description = "Engine for tidyall, your all-in-one code tidier and validator";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3195,7 +3195,7 @@ let
propagatedBuildInputs = [ CodeTidyAll TextAligner ];
meta = {
description = "TidyAll plugin to sort and align Moose-style attributes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3211,7 +3211,7 @@ let
meta = {
homepage = "https://github.com/skaji/Command-Runner";
description = "Run external commands and Perl code refs";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.zakame ];
};
};
@@ -3225,7 +3225,7 @@ let
};
meta = {
description = "Implements some sane defaults for Perl programs";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3238,7 +3238,7 @@ let
};
meta = {
description = "Interface to Bzip2 compression library";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3257,7 +3257,7 @@ let
meta = {
description = "Low-Level Interface to bzip2 compression library";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3283,7 +3283,7 @@ let
doCheck = !stdenv.isDarwin;
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3306,7 +3306,7 @@ let
propagatedBuildInputs = [ ModulePluggable ];
meta = {
description = "Load configuration from different file formats, transparently";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3320,7 +3320,7 @@ let
propagatedBuildInputs = [ CaptureTiny ];
meta = {
description = "A module to implement some of AutoConf macros in pure perl";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3332,7 +3332,7 @@ let
sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa";
};
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3347,7 +3347,7 @@ let
propagatedBuildInputs = [ Moo MooXTypesMooseLike ];
meta = {
description = "Git-compatible config file parsing";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3361,7 +3361,7 @@ let
meta = {
homepage = "https://github.com/schweikert/Config-Grammar";
description = "A grammar-based, user-friendly config parser";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3376,7 +3376,7 @@ let
meta = {
homepage = "https://github.com/rjbs/Config-INI";
description = "Simple .ini-file format";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3391,7 +3391,7 @@ let
buildInputs = [ TestDeep ];
meta = {
description = "Load (and optionally decrypt via GnuPG) user/pass identity information ";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/dagolden/Config-Identity";
};
};
@@ -3406,7 +3406,7 @@ let
propagatedBuildInputs = [ IOStringy ];
meta = {
description = "A module for reading .ini-style configuration files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = teams.deshaw.members;
};
};
@@ -3422,7 +3422,7 @@ let
propagatedBuildInputs = [ ConfigAny ];
meta = {
description = "Load a configuration directory tree containing YAML, JSON, XML, Perl, INI or Config::General files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3437,7 +3437,7 @@ let
buildInputs = [ TestException YAML ];
meta = {
description = "Layered configuration, because configs are like ogres";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3453,7 +3453,7 @@ let
meta = {
homepage = "https://github.com/rjbs/Config-MVP";
description = "Multivalue-property package-oriented configuration";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3468,7 +3468,7 @@ let
meta = {
homepage = "https://github.com/rjbs/Config-MVP-Reader-INI";
description = "An MVP config reader for .ini files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3481,7 +3481,7 @@ let
};
meta = {
description = "Read and write property files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3531,7 +3531,7 @@ let
doCheck = false;
meta = {
description = "Simple, versioned access to configuration data";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3551,7 +3551,7 @@ let
'';
meta = {
description = "A generic connection to a hierarchical-structured data set";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3566,7 +3566,7 @@ let
buildInputs = [ ModuleBuildTiny TestFatal ];
meta = {
description = "Facility for creating read-only scalars, arrays, and hashes";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3579,7 +3579,7 @@ let
};
meta = {
description = "Convert binary octets into ASCII armoured messages";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -3604,7 +3604,7 @@ let
meta = {
homepage = "https://metacpan.org/pod/Convert::Base32";
description = "Encoding and decoding of base32 strings";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -3618,7 +3618,7 @@ let
};
meta = {
description = "Functions for converting to/from bencoded strings";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3633,7 +3633,7 @@ let
propagatedBuildInputs = [ ListUtilsBy ModulePluggable ];
meta = {
description = "Color space conversions and named lookups";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3646,7 +3646,7 @@ let
};
meta = {
description = "Perl module for uuencode and uudecode";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3669,7 +3669,7 @@ let
};
meta = {
description = "Create automatic curried method call closures for any class or object";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3704,7 +3704,7 @@ let
meta = {
homepage = "https://github.com/kazeburo/Cookie-Baker";
description = "Cookie string generator / parser";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3742,7 +3742,7 @@ let
buildInputs = [ TestSharedFork TestTCP ];
meta = {
description = "Coro based PSGI web server";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3756,7 +3756,7 @@ let
propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
meta = {
description = "Query, download and build perl modules from CPAN sites";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3767,16 +3767,16 @@ let
url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz";
sha256 = "5a297afc3e367ad80811464d4eb7e4dd3caff8ba499cdd2b558f6279443a7657";
};
- nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ];
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/minicpan
'';
meta = {
homepage = "https://github.com/rjbs/CPAN-Mini";
description = "Create a minimal mirror of CPAN";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -3790,7 +3790,7 @@ let
};
meta = {
description = "CPanel fork of JSON::XS, fast and correct serializing";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3803,7 +3803,7 @@ let
};
meta = {
description = "Read and write Changes files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3816,7 +3816,7 @@ let
};
propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3832,7 +3832,7 @@ let
meta = {
homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index";
description = "Common library for searching CPAN modules, authors and distributions";
- license = stdenv.lib.licenses.asl20;
+ license = lib.licenses.asl20;
};
};
@@ -3845,7 +3845,7 @@ let
};
meta = {
description = "Extract distribution name and version from a distribution filename";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3859,7 +3859,7 @@ let
buildInputs = [ TestDeep ];
meta = {
description = "Verify requirements in a CPAN::Meta object";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3873,7 +3873,7 @@ let
meta = {
homepage = "https://github.com/bingos/cpan-perl-releases";
description = "Mapping Perl releases on CPAN to the location of the tarballs";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3888,7 +3888,7 @@ let
meta = {
homepage = "https://github.com/jib/cpanplus-devel";
description = "Ameliorated interface to the CPAN";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3903,7 +3903,7 @@ let
meta = {
homepage = "https://github.com/rjbs/cpan-uploader";
description = "Upload things to the CPAN";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3925,7 +3925,7 @@ let
};
meta = {
description = "CAST5 block cipher in pure Perl";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -3954,7 +3954,7 @@ let
];
meta = {
description = "Generate shared secret using elliptic-curve Diffie-Hellman function";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -3977,7 +3977,7 @@ let
propagatedBuildInputs = [ CryptDES ];
meta = {
description = "Triple-DES EDE encryption/decryption";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4014,7 +4014,7 @@ let
propagatedBuildInputs = [ DataBuffer DigestSHA1 FileWhich ];
meta = {
description = "DSA Signatures and Key Generation";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4026,9 +4026,9 @@ let
url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz";
sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa";
};
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Use block ciphers using ECB mode";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4040,7 +4040,7 @@ let
sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c";
};
propagatedBuildInputs = [ ClassMix ];
- perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
+ perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
};
CryptFormat = buildPerlPackage {
@@ -4053,7 +4053,7 @@ let
buildInputs = [ TestException TestFailWarnings ];
meta = {
description = "Conversion utilities for encryption applications";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4077,7 +4077,7 @@ let
propagatedBuildInputs = [ CryptX JSON ];
meta = {
description = "JSON Web Token";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4100,7 +4100,7 @@ let
buildInputs = [ pkgs.unzip ModuleBuildTiny ];
propagatedBuildInputs = [ ConvertASN1 ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4115,7 +4115,7 @@ let
meta = {
homepage = "https://github.com/danaj/Crypt-Random-Seed";
description = "Provide strong randomness for seeding";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4130,7 +4130,7 @@ let
propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ];
meta = {
description = "Interface to /dev/random and /dev/urandom";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4145,7 +4145,7 @@ let
propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ];
meta = {
description = "Get weak or strong random data from pluggable sources";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4159,7 +4159,7 @@ let
meta = {
homepage = "https://github.com/danaj/Crypt-Random-TESHA2";
description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4191,7 +4191,7 @@ let
meta = {
homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160";
description = "Perl extension for the RIPEMD-160 Hash function";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4204,7 +4204,7 @@ let
sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3";
};
propagatedBuildInputs = [ DigestSHA1 ];
- perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
+ perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
};
CryptRijndael = buildPerlPackage {
@@ -4234,7 +4234,7 @@ let
};
meta = {
description = "Provide non blocking randomness";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4250,7 +4250,7 @@ let
perlPreHook = "export LD=$CC";
meta = {
description = "Scrypt password based key derivation function";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF";
maintainers = [ maintainers.sgo ];
};
@@ -4277,7 +4277,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Crypt-Sodium";
description = "Perl bindings for libsodium (NaCL)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4291,7 +4291,7 @@ let
};
meta = {
description = "The Twofish Encryption Algorithm";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4310,15 +4310,15 @@ let
buildInputs = [ TestException ];
propagatedBuildInputs = [ AltCryptRSABigInt CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish FileHomeDir LWP ];
- nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/pgplet
'';
meta = {
homepage = "https://github.com/btrott/Crypt-OpenPGP";
description = "Pure-Perl OpenPGP implementation";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
doCheck = false; /* test fails with 'No random source available!' */
@@ -4333,7 +4333,7 @@ let
};
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Perl wrapper around OpenSSL's AES library";
license = with licenses; [ artistic1 gpl1Plus ];
};
@@ -4359,7 +4359,7 @@ let
};
meta = {
description = "Guess OpenSSL include path";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess";
};
};
@@ -4401,7 +4401,7 @@ let
meta = {
homepage = "https://github.com/dsully/perl-crypt-openssl-x509";
description = "Perl extension to OpenSSL's X509 API";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4418,7 +4418,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Crypt-PBKDF2";
description = "The PBKDF2 password hash algorithm";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4435,7 +4435,7 @@ let
propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ];
meta = {
description = "Cryptography in pure Perl";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4452,7 +4452,7 @@ let
meta = {
description = "Minimal Ed25519 bindings";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
maintainers = [ maintainers.thoughtpolice ];
};
buildInputs = [ CanaryStability ];
@@ -4488,10 +4488,10 @@ let
url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz";
sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8";
};
- perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
+ perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
meta = {
description = "XS based CSS minifier";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4520,7 +4520,7 @@ let
NIX_CFLAGS_LINK = "-lncurses";
meta = {
description = "Perl bindings to ncurses";
- license = stdenv.lib.licenses.artistic1;
+ license = lib.licenses.artistic1;
};
};
@@ -4533,7 +4533,7 @@ let
};
meta = {
description = "curses based OO user interface framework";
- license = stdenv.lib.licenses.artistic1;
+ license = lib.licenses.artistic1;
};
propagatedBuildInputs = [ Curses TermReadKey ];
};
@@ -4547,7 +4547,7 @@ let
};
meta = {
description = "Crypto toolkit";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4560,7 +4560,7 @@ let
};
meta = {
description = "Temporary changing working directory (chdir)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestRequires ];
};
@@ -4575,7 +4575,7 @@ let
buildInputs = [ TestRequires ];
meta = {
description = "Polymorphic data cloning";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4598,7 +4598,7 @@ let
};
meta = {
description = "Pretty printing of data structures";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4611,7 +4611,7 @@ let
};
meta = {
description = "Less indentation and newlines plus sub deparsing";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4644,7 +4644,7 @@ let
propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ];
meta = {
description = "Validates user input (usually from an HTML form) based on input profile";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ CGI ];
};
@@ -4660,7 +4660,7 @@ let
meta = {
homepage = "https://github.com/rjbs/Data-GUID";
description = "Globally unique identifiers";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4686,7 +4686,7 @@ let
};
meta = {
description = "Make binary data human-readable";
- license = with stdenv.lib.licenses; [ artistic1 gpl2 ];
+ license = with lib.licenses; [ artistic1 gpl2 ];
};
};
@@ -4711,7 +4711,7 @@ let
propagatedBuildInputs = [ ClassReturnValue TextvFileasData ];
meta = {
description = "Generates iCalendar (RFC 2445) calendar files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4725,7 +4725,7 @@ let
buildInputs = [ TestBits ];
meta = {
description = "Pack and unpack big-endian IEEE754 floats and doubles";
- license = with stdenv.lib.licenses; [ artistic2 ];
+ license = with lib.licenses; [ artistic2 ];
};
};
@@ -4749,7 +4749,7 @@ let
meta = {
homepage = "https://github.com/msgpack/msgpack-perl";
description = "MessagePack serializing/deserializing";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -4765,7 +4765,7 @@ let
meta = {
homepage = "https://github.com/rjbs/data-optlist";
description = "Parse and validate simple name/value option pairs";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4790,7 +4790,7 @@ let
buildInputs = [ ClassAccessor DataPage TestException ];
meta = {
description = "change long page list to be shorter and well navigate";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4815,7 +4815,7 @@ let
meta = {
homepage = "https://github.com/mattp-/Data-Perl";
description = "Base classes wrapping fundamental Perl data types";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4829,7 +4829,7 @@ let
propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ];
meta = {
description = "colored pretty-print of Perl data structures and objects";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4844,7 +4844,7 @@ let
meta = {
homepage = "https://github.com/rjbs/data-section";
description = "Read multiple hunks of data out of your DATA section";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestFailWarnings ];
};
@@ -4858,7 +4858,7 @@ let
};
meta = {
description = "Modules that serialize data structures";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4872,7 +4872,7 @@ let
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ ClassAccessor ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4885,7 +4885,7 @@ let
};
propagatedBuildInputs = [ DataPage MathRound ];
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4900,7 +4900,7 @@ let
propagatedBuildInputs = [ Moose PathClass namespaceclean ];
meta = {
description = "N at a time iteration API";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4914,7 +4914,7 @@ let
buildInputs = [ TestPod ];
meta = {
description = "Change nature of data within a structure";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4939,7 +4939,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Data-ULID";
description = "Universally Unique Lexicographically Sortable Identifier";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ sgo ];
};
};
@@ -4961,10 +4961,10 @@ let
sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3";
};
buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ];
- perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
+ perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
meta = {
description = "A selection of utilities for data and data types";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/gfx/Perl-Data-Util";
};
};
@@ -4977,7 +4977,7 @@ let
sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360";
};
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5001,7 +5001,7 @@ let
propagatedBuildInputs = [ MathRandomMTAuto ];
meta = {
description = "Fast random UUID generator using the Mersenne Twister algorithm";
- license = stdenv.lib.licenses.asl20;
+ license = lib.licenses.asl20;
};
};
@@ -5016,7 +5016,7 @@ let
propagatedBuildInputs = [ NetDomainTLD ];
meta = {
description = "Domain and host name validation";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5031,7 +5031,7 @@ let
propagatedBuildInputs = [ NetAddrIP ];
meta = {
description = "IPv4 and IPv6 validation methods";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5045,7 +5045,7 @@ let
propagatedBuildInputs = [ DataValidateDomain DataValidateIP ];
meta = {
description = "Common URL validation methods";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5108,7 +5108,7 @@ let
sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04";
};
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl2Plus ];
+ license = with lib.licenses; [ artistic1 gpl2Plus ];
};
};
@@ -5123,7 +5123,7 @@ let
propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ];
meta = {
description = "A date and time object";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -5136,7 +5136,7 @@ let
};
meta = {
description = "Dates in the Julian calendar";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
propagatedBuildInputs = [ DateTime ];
};
@@ -5151,7 +5151,7 @@ let
propagatedBuildInputs = [ DateTimeEventRecurrence ];
meta = {
description = "DateTime rfc2445 recurrences";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5175,7 +5175,7 @@ let
propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ];
meta = {
description = "Create DateTime parser classes and objects";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -5189,7 +5189,7 @@ let
propagatedBuildInputs = [ DateTime TimeDate ];
meta = {
description = "Parses Date::Parse compatible formats";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5203,7 +5203,7 @@ let
propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ];
meta = {
description = "Flexibly parse strings and turn them into DateTime objects";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestException TestMockTime TestNoWarnings ];
};
@@ -5218,7 +5218,7 @@ let
propagatedBuildInputs = [ DateTime HTTPDate ];
meta = {
description = "Date conversion routines";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5232,7 +5232,7 @@ let
propagatedBuildInputs = [ DateTimeEventICal ];
meta = {
description = "Parse and format iCal datetime and duration strings";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5246,7 +5246,7 @@ let
propagatedBuildInputs = [ DateTimeFormatBuilder ];
meta = {
description = "Parses ISO8601 formats";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ Test2Suite ];
};
@@ -5261,7 +5261,7 @@ let
propagatedBuildInputs = [ DateTime ParamsValidate ];
meta = {
description = "Convert between DateTime and RFC2822/822 formats";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5276,7 +5276,7 @@ let
propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ];
meta = {
description = "Create machine readable date/time with natural parsing logic";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5290,7 +5290,7 @@ let
propagatedBuildInputs = [ DateTimeFormatBuilder ];
meta = {
description = "Parse and format MySQL dates and times";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5304,7 +5304,7 @@ let
propagatedBuildInputs = [ DateTimeFormatBuilder ];
meta = {
description = "Parse and format PostgreSQL dates and times";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ ModuleBuildTiny ];
};
@@ -5320,7 +5320,7 @@ let
propagatedBuildInputs = [ DateTime ];
meta = {
description = "Parse and format strp and strf time patterns";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -5334,7 +5334,7 @@ let
propagatedBuildInputs = [ DateTimeFormatBuilder ];
meta = {
description = "Parse and format SQLite dates and times";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5348,7 +5348,7 @@ let
propagatedBuildInputs = [ DateTime ];
meta = {
description = "Parse and format W3CDTF datetime strings";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5363,7 +5363,7 @@ let
propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ];
meta = {
description = "Localization support for DateTime.pm";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5377,7 +5377,7 @@ let
propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ];
meta = {
description = "DateTime set objects";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5392,7 +5392,7 @@ let
propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ];
meta = {
description = "Time zone object base class and factory";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5408,7 +5408,7 @@ let
doCheck = false;
meta = {
description = "Parse a date/time string using the best method available";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5422,7 +5422,7 @@ let
propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ];
meta = {
description = "A collection of handy debugging routines for displaying the values of variables with a minimum of coding";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5436,7 +5436,7 @@ let
propagatedBuildInputs = [ PadWalker ];
meta = {
description = "Meatier versions of C";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5449,7 +5449,7 @@ let
};
meta = {
description = "check that a command is available";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/tokuhirom/Devel-CheckBin";
};
};
@@ -5464,7 +5464,7 @@ let
buildInputs = [ ModuleBuildTiny ];
meta = {
description = "Check the compiler's availability";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/tokuhirom/Devel-CheckCompiler";
};
};
@@ -5499,7 +5499,7 @@ let
meta = {
homepage = "https://metacpan.org/release/Devel-Leak";
description = "Utility for looking for perl objects that are not reclaimed";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian
+ license = with lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian
};
};
@@ -5514,7 +5514,7 @@ let
meta = {
homepage = "https://github.com/bingos/devel-patchperl";
description = "Patch perl source a la Devel::PPPort's buildperl.pl";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5528,7 +5528,7 @@ let
buildInputs = [ TestFatal ];
meta = {
description = "obtain the REFCNT value of a referent";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5541,7 +5541,7 @@ let
};
meta = {
description = "Perl/Pollution/Portability";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -5554,7 +5554,7 @@ let
};
meta = {
description = "Print out each line before it is executed (like sh -x)";
- license = stdenv.lib.licenses.publicDomain;
+ license = lib.licenses.publicDomain;
};
};
@@ -5569,7 +5569,7 @@ let
propagatedBuildInputs = [ DeviceOUI Moose ];
meta = {
description = "Handle hardware MAC Addresses (EUI-48 and EUI-64)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -5586,7 +5586,7 @@ let
propagatedBuildInputs = [ ClassAccessorGrouped LWP SubExporter ];
meta = {
description = "Resolve an Organizationally Unique Identifier";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -5638,7 +5638,7 @@ let
preCheck = "rm t/65_db_config.t"; # do not run failing tests
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Self Contained SQLite RDBMS in a DBI Driver";
license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.unix;
@@ -5657,7 +5657,7 @@ let
meta = {
homepage = "https://github.com/gooddata/DBD-MariaDB";
description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
@@ -5693,7 +5693,7 @@ let
buildInputs = [ pkgs.oracle-instantclient TestNoWarnings ];
propagatedBuildInputs = [ DBI ];
- postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+ postBuild = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath "${pkgs.oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle
'';
};
@@ -5717,8 +5717,8 @@ let
meta = {
description = "DBI PostgreSQL interface";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- platforms = stdenv.lib.platforms.unix;
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ platforms = lib.platforms.unix;
};
};
@@ -5765,7 +5765,7 @@ let
url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz";
sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa";
};
- postInstall = stdenv.lib.optionalString (perl ? crossVersion) ''
+ postInstall = lib.optionalString (perl ? crossVersion) ''
mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI
cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI.pm <catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
'';
makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include";
@@ -23168,7 +23168,7 @@ let
buildInputs = [ TestRequires ];
meta = {
description = "Lightweight pure-perl XML Parser (based on regexps)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23183,7 +23183,7 @@ let
propagatedBuildInputs = [ XMLParser ];
meta = {
description = "Modules for parsing and evaluating XPath statements";
- license = stdenv.lib.licenses.artistic2;
+ license = lib.licenses.artistic2;
};
};
@@ -23219,7 +23219,7 @@ let
# disable tests that require network
preCheck = "rm t/{26-xmlrpc.t,37-mod_xmlrpc.t}";
meta = {
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
description = "Client and server implementation of XML-RPC protocol";
};
};
@@ -23235,7 +23235,7 @@ let
meta = {
homepage = "http://perl-rss.sourceforge.net/";
description = "Creates and updates RSS files";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23262,7 +23262,7 @@ let
meta = {
description = "Base class for SAX Drivers and Filters";
homepage = "https://github.com/grantm/XML-SAX-Base";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23278,7 +23278,7 @@ let
installTargets = [ "pure_install" ];
meta = {
description = "SAX Driver for Expat";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23293,7 +23293,7 @@ let
meta = {
homepage = "https://github.com/perigrin/xml-sax-writer";
description = "SAX2 XML Writer";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23327,7 +23327,7 @@ let
propagatedBuildInputs = [ XMLParser ];
meta = {
description = "Simplified interface to XML::Parser";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23341,7 +23341,7 @@ let
propagatedBuildInputs = [ LWP ];
meta = {
description = "Pure Perl implementation for parsing/writing XML documents";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23392,7 +23392,7 @@ let
buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ];
meta = {
description = "XS pointer backed objects using sv_magic";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23404,10 +23404,10 @@ let
sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43";
};
buildInputs = [ TestFatal ];
- perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC";
+ perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC";
meta = {
description = "XS functions to assist in parsing sub-like syntax";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.zakame ];
};
};
@@ -23422,7 +23422,7 @@ let
propagatedBuildInputs = [ YAMLPP ];
meta = {
description = "See Your Data in the Nude";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/ingydotnet/xxx-pm";
};
};
@@ -23440,7 +23440,7 @@ let
meta = {
homepage = "https://github.com/ingydotnet/yaml-pm";
description = "YAML Ain't Markup Language (tm)";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23451,10 +23451,10 @@ let
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz";
sha256 = "0na1wg3d7ykzy5i44w6i1s37ymq6x0cvcc9gzvmri9xxmv65d4fc";
};
- perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC";
+ perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC";
meta = {
description = "Fast, lightweight YAML loader and dumper";
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
};
};
@@ -23486,7 +23486,7 @@ let
buildInputs = [ TestDeep TestWarn ];
meta = {
description = "YAML Framework";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -23502,11 +23502,11 @@ let
meta = {
homepage = "https://github.com/mikegrb/WebService-Linode";
description = "Perl Interface to the Linode.com API";
- license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
-} // stdenv.lib.optionalAttrs (config.allowAliases or true) {
+} // lib.optionalAttrs (config.allowAliases or true) {
autodie = null; # part of Perl
AutoLoader = null; # part of Perl 5.22
constant = null; # part of Perl 5.22
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 02522a763072..95b6d96644d6 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -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 { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9778b141e21..9dac5041b2aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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 { };