pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub 5a504755 532346c8
+7
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+7
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
···
70
70
</listitem>
71
71
<listitem>
72
72
<para>
73
+
<link xlink:href="https://github.com/hzeller/gmrender-resurrect">gmediarender</link>,
74
+
a simple, headless UPnP/DLNA renderer. Available as
75
+
<link xlink:href="options.html#opt-services.gmediarender.enable">services.gmediarender</link>.
76
+
</para>
77
+
</listitem>
78
+
<listitem>
79
+
<para>
73
80
<link xlink:href="https://github.com/StevenBlack/hosts">stevenblack-blocklist</link>,
74
81
A unified hosts file with base extensions for blocking
75
82
unwanted websites. Available as
+2
nixos/doc/manual/release-notes/rl-2305.section.md
+2
nixos/doc/manual/release-notes/rl-2305.section.md
···
26
26
27
27
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
28
28
29
+
- [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable).
30
+
29
31
- [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable).
30
32
31
33
- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
+1
nixos/modules/module-list.nix
+1
nixos/modules/module-list.nix
+116
nixos/modules/services/audio/gmediarender.nix
+116
nixos/modules/services/audio/gmediarender.nix
···
1
+
{ pkgs, lib, config, utils, ... }:
2
+
3
+
with lib;
4
+
5
+
let
6
+
cfg = config.services.gmediarender;
7
+
in
8
+
{
9
+
options.services.gmediarender = {
10
+
enable = mkEnableOption (mdDoc "the gmediarender DLNA renderer");
11
+
12
+
audioDevice = mkOption {
13
+
type = types.nullOr types.str;
14
+
default = null;
15
+
description = mdDoc ''
16
+
The audio device to use.
17
+
'';
18
+
};
19
+
20
+
audioSink = mkOption {
21
+
type = types.nullOr types.str;
22
+
default = null;
23
+
description = mdDoc ''
24
+
The audio sink to use.
25
+
'';
26
+
};
27
+
28
+
friendlyName = mkOption {
29
+
type = types.nullOr types.str;
30
+
default = null;
31
+
description = mdDoc ''
32
+
A "friendly name" for identifying the endpoint.
33
+
'';
34
+
};
35
+
36
+
initialVolume = mkOption {
37
+
type = types.nullOr types.int;
38
+
default = 0;
39
+
description = mdDoc ''
40
+
A default volume attenuation (in dB) for the endpoint.
41
+
'';
42
+
};
43
+
44
+
package = mkPackageOptionMD pkgs "gmediarender" {
45
+
default = "gmrender-resurrect";
46
+
};
47
+
48
+
port = mkOption {
49
+
type = types.nullOr types.port;
50
+
default = null;
51
+
description = mdDoc "Port that will be used to accept client connections.";
52
+
};
53
+
54
+
uuid = mkOption {
55
+
type = types.nullOr types.str;
56
+
default = null;
57
+
description = mdDoc ''
58
+
A UUID for uniquely identifying the endpoint. If you have
59
+
multiple renderers on your network, you MUST set this.
60
+
'';
61
+
};
62
+
};
63
+
64
+
config = mkIf cfg.enable {
65
+
systemd = {
66
+
services.gmediarender = {
67
+
after = [ "network-online.target" ];
68
+
wantedBy = [ "multi-user.target" ];
69
+
description = "gmediarender server daemon";
70
+
environment = {
71
+
XDG_CACHE_HOME = "%t/gmediarender";
72
+
};
73
+
serviceConfig = {
74
+
DynamicUser = true;
75
+
User = "gmediarender";
76
+
Group = "gmediarender";
77
+
SupplementaryGroups = [ "audio" ];
78
+
ExecStart =
79
+
"${cfg.package}/bin/gmediarender " +
80
+
optionalString (cfg.audioDevice != null) ("--gstout-audiodevice=${utils.escapeSystemdExecArg cfg.audioDevice} ") +
81
+
optionalString (cfg.audioSink != null) ("--gstout-audiosink=${utils.escapeSystemdExecArg cfg.audioSink} ") +
82
+
optionalString (cfg.friendlyName != null) ("--friendly-name=${utils.escapeSystemdExecArg cfg.friendlyName} ") +
83
+
optionalString (cfg.initialVolume != 0) ("--initial-volume=${toString cfg.initialVolume} ") +
84
+
optionalString (cfg.port != null) ("--port=${toString cfg.port} ") +
85
+
optionalString (cfg.uuid != null) ("--uuid=${utils.escapeSystemdExecArg cfg.uuid} ");
86
+
Restart = "always";
87
+
RuntimeDirectory = "gmediarender";
88
+
89
+
# Security options:
90
+
CapabilityBoundingSet = "";
91
+
LockPersonality = true;
92
+
MemoryDenyWriteExecute = true;
93
+
NoNewPrivileges = true;
94
+
# PrivateDevices = true;
95
+
PrivateTmp = true;
96
+
PrivateUsers = true;
97
+
ProcSubset = "pid";
98
+
ProtectClock = true;
99
+
ProtectControlGroups = true;
100
+
ProtectHome = true;
101
+
ProtectHostname = true;
102
+
ProtectKernelLogs = true;
103
+
ProtectKernelModules = true;
104
+
ProtectKernelTunables = true;
105
+
ProtectProc = "invisible";
106
+
RestrictNamespaces = true;
107
+
RestrictRealtime = true;
108
+
RestrictSUIDSGID = true;
109
+
SystemCallArchitectures = "native";
110
+
SystemCallFilter = [ "@system-service" "~@privileged" ];
111
+
UMask = 066;
112
+
};
113
+
};
114
+
};
115
+
};
116
+
}
+23
nixos/modules/services/networking/syncthing.nix
+23
nixos/modules/services/networking/syncthing.nix
···
384
384
description = mdDoc ''
385
385
Extra configuration options for Syncthing.
386
386
See <https://docs.syncthing.net/users/config.html>.
387
+
Note that this attribute set does not exactly match the documented
388
+
xml format. Instead, this is the format of the json rest api. There
389
+
are slight differences. For example, this xml:
390
+
```xml
391
+
<options>
392
+
<listenAddress>default</listenAddress>
393
+
<minHomeDiskFree unit="%">1</minHomeDiskFree>
394
+
</options>
395
+
```
396
+
corresponds to the json:
397
+
```json
398
+
{
399
+
options: {
400
+
listenAddresses = [
401
+
"default"
402
+
];
403
+
minHomeDiskFree = {
404
+
unit = "%";
405
+
value = 1;
406
+
};
407
+
};
408
+
}
409
+
```
387
410
'';
388
411
example = {
389
412
options.localAnnounceEnabled = false;
+6
nixos/modules/virtualisation/lxc-container.nix
+6
nixos/modules/virtualisation/lxc-container.nix
···
150
150
source = config.system.build.toplevel + "/init";
151
151
target = "/sbin/init";
152
152
}
153
+
# Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.
154
+
# Nixos will setup the same symlink after start.
155
+
{
156
+
source = config.system.build.toplevel + "/etc/os-release";
157
+
target = "/etc/os-release";
158
+
}
153
159
];
154
160
155
161
extraCommands = "mkdir -p proc sys dev";
+63
pkgs/applications/blockchains/chia-dev-tools/default.nix
+63
pkgs/applications/blockchains/chia-dev-tools/default.nix
···
1
+
{ lib
2
+
, fetchFromGitHub
3
+
, substituteAll
4
+
, python3Packages
5
+
, chia
6
+
,
7
+
}:
8
+
python3Packages.buildPythonApplication rec {
9
+
pname = "chia-dev-tools";
10
+
version = "1.1.4";
11
+
12
+
src = fetchFromGitHub {
13
+
owner = "Chia-Network";
14
+
repo = pname;
15
+
rev = "v${version}";
16
+
hash = "sha256-lE7FTSDqVS6AstcxZSMdQwgygMvcvh1fqYVTTSSNZpA=";
17
+
};
18
+
19
+
patches = [
20
+
(substituteAll {
21
+
src = ./fix-paths.patch;
22
+
inherit chia;
23
+
})
24
+
];
25
+
26
+
postPatch = ''
27
+
substituteInPlace setup.py \
28
+
--replace "==" ">="
29
+
'';
30
+
31
+
nativeBuildInputs = [
32
+
python3Packages.setuptools-scm
33
+
];
34
+
35
+
# give a hint to setuptools-scm on package version
36
+
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
37
+
38
+
propagatedBuildInputs = with python3Packages; [
39
+
(toPythonModule chia)
40
+
pytimeparse
41
+
];
42
+
43
+
checkInputs = with python3Packages; [
44
+
pytestCheckHook
45
+
pytest-asyncio
46
+
];
47
+
48
+
preCheck = ''
49
+
export HOME=$(mktemp -d)
50
+
'';
51
+
postCheck = "unset HOME";
52
+
53
+
disabledTests = [
54
+
"test_spendbundles"
55
+
];
56
+
57
+
meta = with lib; {
58
+
homepage = "https://www.chia.net/";
59
+
description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more";
60
+
license = with licenses; [ asl20 ];
61
+
maintainers = teams.chia.members;
62
+
};
63
+
}
+13
pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch
+13
pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch
···
1
+
diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py
2
+
index e59ba8f..20912ff 100644
3
+
--- a/cdv/cmds/sim_utils.py
4
+
+++ b/cdv/cmds/sim_utils.py
5
+
@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None:
6
+
7
+
from chia.cmds.start_funcs import async_start
8
+
9
+
- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable
10
+
+ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable
11
+
if root_path.exists():
12
+
config = load_config(root_path, "config.yaml")
13
+
await async_start(root_path, config, group, restart)
+2
-2
pkgs/applications/networking/sniffers/wireshark/default.nix
+2
-2
pkgs/applications/networking/sniffers/wireshark/default.nix
···
11
11
with lib;
12
12
13
13
let
14
-
version = "4.0.1";
14
+
version = "4.0.2";
15
15
variant = if withQt then "qt" else "cli";
16
16
17
17
in stdenv.mkDerivation {
···
21
21
22
22
src = fetchurl {
23
23
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
24
-
sha256 = "sha256-s7AC+Z0Tu/R/ntO+frNyywwkVL0PrqKadWgZzgGf/cI=";
24
+
sha256 = "sha256-81kVaZ8vmyjdshEgLUDsiYTlg008kRSDFEpJhLpEQR0=";
25
25
};
26
26
27
27
cmakeFlags = [
+3
pkgs/applications/networking/sync/rsync/default.nix
+3
pkgs/applications/networking/sync/rsync/default.nix
···
43
43
# disable the included zlib explicitly as it otherwise still compiles and
44
44
# links them even.
45
45
"--with-included-zlib=no"
46
+
] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [
47
+
# fix `multiversioning needs 'ifunc' which is not supported on this target` error
48
+
"--disable-roll-simd"
46
49
];
47
50
48
51
enableParallelBuilding = true;
+5
pkgs/applications/networking/umurmur/default.nix
+5
pkgs/applications/networking/umurmur/default.nix
···
14
14
nativeBuildInputs = [ autoreconfHook ];
15
15
buildInputs = [ openssl protobufc libconfig ];
16
16
17
+
# https://github.com/umurmur/umurmur/issues/176
18
+
postPatch = ''
19
+
sed -i '/CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);/d' src/ssli_openssl.c
20
+
'';
21
+
17
22
configureFlags = [
18
23
"--with-ssl=openssl"
19
24
"--enable-shmapi"
+2
-2
pkgs/applications/office/zotero/default.nix
+2
-2
pkgs/applications/office/zotero/default.nix
···
41
41
42
42
stdenv.mkDerivation rec {
43
43
pname = "zotero";
44
-
version = "6.0.18";
44
+
version = "6.0.20";
45
45
46
46
src = fetchurl {
47
47
url =
48
48
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
49
-
sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0=";
49
+
sha256 = "sha256-HsAvodqio3GJ9TK1pt4WwlEZEAo52ocH0r7cf9IQe9w=";
50
50
};
51
51
52
52
nativeBuildInputs = [ wrapGAppsHook ];
+2
-2
pkgs/applications/science/chemistry/cp2k/default.nix
+2
-2
pkgs/applications/science/chemistry/cp2k/default.nix
···
11
11
12
12
in stdenv.mkDerivation rec {
13
13
pname = "cp2k";
14
-
version = "2022.2";
14
+
version = "2023.1";
15
15
16
16
src = fetchFromGitHub {
17
17
owner = "cp2k";
18
18
repo = "cp2k";
19
19
rev = "v${version}";
20
-
hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw=";
20
+
hash = "sha256-SG5Gz0cDiSfbSZ8m4K+eARMLU4iMk/xK3esN5yt05RE=";
21
21
fetchSubmodules = true;
22
22
};
23
23
+2
-2
pkgs/development/compilers/nextpnr/default.nix
+2
-2
pkgs/development/compilers/nextpnr/default.nix
···
14
14
in
15
15
stdenv.mkDerivation rec {
16
16
pname = "nextpnr";
17
-
version = "0.4";
17
+
version = "0.5";
18
18
19
19
srcs = [
20
20
(fetchFromGitHub {
21
21
owner = "YosysHQ";
22
22
repo = "nextpnr";
23
23
rev = "${pname}-${version}";
24
-
hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY=";
24
+
hash = "sha256-3/a6nVr2v9kK/FFmxZq9LQLAoE/yNRcTGojiFPGRkHU=";
25
25
name = "nextpnr";
26
26
})
27
27
(fetchFromGitHub {
+2
-2
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+2
-2
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
···
12
12
13
13
buildPythonPackage rec {
14
14
pname = "google-cloud-securitycenter";
15
-
version = "1.17.0";
15
+
version = "1.18.0";
16
16
format = "setuptools";
17
17
18
18
disabled = pythonOlder "3.6";
19
19
20
20
src = fetchPypi {
21
21
inherit pname version;
22
-
hash = "sha256-wkq0/LEgEQokKzREpOkprKZUK/paP8CgS51anLTy5Dk=";
22
+
hash = "sha256-gtzSB70x7oN6EiTP1U5P1dV4a4eWZNGtRFInYz7AyCA=";
23
23
};
24
24
25
25
propagatedBuildInputs = [
+3
-3
pkgs/development/tools/misc/clojure-lsp/default.nix
+3
-3
pkgs/development/tools/misc/clojure-lsp/default.nix
···
2
2
3
3
buildGraalvmNativeImage rec {
4
4
pname = "clojure-lsp";
5
-
version = "2022.11.03-00.14.57";
5
+
version = "2022.12.09-15.51.10";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = pname;
9
9
repo = pname;
10
10
rev = version;
11
-
sha256 = "sha256-NtvW0KT6d0k2oN//7xaTnBIoLKkc7zQFj3VdoFdgBWI=";
11
+
sha256 = "sha256-hWDTxYtL0c9zkJDle9/XNPMwDDCltfAnz/Os83xL3iM=";
12
12
};
13
13
14
14
jar = fetchurl {
15
15
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
16
-
sha256 = "49e0a848dc32216a60f48eca68ff476cb69b999f6a79fb7310bf9fb2ffcaf4b6";
16
+
sha256 = "df8e000a69fc2aaa85312952f27a9b79625928d825acfe1da69cb67d220ada33";
17
17
};
18
18
19
19
extraNativeImageBuildArgs = [
+128
pkgs/os-specific/linux/dracut/default.nix
+128
pkgs/os-specific/linux/dracut/default.nix
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, gitUpdater
5
+
, makeBinaryWrapper
6
+
, pkg-config
7
+
, asciidoc
8
+
, libxslt
9
+
, docbook_xsl
10
+
, bash
11
+
, kmod
12
+
, binutils
13
+
, busybox
14
+
, bzip2
15
+
, coreutils
16
+
, cpio
17
+
, findutils
18
+
, glibc
19
+
, gnugrep
20
+
, gnused
21
+
, gnutar
22
+
, gzip
23
+
, kbd
24
+
, lvm2
25
+
, lz4
26
+
, lzop
27
+
, procps
28
+
, rng-tools
29
+
, squashfsTools
30
+
, systemd
31
+
, util-linux
32
+
, xz
33
+
, zstd
34
+
}:
35
+
36
+
stdenv.mkDerivation rec {
37
+
pname = "dracut";
38
+
version = "059";
39
+
40
+
src = fetchFromGitHub {
41
+
owner = "dracutdevs";
42
+
repo = "dracut";
43
+
rev = version;
44
+
hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM=";
45
+
};
46
+
47
+
strictDeps = true;
48
+
49
+
buildInputs = [
50
+
bash
51
+
kmod
52
+
];
53
+
54
+
nativeBuildInputs = [
55
+
makeBinaryWrapper
56
+
pkg-config
57
+
asciidoc
58
+
libxslt
59
+
docbook_xsl
60
+
];
61
+
62
+
postPatch = ''
63
+
substituteInPlace dracut.sh \
64
+
--replace 'dracutbasedir="$dracutsysrootdir"/usr/lib/dracut' 'dracutbasedir="$dracutsysrootdir"'"$out/lib/dracut"
65
+
substituteInPlace lsinitrd.sh \
66
+
--replace 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut"
67
+
68
+
echo 'DRACUT_VERSION=${version}' >dracut-version.sh
69
+
'';
70
+
71
+
preConfigure = ''
72
+
patchShebangs ./configure
73
+
'';
74
+
75
+
postFixup = ''
76
+
wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [
77
+
coreutils
78
+
util-linux
79
+
]} --prefix DRACUT_PATH : ${lib.makeBinPath [
80
+
bash
81
+
binutils
82
+
coreutils
83
+
findutils
84
+
glibc
85
+
gnugrep
86
+
gnused
87
+
gnutar
88
+
kbd
89
+
lvm2
90
+
procps
91
+
rng-tools
92
+
squashfsTools
93
+
systemd
94
+
util-linux
95
+
busybox
96
+
]}
97
+
wrapProgram $out/bin/dracut-catimages --set PATH ${lib.makeBinPath [
98
+
coreutils
99
+
cpio
100
+
findutils
101
+
gzip
102
+
]}
103
+
wrapProgram $out/bin/lsinitrd --set PATH ${lib.makeBinPath [
104
+
binutils
105
+
bzip2
106
+
coreutils
107
+
cpio
108
+
gnused
109
+
gzip
110
+
lz4
111
+
lzop
112
+
squashfsTools
113
+
util-linux
114
+
xz
115
+
zstd
116
+
]}
117
+
'';
118
+
119
+
passthru.updateScript = gitUpdater { };
120
+
121
+
meta = with lib; {
122
+
homepage = "https://dracut.wiki.kernel.org";
123
+
description = "An event driven initramfs infrastructure";
124
+
license = licenses.gpl2Plus;
125
+
maintainers = with maintainers; [ lilyinstarlight ];
126
+
platforms = platforms.linux;
127
+
};
128
+
}
+9
-6
pkgs/tools/misc/toybox/default.nix
+9
-6
pkgs/tools/misc/toybox/default.nix
···
1
1
{
2
2
stdenv, lib, fetchFromGitHub, which,
3
-
buildPackages, libxcrypt, libiconv, Libsystem,
3
+
buildPackages, libxcrypt, libiconv,
4
4
enableStatic ? stdenv.hostPlatform.isStatic,
5
5
enableMinimal ? false,
6
6
extraConfig ? ""
7
7
}:
8
+
9
+
let
10
+
inherit (lib) optionals;
11
+
in
8
12
9
13
stdenv.mkDerivation rec {
10
14
pname = "toybox";
···
17
21
sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk=";
18
22
};
19
23
20
-
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
24
+
depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ];
21
25
buildInputs = [
22
26
libxcrypt
23
-
] ++lib.optionals stdenv.isDarwin [
27
+
] ++ optionals stdenv.isDarwin [
24
28
libiconv
25
-
Libsystem # This shouldn't be necessary, see https://github.com/NixOS/nixpkgs/issues/210923
26
-
] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [
29
+
] ++ optionals (enableStatic && stdenv.cc.libc ? static) [
27
30
stdenv.cc.libc
28
31
stdenv.cc.libc.static
29
32
];
···
52
55
make oldconfig
53
56
'';
54
57
55
-
makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static";
58
+
makeFlags = [ "PREFIX=$(out)/bin" ] ++ optionals enableStatic [ "LDFLAGS=--static" ];
56
59
57
60
installTargets = [ "install_flat" ];
58
61
+26
-9
pkgs/tools/networking/linux-router/default.nix
+26
-9
pkgs/tools/networking/linux-router/default.nix
···
1
-
{ stdenv, lib, fetchFromGitHub, makeWrapper
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, makeWrapper
2
5
3
6
# --- Runtime Dependencies ---
4
-
, bash, procps, iproute2, dnsmasq, iptables
5
-
, coreutils, flock, gawk, getopt, gnugrep, gnused, which
7
+
, bash
8
+
, procps
9
+
, iproute2
10
+
, dnsmasq
11
+
, iptables
12
+
, coreutils
13
+
, flock
14
+
, gawk
15
+
, getopt
16
+
, gnugrep
17
+
, gnused
18
+
, which
6
19
# `nmcli` is not required for create_ap.
7
20
# Use NetworkManager by default because it is very likely already present
8
21
, useNetworkManager ? true
···
10
23
11
24
# --- WiFi Hotspot Dependencies ---
12
25
, useWifiDependencies ? true
13
-
, hostapd, iw
26
+
, hostapd
27
+
, iw
14
28
# You only need this if 'iw' can not recognize your adapter.
15
29
, useWirelessTools ? true
16
30
, wirelesstools # for iwconfig
···
26
40
27
41
stdenv.mkDerivation rec {
28
42
pname = "linux-router";
29
-
version = "0.6.6";
43
+
version = "0.6.7";
30
44
31
45
src = fetchFromGitHub {
32
46
owner = "garywill";
33
47
repo = "linux-router";
34
-
rev = "${version}";
35
-
sha256 = "sha256-QBxlqKNaCUMVkm8rVTZ5z6tTN9WxgDQxeNkbgCe9KEg=";
48
+
rev = "refs/tags/${version}";
49
+
hash = "sha256-Ote/arHCU6qiTXdK2RXv9848aeW6rcBsrb6nfxIzQLs=";
36
50
};
37
51
38
-
nativeBuildInputs = [ makeWrapper ];
52
+
nativeBuildInputs = [
53
+
makeWrapper
54
+
];
39
55
40
56
dontBuild = true;
41
57
···
74
90
- DNS proxy
75
91
- Compatible with NetworkManager (automatically set interface as unmanaged)
76
92
'';
77
-
license = licenses.lgpl21;
93
+
changelog = "https://github.com/garywill/linux-router/releases/tag/${version}";
94
+
license = licenses.lgpl21Only;
78
95
maintainers = with maintainers; [ x3ro ];
79
96
platforms = platforms.linux;
80
97
};
+1
-1
pkgs/tools/networking/tcpflow/default.nix
+1
-1
pkgs/tools/networking/tcpflow/default.nix
+6
-6
pkgs/top-level/all-packages.nix
+6
-6
pkgs/top-level/all-packages.nix
···
12456
12456
12457
12457
toxvpn = callPackage ../tools/networking/toxvpn { };
12458
12458
12459
-
toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox {
12460
-
inherit (darwin.apple_sdk_11_0) Libsystem;
12461
-
};
12459
+
toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { };
12462
12460
12463
12461
trackma = callPackage ../tools/misc/trackma { };
12464
12462
···
28534
28532
28535
28533
dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
28536
28534
28535
+
dracut = callPackage ../os-specific/linux/dracut { };
28536
+
28537
28537
dragonflydb = callPackage ../servers/nosql/dragonflydb { };
28538
28538
28539
28539
dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };
···
33064
33064
33065
33065
uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { };
33066
33066
33067
-
umurmur = callPackage ../applications/networking/umurmur {
33068
-
openssl = openssl_1_1;
33069
-
};
33067
+
umurmur = callPackage ../applications/networking/umurmur { };
33070
33068
33071
33069
udocker = callPackage ../tools/virtualization/udocker { };
33072
33070
···
34003
34001
cgminer = callPackage ../applications/blockchains/cgminer { };
34004
34002
34005
34003
chia = callPackage ../applications/blockchains/chia { };
34004
+
34005
+
chia-dev-tools = callPackage ../applications/blockchains/chia-dev-tools { };
34006
34006
34007
34007
chia-plotter = callPackage ../applications/blockchains/chia-plotter { };
34008
34008