pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub 524db897 7516a2e1
+6
maintainers/maintainer-list.nix
+6
maintainers/maintainer-list.nix
···
10784
github = "staccato";
10785
githubId = 86573128;
10786
};
10787
+
stackshadow = {
10788
+
email = "stackshadow@evilbrain.de";
10789
+
github = "stackshadow";
10790
+
githubId = 7512804;
10791
+
name = "Martin Langlotz";
10792
+
};
10793
steell = {
10794
email = "steve@steellworks.com";
10795
github = "Steell";
+5
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+5
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
···
413
<link linkend="opt-hardware.rasdaemon.enable">hardware.rasdaemon</link>.
414
</para>
415
</listitem>
416
+
<listitem>
417
+
<para>
418
+
<literal>code-server</literal>-module now available
419
+
</para>
420
+
</listitem>
421
</itemizedlist>
422
</section>
423
<section xml:id="sec-release-21.11-incompatibilities">
+2
nixos/doc/manual/release-notes/rl-2111.section.md
+2
nixos/doc/manual/release-notes/rl-2111.section.md
···
124
125
- [rasdaemon](https://github.com/mchehab/rasdaemon), a hardware error logging daemon. Available as [hardware.rasdaemon](#opt-hardware.rasdaemon.enable).
126
127
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
128
129
- The `services.wakeonlan` option was removed, and replaced with `networking.interfaces.<name>.wakeOnLan`.
···
124
125
- [rasdaemon](https://github.com/mchehab/rasdaemon), a hardware error logging daemon. Available as [hardware.rasdaemon](#opt-hardware.rasdaemon.enable).
126
127
+
- `code-server`-module now available
128
+
129
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
130
131
- The `services.wakeonlan` option was removed, and replaced with `networking.interfaces.<name>.wakeOnLan`.
+1
nixos/modules/module-list.nix
+1
nixos/modules/module-list.nix
+139
nixos/modules/services/web-apps/code-server.nix
+139
nixos/modules/services/web-apps/code-server.nix
···
···
1
+
{ config, lib, pkgs, ... }:
2
+
3
+
with lib;
4
+
let
5
+
6
+
cfg = config.services.code-server;
7
+
defaultUser = "code-server";
8
+
defaultGroup = defaultUser;
9
+
10
+
in {
11
+
###### interface
12
+
options = {
13
+
services.code-server = {
14
+
enable = mkEnableOption "code-server";
15
+
16
+
package = mkOption {
17
+
default = pkgs.code-server;
18
+
defaultText = "pkgs.code-server";
19
+
description = "Which code-server derivation to use.";
20
+
type = types.package;
21
+
};
22
+
23
+
extraPackages = mkOption {
24
+
default = [ ];
25
+
description = "Packages that are available in the PATH of code-server.";
26
+
example = "[ pkgs.go ]";
27
+
type = types.listOf types.package;
28
+
};
29
+
30
+
extraEnvironment = mkOption {
31
+
type = types.attrsOf types.str;
32
+
description =
33
+
"Additional environment variables to passed to code-server.";
34
+
default = { };
35
+
example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; };
36
+
};
37
+
38
+
extraArguments = mkOption {
39
+
default = [ "--disable-telemetry" ];
40
+
description = "Additional arguments that passed to code-server";
41
+
example = ''[ "--verbose" ]'';
42
+
type = types.listOf types.str;
43
+
};
44
+
45
+
host = mkOption {
46
+
default = "127.0.0.1";
47
+
description = "The host-ip to bind to.";
48
+
type = types.str;
49
+
};
50
+
51
+
port = mkOption {
52
+
default = 4444;
53
+
description = "The port where code-server runs.";
54
+
type = types.port;
55
+
};
56
+
57
+
auth = mkOption {
58
+
default = "password";
59
+
description = "The type of authentication to use.";
60
+
type = types.enum [ "none" "password" ];
61
+
};
62
+
63
+
hashedPassword = mkOption {
64
+
default = "";
65
+
description =
66
+
"Create the password with: 'echo -n 'thisismypassword' | npx argon2-cli -e'.";
67
+
type = types.str;
68
+
};
69
+
70
+
user = mkOption {
71
+
default = defaultUser;
72
+
example = "yourUser";
73
+
description = ''
74
+
The user to run code-server as.
75
+
By default, a user named <literal>${defaultUser}</literal> will be created.
76
+
'';
77
+
type = types.str;
78
+
};
79
+
80
+
group = mkOption {
81
+
default = defaultGroup;
82
+
example = "yourGroup";
83
+
description = ''
84
+
The group to run code-server under.
85
+
By default, a group named <literal>${defaultGroup}</literal> will be created.
86
+
'';
87
+
type = types.str;
88
+
};
89
+
90
+
extraGroups = mkOption {
91
+
default = [ ];
92
+
description =
93
+
"An array of additional groups for the <literal>${defaultUser}</literal> user.";
94
+
example = [ "docker" ];
95
+
type = types.listOf types.str;
96
+
};
97
+
98
+
};
99
+
};
100
+
101
+
###### implementation
102
+
config = mkIf cfg.enable {
103
+
systemd.services.code-server = {
104
+
description = "VSCode server";
105
+
wantedBy = [ "multi-user.target" ];
106
+
after = [ "network-online.target" ];
107
+
path = cfg.extraPackages;
108
+
environment = {
109
+
HASHED_PASSWORD = cfg.hashedPassword;
110
+
} // cfg.extraEnvironment;
111
+
serviceConfig = {
112
+
ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + builtins.concatStringsSep " " cfg.extraArguments;
113
+
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
114
+
RuntimeDirectory = cfg.user;
115
+
User = cfg.user;
116
+
Group = cfg.group;
117
+
Restart = "on-failure";
118
+
};
119
+
120
+
};
121
+
122
+
users.users."${cfg.user}" = mkMerge [
123
+
(mkIf (cfg.user == defaultUser) {
124
+
isNormalUser = true;
125
+
description = "code-server user";
126
+
inherit (cfg) group;
127
+
})
128
+
{
129
+
packages = cfg.extraPackages;
130
+
inherit (cfg) extraGroups;
131
+
}
132
+
];
133
+
134
+
users.groups."${defaultGroup}" = mkIf (cfg.group == defaultGroup) { };
135
+
136
+
};
137
+
138
+
meta.maintainers = with maintainers; [ stackshadow ];
139
+
}
+148
pkgs/applications/audio/tenacity/default.nix
+148
pkgs/applications/audio/tenacity/default.nix
···
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromSourcehut
4
+
, cmake
5
+
, wxGTK
6
+
, pkg-config
7
+
, python3
8
+
, gettext
9
+
, glib
10
+
, file
11
+
, lame
12
+
, libvorbis
13
+
, libmad
14
+
, libjack2
15
+
, lv2
16
+
, lilv
17
+
, makeWrapper
18
+
, serd
19
+
, sord
20
+
, sqlite
21
+
, sratom
22
+
, suil
23
+
, alsa-lib
24
+
, libsndfile
25
+
, soxr
26
+
, flac
27
+
, twolame
28
+
, expat
29
+
, libid3tag
30
+
, libopus
31
+
, ffmpeg
32
+
, soundtouch
33
+
, pcre
34
+
, portaudio
35
+
, linuxHeaders
36
+
, at-spi2-core
37
+
, dbus
38
+
, epoxy
39
+
, libXdmcp
40
+
, libXtst
41
+
, libpthreadstubs
42
+
, libselinux
43
+
, libsepol
44
+
, libxkbcommon
45
+
, util-linux
46
+
}:
47
+
48
+
stdenv.mkDerivation rec {
49
+
pname = "tenacity";
50
+
version = "unstable-2021-10-18";
51
+
52
+
src = fetchFromSourcehut {
53
+
owner = "~tenacity";
54
+
repo = "tenacity";
55
+
rev = "697c0e764ccb19c1e2f3073ae08ecdac7aa710e4";
56
+
sha256 = "1fc9xz8lyl8si08wkzncpxq92vizan60c3640qr4kbnxg7vi2iy4";
57
+
};
58
+
59
+
postPatch = ''
60
+
touch src/RevisionIdent.h
61
+
62
+
substituteInPlace src/FileNames.cpp \
63
+
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
64
+
'';
65
+
66
+
postFixup = ''
67
+
rm $out/tenacity
68
+
wrapProgram "$out/bin/tenacity" \
69
+
--suffix AUDACITY_PATH : "$out/share/tenacity" \
70
+
--suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \
71
+
--prefix LD_LIBRARY_PATH : "$out/lib/tenacity" \
72
+
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
73
+
'';
74
+
75
+
NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\"";
76
+
77
+
# tenacity only looks for ffmpeg at runtime, so we need to link it in manually
78
+
NIX_LDFLAGS = toString [
79
+
"-lavcodec"
80
+
"-lavdevice"
81
+
"-lavfilter"
82
+
"-lavformat"
83
+
"-lavresample"
84
+
"-lavutil"
85
+
"-lpostproc"
86
+
"-lswresample"
87
+
"-lswscale"
88
+
];
89
+
90
+
nativeBuildInputs = [
91
+
cmake
92
+
gettext
93
+
makeWrapper
94
+
pkg-config
95
+
python3
96
+
] ++ lib.optionals stdenv.isLinux [
97
+
linuxHeaders
98
+
];
99
+
100
+
buildInputs = [
101
+
alsa-lib
102
+
expat
103
+
ffmpeg
104
+
file
105
+
flac
106
+
glib
107
+
lame
108
+
libid3tag
109
+
libjack2
110
+
libmad
111
+
libopus
112
+
libsndfile
113
+
libvorbis
114
+
lilv
115
+
lv2
116
+
pcre
117
+
portaudio
118
+
serd
119
+
sord
120
+
soundtouch
121
+
soxr
122
+
sqlite
123
+
sratom
124
+
suil
125
+
twolame
126
+
wxGTK
127
+
wxGTK.gtk
128
+
] ++ lib.optionals stdenv.isLinux [
129
+
at-spi2-core
130
+
dbus
131
+
epoxy
132
+
libXdmcp
133
+
libXtst
134
+
libpthreadstubs
135
+
libxkbcommon
136
+
libselinux
137
+
libsepol
138
+
util-linux
139
+
];
140
+
141
+
meta = with lib; {
142
+
description = "Sound editor with graphical UI";
143
+
homepage = "https://tenacityaudio.org/";
144
+
license = licenses.gpl2Plus;
145
+
maintainers = with maintainers; [ irenes lheckemann ];
146
+
platforms = platforms.linux;
147
+
};
148
+
}
+2
-2
pkgs/applications/graphics/hydrus/default.nix
+2
-2
pkgs/applications/graphics/hydrus/default.nix
···
10
11
python3Packages.buildPythonPackage rec {
12
pname = "hydrus";
13
-
version = "458";
14
format = "other";
15
16
src = fetchFromGitHub {
17
owner = "hydrusnetwork";
18
repo = "hydrus";
19
rev = "v${version}";
20
-
sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro=";
21
};
22
23
nativeBuildInputs = [
···
10
11
python3Packages.buildPythonPackage rec {
12
pname = "hydrus";
13
+
version = "460";
14
format = "other";
15
16
src = fetchFromGitHub {
17
owner = "hydrusnetwork";
18
repo = "hydrus";
19
rev = "v${version}";
20
+
sha256 = "sha256-cIvidbvMAWVs/XnS7I5ZQkuya9lfuRPNCRSTbFnKhSw=";
21
};
22
23
nativeBuildInputs = [
+3
-3
pkgs/applications/networking/cluster/kube-score/default.nix
+3
-3
pkgs/applications/networking/cluster/kube-score/default.nix
···
2
3
buildGoModule rec {
4
pname = "kube-score";
5
-
version = "1.12.0";
6
7
src = fetchFromGitHub {
8
owner = "zegl";
9
repo = pname;
10
rev = "v${version}";
11
-
sha256 = "sha256-FZbq7f8Urx3tlJOBPnPyp1enFsmtrxqNjR42CTNo6GI=";
12
};
13
14
-
vendorSha256 = "sha256-8Rg57Uj/hdNqAj40MKZ/5PObRkdsInbsRT1ZkRqGTfo=";
15
16
meta = with lib; {
17
description = "Kubernetes object analysis with recommendations for improved reliability and security";
···
2
3
buildGoModule rec {
4
pname = "kube-score";
5
+
version = "1.13.0";
6
7
src = fetchFromGitHub {
8
owner = "zegl";
9
repo = pname;
10
rev = "v${version}";
11
+
sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos=";
12
};
13
14
+
vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo=";
15
16
meta = with lib; {
17
description = "Kubernetes object analysis with recommendations for improved reliability and security";
+2
-2
pkgs/applications/networking/cluster/kubeconform/default.nix
+2
-2
pkgs/applications/networking/cluster/kubeconform/default.nix
+107
-98
pkgs/applications/video/mpv/default.nix
+107
-98
pkgs/applications/video/mpv/default.nix
···
1
-
{ config, lib, stdenv, fetchFromGitHub, fetchpatch
2
-
, addOpenGLRunpath, docutils, perl, pkg-config, python3, wafHook, which
3
-
, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
4
-
, nv-codec-headers, lua, libuchardet, libiconv ? null
5
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
6
7
, waylandSupport ? stdenv.isLinux
···
30
, libdrm ? null
31
, mesa ? null
32
33
-
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
34
, archiveSupport ? true, libarchive ? null
35
, bluraySupport ? true, libbluray ? null
36
, bs2bSupport ? true, libbs2b ? null
···
95
96
in stdenv.mkDerivation rec {
97
pname = "mpv";
98
-
version = "0.33.1";
99
100
-
outputs = [ "out" "dev" ];
101
102
src = fetchFromGitHub {
103
-
owner = "mpv-player";
104
-
repo = "mpv";
105
-
rev = "v${version}";
106
-
sha256 = "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45";
107
};
108
109
-
patches = [
110
-
# To make mpv build with libplacebo 3.104.0:
111
-
(fetchpatch { # vo_gpu: placebo: update for upstream API changes
112
-
url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch";
113
-
sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx";
114
-
})
115
-
# TOREMOVE when > 0.33.1
116
-
# youtube-dl has been abandonned and is now unusable w/
117
-
# youtube.com. Mpv migrated to yt-dlp since the 0.33.1 but did not
118
-
# cut a new release yet. See
119
-
# https://github.com/mpv-player/mpv/pull/9209
120
-
(fetchpatch {
121
-
url = "https://github.com/mpv-player/mpv/commit/d1c92bfd79ef81ac804fcc20aee2ed24e8d587aa.patch";
122
-
sha256 = "1dwxzng3gsrx0gjljm5jmfcjz3pzdss9z2l0n25rmmb4nbcrcx1f";
123
-
})
124
-
];
125
-
126
postPatch = ''
127
patchShebangs ./TOOLS/
128
'';
129
-
130
-
passthru = {
131
-
inherit
132
-
# The wrapper consults luaEnv and lua.version
133
-
luaEnv
134
-
lua
135
-
# In the wrapper, we want to reference vapoursynth which has the
136
-
# `python3` passthru attribute (which has the `sitePrefix`
137
-
# attribute). This way we'll be sure that in the wrapper we'll
138
-
# use the same python3.sitePrefix used to build vapoursynth.
139
-
vapoursynthSupport
140
-
vapoursynth
141
-
;
142
-
};
143
-
144
-
NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext "
145
-
+ optionalString stdenv.isDarwin "-framework CoreFoundation";
146
147
wafConfigureFlags = [
148
"--enable-libmpv-shared"
···
150
"--disable-libmpv-static"
151
"--disable-static-build"
152
"--disable-build-date" # Purity
153
-
(enableFeature archiveSupport "libarchive")
154
-
(enableFeature cddaSupport "cdda")
155
-
(enableFeature dvdnavSupport "dvdnav")
156
-
(enableFeature openalSupport "openal")
157
-
(enableFeature sdl2Support "sdl2")
158
-
(enableFeature sixelSupport "sixel")
159
-
(enableFeature vaapiSupport "vaapi")
160
-
(enableFeature waylandSupport "wayland")
161
-
(enableFeature stdenv.isLinux "dvbin")
162
] # Disable whilst Swift isn't supported
163
++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb";
164
165
nativeBuildInputs = [
166
-
addOpenGLRunpath docutils perl pkg-config python3 wafHook which
167
-
] ++ optional swiftSupport swift;
168
169
buildInputs = [
170
-
ffmpeg freetype libass libpthreadstubs
171
-
luaEnv libuchardet mujs
172
-
] ++ optional alsaSupport alsa-lib
173
-
++ optional archiveSupport libarchive
174
-
++ optional bluraySupport libbluray
175
-
++ optional bs2bSupport libbs2b
176
-
++ optional cacaSupport libcaca
177
-
++ optional cmsSupport lcms2
178
-
++ optional jackaudioSupport libjack2
179
-
++ optional libpngSupport libpng
180
-
++ optional openalSupport openalSoft
181
-
++ optional pulseSupport libpulseaudio
182
-
++ optional rubberbandSupport rubberband
183
-
++ optional screenSaverSupport libXScrnSaver
184
-
++ optional sdl2Support SDL2
185
-
++ optional sixelSupport libsixel
186
-
++ optional speexSupport speex
187
-
++ optional theoraSupport libtheora
188
-
++ optional vaapiSupport libva
189
-
++ optional vapoursynthSupport vapoursynth
190
-
++ optional vdpauSupport libvdpau
191
-
++ optional xineramaSupport libXinerama
192
-
++ optional xvSupport libXv
193
-
++ optional zimgSupport zimg
194
-
++ optional stdenv.isDarwin libiconv
195
-
++ optional stdenv.isLinux nv-codec-headers
196
-
++ optionals cddaSupport [ libcdio libcdio-paranoia ]
197
-
++ optionals drmSupport [ libdrm mesa ]
198
-
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
199
-
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
200
-
++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
201
-
++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
202
-
++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
203
204
enableParallelBuilding = true;
205
206
-
postBuild = optionalString stdenv.isDarwin ''
207
python3 TOOLS/osxbundle.py -s build/mpv
208
'';
209
···
219
220
substituteInPlace $out/lib/pkgconfig/mpv.pc \
221
--replace "$out/include" "$dev/include"
222
-
'' + optionalString stdenv.isDarwin ''
223
mkdir -p $out/Applications
224
cp -r build/mpv.app $out/Applications
225
'';
226
227
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
228
# See the explanation in addOpenGLRunpath.
229
-
postFixup = optionalString stdenv.isLinux ''
230
addOpenGLRunpath $out/bin/mpv
231
'';
232
233
meta = with lib; {
234
-
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
235
homepage = "https://mpv.io";
236
license = licenses.gpl2Plus;
237
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
238
platforms = platforms.darwin ++ platforms.linux;
239
240
-
longDescription = ''
241
-
mpv is a free and open-source general-purpose video player,
242
-
based on the MPlayer and mplayer2 projects, with great
243
-
improvements above both.
244
-
'';
245
};
246
}
···
1
+
{ config
2
+
, lib
3
+
, stdenv
4
+
, fetchFromGitHub
5
+
, fetchpatch
6
+
, addOpenGLRunpath
7
+
, docutils
8
+
, perl
9
+
, pkg-config
10
+
, python3
11
+
, wafHook
12
+
, which
13
+
, ffmpeg
14
+
, freefont_ttf
15
+
, freetype
16
+
, libass
17
+
, libpthreadstubs
18
+
, mujs
19
+
, nv-codec-headers
20
+
, lua
21
+
, libuchardet
22
+
, libiconv ? null
23
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
24
25
, waylandSupport ? stdenv.isLinux
···
48
, libdrm ? null
49
, mesa ? null
50
51
+
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
52
, archiveSupport ? true, libarchive ? null
53
, bluraySupport ? true, libbluray ? null
54
, bs2bSupport ? true, libbs2b ? null
···
113
114
in stdenv.mkDerivation rec {
115
pname = "mpv";
116
+
version = "0.34.0";
117
118
+
outputs = [ "out" "dev" "man" ];
119
120
src = fetchFromGitHub {
121
+
owner = "mpv-player";
122
+
repo = "mpv";
123
+
rev = "v${version}";
124
+
sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8=";
125
};
126
127
postPatch = ''
128
patchShebangs ./TOOLS/
129
'';
130
+
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "
131
+
+ lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
132
133
wafConfigureFlags = [
134
"--enable-libmpv-shared"
···
136
"--disable-libmpv-static"
137
"--disable-static-build"
138
"--disable-build-date" # Purity
139
+
(lib.enableFeature archiveSupport "libarchive")
140
+
(lib.enableFeature cddaSupport "cdda")
141
+
(lib.enableFeature dvdnavSupport "dvdnav")
142
+
(lib.enableFeature openalSupport "openal")
143
+
(lib.enableFeature sdl2Support "sdl2")
144
+
(lib.enableFeature sixelSupport "sixel")
145
+
(lib.enableFeature vaapiSupport "vaapi")
146
+
(lib.enableFeature waylandSupport "wayland")
147
+
(lib.enableFeature stdenv.isLinux "dvbin")
148
] # Disable whilst Swift isn't supported
149
++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb";
150
151
nativeBuildInputs = [
152
+
addOpenGLRunpath
153
+
docutils
154
+
perl
155
+
pkg-config
156
+
python3
157
+
wafHook
158
+
which
159
+
] ++ lib.optionals swiftSupport [ swift ];
160
161
buildInputs = [
162
+
ffmpeg
163
+
freetype
164
+
libass
165
+
libpthreadstubs
166
+
libuchardet
167
+
luaEnv
168
+
mujs
169
+
] ++ lib.optionals alsaSupport [ alsa-lib ]
170
+
++ lib.optionals archiveSupport [ libarchive ]
171
+
++ lib.optionals bluraySupport [ libbluray ]
172
+
++ lib.optionals bs2bSupport [ libbs2b ]
173
+
++ lib.optionals cacaSupport [ libcaca ]
174
+
++ lib.optionals cddaSupport [ libcdio libcdio-paranoia ]
175
+
++ lib.optionals cmsSupport [ lcms2 ]
176
+
++ lib.optionals drmSupport [ libdrm mesa ]
177
+
++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
178
+
++ lib.optionals jackaudioSupport [ libjack2 ]
179
+
++ lib.optionals libpngSupport [ libpng ]
180
+
++ lib.optionals openalSupport [ openalSoft ]
181
+
++ lib.optionals pulseSupport [ libpulseaudio ]
182
+
++ lib.optionals rubberbandSupport [ rubberband ]
183
+
++ lib.optionals screenSaverSupport [ libXScrnSaver ]
184
+
++ lib.optionals sdl2Support [ SDL2 ]
185
+
++ lib.optionals sixelSupport [ libsixel ]
186
+
++ lib.optionals speexSupport [ speex ]
187
+
++ lib.optionals theoraSupport [ libtheora ]
188
+
++ lib.optionals vaapiSupport [ libva ]
189
+
++ lib.optionals vapoursynthSupport [ vapoursynth ]
190
+
++ lib.optionals vdpauSupport [ libvdpau ]
191
+
++ lib.optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
192
+
++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
193
+
++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
194
+
++ lib.optionals xineramaSupport [ libXinerama ]
195
+
++ lib.optionals xvSupport [ libXv ]
196
+
++ lib.optionals zimgSupport [ zimg ]
197
+
++ lib.optionals stdenv.isLinux [ nv-codec-headers ]
198
+
++ lib.optionals stdenv.isDarwin [ libiconv ]
199
+
++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
200
201
enableParallelBuilding = true;
202
203
+
postBuild = lib.optionalString stdenv.isDarwin ''
204
python3 TOOLS/osxbundle.py -s build/mpv
205
'';
206
···
216
217
substituteInPlace $out/lib/pkgconfig/mpv.pc \
218
--replace "$out/include" "$dev/include"
219
+
'' + lib.optionalString stdenv.isDarwin ''
220
mkdir -p $out/Applications
221
cp -r build/mpv.app $out/Applications
222
'';
223
224
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
225
# See the explanation in addOpenGLRunpath.
226
+
postFixup = lib.optionalString stdenv.isLinux ''
227
addOpenGLRunpath $out/bin/mpv
228
'';
229
230
meta = with lib; {
231
homepage = "https://mpv.io";
232
+
description = "General-purpose media player, fork of MPlayer and mplayer2";
233
+
longDescription = ''
234
+
mpv is a free and open-source general-purpose video player, based on the
235
+
MPlayer and mplayer2 projects, with great improvements above both.
236
+
'';
237
license = licenses.gpl2Plus;
238
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
239
platforms = platforms.darwin ++ platforms.linux;
240
+
};
241
242
+
passthru = {
243
+
inherit
244
+
# The wrapper consults luaEnv and lua.version
245
+
luaEnv
246
+
lua
247
+
# In the wrapper, we want to reference vapoursynth which has the `python3`
248
+
# passthru attribute (which has the `sitePrefix` attribute). This way we'll
249
+
# be sure that in the wrapper we'll use the same python3.sitePrefix used to
250
+
# build vapoursynth.
251
+
vapoursynthSupport
252
+
vapoursynth
253
+
;
254
};
255
}
+2
-2
pkgs/applications/video/mpv/wrapper.nix
+2
-2
pkgs/applications/video/mpv/wrapper.nix
···
1
# Arguments that this derivation gets when it is created with `callPackage`
2
{ stdenv
3
, lib
4
-
, symlinkJoin
5
, makeWrapper
6
, yt-dlp
7
}:
8
···
10
mpv:
11
12
let
13
-
# arguments to the function (called `wrapMpv` in all-packages.nix)
14
wrapper = {
15
extraMakeWrapperArgs ? [],
16
youtubeSupport ? true,
···
1
# Arguments that this derivation gets when it is created with `callPackage`
2
{ stdenv
3
, lib
4
, makeWrapper
5
+
, symlinkJoin
6
, yt-dlp
7
}:
8
···
10
mpv:
11
12
let
13
+
# arguments to the function (exposed as `wrapMpv` in all-packages.nix)
14
wrapper = {
15
extraMakeWrapperArgs ? [],
16
youtubeSupport ? true,
+2
-2
pkgs/development/libraries/openxr-loader/default.nix
+2
-2
pkgs/development/libraries/openxr-loader/default.nix
···
2
3
stdenv.mkDerivation rec {
4
pname = "openxr-loader";
5
-
version = "1.0.19";
6
7
src = fetchFromGitHub {
8
owner = "KhronosGroup";
9
repo = "OpenXR-SDK-Source";
10
rev = "release-${version}";
11
-
sha256 = "sha256-LEXxqzHzTadgK2PV9Wiud9MzblDHdF4L5T4fVydRJW8=";
12
};
13
14
nativeBuildInputs = [ cmake python3 ];
···
2
3
stdenv.mkDerivation rec {
4
pname = "openxr-loader";
5
+
version = "1.0.20";
6
7
src = fetchFromGitHub {
8
owner = "KhronosGroup";
9
repo = "OpenXR-SDK-Source";
10
rev = "release-${version}";
11
+
sha256 = "sha256-afyAHTyW9x2KxR1q/K3t5Dpv9OzATcYiSgiDn2S924E=";
12
};
13
14
nativeBuildInputs = [ cmake python3 ];
+2
-2
pkgs/development/libraries/science/math/osqp/default.nix
+2
-2
pkgs/development/libraries/science/math/osqp/default.nix
+1
pkgs/development/libraries/wolfssl/default.nix
+1
pkgs/development/libraries/wolfssl/default.nix
+2
-2
pkgs/development/tools/analysis/tfsec/default.nix
+2
-2
pkgs/development/tools/analysis/tfsec/default.nix
···
5
6
buildGoPackage rec {
7
pname = "tfsec";
8
+
version = "0.58.15";
9
10
src = fetchFromGitHub {
11
owner = "aquasecurity";
12
repo = pname;
13
rev = "v${version}";
14
+
sha256 = "102f984x6hpfjcshqd6s26c0lxjyr8rq6q4bwh9ymvrsxsylj3ng";
15
};
16
17
goPackagePath = "github.com/aquasecurity/tfsec";
+3
-3
pkgs/development/tools/pscale/default.nix
+3
-3
pkgs/development/tools/pscale/default.nix
···
2
3
buildGoModule rec {
4
pname = "pscale";
5
-
version = "0.76.0";
6
7
src = fetchFromGitHub {
8
owner = "planetscale";
9
repo = "cli";
10
rev = "v${version}";
11
-
sha256 = "sha256-yfTfWMyRo1QP0QCbJOxNC1eAYmJQ/yKvWjThXd7r7Bc=";
12
};
13
14
-
vendorSha256 = "sha256-dD+8ZraY0RvoGxJZSWG31Iif+R5CDNtQ9H7J8Ty0x7U=";
15
16
meta = with lib; {
17
homepage = "https://www.planetscale.com/";
···
2
3
buildGoModule rec {
4
pname = "pscale";
5
+
version = "0.85.0";
6
7
src = fetchFromGitHub {
8
owner = "planetscale";
9
repo = "cli";
10
rev = "v${version}";
11
+
sha256 = "sha256-I2t5tuBlO2RpY8+zWSTIDOziriqE6PGKVIwPdmvXuKo=";
12
};
13
14
+
vendorSha256 = "sha256-V7iXPM2WTR5zls/EFxpoLKrconP88om6y2CFNiuS6g4=";
15
16
meta = with lib; {
17
homepage = "https://www.planetscale.com/";
+18
-14
pkgs/misc/emulators/rpcs3/default.nix
+18
-14
pkgs/misc/emulators/rpcs3/default.nix
···
1
-
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git
2
-
, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng
3
-
, ffmpeg, libevdev, libusb1, zlib, curl, python3
4
, sdl2Support ? true, SDL2
5
, pulseaudioSupport ? true, libpulseaudio
6
, waylandSupport ? true, wayland
···
8
}:
9
10
let
11
-
majorVersion = "0.0.16";
12
-
gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
13
in
14
-
mkDerivation {
15
pname = "rpcs3";
16
version = "${majorVersion}-${gitVersion}";
17
18
src = fetchFromGitHub {
19
owner = "RPCS3";
20
repo = "rpcs3";
21
-
rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c";
22
fetchSubmodules = true;
23
-
sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd";
24
};
25
26
preConfigure = ''
27
cat > ./rpcs3/git-version.h <<EOF
28
#define RPCS3_GIT_VERSION "${gitVersion}"
···
38
"-DUSE_SYSTEM_LIBPNG=ON"
39
"-DUSE_SYSTEM_FFMPEG=ON"
40
"-DUSE_SYSTEM_CURL=ON"
41
-
# NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake
42
-
#"-DUSE_SYSTEM_WOLFSSL=ON"
43
"-DUSE_NATIVE_INSTRUCTIONS=OFF"
44
];
45
46
-
nativeBuildInputs = [ cmake pkg-config git ];
47
48
buildInputs = [
49
-
qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg
50
-
libevdev zlib libusb1 curl python3
51
] ++ lib.optional sdl2Support SDL2
52
++ lib.optional pulseaudioSupport libpulseaudio
53
++ lib.optional alsaSupport alsa-lib
···
56
meta = with lib; {
57
description = "PS3 emulator/debugger";
58
homepage = "https://rpcs3.net/";
59
-
maintainers = with maintainers; [ abbradar neonfuz ilian ];
60
license = licenses.gpl2Only;
61
platforms = [ "x86_64-linux" ];
62
};
···
1
+
{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
2
+
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
3
+
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
4
, sdl2Support ? true, SDL2
5
, pulseaudioSupport ? true, libpulseaudio
6
, waylandSupport ? true, wayland
···
8
}:
9
10
let
11
+
majorVersion = "0.0.19";
12
+
gitVersion = "12975-37383f421";
13
in
14
+
gcc11Stdenv.mkDerivation {
15
pname = "rpcs3";
16
version = "${majorVersion}-${gitVersion}";
17
18
src = fetchFromGitHub {
19
owner = "RPCS3";
20
repo = "rpcs3";
21
+
rev = "37383f4217e1c510a543e100d0ca495800b3361a";
22
fetchSubmodules = true;
23
+
sha256 = "1pm1r4j4cdcmr8xmslyv2n6iwcjldnr396by4r6lgf4mdlnwahhm";
24
};
25
26
+
passthru.updateScript = ./update.sh;
27
+
28
preConfigure = ''
29
cat > ./rpcs3/git-version.h <<EOF
30
#define RPCS3_GIT_VERSION "${gitVersion}"
···
40
"-DUSE_SYSTEM_LIBPNG=ON"
41
"-DUSE_SYSTEM_FFMPEG=ON"
42
"-DUSE_SYSTEM_CURL=ON"
43
+
"-DUSE_SYSTEM_WOLFSSL=ON"
44
+
"-DUSE_SYSTEM_FAUDIO=ON"
45
+
"-DUSE_SYSTEM_PUGIXML=ON"
46
+
"-DUSE_SYSTEM_FLATBUFFERS=ON"
47
"-DUSE_NATIVE_INSTRUCTIONS=OFF"
48
];
49
50
+
nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];
51
52
buildInputs = [
53
+
qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
54
+
libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers
55
] ++ lib.optional sdl2Support SDL2
56
++ lib.optional pulseaudioSupport libpulseaudio
57
++ lib.optional alsaSupport alsa-lib
···
60
meta = with lib; {
61
description = "PS3 emulator/debugger";
62
homepage = "https://rpcs3.net/";
63
+
maintainers = with maintainers; [ abbradar neonfuz ilian zane ];
64
license = licenses.gpl2Only;
65
platforms = [ "x86_64-linux" ];
66
};
+56
pkgs/misc/emulators/rpcs3/update.sh
+56
pkgs/misc/emulators/rpcs3/update.sh
···
···
1
+
#!/usr/bin/env nix-shell
2
+
#!nix-shell -i bash -p gnused jq nix-prefetch-git curl
3
+
4
+
set -eou pipefail
5
+
6
+
ROOT="$(dirname "$(readlink -f "$0")")"
7
+
if [[ ! "$(basename $ROOT)" == "rpcs3" || ! -f "$ROOT/default.nix" ]]; then
8
+
echo "ERROR: Not in the rpcs3 folder"
9
+
exit 1
10
+
fi
11
+
12
+
if [[ ! -v GITHUB_TOKEN ]]; then
13
+
echo "ERROR: \$GITHUB_TOKEN not set"
14
+
exit 1
15
+
fi
16
+
17
+
PAYLOAD=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <<EOF | curl -s -H "Authorization: bearer $GITHUB_TOKEN" -d '@-' https://api.github.com/graphql
18
+
{
19
+
repository(owner: "RPCS3", name: "rpcs3") {
20
+
branch: ref(qualifiedName: "refs/heads/master") {
21
+
target {
22
+
oid
23
+
... on Commit {
24
+
history {
25
+
totalCount
26
+
}
27
+
}
28
+
}
29
+
}
30
+
31
+
tag: refs(refPrefix: "refs/tags/", first: 1, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) {
32
+
nodes {
33
+
name
34
+
}
35
+
}
36
+
}
37
+
}
38
+
EOF
39
+
)
40
+
RPCS3_COMMIT=$(jq -r .data.repository.branch.target.oid <<< "$PAYLOAD")
41
+
RPCS3_MAJORVER=$(jq -r .data.repository.tag.nodes[0].name <<< "$PAYLOAD" | sed 's/^v//g')
42
+
RPCS3_COUNT=$(jq -r .data.repository.branch.target.history.totalCount <<< "$PAYLOAD")
43
+
44
+
RPCS3_GITVER="$RPCS3_COUNT-${RPCS3_COMMIT::9}"
45
+
echo "INFO: Latest commit is $RPCS3_COMMIT"
46
+
echo "INFO: Latest version is $RPCS3_MAJORVER-$RPCS3_GITVER"
47
+
48
+
RPCS3_SHA256=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$RPCS3_COMMIT" | jq -r .sha256)
49
+
echo "INFO: SHA256 is $RPCS3_SHA256"
50
+
51
+
sed -i -E \
52
+
-e "s/majorVersion\s+.+$/majorVersion = \"${RPCS3_MAJORVER}\";/g" \
53
+
-e "s/gitVersion\s+.+$/gitVersion = \"${RPCS3_GITVER}\";/g" \
54
+
-e "s/rev\s*=\s*\"[a-z0-9]+\";$/rev = \"${RPCS3_COMMIT}\";/g" \
55
+
-e "s/sha256\s*=\s*\"[a-z0-9]+\";$/sha256 = \"${RPCS3_SHA256}\";/g" \
56
+
"$ROOT/default.nix"
+3
-3
pkgs/misc/screensavers/pipes-rs/default.nix
+3
-3
pkgs/misc/screensavers/pipes-rs/default.nix
···
2
3
rustPlatform.buildRustPackage rec {
4
pname = "pipes-rs";
5
-
version = "1.4.5";
6
7
src = fetchFromGitHub {
8
owner = "lhvy";
9
repo = pname;
10
rev = "v${version}";
11
-
sha256 = "sha256-BC6QqSZ7siDVSO8oOH7DimTe6RFnCBygmvtPrQgsC/Q=";
12
};
13
14
-
cargoSha256 = "sha256-nctkc2vDE7WXm84g/EkGKc1/ju/Xy9d/nc8NPIVFl58=";
15
16
doInstallCheck = true;
17
···
2
3
rustPlatform.buildRustPackage rec {
4
pname = "pipes-rs";
5
+
version = "1.4.6";
6
7
src = fetchFromGitHub {
8
owner = "lhvy";
9
repo = pname;
10
rev = "v${version}";
11
+
sha256 = "sha256-HtwUYYQqldEtE9VkQAJscW8jp/u8Cb4/G5d2uqanOjI=";
12
};
13
14
+
cargoSha256 = "sha256-o/aPB0jfZfg2sDkgCBlLlCK3gbjjHZeiG8OxRXKXJyY=";
15
16
doInstallCheck = true;
17
+3
-3
pkgs/shells/nushell/default.nix
+3
-3
pkgs/shells/nushell/default.nix
···
18
19
rustPlatform.buildRustPackage rec {
20
pname = "nushell";
21
-
version = "0.38.0";
22
23
src = fetchFromGitHub {
24
owner = pname;
25
repo = pname;
26
rev = version;
27
-
sha256 = "155rn0balgikkhy77gbva6a88pgwm27flzgjyphiwzwnah1mmhca";
28
};
29
30
-
cargoSha256 = "1pk56s47mk0f8cww6h1y43jdnf311g35xynz1jvhrk31yyjhb0jl";
31
32
nativeBuildInputs = [ pkg-config ]
33
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
···
18
19
rustPlatform.buildRustPackage rec {
20
pname = "nushell";
21
+
version = "0.39.0";
22
23
src = fetchFromGitHub {
24
owner = pname;
25
repo = pname;
26
rev = version;
27
+
sha256 = "sha256-eN1tTKNuZMU3qObHaqq70bdkmZeAD6LNAQau9JGSXpE=";
28
};
29
30
+
cargoSha256 = "sha256-6TZz8b8fALPTDRxzp+7ZWCHjOwVtqRjdSO6aEwZcMnc=";
31
32
nativeBuildInputs = [ pkg-config ]
33
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
+3
-3
pkgs/tools/misc/lokalise2-cli/default.nix
+3
-3
pkgs/tools/misc/lokalise2-cli/default.nix
···
2
3
buildGoModule rec {
4
pname = "lokalise2-cli";
5
-
version = "2.6.7";
6
7
src = fetchFromGitHub {
8
owner = "lokalise";
9
repo = "lokalise-cli-2-go";
10
rev = "v${version}";
11
-
sha256 = "sha256-p3JvaDDebbIgOvTh0e7yYe3qOXvj1pLSG95hpK62M7s=";
12
};
13
14
-
vendorSha256 = "sha256-KJ8haktP9qoG5QsKnTOkvE8L+SQ9Z6hrsjUeS0wrdLs=";
15
16
doCheck = false;
17
···
2
3
buildGoModule rec {
4
pname = "lokalise2-cli";
5
+
version = "2.6.8";
6
7
src = fetchFromGitHub {
8
owner = "lokalise";
9
repo = "lokalise-cli-2-go";
10
rev = "v${version}";
11
+
sha256 = "sha256-U8XN7cH64ICVxcjmIWBeelOT3qQlGt6MhOPgUWkCPF0=";
12
};
13
14
+
vendorSha256 = "sha256-PM3Jjgq6mbM6iVCXRos9UsqqFNaXOqq713GZ2R9tQww=";
15
16
doCheck = false;
17
+3
-3
pkgs/tools/networking/oapi-codegen/default.nix
+3
-3
pkgs/tools/networking/oapi-codegen/default.nix
···
2
3
buildGoModule rec {
4
pname = "oapi-codegen";
5
-
version = "1.8.2";
6
7
src = fetchFromGitHub {
8
owner = "deepmap";
9
repo = pname;
10
rev = "v${version}";
11
-
sha256 = "sha256-8hyRuGKspWqv+uBeSz4i12Grl83EQVPWB1weEVf9yhA=";
12
};
13
14
-
vendorSha256 = "sha256-YCZzIsu1mMAAjLGHISrDkfY4Lx0az2SZV8bnZOMalx8=";
15
16
# Tests use network
17
doCheck = false;
···
2
3
buildGoModule rec {
4
pname = "oapi-codegen";
5
+
version = "1.8.3";
6
7
src = fetchFromGitHub {
8
owner = "deepmap";
9
repo = pname;
10
rev = "v${version}";
11
+
sha256 = "sha256-VAtfJ1PXTSPMoQ4NqX0GcZMyi15edxWj6Xsj6h1b7hc=";
12
};
13
14
+
vendorSha256 = "sha256-s6+Rs+G4z5fcmUiwGjeDoQYKWJz0a/PCejfKyn8WWxs=";
15
16
# Tests use network
17
doCheck = false;
+3
-3
pkgs/tools/networking/yggdrasil/default.nix
+3
-3
pkgs/tools/networking/yggdrasil/default.nix
···
2
3
buildGoModule rec {
4
pname = "yggdrasil";
5
-
version = "0.4.0";
6
7
src = fetchFromGitHub {
8
owner = "yggdrasil-network";
9
repo = "yggdrasil-go";
10
rev = "v${version}";
11
-
sha256 = "sha256-sMcbOTLdmAXp3U2XeNM0hrwOTjzr+9B6IvAaVbjhuFY=";
12
};
13
14
vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc=";
···
33
"An experiment in scalable routing as an encrypted IPv6 overlay network";
34
homepage = "https://yggdrasil-network.github.io/";
35
license = licenses.lgpl3;
36
-
maintainers = with maintainers; [ ehmry gazally lassulus ];
37
};
38
}
···
2
3
buildGoModule rec {
4
pname = "yggdrasil";
5
+
version = "0.4.2";
6
7
src = fetchFromGitHub {
8
owner = "yggdrasil-network";
9
repo = "yggdrasil-go";
10
rev = "v${version}";
11
+
sha256 = "sha256-5bx9KGZD7m+FX9hWU1pu8uJ2FU+P/TetRS3kJL5jhhI=";
12
};
13
14
vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc=";
···
33
"An experiment in scalable routing as an encrypted IPv6 overlay network";
34
homepage = "https://yggdrasil-network.github.io/";
35
license = licenses.lgpl3;
36
+
maintainers = with maintainers; [ bbigras ehmry gazally lassulus ];
37
};
38
}
+3
-3
pkgs/tools/package-management/nfpm/default.nix
+3
-3
pkgs/tools/package-management/nfpm/default.nix
···
2
3
buildGoModule rec {
4
pname = "nfpm";
5
-
version = "2.6.0";
6
7
src = fetchFromGitHub {
8
owner = "goreleaser";
9
repo = pname;
10
rev = "v${version}";
11
-
sha256 = "sha256-GKdfi4hdvpB9VY8VqGYNjTezmPxotrzL/XSm1H5VLQs=";
12
};
13
14
-
vendorSha256 = "sha256-APF6WHuH+YzgX3GbkSzZArGdiE7xPsLljEzCu96BvO4=";
15
16
doCheck = false;
17
···
2
3
buildGoModule rec {
4
pname = "nfpm";
5
+
version = "2.7.1";
6
7
src = fetchFromGitHub {
8
owner = "goreleaser";
9
repo = pname;
10
rev = "v${version}";
11
+
sha256 = "sha256-GKX+5N8BPm4VmI10mzPJORjwLpuOLLjO+Q+RNelKUVI=";
12
};
13
14
+
vendorSha256 = "sha256-NPMJ5sCdbfDraRoK5fSdaxMpYS2i8ir0cklGDoHNLAY=";
15
16
doCheck = false;
17
+2
-2
pkgs/tools/security/libtpms/default.nix
+2
-2
pkgs/tools/security/libtpms/default.nix
+2
-2
pkgs/tools/security/otpauth/default.nix
+2
-2
pkgs/tools/security/otpauth/default.nix
+7
-10
pkgs/tools/security/rbw/default.nix
+7
-10
pkgs/tools/security/rbw/default.nix
···
22
# pass-import
23
, withPass ? false
24
, pass
25
-
26
-
# git-credential-helper
27
-
, withGitCredential ? false
28
}:
29
30
rustPlatform.buildRustPackage rec {
···
47
48
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
49
50
-
postPatch = lib.optionalString withFzf ''
51
patchShebangs bin/rbw-fzf
52
substituteInPlace bin/rbw-fzf \
53
--replace fzf ${fzf}/bin/fzf \
···
61
patchShebangs bin/pass-import
62
substituteInPlace bin/pass-import \
63
--replace pass ${pass}/bin/pass
64
-
'' + lib.optionalString withGitCredential ''
65
-
patchShebangs bin/git-credential-rbw
66
-
substituteInPlace bin/git-credential-rbw \
67
-
--replace rbw $out/bin/rbw
68
'';
69
70
preConfigure = ''
···
77
$out/bin/rbw gen-completions $shell > rbw.$shell
78
installShellCompletion rbw.$shell
79
done
80
'' + lib.optionalString withFzf ''
81
cp bin/rbw-fzf $out/bin
82
'' + lib.optionalString withRofi ''
83
cp bin/rbw-rofi $out/bin
84
'' + lib.optionalString withPass ''
85
cp bin/pass-import $out/bin
86
-
'' + lib.optionalString withGitCredential ''
87
-
cp bin/git-credential-rbw $out/bin
88
'';
89
90
meta = with lib; {
···
22
# pass-import
23
, withPass ? false
24
, pass
25
}:
26
27
rustPlatform.buildRustPackage rec {
···
44
45
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
46
47
+
postPatch = ''
48
+
patchShebangs bin/git-credential-rbw
49
+
substituteInPlace bin/git-credential-rbw \
50
+
--replace rbw $out/bin/rbw
51
+
'' + lib.optionalString withFzf ''
52
patchShebangs bin/rbw-fzf
53
substituteInPlace bin/rbw-fzf \
54
--replace fzf ${fzf}/bin/fzf \
···
62
patchShebangs bin/pass-import
63
substituteInPlace bin/pass-import \
64
--replace pass ${pass}/bin/pass
65
'';
66
67
preConfigure = ''
···
74
$out/bin/rbw gen-completions $shell > rbw.$shell
75
installShellCompletion rbw.$shell
76
done
77
+
'' + ''
78
+
cp bin/git-credential-rbw $out/bin
79
'' + lib.optionalString withFzf ''
80
cp bin/rbw-fzf $out/bin
81
'' + lib.optionalString withRofi ''
82
cp bin/rbw-rofi $out/bin
83
'' + lib.optionalString withPass ''
84
cp bin/pass-import $out/bin
85
'';
86
87
meta = with lib; {
+2
pkgs/top-level/all-packages.nix
+2
pkgs/top-level/all-packages.nix
···
28242
28243
temporal = callPackage ../applications/networking/cluster/temporal { };
28244
28245
+
tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; };
28246
+
28247
tendermint = callPackage ../tools/networking/tendermint { };
28248
28249
termdbms = callPackage ../development/tools/database/termdbms { };