mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 14:11:21 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
be6f4078a4
@ -650,6 +650,13 @@ in mkLicense lset) ({
|
||||
free = true;
|
||||
};
|
||||
|
||||
fairsource09 = {
|
||||
fullName = "Fair Source License, version 0.9";
|
||||
url = "https://fair.io/v0.9.txt";
|
||||
free = false;
|
||||
redistributable = true;
|
||||
};
|
||||
|
||||
issl = {
|
||||
fullName = "Intel Simplified Software License";
|
||||
url = "https://software.intel.com/en-us/license/intel-simplified-software-license";
|
||||
|
||||
@ -16008,6 +16008,13 @@
|
||||
githubId = 1755789;
|
||||
name = "Robert Irelan";
|
||||
};
|
||||
tengkuizdihar = {
|
||||
name = "Tengku Izdihar";
|
||||
email = "tengkuizdihar@gmail.com";
|
||||
matrix = "@tengkuizdihar:matrix.org";
|
||||
github = "tengkuizdihar";
|
||||
githubId = 22078730;
|
||||
};
|
||||
tennox = {
|
||||
email = "tennox+nix@txlab.io";
|
||||
github = "tennox";
|
||||
|
||||
@ -82,6 +82,8 @@
|
||||
|
||||
- DocBook option documentation is no longer supported, all module documentation now uses markdown.
|
||||
|
||||
- `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets.
|
||||
|
||||
- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.
|
||||
|
||||
- `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.
|
||||
|
||||
@ -3,23 +3,44 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.fail2ban;
|
||||
|
||||
fail2banConf = pkgs.writeText "fail2ban.local" cfg.daemonConfig;
|
||||
settingsFormat = pkgs.formats.keyValue { };
|
||||
|
||||
jailConf = pkgs.writeText "jail.local" ''
|
||||
[INCLUDES]
|
||||
configFormat = pkgs.formats.ini {
|
||||
mkKeyValue = generators.mkKeyValueDefault { } " = ";
|
||||
};
|
||||
|
||||
before = paths-nixos.conf
|
||||
mkJailConfig = name: attrs:
|
||||
optionalAttrs (name != "DEFAULT") { inherit (attrs) enabled; } //
|
||||
optionalAttrs (attrs.filter != null) { filter = if (builtins.isString filter) then filter else name; } //
|
||||
attrs.settings;
|
||||
|
||||
${concatStringsSep "\n" (attrValues (flip mapAttrs cfg.jails (name: def:
|
||||
optionalString (def != "")
|
||||
''
|
||||
[${name}]
|
||||
${def}
|
||||
'')))}
|
||||
'';
|
||||
mkFilter = name: attrs: nameValuePair "fail2ban/filter.d/${name}.conf" {
|
||||
source = configFormat.generate "filter.d/${name}.conf" attrs.filter;
|
||||
};
|
||||
|
||||
fail2banConf = configFormat.generate "fail2ban.local" cfg.daemonSettings;
|
||||
|
||||
strJails = filterAttrs (_: builtins.isString) cfg.jails;
|
||||
attrsJails = filterAttrs (_: builtins.isAttrs) cfg.jails;
|
||||
|
||||
jailConf =
|
||||
let
|
||||
configFile = configFormat.generate "jail.local" (
|
||||
{ INCLUDES.before = "paths-nixos.conf"; } // (mapAttrs mkJailConfig attrsJails)
|
||||
);
|
||||
extraConfig = concatStringsSep "\n" (attrValues (mapAttrs
|
||||
(name: def:
|
||||
optionalString (def != "")
|
||||
''
|
||||
[${name}]
|
||||
${def}
|
||||
'')
|
||||
strJails));
|
||||
|
||||
in
|
||||
pkgs.concatText "jail.local" [ configFile (pkgs.writeText "extra-jail.local" extraConfig) ];
|
||||
|
||||
pathsConf = pkgs.writeText "paths-nixos.conf" ''
|
||||
# NixOS
|
||||
@ -32,15 +53,18 @@ let
|
||||
|
||||
[DEFAULT]
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "fail2ban" "daemonConfig" ] "The daemon is now configured through the attribute set `services.fail2ban.daemonSettings`.")
|
||||
(mkRemovedOptionModule [ "services" "fail2ban" "extraSettings" ] "The extra default configuration can now be set using `services.fail2ban.jails.DEFAULT.settings`.")
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.fail2ban = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
@ -69,7 +93,7 @@ in
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
default = [];
|
||||
default = [ ];
|
||||
type = types.listOf types.package;
|
||||
example = lib.literalExpression "[ pkgs.ipset ]";
|
||||
description = lib.mdDoc ''
|
||||
@ -180,7 +204,7 @@ in
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
"bantime.overalljails" (if true) specifies the search of IP in the database will be executed
|
||||
cross over all jails, if false (default), only current jail of the ban IP will be searched
|
||||
cross over all jails, if false (default), only current jail of the ban IP will be searched.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -194,60 +218,75 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
daemonConfig = mkOption {
|
||||
default = ''
|
||||
[Definition]
|
||||
logtarget = SYSLOG
|
||||
socket = /run/fail2ban/fail2ban.sock
|
||||
pidfile = /run/fail2ban/fail2ban.pid
|
||||
dbfile = /var/lib/fail2ban/fail2ban.sqlite3
|
||||
'';
|
||||
type = types.lines;
|
||||
description = lib.mdDoc ''
|
||||
The contents of Fail2ban's main configuration file. It's
|
||||
generally not necessary to change it.
|
||||
'';
|
||||
};
|
||||
daemonSettings = mkOption {
|
||||
inherit (configFormat) type;
|
||||
|
||||
extraSettings = mkOption {
|
||||
type = with types; attrsOf (oneOf [ bool ints.positive str ]);
|
||||
default = {};
|
||||
description = lib.mdDoc ''
|
||||
Extra default configuration for all jails (i.e. `[DEFAULT]`). See
|
||||
<https://github.com/fail2ban/fail2ban/blob/master/config/jail.conf> for an overview.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
defaultText = literalExpression ''
|
||||
{
|
||||
findtime = "15m";
|
||||
Definition = {
|
||||
logtarget = "SYSLOG";
|
||||
socket = "/run/fail2ban/fail2ban.sock";
|
||||
pidfile = "/run/fail2ban/fail2ban.pid";
|
||||
dbfile = "/var/lib/fail2ban/fail2ban.sqlite3";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
The contents of Fail2ban's main configuration file.
|
||||
It's generally not necessary to change it.
|
||||
'';
|
||||
};
|
||||
|
||||
jails = mkOption {
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{ apache-nohome-iptables = '''
|
||||
# Block an IP address if it accesses a non-existent
|
||||
# home directory more than 5 times in 10 minutes,
|
||||
# since that indicates that it's scanning.
|
||||
filter = apache-nohome
|
||||
action = iptables-multiport[name=HTTP, port="http,https"]
|
||||
logpath = /var/log/httpd/error_log*
|
||||
backend = auto
|
||||
findtime = 600
|
||||
bantime = 600
|
||||
maxretry = 5
|
||||
''';
|
||||
dovecot = '''
|
||||
# block IPs which failed to log-in
|
||||
# aggressive mode add blocking for aborted connections
|
||||
enabled = true
|
||||
filter = dovecot[mode=aggressive]
|
||||
maxretry = 3
|
||||
''';
|
||||
}
|
||||
{
|
||||
apache-nohome-iptables = {
|
||||
settings = {
|
||||
# Block an IP address if it accesses a non-existent
|
||||
# home directory more than 5 times in 10 minutes,
|
||||
# since that indicates that it's scanning.
|
||||
filter = "apache-nohome";
|
||||
action = '''iptables-multiport[name=HTTP, port="http,https"]''';
|
||||
logpath = "/var/log/httpd/error_log*";
|
||||
backend = "auto";
|
||||
findtime = 600;
|
||||
bantime = 600;
|
||||
maxretry = 5;
|
||||
};
|
||||
};
|
||||
dovecot = {
|
||||
settings = {
|
||||
# block IPs which failed to log-in
|
||||
# aggressive mode add blocking for aborted connections
|
||||
filter = "dovecot[mode=aggressive]";
|
||||
maxretry = 3;
|
||||
};
|
||||
};
|
||||
};
|
||||
'';
|
||||
type = types.attrsOf types.lines;
|
||||
type = with types; attrsOf (either lines (submodule ({ name, ... }: {
|
||||
options = {
|
||||
enabled = mkEnableOption "this jail." // {
|
||||
default = true;
|
||||
readOnly = name == "DEFAULT";
|
||||
};
|
||||
|
||||
filter = mkOption {
|
||||
type = nullOr (either str configFormat.type);
|
||||
|
||||
default = null;
|
||||
description = lib.mdDoc "Content of the filter used for this jail.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
inherit (settingsFormat) type;
|
||||
|
||||
default = { };
|
||||
description = lib.mdDoc "Additional settings for this jail.";
|
||||
};
|
||||
};
|
||||
})));
|
||||
description = lib.mdDoc ''
|
||||
The configuration of each Fail2ban “jail”. A jail
|
||||
consists of an action (such as blocking a port using
|
||||
@ -278,7 +317,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = (cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null);
|
||||
assertion = cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null;
|
||||
message = ''
|
||||
Options `services.fail2ban.bantime-increment.formula` and `services.fail2ban.bantime-increment.multipliers` cannot be both specified.
|
||||
'';
|
||||
@ -300,7 +339,7 @@ in
|
||||
"fail2ban/paths-nixos.conf".source = pathsConf;
|
||||
"fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf";
|
||||
"fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf";
|
||||
};
|
||||
} // (mapAttrs' mkFilter (filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails));
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.fail2ban = {
|
||||
@ -335,39 +374,41 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
# Defaults for the daemon settings
|
||||
services.fail2ban.daemonSettings.Definition = {
|
||||
logtarget = mkDefault "SYSLOG";
|
||||
socket = mkDefault "/run/fail2ban/fail2ban.sock";
|
||||
pidfile = mkDefault "/run/fail2ban/fail2ban.pid";
|
||||
dbfile = mkDefault "/var/lib/fail2ban/fail2ban.sqlite3";
|
||||
};
|
||||
|
||||
# Add some reasonable default jails. The special "DEFAULT" jail
|
||||
# sets default values for all other jails.
|
||||
services.fail2ban.jails.DEFAULT = ''
|
||||
# Bantime increment options
|
||||
bantime.increment = ${boolToString cfg.bantime-increment.enable}
|
||||
${optionalString (cfg.bantime-increment.rndtime != null) "bantime.rndtime = ${cfg.bantime-increment.rndtime}"}
|
||||
${optionalString (cfg.bantime-increment.maxtime != null) "bantime.maxtime = ${cfg.bantime-increment.maxtime}"}
|
||||
${optionalString (cfg.bantime-increment.factor != null) "bantime.factor = ${cfg.bantime-increment.factor}"}
|
||||
${optionalString (cfg.bantime-increment.formula != null) "bantime.formula = ${cfg.bantime-increment.formula}"}
|
||||
${optionalString (cfg.bantime-increment.multipliers != null) "bantime.multipliers = ${cfg.bantime-increment.multipliers}"}
|
||||
${optionalString (cfg.bantime-increment.overalljails != null) "bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}"}
|
||||
# Miscellaneous options
|
||||
ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
|
||||
${optionalString (cfg.bantime != null) ''
|
||||
bantime = ${cfg.bantime}
|
||||
''}
|
||||
maxretry = ${toString cfg.maxretry}
|
||||
backend = systemd
|
||||
# Actions
|
||||
banaction = ${cfg.banaction}
|
||||
banaction_allports = ${cfg.banaction-allports}
|
||||
${optionalString (cfg.extraSettings != {}) ''
|
||||
# Extra settings
|
||||
${generators.toKeyValue {} cfg.extraSettings}
|
||||
''}
|
||||
'';
|
||||
# Block SSH if there are too many failing connection attempts.
|
||||
services.fail2ban.jails = mkMerge [
|
||||
{
|
||||
DEFAULT.settings = (optionalAttrs cfg.bantime-increment.enable
|
||||
({ "bantime.increment" = cfg.bantime-increment.enable; } // (mapAttrs'
|
||||
(name: nameValuePair "bantime.${name}")
|
||||
(filterAttrs (n: v: v != null && n != "enable") cfg.bantime-increment))
|
||||
)
|
||||
) // {
|
||||
# Miscellaneous options
|
||||
inherit (cfg) banaction maxretry;
|
||||
ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}'';
|
||||
backend = "systemd";
|
||||
# Actions
|
||||
banaction_allports = cfg.banaction-allports;
|
||||
};
|
||||
}
|
||||
|
||||
# Block SSH if there are too many failing connection attempts.
|
||||
(mkIf config.services.openssh.enable {
|
||||
sshd.settings.port = mkDefault (concatMapStringsSep "," builtins.toString config.services.openssh.ports);
|
||||
})
|
||||
];
|
||||
|
||||
# Benefits from verbose sshd logging to observe failed login attempts,
|
||||
# so we set that here unless the user overrode it.
|
||||
services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE";
|
||||
services.fail2ban.jails.sshd = mkDefault ''
|
||||
enabled = true
|
||||
port = ${concatMapStringsSep "," (p: toString p) config.services.openssh.ports}
|
||||
'';
|
||||
services.openssh.settings.LogLevel = mkDefault "VERBOSE";
|
||||
};
|
||||
}
|
||||
|
||||
@ -256,6 +256,7 @@ in {
|
||||
etebase-server = handleTest ./etebase-server.nix {};
|
||||
etesync-dav = handleTest ./etesync-dav.nix {};
|
||||
evcc = handleTest ./evcc.nix {};
|
||||
fail2ban = handleTest ./fail2ban.nix { };
|
||||
fakeroute = handleTest ./fakeroute.nix {};
|
||||
fancontrol = handleTest ./fancontrol.nix {};
|
||||
fcitx5 = handleTest ./fcitx5 {};
|
||||
|
||||
18
nixos/tests/fail2ban.nix
Normal file
18
nixos/tests/fail2ban.nix
Normal file
@ -0,0 +1,18 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "fail2ban";
|
||||
|
||||
nodes.machine = _: {
|
||||
services.fail2ban = {
|
||||
enable = true;
|
||||
bantime-increment.enable = true;
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
machine.wait_for_unit("fail2ban")
|
||||
'';
|
||||
})
|
||||
@ -1,5 +1,8 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, openexr
|
||||
, jemalloc
|
||||
, c-blosc
|
||||
, binutils
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
@ -21,33 +24,50 @@
|
||||
, ilmbase
|
||||
, libpng
|
||||
, mpfr
|
||||
, nanosvg
|
||||
, nlopt
|
||||
, opencascade-occt
|
||||
, openvdb
|
||||
, pcre
|
||||
, qhull
|
||||
, tbb
|
||||
, wxGTK31
|
||||
, tbb_2021_8
|
||||
, wxGTK32
|
||||
, xorg
|
||||
, fetchpatch
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||
}:
|
||||
let
|
||||
wxGTK-prusa = wxGTK31.overrideAttrs (old: rec {
|
||||
wxGTK-prusa = wxGTK32.overrideAttrs (old: rec {
|
||||
pname = "wxwidgets-prusa3d-patched";
|
||||
version = "3.1.4";
|
||||
version = "3.2.0";
|
||||
configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ];
|
||||
patches = [ ./wxWidgets-Makefile.in-fix.patch ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "wxWidgets";
|
||||
rev = "489f6118256853cf5b299d595868641938566cdb";
|
||||
hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ=";
|
||||
rev = "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26";
|
||||
hash = "sha256-rYvmNmvv48JSKVT4ph9AS+JdstnLSRmcpWz1IdgBzQo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
});
|
||||
nanosvg-fltk = nanosvg.overrideAttrs (old: rec {
|
||||
pname = "nanosvg-fltk";
|
||||
version = "unstable-2022-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fltk";
|
||||
repo = "nanosvg";
|
||||
rev = "abcd277ea45e9098bed752cf9c6875b533c0892f";
|
||||
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
|
||||
};
|
||||
});
|
||||
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
|
||||
buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ];
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -72,35 +92,19 @@ stdenv.mkDerivation rec {
|
||||
ilmbase
|
||||
libpng
|
||||
mpfr
|
||||
nanosvg-fltk
|
||||
nlopt
|
||||
opencascade-occt
|
||||
openvdb
|
||||
openvdb_tbb_2021_8
|
||||
pcre
|
||||
tbb
|
||||
qhull
|
||||
tbb_2021_8
|
||||
wxGTK-prusa
|
||||
xorg.libX11
|
||||
] ++ lib.optionals withSystemd [
|
||||
systemd
|
||||
] ++ nativeCheckInputs;
|
||||
|
||||
patches = [
|
||||
# Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355
|
||||
(fetchpatch {
|
||||
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
|
||||
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
|
||||
})
|
||||
# Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238
|
||||
# Can be removed with the next version update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch";
|
||||
sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch";
|
||||
sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20=";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ gtest ];
|
||||
|
||||
@ -125,10 +129,8 @@ stdenv.mkDerivation rec {
|
||||
# now seems to be integrated into the main lib.
|
||||
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
|
||||
|
||||
# Disable test_voronoi.cpp as the assembler hangs during build,
|
||||
# likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3
|
||||
# See issue #185808 for details.
|
||||
sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt
|
||||
# Disable slic3r_jobs_tests.cpp as the test fails sometimes
|
||||
sed -i 's|slic3r_jobs_tests.cpp||g' tests/slic3rutils/CMakeLists.txt
|
||||
|
||||
# prusa-slicer expects the OCCTWrapper shared library in the same folder as
|
||||
# the executable when loading STEP files. We force the loader to find it in
|
||||
@ -138,6 +140,10 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/libslic3r/Format/STEP.cpp \
|
||||
--replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";'
|
||||
fi
|
||||
# https://github.com/prusa3d/PrusaSlicer/issues/9581
|
||||
if [ -f "cmake/modules/FindEXPAT.cmake" ]; then
|
||||
rm cmake/modules/FindEXPAT.cmake
|
||||
fi
|
||||
|
||||
# Fix resources folder location on macOS
|
||||
substituteInPlace src/PrusaSlicer.cpp \
|
||||
@ -147,10 +153,18 @@ stdenv.mkDerivation rec {
|
||||
sed -i '/libslic3r/d' tests/CMakeLists.txt
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# wxWidgets: CheckResizerFlags assert fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/prusa3d/PrusaSlicer/commit/24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c.patch";
|
||||
hash = "sha256-MNGtaI7THu6HEl9dMwcO1hkrCtIkscoNh4ulA2cKtZA=";
|
||||
})
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
sha256 = "sha256-oQRBVAbA2wOYZkQiYIgbd3UcKAkXjnNXo6gB5QbPDAs=";
|
||||
hash = "sha256-6AZdwNcgddHePyB0bNS7xGmpz38uzhAwUxgo48OQLuU=";
|
||||
rev = "version_${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -0,0 +1,112 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 8f33aa2ff4..39928382da 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_msw_utils.o \
|
||||
monodll_utilsexc.o \
|
||||
monodll_fswatcher.o \
|
||||
- monodll_msw_secretstore.o
|
||||
+ monodll_msw_secretstore.o \
|
||||
monodll_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
|
||||
@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_uuid.o \
|
||||
monodll_msw_evtloop.o \
|
||||
monodll_access.o \
|
||||
- monodll_dark_mode.o
|
||||
+ monodll_dark_mode.o \
|
||||
monodll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
|
||||
@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
monodll_uuid.o \
|
||||
monodll_msw_evtloop.o \
|
||||
monodll_access.o \
|
||||
- monodll_dark_mode.o
|
||||
+ monodll_dark_mode.o \
|
||||
monodll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_msw_utils.o \
|
||||
monolib_utilsexc.o \
|
||||
monolib_fswatcher.o \
|
||||
- monolib_msw_secretstore.o
|
||||
+ monolib_msw_secretstore.o \
|
||||
monolib_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
|
||||
@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
monolib_uuid.o \
|
||||
monolib_msw_evtloop.o \
|
||||
monolib_access.o \
|
||||
- monolib_dark_mode.o
|
||||
+ monolib_dark_mode.o \
|
||||
monolib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
monolib_uuid.o \
|
||||
monolib_msw_evtloop.o \
|
||||
monolib_access.o \
|
||||
- monolib_dark_mode.o
|
||||
+ monolib_dark_mode.o \
|
||||
monolib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
|
||||
basedll_msw_utils.o \
|
||||
basedll_utilsexc.o \
|
||||
basedll_fswatcher.o \
|
||||
- basedll_msw_secretstore.o
|
||||
+ basedll_msw_secretstore.o \
|
||||
basedll_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
|
||||
@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
|
||||
baselib_msw_utils.o \
|
||||
baselib_utilsexc.o \
|
||||
baselib_fswatcher.o \
|
||||
- baselib_msw_secretstore.o
|
||||
+ baselib_msw_secretstore.o \
|
||||
baselib_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
|
||||
@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
coredll_uuid.o \
|
||||
coredll_msw_evtloop.o \
|
||||
coredll_access.o \
|
||||
- coredll_dark_mode.o
|
||||
+ coredll_dark_mode.o \
|
||||
coredll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
coredll_uuid.o \
|
||||
coredll_msw_evtloop.o \
|
||||
coredll_access.o \
|
||||
- coredll_dark_mode.o
|
||||
+ coredll_dark_mode.o \
|
||||
coredll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
corelib_uuid.o \
|
||||
corelib_msw_evtloop.o \
|
||||
corelib_access.o \
|
||||
- corelib_dark_mode.o
|
||||
+ corelib_dark_mode.o \
|
||||
corelib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
corelib_uuid.o \
|
||||
corelib_msw_evtloop.o \
|
||||
corelib_access.o \
|
||||
- corelib_dark_mode.o
|
||||
+ corelib_dark_mode.o \
|
||||
corelib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "newsboat";
|
||||
version = "2.31";
|
||||
version = "2.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newsboat";
|
||||
repo = "newsboat";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-e06QsfcAo/iYlvtdYZ8hX0EIMCDcwRrsJGjUxCrthUo=";
|
||||
hash = "sha256-ACPnCm2cu9BEpMd02t+G4mg6DZ8jCydfK4p+Ad87Hek=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MJkiC+UoiO4DiSvHLAklBdla+RmMYaxA/8oXNblYMF4=";
|
||||
cargoHash = "sha256-HHc8HSNWoBkDR7lQgvXUML5ly8sShDn16DWNf/Jig2g=";
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
let
|
||||
pname = "gfold";
|
||||
version = "4.3.3";
|
||||
version = "4.4.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -21,10 +21,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "nickgerace";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-J7D/fwXhWgS6C9iJqdBaA0Ym7ioCbqmyI9BrmZfoEjY=";
|
||||
sha256 = "sha256-2rBKf7+brd2NbukJYmeRpn7skxrLbMGYC9+VLqmdFfw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o7bUgm2SEDis6h+feUYE/Ew6pwbYCw/peRvb4c64TlM=";
|
||||
cargoHash = "sha256-7yPKZJKJF/ISfYfqpWLMApcNHqv3aFXL1a/cGtmbMVg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner
|
||||
{ lib, rustPlatform, fetchgit, fetchpatch
|
||||
, pkg-config, protobuf, python3, wayland-scanner
|
||||
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
@ -13,6 +14,15 @@ rustPlatform.buildRustPackage rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport fix for non-Glibc.
|
||||
(fetchpatch {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/8afa6096aa0417ccc5de0213a241dd7ebd25ac0a%5E%21/?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-oRwGprs/P2ZG8BM9CMzyEyM8fjuyFINQw4rjTq9rKXA=";
|
||||
})
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoSha256 = "EhxrtCGrwCcODCjPUONjY1glPGEXbjvk6No/g2kJzI8=";
|
||||
|
||||
46
pkgs/applications/virtualization/tart/default.nix
Normal file
46
pkgs/applications/virtualization/tart/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
# Softnet support ("--net-softnet") is disabled by default as it requires
|
||||
# passwordless-sudo when installed through nix. Alternatively users may install
|
||||
# softnet through other means with "setuid"-bit enabled.
|
||||
# See https://github.com/cirruslabs/softnet#installing
|
||||
, enableSoftnet ? false, softnet
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tart";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz";
|
||||
sha256 = "1n052nwsccc3sr0jqnvhyl0six8wi46vysxjchwrdm8brnsdpf84";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# ./tart.app/Contents/MacOS/tart binary is required to be used in order to
|
||||
# trick macOS to pick tart.app/Contents/embedded.provision profile for elevated
|
||||
# privileges that Tart needs
|
||||
mkdir -p $out/bin $out/Applications
|
||||
cp -r tart.app $out/Applications/tart.app
|
||||
makeWrapper $out/Applications/tart.app/Contents/MacOS/tart $out/bin/tart \
|
||||
--prefix PATH : ${lib.makeBinPath (lib.optional enableSoftnet softnet)}
|
||||
install -Dm444 LICENSE $out/share/tart/LICENSE
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "macOS VMs on Apple Silicon to use in CI and other automations";
|
||||
homepage = "https://tart.run";
|
||||
license = licenses.fairsource09;
|
||||
maintainers = with maintainers; [ emilytrau Enzime ];
|
||||
platforms = [ "aarch64-darwin" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "dbip-country-lite";
|
||||
version = "2023-06";
|
||||
version = "2023-07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz";
|
||||
hash = "sha256-H+f7OhI03qhgpldF05Nc5ohPIPNhyVRCwiVqeWkvIbc=";
|
||||
hash = "sha256-WVsyhopYbBlCWDq9UoPe1rcGU3pBYsXkqNWbaQXzRFA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20230621141418";
|
||||
version = "20230627034247";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-2RUnE96CYZD/0BixdO/2APnjhOAw12lW+XpktfN3B+U=";
|
||||
hash = "sha256-9GrIvrLIU72oy12K/+1WaqOjvMJngKRNmkpwTq/9r9Q=";
|
||||
};
|
||||
vendorHash = "sha256-lPOn296ngMCYdXoGNDG9okkLC5ryjKIL+UP98lyaKcg=";
|
||||
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
|
||||
meta = with lib; {
|
||||
description = "community managed domain list";
|
||||
homepage = "https://github.com/v2fly/domain-list-community";
|
||||
|
||||
23
pkgs/development/libraries/nanosvg/default.nix
Normal file
23
pkgs/development/libraries/nanosvg/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "nanosvg";
|
||||
version = "unstable-2022-12-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "memononen";
|
||||
repo = "nanosvg";
|
||||
rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1";
|
||||
hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple stupid SVG parser";
|
||||
homepage = "https://github.com/memononen/nanosvg";
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiobiketrax";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "basilfx";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lMgD315movmr+u+8BMaqhb1L46Wf0Ak56VAT2jpg1kM=";
|
||||
hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bimmer-connected";
|
||||
version = "0.13.7";
|
||||
version = "0.13.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bimmerconnected";
|
||||
repo = "bimmer_connected";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JnrM2LuvqGHxec2C8eYjO++ejZ2jXIi8XmxpIw/tSxs=";
|
||||
hash = "sha256-IC668e9XRi4rxwiwwdu4mkrQQy/hkM3OGodCDso/Uo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "camel-converter";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "sanders41";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t0wZ03xMNuBEUeXC+DizNSVJmnlt2SH9f0qw6F4UXg8=";
|
||||
hash = "sha256-XKtWR9dmSMfqkJYUHDQtWBLG3CHrbrI5lNtPUTShmBE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -44,6 +44,11 @@ buildPythonPackage rec {
|
||||
"camel_converter"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AttributeError: 'Test' object has no attribute 'model_dump'
|
||||
"test_camel_config"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for the Meilisearch API";
|
||||
homepage = "https://github.com/sanders41/camel-converter";
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-mail";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "sabuhish";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ttVzjmMZe1iWn2J7N5pcol4GFnKv3CB3DOQkZU2HnHg=";
|
||||
hash = "sha256-m8d4y75+mSh9A+YVaV/yZhN3ckOe2mV1jdtfeNFtU/w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.29.1";
|
||||
version = "0.30.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-df6uFIaTdTy5VMKxBZew5zK0/iO7KbttbjGBJp1Vhjw=";
|
||||
hash = "sha256-OiDNK/NqC1nDiN2uoYaVj07BirzNB6DBKvMKNrfWDIA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
64
pkgs/development/python-modules/referencing/default.nix
Normal file
64
pkgs/development/python-modules/referencing/default.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, jsonschema
|
||||
, pytest-subtests
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rpds-py
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "referencing";
|
||||
version = "0.29.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-jsonschema";
|
||||
repo = "referencing";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-+wPNPYu2/0gBmHFJ8aAeZ3dFDC7uFV6Ww3RAbri26Mc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/Topic/d" pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
rpds-py
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
jsonschema
|
||||
pytest-subtests
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"referencing"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-specification JSON referencing";
|
||||
homepage = "https://github.com/python-jsonschema/referencing";
|
||||
changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
51
pkgs/development/python-modules/rpds-py/default.nix
Normal file
51
pkgs/development/python-modules/rpds-py/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cargo
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rustc
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rpds-py";
|
||||
version = "0.7.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "rpds_py";
|
||||
inherit version;
|
||||
hash = "sha256-2UC1ZE8U5JscbnkCueyKDHWEEJ+/OA+hgRWDGmQZJ8g=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-BAoE0oRQGf5ze/8uAH6gsFP77lPvOvYy8W9iDrqUn3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.maturinBuildHook
|
||||
cargo
|
||||
rustc
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rpds"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings to Rust's persistent data structures (rpds";
|
||||
homepage = "https://pypi.org/project/rpds-py/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.25.1";
|
||||
version = "1.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-I7lsyMJ6akQvpzXEcUrWfomTX+oFYCX7YiE4cf6KAuE=";
|
||||
hash = "sha256-zGlfkp7xOIpQKl0xL8EqtbMZfgCsi+txcsC/HW4ViEg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "allure";
|
||||
version = "2.22.4";
|
||||
version = "2.23.0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz";
|
||||
sha256 = "sha256-oqxobClWwPNeZZhFdoX2tzD2/unG/XmvSp6hU+zzyos=";
|
||||
sha256 = "sha256-RBe9S6eHnKhtar/rLoLs6gl2TJtCNfoGrYLDbE6CpRI=";
|
||||
};
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-remote";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aC1I+33jEmgjtidA5CQXpwePsavwlx97abpsc68RkBI=";
|
||||
sha256 = "sha256-7zAeGJyMfMdrVDCuTWU3zikXjM/ydjnGj6Ctjckd32c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4vNRtFqtzoDHjDQwPe1/sJNzcCU+b7XHgQ5YqEzNhjI=";
|
||||
vendorHash = "sha256-SxGBfWcV10L6xC5XPIfv/HJWQy5g3AoV8z4/ae23DEc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.1.40";
|
||||
version = "0.1.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TqLxx69mnc6fN0TdhFsMjTbTBP9Asr0IFVCJlgnCB+U=";
|
||||
hash = "sha256-mvB5TCPkRWDAkDd4PV50EKjtlaZSFqTl6IDMTnPDrng=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ml+ODoJqRkOiqPqLltpxrMvkTFV+iSoCrdr4PuvkMCY=";
|
||||
vendorHash = "sha256-2us72JBzLXaxJ6X6T/Hc2y4YVoAJ6YvJVJdO3KzsbkE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
51
pkgs/games/pegasus-frontend/default.nix
Normal file
51
pkgs/games/pegasus-frontend/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtgraphicaleffects
|
||||
, qtmultimedia
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, SDL2
|
||||
, sqlite
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pegasus-frontend";
|
||||
version = "unstable-2023-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmatyas";
|
||||
repo = "pegasus-frontend";
|
||||
rev = "6421d7a75d29a82ea06008e4a08ec14e074430d9";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-mwJm+3zMP4alcis7OFQUcH3eXlRTZhoZYtxKrvCQGc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qtgraphicaleffects
|
||||
qtx11extras
|
||||
sqlite
|
||||
SDL2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross platform, customizable graphical frontend for launching emulators and managing your game collection.";
|
||||
homepage = "https://pegasus-frontend.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ tengkuizdihar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -4,16 +4,16 @@ let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.3.4"; #zen
|
||||
version = "6.4.1"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1dj5pk8fqf4plk5nri6cajwvdcs9b6gpfk1y620vi3g7w15p1gvx"; #zen
|
||||
sha256 = "05a3dplzz6vy5gjz9yd1hz7n4xf3mlr2q112kf3yabg8k8izqnys"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.3.4"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "06xkcrd4wjpj23dnrfbyxyx1699vxzswb3r6p2xjwmpy44j5wjgf"; #lqx
|
||||
version = "6.3.11"; #lqx
|
||||
suffix = "lqx2"; #lqx
|
||||
sha256 = "0hpzafw2zwy25ss4cwj6mm8pr1nnv680m8bfcal29f7gaxbm96k8"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, cmake, python3, bison, openssl, readline, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "monetdb";
|
||||
version = "11.45.17";
|
||||
version = "11.47.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
|
||||
sha256 = "sha256-sVRNnaklw2mHkTz8Kw6x8uPfdN+I1n1tOjHBslyMpGc=";
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-0vhcPh4ZXCAKpgiSZstu6vBQv7VwOYc6qoz8dPkugNE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison cmake python3 ];
|
||||
buildInputs = [ openssl readline bzip2 ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/monetdb-packages.cmake --replace \
|
||||
'get_os_release_info(LINUX_DISTRO LINUX_DISTRO_VERSION)' \
|
||||
@ -27,9 +30,6 @@ stdenv.mkDerivation rec {
|
||||
$out/bin/Mconvert.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
buildInputs = [ bison openssl readline bzip2 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source database system";
|
||||
homepage = "https://www.monetdb.org/";
|
||||
@ -37,4 +37,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.StillerHarpo ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -164,7 +164,6 @@ self: super:
|
||||
});
|
||||
|
||||
xdm = super.xdm.overrideAttrs (attrs: {
|
||||
patches = (attrs.patches or []) ++ [ ./xdm-fix-header-inclusion.patch ];
|
||||
buildInputs = attrs.buildInputs ++ [ libxcrypt ];
|
||||
configureFlags = attrs.configureFlags or [] ++ [
|
||||
"ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp"
|
||||
@ -856,14 +855,6 @@ self: super:
|
||||
"--with-launchdaemons-dir=\${out}/LaunchDaemons"
|
||||
"--with-launchagents-dir=\${out}/LaunchAgents"
|
||||
];
|
||||
patches = [
|
||||
# don't unset DBUS_SESSION_BUS_ADDRESS in startx
|
||||
(fetchpatch {
|
||||
name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch";
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/40f3ac0a31336d871c76065270d3f10e922d06f3/trunk/fs46369.patch";
|
||||
sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
# Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths
|
||||
substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix"
|
||||
|
||||
@ -1,78 +1,77 @@
|
||||
https://invisible-mirror.net/archives/luit/luit-20190106.tgz
|
||||
https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
|
||||
https://xcb.freedesktop.org/dist/xcb-util-0.4.1.tar.xz
|
||||
https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
|
||||
https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.1.tar.xz
|
||||
https://xcb.freedesktop.org/dist/xcb-util-image-0.4.1.tar.xz
|
||||
https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.1.tar.xz
|
||||
https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.10.tar.xz
|
||||
https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.2.tar.xz
|
||||
mirror://xorg/individual/app/appres-1.0.5.tar.bz2
|
||||
https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz
|
||||
mirror://xorg/individual/app/bitmap-1.0.9.tar.gz
|
||||
mirror://xorg/individual/app/editres-1.0.7.tar.bz2
|
||||
mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-cursor-0.1.3.tar.bz2
|
||||
mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz
|
||||
mirror://xorg/individual/app/appres-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/bitmap-1.1.0.tar.xz
|
||||
mirror://xorg/individual/app/editres-1.0.8.tar.xz
|
||||
mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2
|
||||
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
|
||||
mirror://xorg/individual/app/ico-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/listres-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/iceauth-1.0.9.tar.xz
|
||||
mirror://xorg/individual/app/ico-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/listres-1.0.5.tar.xz
|
||||
mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz
|
||||
mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2
|
||||
mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2
|
||||
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/transset-1.0.2.tar.bz2
|
||||
mirror://xorg/individual/app/twm-1.0.10.tar.bz2
|
||||
mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/oclock-1.0.5.tar.xz
|
||||
mirror://xorg/individual/app/sessreg-1.1.3.tar.xz
|
||||
mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
|
||||
mirror://xorg/individual/app/smproxy-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/transset-1.0.3.tar.xz
|
||||
mirror://xorg/individual/app/twm-1.0.12.tar.xz
|
||||
mirror://xorg/individual/app/viewres-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
|
||||
mirror://xorg/individual/app/xauth-1.1.2.tar.xz
|
||||
mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2
|
||||
mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
|
||||
mirror://xorg/individual/app/xclock-1.0.9.tar.bz2
|
||||
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2
|
||||
mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
|
||||
mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2
|
||||
mirror://xorg/individual/app/xdm-1.1.12.tar.bz2
|
||||
mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
|
||||
mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xev-1.2.4.tar.bz2
|
||||
mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
|
||||
mirror://xorg/individual/app/xclock-1.1.1.tar.xz
|
||||
mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz
|
||||
mirror://xorg/individual/app/xconsole-1.0.8.tar.xz
|
||||
mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz
|
||||
mirror://xorg/individual/app/xdm-1.1.14.tar.xz
|
||||
mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
|
||||
mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xev-1.2.5.tar.xz
|
||||
mirror://xorg/individual/app/xeyes-1.2.0.tar.bz2
|
||||
mirror://xorg/individual/app/xfd-1.1.3.tar.bz2
|
||||
mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xfs-1.2.0.tar.bz2
|
||||
mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xfd-1.1.4.tar.xz
|
||||
mirror://xorg/individual/app/xfontsel-1.1.0.tar.xz
|
||||
mirror://xorg/individual/app/xfs-1.2.1.tar.xz
|
||||
mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xgamma-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xgc-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/xhost-1.0.9.tar.xz
|
||||
mirror://xorg/individual/app/xinit-1.4.1.tar.bz2
|
||||
mirror://xorg/individual/app/xinput-1.6.3.tar.bz2
|
||||
mirror://xorg/individual/app/xinit-1.4.2.tar.xz
|
||||
mirror://xorg/individual/app/xinput-1.6.4.tar.xz
|
||||
mirror://xorg/individual/app/xkbcomp-1.4.6.tar.xz
|
||||
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
|
||||
mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/xkill-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xload-1.1.3.tar.bz2
|
||||
mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2
|
||||
mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2
|
||||
mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2
|
||||
mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz
|
||||
mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/xkbutils-1.0.5.tar.xz
|
||||
mirror://xorg/individual/app/xkill-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/xload-1.1.4.tar.xz
|
||||
mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz
|
||||
mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz
|
||||
mirror://xorg/individual/app/xlsfonts-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xmag-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xmessage-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz
|
||||
mirror://xorg/individual/app/xmore-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/app/xpr-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xpr-1.1.0.tar.xz
|
||||
mirror://xorg/individual/app/xprop-1.2.6.tar.xz
|
||||
mirror://xorg/individual/app/xrandr-1.5.1.tar.xz
|
||||
mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2
|
||||
mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xrandr-1.5.2.tar.xz
|
||||
mirror://xorg/individual/app/xrdb-1.2.2.tar.xz
|
||||
mirror://xorg/individual/app/xrefresh-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xset-1.2.5.tar.xz
|
||||
mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2
|
||||
mirror://xorg/individual/app/xsm-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz
|
||||
mirror://xorg/individual/app/xsm-1.0.5.tar.xz
|
||||
mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
|
||||
mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2
|
||||
mirror://xorg/individual/app/xwd-1.0.8.tar.bz2
|
||||
mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
|
||||
mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz
|
||||
mirror://xorg/individual/app/xwd-1.0.9.tar.xz
|
||||
mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz
|
||||
mirror://xorg/individual/app/xwud-1.0.6.tar.xz
|
||||
mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2
|
||||
mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2
|
||||
@ -129,43 +128,44 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2
|
||||
mirror://xorg/individual/font/encodings-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/font/encodings-1.0.7.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
|
||||
mirror://xorg/individual/font/font-alias-1.0.5.tar.xz
|
||||
mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2
|
||||
mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2
|
||||
mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-util-1.3.3.tar.xz
|
||||
mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bh-ttf-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz
|
||||
mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
|
||||
mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
|
||||
mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz
|
||||
mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
|
||||
mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-util-1.4.0.tar.xz
|
||||
mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
|
||||
mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
|
||||
mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
|
||||
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
|
||||
@ -211,6 +211,7 @@ mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz
|
||||
mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
|
||||
mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz
|
||||
mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2
|
||||
mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz
|
||||
mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
|
||||
mirror://xorg/individual/util/lndir-1.0.4.tar.xz
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
On glibc-2.36 this fails with
|
||||
|
||||
genauth.c:45:12: fatal error: bsd/stdlib.h: No such file or directory
|
||||
45 | # include <bsd/stdlib.h>
|
||||
| ^~~~~~~~~~~~~~
|
||||
|
||||
This is because the file will be included if HAVE_ARC4RANDOM is true and `__linux__` is set.
|
||||
However, this is wrong: arc4random is now defined in glibc-2.36 and thus stdlib.h must be included
|
||||
even though HAVE_ARC4RANDOM is true.
|
||||
|
||||
diff --git a/xdm/genauth.c b/xdm/genauth.c
|
||||
index cd2ad61..74d0ae1 100644
|
||||
--- a/xdm/genauth.c
|
||||
+++ b/xdm/genauth.c
|
||||
@@ -40,13 +40,7 @@ from The Open Group.
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
-#ifdef HAVE_ARC4RANDOM
|
||||
-# ifdef __linux__
|
||||
-# include <bsd/stdlib.h>
|
||||
-# else
|
||||
-# include <stdlib.h>
|
||||
-# endif
|
||||
-#endif
|
||||
+#include <stdlib.h>
|
||||
|
||||
#include <time.h>
|
||||
#define Time_t time_t
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.83.1";
|
||||
version = "0.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GZLkz2aadUiSD+v69vLq5BDgn0MSnHVkeGeAFLNDWgM=";
|
||||
hash = "sha256-1/8M4z/ezyyZRG+amzErOGIv2kRZ/sfx7AAB7V7aPX8=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -22,7 +22,7 @@ buildGoModule rec {
|
||||
};
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-hv+0qLzGd31CTDGd3STszSUO2BOMRfppyewbJKzGDTg=";
|
||||
vendorHash = "sha256-WDxHDf+F0QdM/kK2WrStjgzq6h4IPFdsZFbO5qpILp4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -79,6 +79,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch";
|
||||
hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU=";
|
||||
})
|
||||
# fix SIGABRT in X11 https://github.com/ibus/ibus/issues/2484
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ibus/ibus/commit/8f706d160631f1ffdbfa16543a38b9d5f91c16ad.patch";
|
||||
hash = "sha256-YzS9TmUWW0OmheDeCeU00kFK2U2QEmKYMSRJAbu14ec=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
@ -1,33 +1,99 @@
|
||||
{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch
|
||||
, abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
|
||||
, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
|
||||
, gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
|
||||
, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd
|
||||
{ lib
|
||||
, stdenv
|
||||
, abootimg
|
||||
, acl
|
||||
, apksigcopier
|
||||
, apksigner
|
||||
, apktool
|
||||
, binutils-unwrapped-all-targets
|
||||
, bzip2
|
||||
, cbfstool
|
||||
, cdrkit
|
||||
, colord
|
||||
, colordiff
|
||||
, coreutils
|
||||
, cpio
|
||||
, db
|
||||
, diffutils
|
||||
, docutils
|
||||
, dtc
|
||||
, e2fsprogs
|
||||
, enableBloat ? true
|
||||
, enableUnfree ? false
|
||||
# updater only
|
||||
, enjarify
|
||||
, fetchurl
|
||||
, file
|
||||
, findutils
|
||||
, fontforge-fonttools
|
||||
, ffmpeg
|
||||
, fpc
|
||||
, gettext
|
||||
, ghc
|
||||
, ghostscriptX
|
||||
, giflib
|
||||
, gnumeric
|
||||
, gnupg
|
||||
, gnutar
|
||||
, gzip
|
||||
, hdf5
|
||||
, help2man
|
||||
, html2text
|
||||
, imagemagick
|
||||
, installShellFiles
|
||||
, jdk
|
||||
, libarchive
|
||||
, libcaca
|
||||
, libxmlb
|
||||
, llvm
|
||||
, lz4
|
||||
, lzip
|
||||
, mono
|
||||
, ocaml
|
||||
, odt2txt
|
||||
, oggvideotools
|
||||
, openssh
|
||||
, openssl
|
||||
, pdftk
|
||||
, pgpdump
|
||||
, poppler_utils
|
||||
, procyon
|
||||
, python3
|
||||
, qemu
|
||||
, R
|
||||
, radare2
|
||||
, sng
|
||||
, sqlite
|
||||
, squashfsTools
|
||||
, tcpdump
|
||||
, ubootTools
|
||||
, unzip
|
||||
, wabt
|
||||
, xmlbeans
|
||||
, xxd
|
||||
, xz
|
||||
, zip
|
||||
, zstd
|
||||
# updater only
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "233";
|
||||
version = "243";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4=";
|
||||
hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./ignore_links.patch
|
||||
# test_text_proper_indentation requires file >= 5.44
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch";
|
||||
sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -38,43 +104,127 @@ python3Packages.buildPythonApplication rec {
|
||||
substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ docutils help2man installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
docutils
|
||||
help2man
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
# Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
|
||||
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
|
||||
#
|
||||
# Still missing these tools: docx2txt lipo otool r2pipe
|
||||
# Still missing these tools:
|
||||
# aapt2
|
||||
# dexdump
|
||||
# docx2txt
|
||||
# getfacl
|
||||
# lipo
|
||||
# otool
|
||||
# r2pipe
|
||||
#
|
||||
# We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
|
||||
pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([
|
||||
binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils
|
||||
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
|
||||
html2text libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
|
||||
xz zip zstd cdrkit dtc
|
||||
binutils-unwrapped-all-targets
|
||||
bzip2
|
||||
cdrkit
|
||||
colordiff
|
||||
coreutils
|
||||
cpio
|
||||
db
|
||||
diffutils
|
||||
dtc
|
||||
e2fsprogs
|
||||
file
|
||||
findutils
|
||||
fontforge-fonttools
|
||||
gettext
|
||||
gnutar
|
||||
gzip
|
||||
html2text
|
||||
libarchive
|
||||
libxmlb
|
||||
lz4
|
||||
lzip
|
||||
openssl
|
||||
pgpdump
|
||||
sng
|
||||
sqlite
|
||||
squashfsTools
|
||||
unzip
|
||||
xxd
|
||||
xz
|
||||
zip
|
||||
zstd
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
argcomplete
|
||||
debian
|
||||
defusedxml
|
||||
jsbeautifier
|
||||
jsondiff
|
||||
libarchive-c
|
||||
progressbar33
|
||||
pypdf2
|
||||
python-magic
|
||||
pyxattr
|
||||
rpm
|
||||
tlsh
|
||||
])
|
||||
++ lib.optionals enableBloat (
|
||||
[
|
||||
abootimg
|
||||
apksigcopier
|
||||
apksigner
|
||||
cbfstool
|
||||
colord
|
||||
enjarify
|
||||
ffmpeg
|
||||
fpc
|
||||
ghc
|
||||
ghostscriptX
|
||||
giflib
|
||||
gnupg
|
||||
hdf5
|
||||
imagemagick
|
||||
jdk
|
||||
libcaca
|
||||
llvm
|
||||
mono
|
||||
ocaml
|
||||
odt2txt
|
||||
openssh
|
||||
pdftk
|
||||
poppler_utils
|
||||
procyon
|
||||
qemu
|
||||
R
|
||||
radare2
|
||||
tcpdump
|
||||
ubootTools
|
||||
wabt
|
||||
xmlbeans
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c
|
||||
python-magic progressbar33 pypdf2 tlsh pyxattr rpm
|
||||
++ (with python3.pkgs; [
|
||||
androguard
|
||||
binwalk
|
||||
guestfs
|
||||
h5py
|
||||
pdfminer-six
|
||||
])
|
||||
++ lib.optionals enableBloat (
|
||||
[
|
||||
apksigcopier apksigner enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg pdftk
|
||||
hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt openssh
|
||||
poppler_utils procyon qemu R tcpdump wabt radare2 xmlbeans
|
||||
abootimg cbfstool colord ubootTools
|
||||
]
|
||||
++ (with python3Packages; [ androguard binwalk h5py pdfminer-six guestfs ])
|
||||
# oggvideotools is broken on Darwin, please put it back when it will be fixed?
|
||||
++ lib.optionals stdenv.isLinux [ oggvideotools ]
|
||||
# This doesn't work on aarch64-darwin
|
||||
++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ]
|
||||
# `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree.
|
||||
++ lib.optionals enableUnfree [ apktool ]
|
||||
));
|
||||
# oggvideotools is broken on Darwin, please put it back when it will be fixed?
|
||||
++ lib.optionals stdenv.isLinux [ oggvideotools ]
|
||||
# This doesn't work on aarch64-darwin
|
||||
++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ]
|
||||
# apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree
|
||||
++ lib.optionals enableUnfree [ apktool ]
|
||||
));
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
] ++ pythonPath;
|
||||
|
||||
pytestFlagsArray = [
|
||||
# always show more information when tests fail
|
||||
# Always show more information when tests fail
|
||||
"-vv"
|
||||
];
|
||||
|
||||
@ -88,7 +238,7 @@ python3Packages.buildPythonApplication rec {
|
||||
"test_diff_meta"
|
||||
"test_diff_meta2"
|
||||
|
||||
# fails because it fails to determine llvm version
|
||||
# Fails because it fails to determine llvm version
|
||||
"test_item3_deflate_llvm_bitcode"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Disable flaky tests on Darwin
|
||||
@ -97,7 +247,7 @@ python3Packages.buildPythonApplication rec {
|
||||
"test_symlink_root"
|
||||
];
|
||||
|
||||
# flaky tests on Darwin
|
||||
# Flaky tests on Darwin
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
"tests/comparators/test_git.py"
|
||||
"tests/comparators/test_java.py"
|
||||
@ -106,7 +256,7 @@ python3Packages.buildPythonApplication rec {
|
||||
"tests/comparators/test_macho.py"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
passthru = {
|
||||
updateScript = writeScript "update-diffoscope" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl pcre common-updater-scripts
|
||||
@ -117,7 +267,7 @@ python3Packages.buildPythonApplication rec {
|
||||
newVersion="$(curl -s https://diffoscope.org/ | pcregrep -o1 'Latest release: ([0-9]+)')"
|
||||
update-source-version ${pname} "$newVersion"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Perform in-depth comparison of files, archives, and directories";
|
||||
@ -132,6 +282,7 @@ python3Packages.buildPythonApplication rec {
|
||||
project and was formerly known as "debbindiff".
|
||||
'';
|
||||
homepage = "https://diffoscope.org/";
|
||||
changelog = "https://diffoscope.org/news/diffoscope-${version}-released/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dezgeg danielfullmer raitobezarius ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.67.1";
|
||||
version = "1.68.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O1ANUA2xCLl0ks+YCS8ADK5ySPYV4aSf3i5L6EN8swA=";
|
||||
hash = "sha256-qFPTDyljSKWim8sZbDM5OZ4sHL4csqXxit4UdMnOTxs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Xxoe+8MKwZPPapTILHAIegGPBn8vaAjU5bZrd8RvazE=";
|
||||
|
||||
34
pkgs/tools/networking/softnet/default.nix
Normal file
34
pkgs/tools/networking/softnet/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "softnet";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cirruslabs/softnet/releases/download/${finalAttrs.version}/softnet.tar.gz";
|
||||
sha256 = "1g274x524xc85hfzxi3vb4xp720bjgk740bp6hc92d1ikmp0b664";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D softnet $out/bin/softnet
|
||||
install -Dm444 -t $out/share/softnet README.md LICENSE
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Software networking with isolation for Tart";
|
||||
homepage = "https://github.com/cirruslabs/softnet";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = [ "aarch64-darwin" ];
|
||||
# Source build will be possible after darwin SDK 12.0 bump
|
||||
# https://github.com/NixOS/nixpkgs/pull/229210
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, config
|
||||
, aws-sdk-cpp
|
||||
, boehmgc
|
||||
, callPackage
|
||||
@ -118,7 +119,7 @@ let
|
||||
hash = "sha256-YrmFkVpwPreiig1/BsP+DInpTdQrPmS7bEY0WUGpw+c=";
|
||||
};
|
||||
|
||||
in lib.makeExtensible (self: {
|
||||
in lib.makeExtensible (self: ({
|
||||
nix_2_3 = (common rec {
|
||||
version = "2.3.16";
|
||||
src = fetchurl {
|
||||
@ -130,18 +131,6 @@ in lib.makeExtensible (self: {
|
||||
];
|
||||
}).override { boehmgc = boehmgc-nix_2_3; };
|
||||
|
||||
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";
|
||||
|
||||
nix_2_5 = throw "nixVersions.nix_2_5 has been removed";
|
||||
|
||||
nix_2_6 = throw "nixVersions.nix_2_6 has been removed";
|
||||
|
||||
nix_2_7 = throw "nixVersions.nix_2_7 has been removed";
|
||||
|
||||
nix_2_8 = throw "nixVersions.nix_2_8 has been removed";
|
||||
|
||||
nix_2_9 = throw "nixVersions.nix_2_9 has been removed";
|
||||
|
||||
nix_2_10 = common {
|
||||
version = "2.10.3";
|
||||
hash = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";
|
||||
@ -217,4 +206,16 @@ in lib.makeExtensible (self: {
|
||||
stable = self.nix_2_15;
|
||||
|
||||
unstable = self.nix_2_16;
|
||||
})
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";
|
||||
|
||||
nix_2_5 = throw "nixVersions.nix_2_5 has been removed";
|
||||
|
||||
nix_2_6 = throw "nixVersions.nix_2_6 has been removed";
|
||||
|
||||
nix_2_7 = throw "nixVersions.nix_2_7 has been removed";
|
||||
|
||||
nix_2_8 = throw "nixVersions.nix_2_8 has been removed";
|
||||
|
||||
nix_2_9 = throw "nixVersions.nix_2_9 has been removed";
|
||||
}))
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfox";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BishopFox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EqL5/PVQm/lfviojKoYKDnzilx7KQZ7T3EEx/or6y7E=";
|
||||
hash = "sha256-zkZ8Glny9eERfU4DGtTOc66O7LOk5NISqUR5muxb2m0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ=";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oauth2c";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudentity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ecG7+b1chHAJVB7WTilA1dowtisLHj2E/ORUoXXxqNY=";
|
||||
hash = "sha256-+R3NViAnrHg/9dthF0e2dEppX5MLzHeRMYFiZutE1mU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE=";
|
||||
|
||||
@ -2,17 +2,18 @@
|
||||
|
||||
let
|
||||
version = "3.99.5";
|
||||
suffix = "SP13";
|
||||
suffix = "SP15";
|
||||
tarBall = "${version}final.${suffix}";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsc-cyberjack";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"http://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.gz";
|
||||
sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b";
|
||||
"https://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.bz2";
|
||||
sha256 = "sha256-rLfCgyRQcYdWcTdnxLPvUAgy1lLtUbNRELkQsR69Rno=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tools" ];
|
||||
@ -36,7 +37,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "REINER SCT cyberJack USB chipcard reader user space driver";
|
||||
homepage = "https://www.reiner-sct.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ aszlig ];
|
||||
maintainers = with maintainers; [ aszlig flokli ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10756,6 +10756,8 @@ with pkgs;
|
||||
|
||||
pcmsolver = callPackage ../development/libraries/pcmsolver { };
|
||||
|
||||
pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend {};
|
||||
|
||||
pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
|
||||
|
||||
pffft = callPackage ../development/libraries/pffft { };
|
||||
@ -12848,6 +12850,8 @@ with pkgs;
|
||||
|
||||
sockperf = callPackage ../tools/networking/sockperf { };
|
||||
|
||||
softnet = callPackage ../tools/networking/softnet { };
|
||||
|
||||
solaar = callPackage ../applications/misc/solaar { };
|
||||
|
||||
solanum = callPackage ../servers/irc/solanum {
|
||||
@ -23512,6 +23516,8 @@ with pkgs;
|
||||
|
||||
nanomsg = callPackage ../development/libraries/nanomsg { };
|
||||
|
||||
nanosvg = callPackage ../development/libraries/nanosvg { };
|
||||
|
||||
nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { };
|
||||
|
||||
nanotts = callPackage ../tools/audio/nanotts { };
|
||||
@ -34621,6 +34627,8 @@ with pkgs;
|
||||
|
||||
sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { };
|
||||
|
||||
tart = callPackage ../applications/virtualization/tart { };
|
||||
|
||||
tecoc = callPackage ../applications/editors/tecoc { };
|
||||
|
||||
viber = callPackage ../applications/networking/instant-messengers/viber { };
|
||||
|
||||
@ -10625,6 +10625,8 @@ self: super: with self; {
|
||||
|
||||
reedsolo = callPackage ../development/python-modules/reedsolo { };
|
||||
|
||||
referencing = callPackage ../development/python-modules/referencing { };
|
||||
|
||||
reflink = callPackage ../development/python-modules/reflink { };
|
||||
|
||||
regenmaschine = callPackage ../development/python-modules/regenmaschine { };
|
||||
@ -10889,6 +10891,8 @@ self: super: with self; {
|
||||
|
||||
rpdb = callPackage ../development/python-modules/rpdb { };
|
||||
|
||||
rpds-py = callPackage ../development/python-modules/rpds-py { };
|
||||
|
||||
rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { };
|
||||
|
||||
rpi-gpio = callPackage ../development/python-modules/rpi-gpio { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user