mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
15494ec8f1
@ -119,6 +119,12 @@
|
||||
githubId = 241628;
|
||||
name = "Adam Russell";
|
||||
};
|
||||
aadibajpai = {
|
||||
email = "hello@aadibajpai.com";
|
||||
github = "aadibajpai";
|
||||
githubId = 27063113;
|
||||
name = "Aadi Bajpai";
|
||||
};
|
||||
aanderse = {
|
||||
email = "aaron@fosslib.net";
|
||||
matrix = "@aanderse:nixos.dev";
|
||||
|
||||
@ -190,6 +190,14 @@
|
||||
usage in non-X11 environments, e.g. Wayland.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.stubby</literal> module was converted to
|
||||
a
|
||||
<link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">settings-style</link>
|
||||
configuration.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -78,3 +78,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
added, decoupling the setting of `SSH_ASKPASS` from
|
||||
`services.xserver.enable`. This allows easy usage in non-X11 environments,
|
||||
e.g. Wayland.
|
||||
|
||||
- The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
|
||||
|
||||
@ -4,177 +4,48 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.stubby;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
confFile = settingsFormat.generate "stubby.yml" cfg.settings;
|
||||
in {
|
||||
imports = map (x:
|
||||
(mkRemovedOptionModule [ "services" "stubby" x ]
|
||||
"Stubby configuration moved to services.stubby.settings.")) [
|
||||
"authenticationMode"
|
||||
"fallbackProtocols"
|
||||
"idleTimeout"
|
||||
"listenAddresses"
|
||||
"queryPaddingBlocksize"
|
||||
"roundRobinUpstreams"
|
||||
"subnetPrivate"
|
||||
"upstreamServers"
|
||||
];
|
||||
|
||||
fallbacks = concatMapStringsSep "\n " (x: "- ${x}") cfg.fallbackProtocols;
|
||||
listeners = concatMapStringsSep "\n " (x: "- ${x}") cfg.listenAddresses;
|
||||
|
||||
# By default, the recursive resolvers maintained by the getdns
|
||||
# project itself are enabled. More information about both getdns's servers,
|
||||
# as well as third party options for upstream resolvers, can be found here:
|
||||
# https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers
|
||||
#
|
||||
# You can override these values by supplying a yaml-formatted array of your
|
||||
# preferred upstream resolvers in the following format:
|
||||
#
|
||||
# 106 # - address_data: IPv4 or IPv6 address of the upstream
|
||||
# port: Port for UDP/TCP (default is 53)
|
||||
# tls_auth_name: Authentication domain name checked against the server
|
||||
# certificate
|
||||
# tls_pubkey_pinset: An SPKI pinset verified against the keys in the server
|
||||
# certificate
|
||||
# - digest: Only "sha256" is currently supported
|
||||
# value: Base64 encoded value of the sha256 fingerprint of the public
|
||||
# key
|
||||
# tls_port: Port for TLS (default is 853)
|
||||
|
||||
defaultUpstream = ''
|
||||
- address_data: 145.100.185.15
|
||||
tls_auth_name: "dnsovertls.sinodun.com"
|
||||
tls_pubkey_pinset:
|
||||
- digest: "sha256"
|
||||
value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
|
||||
- address_data: 145.100.185.16
|
||||
tls_auth_name: "dnsovertls1.sinodun.com"
|
||||
tls_pubkey_pinset:
|
||||
- digest: "sha256"
|
||||
value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
|
||||
- address_data: 185.49.141.37
|
||||
tls_auth_name: "getdnsapi.net"
|
||||
tls_pubkey_pinset:
|
||||
- digest: "sha256"
|
||||
value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
|
||||
- address_data: 2001:610:1:40ba:145:100:185:15
|
||||
tls_auth_name: "dnsovertls.sinodun.com"
|
||||
tls_pubkey_pinset:
|
||||
- digest: "sha256"
|
||||
value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
|
||||
- address_data: 2001:610:1:40ba:145:100:185:16
|
||||
tls_auth_name: "dnsovertls1.sinodun.com"
|
||||
tls_pubkey_pinset:
|
||||
- digest: "sha256"
|
||||
value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
|
||||
- address_data: 2a04:b900:0:100::38
|
||||
tls_auth_name: "getdnsapi.net"
|
||||
tls_pubkey_pinset:
|
||||
- digest: "sha256"
|
||||
value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
|
||||
'';
|
||||
|
||||
# Resolution type is not changeable here because it is required per the
|
||||
# stubby documentation:
|
||||
#
|
||||
# "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby
|
||||
# operation."
|
||||
#
|
||||
# https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby
|
||||
|
||||
confFile = pkgs.writeText "stubby.yml" ''
|
||||
resolution_type: GETDNS_RESOLUTION_STUB
|
||||
dns_transport_list:
|
||||
${fallbacks}
|
||||
appdata_dir: "/var/cache/stubby"
|
||||
tls_authentication: ${cfg.authenticationMode}
|
||||
tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
|
||||
edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
|
||||
idle_timeout: ${toString cfg.idleTimeout}
|
||||
listen_addresses:
|
||||
${listeners}
|
||||
round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"}
|
||||
${cfg.extraConfig}
|
||||
upstream_recursive_servers:
|
||||
${cfg.upstreamServers}
|
||||
'';
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.stubby = {
|
||||
|
||||
enable = mkEnableOption "Stubby DNS resolver";
|
||||
|
||||
fallbackProtocols = mkOption {
|
||||
default = [ "GETDNS_TRANSPORT_TLS" ];
|
||||
type = with types; listOf (enum [
|
||||
"GETDNS_TRANSPORT_TLS"
|
||||
"GETDNS_TRANSPORT_TCP"
|
||||
"GETDNS_TRANSPORT_UDP"
|
||||
]);
|
||||
description = ''
|
||||
Ordered list composed of one or more transport protocols.
|
||||
Strict mode should only use <literal>GETDNS_TRANSPORT_TLS</literal>.
|
||||
Other options are <literal>GETDNS_TRANSPORT_UDP</literal> and
|
||||
<literal>GETDNS_TRANSPORT_TCP</literal>.
|
||||
settings = mkOption {
|
||||
type = types.attrsOf settingsFormat.type;
|
||||
example = lib.literalExpression ''
|
||||
pkgs.stubby.passthru.settingsExample // {
|
||||
upstream_recursive_servers = [{
|
||||
address_data = "158.64.1.29";
|
||||
tls_auth_name = "kaitain.restena.lu";
|
||||
tls_pubkey_pinset = [{
|
||||
digest = "sha256";
|
||||
value = "7ftvIkA+UeN/ktVkovd/7rPZ6mbkhVI7/8HnFJIiLa4=";
|
||||
}];
|
||||
}];
|
||||
};
|
||||
'';
|
||||
};
|
||||
|
||||
authenticationMode = mkOption {
|
||||
default = "GETDNS_AUTHENTICATION_REQUIRED";
|
||||
type = types.enum [
|
||||
"GETDNS_AUTHENTICATION_REQUIRED"
|
||||
"GETDNS_AUTHENTICATION_NONE"
|
||||
];
|
||||
description = ''
|
||||
Selects the Strict or Opportunistic usage profile.
|
||||
For strict, set to <literal>GETDNS_AUTHENTICATION_REQUIRED</literal>.
|
||||
for opportunistic, use <literal>GETDNS_AUTHENTICATION_NONE</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
queryPaddingBlocksize = mkOption {
|
||||
default = 128;
|
||||
type = types.int;
|
||||
description = ''
|
||||
EDNS0 option to pad the size of the DNS query to the given blocksize.
|
||||
'';
|
||||
};
|
||||
|
||||
subnetPrivate = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
EDNS0 option for ECS client privacy. Default is
|
||||
<literal>true</literal>. If set, this option prevents the client
|
||||
subnet from being sent to authoritative nameservers.
|
||||
'';
|
||||
};
|
||||
|
||||
idleTimeout = mkOption {
|
||||
default = 10000;
|
||||
type = types.int;
|
||||
description = "EDNS0 option for keepalive idle timeout expressed in
|
||||
milliseconds.";
|
||||
};
|
||||
|
||||
listenAddresses = mkOption {
|
||||
default = [ "127.0.0.1" "0::1" ];
|
||||
type = with types; listOf str;
|
||||
description = ''
|
||||
Sets the listen address for the stubby daemon.
|
||||
Uses port 53 by default.
|
||||
Ise IP@port to specify a different port.
|
||||
'';
|
||||
};
|
||||
|
||||
roundRobinUpstreams = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Instructs stubby to distribute queries across all available name
|
||||
servers. Default is <literal>true</literal>. Set to
|
||||
<literal>false</literal> in order to use the first available.
|
||||
'';
|
||||
};
|
||||
|
||||
upstreamServers = mkOption {
|
||||
default = defaultUpstream;
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Replace default upstreams. See <citerefentry><refentrytitle>stubby
|
||||
</refentrytitle><manvolnum>1</manvolnum></citerefentry> for an
|
||||
example of the entry formatting. In Strict mode, at least one of the
|
||||
following settings must be supplied for each nameserver:
|
||||
<literal>tls_auth_name</literal> or
|
||||
<literal>tls_pubkey_pinset</literal>.
|
||||
Content of the Stubby configuration file. All Stubby settings may be set or queried
|
||||
here. The default settings are available at
|
||||
<literal>pkgs.stubby.passthru.settingsExample</literal>. See
|
||||
<link xlink:href="https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby"/>.
|
||||
A list of the public recursive servers can be found here:
|
||||
<link xlink:href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers"/>.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -184,20 +55,21 @@ in
|
||||
description = "Enable or disable debug level logging.";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Add additional configuration options. see <citerefentry>
|
||||
<refentrytitle>stubby</refentrytitle><manvolnum>1</manvolnum>
|
||||
</citerefentry>for more options.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.stubby ];
|
||||
assertions = [{
|
||||
assertion =
|
||||
(cfg.settings.resolution_type or "") == "GETDNS_RESOLUTION_STUB";
|
||||
message = ''
|
||||
services.stubby.settings.resolution_type must be set to "GETDNS_RESOLUTION_STUB".
|
||||
Is services.stubby.settings unset?
|
||||
'';
|
||||
}];
|
||||
|
||||
services.stubby.settings.appdata_dir = "/var/cache/stubby";
|
||||
|
||||
systemd.services.stubby = {
|
||||
description = "Stubby local DNS resolver";
|
||||
after = [ "network.target" ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binance";
|
||||
version = "1.28.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
|
||||
sha256 = "sha256-qJuD+O4M9U8P6JhFUFc92yllX1vgZZvTlTd0bph3Vo4=";
|
||||
sha256 = "sha256-LQX5RUTVm6lBdRzCFMBq1NLGGiLBVyykJ1LY9FqINnY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.5.12";
|
||||
version = "2.6.10";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
@ -16,8 +16,8 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-/S/paqMKVerSQFjA4wQ9fLV0WaqKm4CzQfy+0OdH7c8=";
|
||||
x86_64-darwin = "sha256-5eKTfZRpW7IYwFt8TeJiytrwEpiHBgN4k9kth+Lh0Bo=";
|
||||
x86_64-linux = "sha256-2/QYEzQjB9n/4k5I/fry3ol8Fpsb5+tc1ttVdf2ID+4=";
|
||||
x86_64-darwin = "sha256-BwBpq78hYJVUItUgs9lonBTV4YWJ+qvML6VTj5M4BQ4=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
||||
@ -31,11 +31,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "obsidian";
|
||||
version = "0.12.19";
|
||||
version = "0.13.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
|
||||
sha256 = "sha256-M9U67+mCL/CziTprCAhfrZTWl6i7HRfH24l/xqUqkIg=";
|
||||
sha256 = "0d55lk643yqjz4s6j5lbrdkf9f7wmwlz9ahjx760rzqpzy5190nr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zip, gettext, perl
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, zip, gettext, perl
|
||||
, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
|
||||
, qrencode, libuuid, libyubikey, yubikey-personalization
|
||||
, curl, openssl, file
|
||||
@ -6,13 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pwsafe";
|
||||
version = "3.56.0";
|
||||
version = "1.14.0"; # do NOT update to 3.x Windows releases
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZLX/3cs1cdia5+32QEwE6q3V0uFNkkmiIGboKW6Xej8=";
|
||||
hash = "sha256-s3IXe4gTwUOzQslNfWrcN/srrG9Jv02zfkGgiZN3C1s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -32,19 +34,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
# Fix perl scripts used during the build.
|
||||
for f in `find . -type f -name '*.pl'`; do
|
||||
for f in $(find . -type f -name '*.pl') ; do
|
||||
patchShebangs $f
|
||||
done
|
||||
|
||||
# Fix hard coded paths.
|
||||
for f in `grep -Rl /usr/share/ src`; do
|
||||
for f in $(grep -Rl /usr/share/ src) ; do
|
||||
substituteInPlace $f --replace /usr/share/ $out/share/
|
||||
done
|
||||
|
||||
# Fix hard coded zip path.
|
||||
substituteInPlace help/Makefile.linux --replace /usr/bin/zip ${zip}/bin/zip
|
||||
|
||||
for f in `grep -Rl /usr/bin/ .`; do
|
||||
for f in $(grep -Rl /usr/bin/ .) ; do
|
||||
substituteInPlace $f --replace /usr/bin/ ""
|
||||
done
|
||||
'';
|
||||
|
||||
@ -1,24 +1,17 @@
|
||||
{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, meson, ninja, perl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i3status";
|
||||
version = "2.13";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2";
|
||||
sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff";
|
||||
url = "https://i3wm.org/i3status/i3status-${version}.tar.xz";
|
||||
sha256 = "0929chhvyq9hg4scpcz8r9zn3s9jvbg6a86k3wqa77qg85rh4kaw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
|
||||
nativeBuildInputs = [ meson ninja perl pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
|
||||
buildInputs = [ libconfuse yajl alsa-lib libpulseaudio libnl ];
|
||||
|
||||
makeFlags = [ "all" "PREFIX=$(out)" ];
|
||||
|
||||
# This hack is needed because for unknown reasons configure generates a broken makefile on the 2.13 release under nixos
|
||||
preBuild = ''
|
||||
sed -i -e 's/\$(TEST_LOGS) \$(TEST_LOGS/\$(TEST_LOGS)/g' Makefile
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar";
|
||||
homepage = "https://i3wm.org";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stdman";
|
||||
version = "2020.11.17";
|
||||
version = "2021.12.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeaye";
|
||||
repo = "stdman";
|
||||
rev = version;
|
||||
sha256 = "sha256-pzAVuXSuUfwI7gQpFqmH/+klSUH3KipZup2TgZs8XsY=";
|
||||
sha256 = "sha256-wOMQzC5w8aDmxNxQ5HK8jMgoow1wXBfHGUwFBw2WiPA=";
|
||||
};
|
||||
|
||||
outputDevdoc = "out";
|
||||
|
||||
@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (jdk.meta) platforms;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin
|
||||
};
|
||||
}
|
||||
# TODO: Processing app
|
||||
|
||||
@ -1,22 +1,36 @@
|
||||
{ lib, stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
|
||||
# Getdns and Stubby are released together, see https://getdnsapi.net/releases/
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
{ lib, stdenv, fetchurl, cmake, darwin, doxygen, libidn2, libyaml, openssl
|
||||
, systemd, unbound, yq }:
|
||||
let
|
||||
metaCommon = with lib; {
|
||||
maintainers = with maintainers; [ leenaars ehmry ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
in rec {
|
||||
|
||||
getdns = stdenv.mkDerivation rec {
|
||||
pname = "getdns";
|
||||
version = "1.6.0";
|
||||
versionRewrite = builtins.splitVersion version;
|
||||
version = "1.7.0";
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getdnsapi.net/releases/${pname}-${
|
||||
builtins.concatStringsSep "-" versionRewrite
|
||||
with builtins;
|
||||
concatStringsSep "-" (splitVersion version)
|
||||
}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jhg7258wz287kjymimvdvv04n69lwxdc3sb62l2p453f5s77ra0";
|
||||
sha256 = "sha256-6ocTzl4HesdrFBjOtq/SXm1OOelgD29egdOjoTpg9lI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
buildInputs = [ unbound libidn2 openssl doxygen ];
|
||||
buildInputs = [ libidn2 openssl unbound ];
|
||||
|
||||
meta = with lib; {
|
||||
postInstall = "rm -r $out/share/doc";
|
||||
|
||||
meta = with lib;
|
||||
metaCommon // {
|
||||
description = "A modern asynchronous DNS API";
|
||||
longDescription = ''
|
||||
getdns is an implementation of a modern asynchronous DNS API; the
|
||||
@ -30,8 +44,44 @@ stdenv.mkDerivation rec {
|
||||
their applications.
|
||||
'';
|
||||
homepage = "https://getdnsapi.net";
|
||||
maintainers = with maintainers; [ leenaars ehmry ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
stubby = stdenv.mkDerivation rec {
|
||||
pname = "stubby";
|
||||
version = "0.4.0";
|
||||
outputs = [ "out" "man" "stubbyExampleJson" ];
|
||||
|
||||
inherit (getdns) src;
|
||||
sourceRoot = "${getdns.name}/stubby";
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen yq ];
|
||||
|
||||
buildInputs = [ getdns libyaml openssl systemd ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.Security ];
|
||||
|
||||
postInstall = ''
|
||||
rm -r $out/share/doc
|
||||
yq \
|
||||
< $NIX_BUILD_TOP/$sourceRoot/stubby.yml.example \
|
||||
> $stubbyExampleJson
|
||||
'';
|
||||
|
||||
passthru.settingsExample = with builtins;
|
||||
fromJSON (readFile stubby.stubbyExampleJson);
|
||||
|
||||
meta = with lib;
|
||||
metaCommon // {
|
||||
description = "A local DNS Privacy stub resolver (using DNS-over-TLS)";
|
||||
longDescription = ''
|
||||
Stubby is an application that acts as a local DNS Privacy stub
|
||||
resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS
|
||||
queries sent from a client machine (desktop or laptop) to a DNS
|
||||
Privacy resolver increasing end user privacy. Stubby is developed by
|
||||
the getdns team.
|
||||
'';
|
||||
homepage = "https://dnsprivacy.org/wiki/x/JYAT";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,21 +1,26 @@
|
||||
{ lib, stdenv, fetchzip, fetchpatch, cmake
|
||||
, libjpeg, openssl, zlib, libgcrypt, libpng
|
||||
, systemd, Carbon
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, libjpeg
|
||||
, openssl
|
||||
, zlib
|
||||
, libgcrypt
|
||||
, libpng
|
||||
, systemd
|
||||
, Carbon
|
||||
}:
|
||||
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvncserver";
|
||||
version = "0.9.13";
|
||||
url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
|
||||
sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) pname version;
|
||||
src = fetchzip {
|
||||
inherit (s) url sha256;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibVNC";
|
||||
repo = "libvncserver";
|
||||
rev = "LibVNCServer-${version}";
|
||||
sha256 = "sha256-gQT/M2u4nWQ0MfO2gWAqY0ZJc7V9eGczGzcsxKmG4H8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -24,12 +29,11 @@ stdenv.mkDerivation {
|
||||
++ lib.optional stdenv.isDarwin Carbon;
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "VNC server library";
|
||||
homepage = "https://libvnc.github.io/";
|
||||
license = lib.licenses.gpl2Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simpleitk";
|
||||
version = "2.0.2";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q51jmd6skrr31avxlrxx433lawc838ilzrj5vvv38a9f4gl45v8";
|
||||
sha256 = "0ShUo9UVkliROIIR5bJtqlzESByfq9SQ1+Hy/40vJ50=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake swig ];
|
||||
nativeBuildInputs = [ cmake swig4 ];
|
||||
buildInputs = [ lua itk ];
|
||||
|
||||
# 2.0.0: linker error building examples
|
||||
|
||||
58
pkgs/development/python-modules/aocd/default.nix
Normal file
58
pkgs/development/python-modules/aocd/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests
|
||||
, pytestCheckHook, tzlocal, pytest-mock, pytest-freezegun, pytest-raisin
|
||||
, pytest-socket, requests-mock, pebble, python-dateutil, termcolor
|
||||
, beautifulsoup4, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aocd";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimglenn";
|
||||
repo = "advent-of-code-data";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wdg6XUkjnAc9yAP7DP0UT6SlQHfj/ymhqzIGNM3fco4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
requests
|
||||
termcolor
|
||||
beautifulsoup4
|
||||
pebble
|
||||
tzlocal
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Too many failing tests
|
||||
preCheck = "rm pytest.ini";
|
||||
|
||||
disabledTests = [
|
||||
"test_results"
|
||||
"test_results_xmas"
|
||||
"test_run_error"
|
||||
"test_run_and_autosubmit"
|
||||
"test_run_and_no_autosubmit"
|
||||
"test_load_input_from_file"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytest-freezegun
|
||||
pytest-raisin
|
||||
pytest-socket
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aocd" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wimglenn/advent-of-code-data";
|
||||
description = "Get your Advent of Code data with a single import statement";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aadibajpai ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
pname = "dbutils";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "DBUtils";
|
||||
sha256 = "549d472197b3eef27e7bb2dd2246b28e880ac0ae9fdf63aadfd3b7def153db0c";
|
||||
sha256 = "6ec83f4d75d7a7b42a92e86b775f251e2671639b3b2123fe13a5d8d8fe7c5643";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-py";
|
||||
version = "1.2.9";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "16eacdc9c53f55d2130891c6335e88046afa0601184fd5197fee35a09e99d9cf";
|
||||
sha256 = "2e38f02b6b8809907d3fb419d54c040bd176ec921b2b226a716fe7ebb456bde4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -7,23 +7,29 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grammalecte";
|
||||
version = "0.6.5";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip";
|
||||
sha256 = "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0";
|
||||
url = "https://grammalecte.net/grammalecte/zip/Grammalecte-fr-v${version}.zip";
|
||||
sha256 = "076jv3ywdgqqzg92bfbagc7ypy08xjq5zn4vgna6j9350fkfqhzn";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
runHook prePatch
|
||||
substituteInPlace grammalecte-server.py --replace sys.version_info.major sys.version_info
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ bottle ];
|
||||
|
||||
preBuild = "cd ..";
|
||||
sourceRoot = ".";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
meta = {
|
||||
description = "Grammalecte is an open source grammar checker for the French language";
|
||||
description = "An open source grammar and typographic corrector for the French language";
|
||||
homepage = "https://grammalecte.net";
|
||||
license = with lib.licenses; [ gpl3 ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ apeyroux ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.17.4";
|
||||
version = "1.17.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Dtyf7T34g2sD86cipKsOwfcCXet6u6f5oHVaHCBEbUA=";
|
||||
sha256 = "004773a1wsip1gnqvas78k0snv7yq83qv1spir891sz4mmg7fyin";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }:
|
||||
{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pebble";
|
||||
@ -11,6 +11,8 @@ buildPythonPackage rec {
|
||||
sha256 = "0a595f7mrf89xlck9b2x83bqybc9zd9jxkl0sa5cf19vax18rg8h";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybase64";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9e310fcf5cfa2cbf7d1d7eb503b6066bec785216bcd1d8c0a736f59d5ec21b0b";
|
||||
sha256 = "d2016a3a487d3d4501d8281f61ee54c25efd65e37a4c7dce8011e0de7183c956";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
37
pkgs/development/python-modules/pytest-raisin/default.nix
Normal file
37
pkgs/development/python-modules/pytest-raisin/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-raisin";
|
||||
version = "0.3";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimglenn";
|
||||
repo = "pytest-raisin";
|
||||
rev = "v${version}";
|
||||
sha256 = "73cOrsqlE04m6X3a6VwtRzfi24oqkdO3HjKQH61bU88=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
# tests cause circular pytest-raisin already registered with pytest error
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin enabling the use of exception instances with pytest.raises context";
|
||||
homepage = "https://github.com/wimglenn/pytest-raisin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aadibajpai ];
|
||||
};
|
||||
}
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vehicle";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "frenck";
|
||||
repo = "python-vehicle";
|
||||
rev = "v${version}";
|
||||
sha256 = "0blpyh246l16bn6jy8ifym2br13k8qxagggbwpzwrwfxkb3kdz5x";
|
||||
sha256 = "04xcs5bfjd49j870gyyznc8hkaadsa9gm9pz0w9qvzlphnxvv5h4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "0.14.49";
|
||||
version = "0.14.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = version;
|
||||
sha256 = "0m126jjklkwiwzg44xkii9gx0pmhqm7xdj0hblsrp09jnym7rjns";
|
||||
sha256 = "sha256-yNq3GRovFm0OlYNJJGjTe5AqKG9J4I+igJ/WVNLWdKI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0msgq7bmy424bcyx23srjs7w2bck4b7zad8mi8l3j20ajya3amaa";
|
||||
vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alsa-utils";
|
||||
version = "1.2.5.1";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-nBaa43pJKV+bl7kqzncoA9r2tlEKGVdOC3j4flYhGNA=";
|
||||
sha256 = "sha256-ah79ih8dnTjkiWM+rsH/+lwxVmOzFsq4BL5IaIfmFF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext makeWrapper ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.258";
|
||||
version = "4.14.259";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi";
|
||||
sha256 = "0s23iq89xdgckzyh8xv7p7wx0agjpj8ac2p42jpx6yzp3xa89qi6";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.221";
|
||||
version = "4.19.222";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3";
|
||||
sha256 = "0f48c6lv0nqggn5rn1wfnlf3xjz6ckmzvjqbhpyar43x7l687c4p";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.295";
|
||||
version = "4.4.296";
|
||||
extraMeta.branch = "4.4";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1h3i2lgm2sy325f58jildip7m6sb4hr2n9pm3gc3h2gash65kc2r";
|
||||
sha256 = "1ydh6qiib6anxv5kxd13d9p2hjh3ni7r3whxazlzvckijmzqd5nb";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.293";
|
||||
version = "4.9.294";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0l64rz6ly5ls23lqq0cv98xb4z2mimp2jrsjrs6kq3zm4k2mm4gs";
|
||||
sha256 = "0s527wr1zngyfz4p7nss1id14amc448g19i1wy20s13n43gm1jii";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.87";
|
||||
version = "5.10.88";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3";
|
||||
sha256 = "1sv8j34k75xpbdgyddhlszlgn74fbj0girgixz7v18l2qfv331kg";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.10";
|
||||
version = "5.15.11";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8";
|
||||
sha256 = "1km1fglpg1a67vsfx6gqz9ikb6pywdl146bhws915n8jgrz8n5y1";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.167";
|
||||
version = "5.4.168";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l";
|
||||
sha256 = "108i35bnfhv7cpq8ifp915ybngygl2qf6cfslrh3aqk5sk29mdzc";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "18484";
|
||||
sha256 = "0wyxpfzkpjwxsp4pqfjrpdr9vqgszsa31g1a5f9r7d1rkkw94f3s";
|
||||
rev = "18517";
|
||||
sha256 = "1i4gppn3lyi3aqzscrdhm2dsvfa84xqhymcc468sakn9in3g85gg";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.83-rt58"; # updated by ./update-rt.sh
|
||||
version = "5.10.87-rt59"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -18,14 +18,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg";
|
||||
sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1n1jj7zyhnk4d5imf5v0cblqxv7q0ybc3i17yd224qmkj3bmly9w";
|
||||
sha256 = "04sr3n3ilvqq0dl59l92qmn3p7fjlsxxvbs3qls7b4pncb2xyyj3";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chamber";
|
||||
version = "2.10.6";
|
||||
version = "2.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8VnFpzm5St0AYFzups2ILQ/MrQRZLQ1xY9JjlGVBmZk=";
|
||||
sha256 = "sha256-HpxHGbgPdu92ha0QO15x1rrJikDmpSA8E8YdgjzQ/Mw=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fend";
|
||||
version = "0.1.26";
|
||||
version = "0.1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "printfn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U5LYjoq11qZYus/McDbtVljj2RSP9MCXXDvOWgbXerk=";
|
||||
sha256 = "sha256-4Zn42GXtX1UZYa8m3Ig90xDkmwDG7egPE5fRzPYj9sw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-E7by7FJfmOBqDoZLA9s/bj/EHaZ4IsHYTHWcvIuaMNg=";
|
||||
cargoSha256 = "sha256-brk6hpBq/wyt0TWQGojTk+bz3/2Jvwx7MoVSkTEq0hU=";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stubby";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getdnsapi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04izd1v4fv9l7r75aafkrp6svczbx4cvv1vnfyx5n9105pin11mx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake libyaml ];
|
||||
|
||||
buildInputs = [ doxygen getdns systemd ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A local DNS Privacy stub resolver (using DNS-over-TLS)";
|
||||
longDescription = ''
|
||||
Stubby is an application that acts as a local DNS Privacy stub
|
||||
resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS
|
||||
queries sent from a client machine (desktop or laptop) to a DNS
|
||||
Privacy resolver increasing end user privacy. Stubby is developed by
|
||||
the getdns team.
|
||||
'';
|
||||
homepage = "https://dnsprivacy.org/wiki/x/JYAT";
|
||||
downloadPage = "https://github.com/getdnsapi/stubby";
|
||||
maintainers = with maintainers; [ leenaars ehmry ];
|
||||
license = licenses.bsd3; platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "passff-host";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "passff";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9q4onU/e/pzLp5lGQjf/ScOOCVMiMQRaLGEm8K8flX4=";
|
||||
sha256 = "sha256-1JPToJF/ruu69TEZAAvV3Zl0qcTpEyMb2qQDAWWgKNw=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||
/etc/opt/chrome/native-messaging-hosts
|
||||
/etc/chromium/native-messaging-hosts
|
||||
/etc/vivaldi/native-messaging-hosts
|
||||
/lib/librewolf/native-messaging-hosts
|
||||
)
|
||||
|
||||
for manifestDir in "''${nativeMessagingPaths[@]}"; do
|
||||
@ -42,6 +43,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Host app for the WebExtension PassFF";
|
||||
homepage = "https://github.com/passff/passff-host";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ nadrieril ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +1,22 @@
|
||||
{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config
|
||||
, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
|
||||
{ lib, mkDerivation, fetchurl, cmake, darkhttpd, gettext, makeWrapper
|
||||
, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
|
||||
, qttranslations, qtsvg }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qdigidoc";
|
||||
version = "4.2.8";
|
||||
version = "4.2.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/open-eid/DigiDoc4-Client";
|
||||
rev = "v${version}";
|
||||
sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm";
|
||||
fetchSubmodules = true;
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
|
||||
sha256 = "1rhd3mvj6ld16zgfscj81f1vhs2nvifsizky509l1av7dsjfbbzr";
|
||||
};
|
||||
|
||||
tsl = fetchurl {
|
||||
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
|
||||
sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";
|
||||
url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-300.xml";
|
||||
sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
|
||||
};
|
||||
|
||||
# Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914)
|
||||
patches = [ ./qt5.15.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitri Smirnov <dmitri@smirnov.ee>
|
||||
Date: Mon, 8 Mar 2021 14:15:27 +0100
|
||||
Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?=
|
||||
=?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Dmitri Smirnov <dmitri@smirnov.ee>
|
||||
---
|
||||
client/widgets/CheckBox.cpp | 1 +
|
||||
client/widgets/MainAction.cpp | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp
|
||||
index a03b56e5d..725d585b7 100644
|
||||
--- a/client/widgets/CheckBox.cpp
|
||||
+++ b/client/widgets/CheckBox.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <QBrush>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QStyleOptionButton>
|
||||
|
||||
CheckBox::CheckBox(QWidget *parent)
|
||||
diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp
|
||||
index 4cf4bb1cf..a46c193e3 100644
|
||||
--- a/client/widgets/MainAction.cpp
|
||||
+++ b/client/widgets/MainAction.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtGui/QPainter>
|
||||
+#include <QtGui/QPainterPath>
|
||||
#include <QtGui/QPaintEvent>
|
||||
|
||||
using namespace ria::qdigidoc4;
|
||||
@ -186,6 +186,8 @@ with pkgs;
|
||||
|
||||
antsimulator = callPackage ../games/antsimulator { };
|
||||
|
||||
aocd = with pythonPackages; toPythonApplication aocd;
|
||||
|
||||
astrolog = callPackage ../applications/science/astronomy/astrolog { };
|
||||
|
||||
atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
|
||||
@ -9789,8 +9791,6 @@ with pkgs;
|
||||
|
||||
stremio = qt5.callPackage ../applications/video/stremio { };
|
||||
|
||||
stubby = callPackage ../tools/networking/stubby { };
|
||||
|
||||
sunwait = callPackage ../applications/misc/sunwait { };
|
||||
|
||||
surface-control = callPackage ../applications/misc/surface-control { };
|
||||
@ -16514,7 +16514,8 @@ with pkgs;
|
||||
|
||||
getdata = callPackage ../development/libraries/getdata { };
|
||||
|
||||
getdns = callPackage ../development/libraries/getdns { };
|
||||
inherit (callPackages ../development/libraries/getdns { })
|
||||
getdns stubby;
|
||||
|
||||
gettext = callPackage ../development/libraries/gettext { };
|
||||
|
||||
@ -19733,7 +19734,7 @@ with pkgs;
|
||||
|
||||
simp_le = callPackage ../tools/admin/simp_le { };
|
||||
|
||||
simpleitk = callPackage ../development/libraries/simpleitk { };
|
||||
simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; };
|
||||
|
||||
sfml = callPackage ../development/libraries/sfml {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
|
||||
|
||||
@ -540,6 +540,8 @@ in {
|
||||
inherit (pkgs) graphviz;
|
||||
};
|
||||
|
||||
aocd = callPackage ../development/python-modules/aocd { };
|
||||
|
||||
apache-airflow = callPackage ../development/python-modules/apache-airflow { };
|
||||
|
||||
apcaccess = callPackage ../development/python-modules/apcaccess { };
|
||||
@ -7623,6 +7625,8 @@ in {
|
||||
|
||||
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
|
||||
|
||||
pytest-raisin = callPackage ../development/python-modules/pytest-raisin { };
|
||||
|
||||
pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
|
||||
|
||||
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user