pyrox.dev
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
+1
-1
.github/CODEOWNERS
+1
-1
.github/CODEOWNERS
+4
.github/workflows/labels.yml
+4
.github/workflows/labels.yml
+2
.github/workflows/manual-nixos.yml
+2
.github/workflows/manual-nixos.yml
+2
.github/workflows/manual-nixpkgs.yml
+2
.github/workflows/manual-nixpkgs.yml
+2
-2
doc/builders/images.xml
+2
-2
doc/builders/images.xml
···
5
5
<para>
6
6
This chapter describes tools for creating various types of images.
7
7
</para>
8
-
<xi:include href="images/appimagetools.xml" />
8
+
<xi:include href="images/appimagetools.section.xml" />
9
9
<xi:include href="images/dockertools.section.xml" />
10
10
<xi:include href="images/ocitools.section.xml" />
11
-
<xi:include href="images/snaptools.xml" />
11
+
<xi:include href="images/snaptools.section.xml" />
12
12
</chapter>
+48
doc/builders/images/appimagetools.section.md
+48
doc/builders/images/appimagetools.section.md
···
1
+
# pkgs.appimageTools {#sec-pkgs-appimageTools}
2
+
3
+
`pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well.
4
+
5
+
::: warning
6
+
The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future.
7
+
:::
8
+
9
+
## AppImage formats {#ssec-pkgs-appimageTools-formats}
10
+
11
+
There are different formats for AppImages, see [the specification](https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format) for details.
12
+
13
+
- Type 1 images are ISO 9660 files that are also ELF executables.
14
+
- Type 2 images are ELF executables with an appended filesystem.
15
+
16
+
They can be told apart with `file -k`:
17
+
18
+
```ShellSession
19
+
$ file -k type1.AppImage
20
+
type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0,
21
+
spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data
22
+
23
+
$ file -k type2.AppImage
24
+
type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data
25
+
```
26
+
27
+
Note how the type 1 AppImage is described as an `ISO 9660 CD-ROM filesystem`, and the type 2 AppImage is not.
28
+
29
+
## Wrapping {#ssec-pkgs-appimageTools-wrapping}
30
+
31
+
Depending on the type of AppImage you're wrapping, you'll have to use `wrapType1` or `wrapType2`.
32
+
33
+
```nix
34
+
appimageTools.wrapType2 { # or wrapType1
35
+
name = "patchwork";
36
+
src = fetchurl {
37
+
url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
38
+
sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
39
+
};
40
+
extraPkgs = pkgs: with pkgs; [ ];
41
+
}
42
+
```
43
+
44
+
- `name` specifies the name of the resulting image.
45
+
- `src` specifies the AppImage file to extract.
46
+
- `extraPkgs` allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs:
47
+
- Looking through the extracted AppImage files, reading its scripts and running `patchelf` and `ldd` on its executables. This can also be done in `appimage-run`, by setting `APPIMAGE_DEBUG_EXEC=bash`.
48
+
- Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found.
-102
doc/builders/images/appimagetools.xml
-102
doc/builders/images/appimagetools.xml
···
1
-
<section xmlns="http://docbook.org/ns/docbook"
2
-
xmlns:xlink="http://www.w3.org/1999/xlink"
3
-
xmlns:xi="http://www.w3.org/2001/XInclude"
4
-
xml:id="sec-pkgs-appimageTools">
5
-
<title>pkgs.appimageTools</title>
6
-
7
-
<para>
8
-
<varname>pkgs.appimageTools</varname> is a set of functions for extracting and wrapping <link xlink:href="https://appimage.org/">AppImage</link> files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, <literal>pkgs.appimage-run</literal> can be used as well.
9
-
</para>
10
-
11
-
<warning>
12
-
<para>
13
-
The <varname>appimageTools</varname> API is unstable and may be subject to backwards-incompatible changes in the future.
14
-
</para>
15
-
</warning>
16
-
17
-
<section xml:id="ssec-pkgs-appimageTools-formats">
18
-
<title>AppImage formats</title>
19
-
20
-
<para>
21
-
There are different formats for AppImages, see <link xlink:href="https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format">the specification</link> for details.
22
-
</para>
23
-
24
-
<itemizedlist>
25
-
<listitem>
26
-
<para>
27
-
Type 1 images are ISO 9660 files that are also ELF executables.
28
-
</para>
29
-
</listitem>
30
-
<listitem>
31
-
<para>
32
-
Type 2 images are ELF executables with an appended filesystem.
33
-
</para>
34
-
</listitem>
35
-
</itemizedlist>
36
-
37
-
<para>
38
-
They can be told apart with <command>file -k</command>:
39
-
</para>
40
-
41
-
<screen>
42
-
<prompt>$ </prompt>file -k type1.AppImage
43
-
type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0,
44
-
spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data
45
-
46
-
<prompt>$ </prompt>file -k type2.AppImage
47
-
type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data
48
-
</screen>
49
-
50
-
<para>
51
-
Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM filesystem</literal>, and the type 2 AppImage is not.
52
-
</para>
53
-
</section>
54
-
55
-
<section xml:id="ssec-pkgs-appimageTools-wrapping">
56
-
<title>Wrapping</title>
57
-
58
-
<para>
59
-
Depending on the type of AppImage you're wrapping, you'll have to use <varname>wrapType1</varname> or <varname>wrapType2</varname>.
60
-
</para>
61
-
62
-
<programlisting>
63
-
appimageTools.wrapType2 { # or wrapType1
64
-
name = "patchwork"; <co xml:id='ex-appimageTools-wrapping-1' />
65
-
src = fetchurl { <co xml:id='ex-appimageTools-wrapping-2' />
66
-
url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
67
-
sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
68
-
};
69
-
extraPkgs = pkgs: with pkgs; [ ]; <co xml:id='ex-appimageTools-wrapping-3' />
70
-
}</programlisting>
71
-
72
-
<calloutlist>
73
-
<callout arearefs='ex-appimageTools-wrapping-1'>
74
-
<para>
75
-
<varname>name</varname> specifies the name of the resulting image.
76
-
</para>
77
-
</callout>
78
-
<callout arearefs='ex-appimageTools-wrapping-2'>
79
-
<para>
80
-
<varname>src</varname> specifies the AppImage file to extract.
81
-
</para>
82
-
</callout>
83
-
<callout arearefs='ex-appimageTools-wrapping-3'>
84
-
<para>
85
-
<varname>extraPkgs</varname> allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs:
86
-
<itemizedlist>
87
-
<listitem>
88
-
<para>
89
-
Looking through the extracted AppImage files, reading its scripts and running <command>patchelf</command> and <command>ldd</command> on its executables. This can also be done in <command>appimage-run</command>, by setting <command>APPIMAGE_DEBUG_EXEC=bash</command>.
90
-
</para>
91
-
</listitem>
92
-
<listitem>
93
-
<para>
94
-
Running <command>strace -vfefile</command> on the wrapped executable, looking for libraries that can't be found.
95
-
</para>
96
-
</listitem>
97
-
</itemizedlist>
98
-
</para>
99
-
</callout>
100
-
</calloutlist>
101
-
</section>
102
-
</section>
-28
doc/builders/images/snap/example-firefox.nix
-28
doc/builders/images/snap/example-firefox.nix
···
1
-
let
2
-
inherit (import <nixpkgs> { }) snapTools firefox;
3
-
in snapTools.makeSnap {
4
-
meta = {
5
-
name = "nix-example-firefox";
6
-
summary = firefox.meta.description;
7
-
architectures = [ "amd64" ];
8
-
apps.nix-example-firefox = {
9
-
command = "${firefox}/bin/firefox";
10
-
plugs = [
11
-
"pulseaudio"
12
-
"camera"
13
-
"browser-support"
14
-
"avahi-observe"
15
-
"cups-control"
16
-
"desktop"
17
-
"desktop-legacy"
18
-
"gsettings"
19
-
"home"
20
-
"network"
21
-
"mount-observe"
22
-
"removable-media"
23
-
"x11"
24
-
];
25
-
};
26
-
confinement = "strict";
27
-
};
28
-
}
-12
doc/builders/images/snap/example-hello.nix
-12
doc/builders/images/snap/example-hello.nix
···
1
-
let
2
-
inherit (import <nixpkgs> { }) snapTools hello;
3
-
in snapTools.makeSnap {
4
-
meta = {
5
-
name = "hello";
6
-
summary = hello.meta.description;
7
-
description = hello.meta.longDescription;
8
-
architectures = [ "amd64" ];
9
-
confinement = "strict";
10
-
apps.hello.command = "${hello}/bin/hello";
11
-
};
12
-
}
+71
doc/builders/images/snaptools.section.md
+71
doc/builders/images/snaptools.section.md
···
1
+
# pkgs.snapTools {#sec-pkgs-snapTools}
2
+
3
+
`pkgs.snapTools` is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
4
+
5
+
## The makeSnap Function {#ssec-pkgs-snapTools-makeSnap-signature}
6
+
7
+
`makeSnap` takes a single named argument, `meta`. This argument mirrors [the upstream `snap.yaml` format](https://docs.snapcraft.io/snap-format) exactly.
8
+
9
+
The `base` should not be specified, as `makeSnap` will force set it.
10
+
11
+
Currently, `makeSnap` does not support creating GUI stubs.
12
+
13
+
## Build a Hello World Snap {#ssec-pkgs-snapTools-build-a-snap-hello}
14
+
15
+
The following expression packages GNU Hello as a Snapcraft snap.
16
+
17
+
```{#ex-snapTools-buildSnap-hello .nix}
18
+
let
19
+
inherit (import <nixpkgs> { }) snapTools hello;
20
+
in snapTools.makeSnap {
21
+
meta = {
22
+
name = "hello";
23
+
summary = hello.meta.description;
24
+
description = hello.meta.longDescription;
25
+
architectures = [ "amd64" ];
26
+
confinement = "strict";
27
+
apps.hello.command = "${hello}/bin/hello";
28
+
};
29
+
}
30
+
```
31
+
32
+
`nix-build` this expression and install it with `snap install ./result --dangerous`. `hello` will now be the Snapcraft version of the package.
33
+
34
+
## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox}
35
+
36
+
Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
37
+
38
+
```{#ex-snapTools-buildSnap-firefox .nix}
39
+
let
40
+
inherit (import <nixpkgs> { }) snapTools firefox;
41
+
in snapTools.makeSnap {
42
+
meta = {
43
+
name = "nix-example-firefox";
44
+
summary = firefox.meta.description;
45
+
architectures = [ "amd64" ];
46
+
apps.nix-example-firefox = {
47
+
command = "${firefox}/bin/firefox";
48
+
plugs = [
49
+
"pulseaudio"
50
+
"camera"
51
+
"browser-support"
52
+
"avahi-observe"
53
+
"cups-control"
54
+
"desktop"
55
+
"desktop-legacy"
56
+
"gsettings"
57
+
"home"
58
+
"network"
59
+
"mount-observe"
60
+
"removable-media"
61
+
"x11"
62
+
];
63
+
};
64
+
confinement = "strict";
65
+
};
66
+
}
67
+
```
68
+
69
+
`nix-build` this expression and install it with `snap install ./result --dangerous`. `nix-example-firefox` will now be the Snapcraft version of the Firefox package.
70
+
71
+
The specific meaning behind plugs can be looked up in the [Snapcraft interface documentation](https://docs.snapcraft.io/supported-interfaces).
-59
doc/builders/images/snaptools.xml
-59
doc/builders/images/snaptools.xml
···
1
-
<section xmlns="http://docbook.org/ns/docbook"
2
-
xmlns:xlink="http://www.w3.org/1999/xlink"
3
-
xmlns:xi="http://www.w3.org/2001/XInclude"
4
-
xml:id="sec-pkgs-snapTools">
5
-
<title>pkgs.snapTools</title>
6
-
7
-
<para>
8
-
<varname>pkgs.snapTools</varname> is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
9
-
</para>
10
-
11
-
<section xml:id="ssec-pkgs-snapTools-makeSnap-signature">
12
-
<title>The makeSnap Function</title>
13
-
14
-
<para>
15
-
<function>makeSnap</function> takes a single named argument, <parameter>meta</parameter>. This argument mirrors <link xlink:href="https://docs.snapcraft.io/snap-format">the upstream <filename>snap.yaml</filename> format</link> exactly.
16
-
</para>
17
-
18
-
<para>
19
-
The <parameter>base</parameter> should not be specified, as <function>makeSnap</function> will force set it.
20
-
</para>
21
-
22
-
<para>
23
-
Currently, <function>makeSnap</function> does not support creating GUI stubs.
24
-
</para>
25
-
</section>
26
-
27
-
<section xml:id="ssec-pkgs-snapTools-build-a-snap-hello">
28
-
<title>Build a Hello World Snap</title>
29
-
30
-
<example xml:id="ex-snapTools-buildSnap-hello">
31
-
<title>Making a Hello World Snap</title>
32
-
<para>
33
-
The following expression packages GNU Hello as a Snapcraft snap.
34
-
</para>
35
-
<programlisting><xi:include href="./snap/example-hello.nix" parse="text" /></programlisting>
36
-
<para>
37
-
<command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. <command>hello</command> will now be the Snapcraft version of the package.
38
-
</para>
39
-
</example>
40
-
</section>
41
-
42
-
<section xml:id="ssec-pkgs-snapTools-build-a-snap-firefox">
43
-
<title>Build a Hello World Snap</title>
44
-
45
-
<example xml:id="ex-snapTools-buildSnap-firefox">
46
-
<title>Making a Graphical Snap</title>
47
-
<para>
48
-
Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
49
-
</para>
50
-
<programlisting><xi:include href="./snap/example-firefox.nix" parse="text" /></programlisting>
51
-
<para>
52
-
<command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. <command>nix-example-firefox</command> will now be the Snapcraft version of the Firefox package.
53
-
</para>
54
-
<para>
55
-
The specific meaning behind plugs can be looked up in the <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft interface documentation</link>.
56
-
</para>
57
-
</example>
58
-
</section>
59
-
</section>
+3
-1
lib/systems/doubles.nix
+3
-1
lib/systems/doubles.nix
···
33
33
"mmix-mmixware"
34
34
35
35
# NetBSD
36
-
"i686-netbsd" "x86_64-netbsd"
36
+
"aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd"
37
+
"i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd"
38
+
"riscv64-netbsd" "x86_64-netbsd"
37
39
38
40
# none
39
41
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
+3
-3
lib/tests/systems.nix
+3
-3
lib/tests/systems.nix
···
15
15
with lib.systems.doubles; lib.runTests {
16
16
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
17
17
18
-
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
18
+
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
19
19
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
20
-
testmips = mseteq mips [ "mipsel-linux" ];
20
+
testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ];
21
21
testmmix = mseteq mmix [ "mmix-mmixware" ];
22
22
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
23
23
···
29
29
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
30
30
testillumos = mseteq illumos [ "x86_64-solaris" ];
31
31
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ];
32
-
testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
32
+
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
33
33
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
34
34
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
35
35
testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);
+1
nixos/modules/module-list.nix
+1
nixos/modules/module-list.nix
+25
nixos/modules/programs/flexoptix-app.nix
+25
nixos/modules/programs/flexoptix-app.nix
···
1
+
{ config, pkgs, lib, ... }:
2
+
3
+
with lib;
4
+
5
+
let
6
+
cfg = config.programs.flexoptix-app;
7
+
in {
8
+
options = {
9
+
programs.flexoptix-app = {
10
+
enable = mkEnableOption "FLEXOPTIX app + udev rules";
11
+
12
+
package = mkOption {
13
+
description = "FLEXOPTIX app package to use";
14
+
type = types.package;
15
+
default = pkgs.flexoptix-app;
16
+
defaultText = "\${pkgs.flexoptix-app}";
17
+
};
18
+
};
19
+
};
20
+
21
+
config = mkIf cfg.enable {
22
+
environment.systemPackages = [ cfg.package ];
23
+
services.udev.packages = [ cfg.package ];
24
+
};
25
+
}
+1
-1
nixos/modules/services/monitoring/nagios.nix
+1
-1
nixos/modules/services/monitoring/nagios.nix
···
192
192
path = [ pkgs.nagios ] ++ cfg.plugins;
193
193
wantedBy = [ "multi-user.target" ];
194
194
after = [ "network.target" ];
195
+
restartTriggers = [ nagiosCfgFile ];
195
196
196
197
serviceConfig = {
197
198
User = "nagios";
···
201
202
LogsDirectory = "nagios";
202
203
StateDirectory = "nagios";
203
204
ExecStart = "${pkgs.nagios}/bin/nagios /etc/nagios.cfg";
204
-
X-ReloadIfChanged = nagiosCfgFile;
205
205
};
206
206
};
207
207
+12
-1
nixos/modules/services/web-apps/mastodon.nix
+12
-1
nixos/modules/services/web-apps/mastodon.nix
···
31
31
// (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {})
32
32
// cfg.extraConfig;
33
33
34
+
systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@resources" "@setuid" "@swap" ];
35
+
34
36
cfgService = {
35
37
# User and group
36
38
User = cfg.user;
···
68
70
PrivateMounts = true;
69
71
# System Call Filtering
70
72
SystemCallArchitectures = "native";
71
-
SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap";
72
73
};
73
74
74
75
envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") (
···
432
433
serviceConfig = {
433
434
Type = "oneshot";
434
435
WorkingDirectory = cfg.package;
436
+
# System Call Filtering
437
+
SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
435
438
} // cfgService;
436
439
437
440
after = [ "network.target" ];
···
457
460
Type = "oneshot";
458
461
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
459
462
WorkingDirectory = cfg.package;
463
+
# System Call Filtering
464
+
SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
460
465
} // cfgService;
461
466
after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []);
462
467
wantedBy = [ "multi-user.target" ];
···
481
486
# Runtime directory and mode
482
487
RuntimeDirectory = "mastodon-streaming";
483
488
RuntimeDirectoryMode = "0750";
489
+
# System Call Filtering
490
+
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
484
491
} // cfgService;
485
492
};
486
493
···
503
510
# Runtime directory and mode
504
511
RuntimeDirectory = "mastodon-web";
505
512
RuntimeDirectoryMode = "0750";
513
+
# System Call Filtering
514
+
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
506
515
} // cfgService;
507
516
path = with pkgs; [ file imagemagick ffmpeg ];
508
517
};
···
522
531
RestartSec = 20;
523
532
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
524
533
WorkingDirectory = cfg.package;
534
+
# System Call Filtering
535
+
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
525
536
} // cfgService;
526
537
path = with pkgs; [ file imagemagick ffmpeg ];
527
538
};
+1
nixos/modules/services/web-servers/nginx/default.nix
+1
nixos/modules/services/web-servers/nginx/default.nix
+5
-1
nixos/tests/prometheus-exporters.nix
+5
-1
nixos/tests/prometheus-exporters.nix
···
118
118
metricProvider = {
119
119
services.bird2.enable = true;
120
120
services.bird2.config = ''
121
+
router id 127.0.0.1;
122
+
121
123
protocol kernel MyObviousTestString {
122
124
ipv4 {
123
125
import all;
···
132
134
exporterTest = ''
133
135
wait_for_unit("prometheus-bird-exporter.service")
134
136
wait_for_open_port(9324)
135
-
succeed("curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'")
137
+
wait_until_succeeds(
138
+
"curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'"
139
+
)
136
140
'';
137
141
};
138
142
+2
-4
pkgs/applications/audio/pulseeffects/default.nix
+2
-4
pkgs/applications/audio/pulseeffects/default.nix
···
46
46
];
47
47
in stdenv.mkDerivation rec {
48
48
pname = "pulseeffects";
49
-
# 5.0.3 crashes. Test carefully before updating.
50
-
# https://github.com/wwmm/pulseeffects/issues/927
51
-
version = "5.0.2";
49
+
version = "5.0.3";
52
50
53
51
src = fetchFromGitHub {
54
52
owner = "wwmm";
55
53
repo = "pulseeffects";
56
54
rev = "v${version}";
57
-
sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm";
55
+
sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx";
58
56
};
59
57
60
58
nativeBuildInputs = [
+29
pkgs/applications/graphics/pixelnuke/default.nix
+29
pkgs/applications/graphics/pixelnuke/default.nix
···
1
+
{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }:
2
+
3
+
stdenv.mkDerivation {
4
+
pname = "pixelnuke";
5
+
version = "unstable-2019-05-19";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "defnull";
9
+
repo = "pixelflut";
10
+
rev = "3458157a242ba1789de7ce308480f4e1cbacc916";
11
+
sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40";
12
+
};
13
+
14
+
sourceRoot = "source/pixelnuke";
15
+
16
+
buildInputs = [ libevent glew glfw ];
17
+
18
+
installPhase = ''
19
+
install -Dm755 ./pixelnuke $out/bin/pixelnuke
20
+
'';
21
+
22
+
meta = with lib; {
23
+
description = "Multiplayer canvas (C implementation)";
24
+
homepage = "https://cccgoe.de/wiki/Pixelflut";
25
+
license = licenses.unlicense;
26
+
platforms = platforms.linux;
27
+
maintainers = with maintainers; [ mrVanDalo ];
28
+
};
29
+
}
+11
-19
pkgs/applications/networking/browsers/chromium/common.nix
+11
-19
pkgs/applications/networking/browsers/chromium/common.nix
···
110
110
buildPath = "out/${buildType}";
111
111
libExecPath = "$out/libexec/${packageName}";
112
112
113
+
warnObsoleteVersionConditional = min-version: result:
114
+
let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
115
+
in if versionAtLeast ungoogled-version min-version
116
+
then warn "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
117
+
result
118
+
else result;
113
119
chromiumVersionAtLeast = min-version:
114
-
versionAtLeast upstream-info.version min-version;
120
+
let result = versionAtLeast upstream-info.version min-version;
121
+
in warnObsoleteVersionConditional min-version result;
115
122
versionRange = min-version: upto-version:
116
123
let inherit (upstream-info) version;
117
124
result = versionAtLeast version min-version && versionOlder version upto-version;
118
-
ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
119
-
in if versionAtLeast ungoogled-version upto-version
120
-
then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
121
-
result
122
-
else result;
125
+
in warnObsoleteVersionConditional upto-version result;
123
126
124
127
ungoogler = ungoogled-chromium {
125
128
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
···
162
165
patches = [
163
166
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
164
167
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
165
-
# ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
166
-
] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch
167
-
# To fix the build of chromiumBeta and chromiumDev:
168
-
"b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs
169
-
"1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x"
170
-
) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch {
171
-
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
172
-
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
173
-
}) ++ optional (chromiumVersionAtLeast "90")
168
+
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
174
169
./patches/fix-missing-atspi2-dependency.patch
175
-
++ optionals (chromiumVersionAtLeast "91") [
170
+
] ++ optionals (chromiumVersionAtLeast "91") [
176
171
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
177
172
];
178
173
···
285
280
} // optionalAttrs pulseSupport {
286
281
use_pulseaudio = true;
287
282
link_pulseaudio = true;
288
-
} // optionalAttrs (chromiumVersionAtLeast "89") {
289
-
rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90
290
283
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
291
284
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
292
285
chrome_pgo_phase = 0;
293
-
} // optionalAttrs (chromiumVersionAtLeast "90") {
294
286
# Disable build with TFLite library because it fails without additional changes:
295
287
# ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it
296
288
# Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz
+8
-8
pkgs/applications/networking/browsers/chromium/upstream-info.json
+8
-8
pkgs/applications/networking/browsers/chromium/upstream-info.json
···
44
44
}
45
45
},
46
46
"ungoogled-chromium": {
47
-
"version": "89.0.4389.114",
48
-
"sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j",
49
-
"sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a",
47
+
"version": "90.0.4430.85",
48
+
"sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
49
+
"sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir",
50
50
"deps": {
51
51
"gn": {
52
-
"version": "2021-01-07",
52
+
"version": "2021-02-09",
53
53
"url": "https://gn.googlesource.com/gn",
54
-
"rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
55
-
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
54
+
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
55
+
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
56
56
},
57
57
"ungoogled-patches": {
58
-
"rev": "89.0.4389.114-1",
59
-
"sha256": "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s"
58
+
"rev": "90.0.4430.85-1",
59
+
"sha256": "04nrx6fgkizmza50xj236m4rb1j8yaw0cw5790df1vlmbsc81667"
60
60
}
61
61
}
62
62
}
+6
-4
pkgs/applications/networking/cluster/terraform-providers/providers.json
+6
-4
pkgs/applications/networking/cluster/terraform-providers/providers.json
···
823
823
"version": "1.5.0"
824
824
},
825
825
"rancher2": {
826
-
"owner": "terraform-providers",
826
+
"owner": "rancher",
827
+
"provider-source-address": "registry.terraform.io/hashicorp/rancher2",
827
828
"repo": "terraform-provider-rancher2",
828
-
"rev": "v1.8.3",
829
-
"sha256": "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna",
830
-
"version": "1.8.3"
829
+
"rev": "v1.13.0",
830
+
"sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89",
831
+
"vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c",
832
+
"version": "1.13.0"
831
833
},
832
834
"random": {
833
835
"owner": "hashicorp",
+2
-2
pkgs/applications/radio/airspy/default.nix
+2
-2
pkgs/applications/radio/airspy/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "airspy";
7
-
version = "1.0.9";
7
+
version = "1.0.10";
8
8
9
9
src = fetchFromGitHub {
10
10
owner = "airspy";
11
11
repo = "airspyone_host";
12
12
rev = "v${version}";
13
-
sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
13
+
sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9";
14
14
};
15
15
16
16
postPatch = ''
+12
-7
pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
+12
-7
pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
···
1
-
{ lib, buildGoPackage, fetchFromGitHub }:
1
+
{ lib, fetchFromGitHub, buildGoModule }:
2
2
3
-
buildGoPackage rec {
3
+
buildGoModule rec {
4
4
pname = "git-chglog";
5
-
version = "0.9.1";
6
-
7
-
goPackagePath = "github.com/git-chglog/git-chglog";
5
+
version = "0.14.2";
8
6
9
7
src = fetchFromGitHub {
10
8
owner = "git-chglog";
11
9
repo = "git-chglog";
12
-
rev = version;
13
-
sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p";
10
+
rev = "v${version}";
11
+
sha256 = "124bqywkj37gv61fswgrg528bf3rjqms1664x22lkn0sqh22zyv1";
14
12
};
15
13
14
+
vendorSha256 = "09zjypmcc3ra7sw81q1pbbrlpxxp4k00p1cfkrrih8wvb25z89h5";
15
+
16
+
buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ];
17
+
18
+
subPackages = [ "cmd/git-chglog" ];
19
+
16
20
meta = with lib; {
17
21
description = "CHANGELOG generator implemented in Go (Golang)";
22
+
homepage = "https://github.com/git-chglog/git-chglog";
18
23
license = licenses.mit;
19
24
maintainers = with maintainers; [ ldenefle ];
20
25
};
+2
-2
pkgs/applications/video/mkvtoolnix/default.nix
+2
-2
pkgs/applications/video/mkvtoolnix/default.nix
···
13
13
14
14
stdenv.mkDerivation rec {
15
15
pname = "mkvtoolnix";
16
-
version = "55.0.0";
16
+
version = "56.0.0";
17
17
18
18
src = fetchFromGitLab {
19
19
owner = "mbunkus";
20
20
repo = "mkvtoolnix";
21
21
rev = "release-${version}";
22
-
sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7";
22
+
sha256 = "0nhpp1zkggxqjj7lhj6as5mcjcz5yk3l1d1xcgs7i9153blam1yj";
23
23
};
24
24
25
25
nativeBuildInputs = [
+27
pkgs/applications/window-managers/i3/workstyle.nix
+27
pkgs/applications/window-managers/i3/workstyle.nix
···
1
+
{ lib
2
+
, rustPlatform
3
+
, fetchFromGitHub
4
+
}:
5
+
6
+
rustPlatform.buildRustPackage rec {
7
+
pname = "workstyle";
8
+
version = "0.2.1";
9
+
10
+
src = fetchFromGitHub {
11
+
owner = "pierrechevalier83";
12
+
repo = pname;
13
+
rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9";
14
+
sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn";
15
+
};
16
+
17
+
cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54";
18
+
19
+
doCheck = false; # No tests
20
+
21
+
meta = with lib; {
22
+
description = "Sway workspaces with style";
23
+
homepage = "https://github.com/pierrechevalier83/workstyle";
24
+
license = licenses.mit;
25
+
maintainers = with maintainers; [ FlorianFranzen ];
26
+
};
27
+
}
+6
-3
pkgs/desktops/mate/atril/default.nix
+6
-3
pkgs/desktops/mate/atril/default.nix
···
17
17
, enablePostScript ? true, libspectre
18
18
, enableXps ? true, libgxps
19
19
, enableImages ? false
20
+
, mateUpdateScript
20
21
}:
21
22
22
23
with lib;
23
24
24
25
stdenv.mkDerivation rec {
25
26
pname = "atril";
26
-
version = "1.24.0";
27
+
version = "1.24.1";
27
28
28
29
src = fetchurl {
29
30
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
30
-
sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y";
31
+
sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl";
31
32
};
32
33
33
34
nativeBuildInputs = [
···
67
68
68
69
enableParallelBuilding = true;
69
70
71
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
72
+
70
73
meta = with lib; {
71
74
description = "A simple multi-page document viewer for the MATE desktop";
72
75
homepage = "https://mate-desktop.org";
73
-
license = licenses.gpl2;
76
+
license = licenses.gpl2Plus;
74
77
platforms = platforms.unix;
75
78
maintainers = [ maintainers.romildo ];
76
79
};
+4
-2
pkgs/desktops/mate/caja-dropbox/default.nix
+4
-2
pkgs/desktops/mate/caja-dropbox/default.nix
···
1
1
{ lib, stdenv, fetchurl, substituteAll
2
2
, pkg-config, gobject-introspection, gdk-pixbuf
3
-
, gtk3, mate, python3, dropbox }:
3
+
, gtk3, mate, python3, dropbox, mateUpdateScript }:
4
4
5
5
let
6
6
dropboxd = "${dropbox}/bin/dropbox";
···
43
43
44
44
enableParallelBuilding = true;
45
45
46
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
47
+
46
48
meta = with lib; {
47
49
description = "Dropbox extension for Caja file manager";
48
50
homepage = "https://github.com/mate-desktop/caja-dropbox";
49
-
license = with licenses; [ gpl3 cc-by-nd-30 ];
51
+
license = with licenses; [ gpl3Plus cc-by-nd-30 ];
50
52
platforms = platforms.unix;
51
53
maintainers = [ maintainers.romildo ];
52
54
};
+4
-2
pkgs/desktops/mate/caja-extensions/default.nix
+4
-2
pkgs/desktops/mate/caja-extensions/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "caja-extensions";
···
33
33
34
34
enableParallelBuilding = true;
35
35
36
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
37
+
36
38
meta = with lib; {
37
39
description = "Set of extensions for Caja file manager";
38
40
homepage = "https://mate-desktop.org";
39
-
license = licenses.gpl2;
41
+
license = licenses.gpl2Plus;
40
42
platforms = platforms.unix;
41
43
maintainers = [ maintainers.romildo ];
42
44
};
+1
-1
pkgs/desktops/mate/caja-with-extensions/default.nix
+1
-1
pkgs/desktops/mate/caja-with-extensions/default.nix
+9
-7
pkgs/desktops/mate/caja/default.nix
+9
-7
pkgs/desktops/mate/caja/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "caja";
5
-
version = "1.24.0";
5
+
version = "1.24.1";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0";
9
+
sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
33
33
34
34
enableParallelBuilding = true;
35
35
36
-
meta = {
36
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
37
+
38
+
meta = with lib; {
37
39
description = "File manager for the MATE desktop";
38
40
homepage = "https://mate-desktop.org";
39
-
license = with lib.licenses; [ gpl2 lgpl2 ];
40
-
platforms = lib.platforms.unix;
41
-
maintainers = [ lib.maintainers.romildo ];
41
+
license = with licenses; [ gpl2Plus lgpl2Plus ];
42
+
platforms = platforms.unix;
43
+
maintainers = [ maintainers.romildo ];
42
44
};
43
45
}
+9
-1
pkgs/desktops/mate/default.nix
+9
-1
pkgs/desktops/mate/default.nix
···
1
-
{ newScope }:
1
+
{ pkgs, newScope }:
2
2
3
3
let
4
4
callPackage = newScope self;
5
5
6
6
self = rec {
7
+
8
+
# Update script tailored to mate packages from git repository
9
+
mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }:
10
+
pkgs.genericUpdater {
11
+
inherit pname version odd-unstable;
12
+
attrPath = "mate.${pname}";
13
+
versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}";
14
+
};
7
15
8
16
atril = callPackage ./atril { };
9
17
caja = callPackage ./caja { };
+9
-7
pkgs/desktops/mate/engrampa/default.nix
+9
-7
pkgs/desktops/mate/engrampa/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "engrampa";
5
-
version = "1.24.1";
5
+
version = "1.24.2";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y";
9
+
sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
32
32
33
33
enableParallelBuilding = true;
34
34
35
-
meta = {
35
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
36
+
37
+
meta = with lib; {
36
38
description = "Archive Manager for MATE";
37
39
homepage = "https://mate-desktop.org";
38
-
license = lib.licenses.gpl2;
39
-
platforms = lib.platforms.unix;
40
-
maintainers = [ lib.maintainers.romildo ];
40
+
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
41
+
platforms = platforms.unix;
42
+
maintainers = [ maintainers.romildo ];
41
43
};
42
44
}
+6
-4
pkgs/desktops/mate/eom/default.nix
+6
-4
pkgs/desktops/mate/eom/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "eom";
5
-
version = "1.24.1";
5
+
version = "1.24.2";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f";
9
+
sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
32
32
33
33
enableParallelBuilding = true;
34
34
35
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
36
+
35
37
meta = {
36
38
description = "An image viewing and cataloging program for the MATE desktop";
37
39
homepage = "https://mate-desktop.org";
38
-
license = lib.licenses.gpl2;
40
+
license = lib.licenses.gpl2Plus;
39
41
platforms = lib.platforms.unix;
40
42
maintainers = [ lib.maintainers.romildo ];
41
43
};
+4
-2
pkgs/desktops/mate/libmatekbd/default.nix
+4
-2
pkgs/desktops/mate/libmatekbd/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "libmatekbd";
···
15
15
16
16
enableParallelBuilding = true;
17
17
18
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
19
+
18
20
meta = with lib; {
19
21
description = "Keyboard management library for MATE";
20
22
homepage = "https://github.com/mate-desktop/libmatekbd";
21
-
license = licenses.gpl2;
23
+
license = licenses.gpl2Plus;
22
24
platforms = platforms.unix;
23
25
maintainers = [ maintainers.romildo ];
24
26
};
+5
-2
pkgs/desktops/mate/libmatemixer/default.nix
+5
-2
pkgs/desktops/mate/libmatemixer/default.nix
···
2
2
, alsaSupport ? stdenv.isLinux, alsaLib
3
3
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
4
4
, ossSupport ? false
5
-
}:
5
+
, mateUpdateScript
6
+
}:
6
7
7
8
stdenv.mkDerivation rec {
8
9
pname = "libmatemixer";
···
23
24
24
25
enableParallelBuilding = true;
25
26
27
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
28
+
26
29
meta = with lib; {
27
30
description = "Mixer library for MATE";
28
31
homepage = "https://github.com/mate-desktop/libmatemixer";
29
-
license = with licenses; [ gpl2 lgpl2 ];
32
+
license = licenses.lgpl2Plus;
30
33
platforms = platforms.linux;
31
34
maintainers = [ maintainers.romildo ];
32
35
};
+4
-2
pkgs/desktops/mate/libmateweather/default.nix
+4
-2
pkgs/desktops/mate/libmateweather/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "libmateweather";
···
22
22
23
23
enableParallelBuilding = true;
24
24
25
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
26
+
25
27
meta = with lib; {
26
28
description = "Library to access weather information from online services for MATE";
27
29
homepage = "https://github.com/mate-desktop/libmateweather";
28
-
license = licenses.gpl2;
30
+
license = licenses.gpl2Plus;
29
31
platforms = platforms.unix;
30
32
maintainers = [ maintainers.romildo ];
31
33
};
+6
-4
pkgs/desktops/mate/marco/default.nix
+6
-4
pkgs/desktops/mate/marco/default.nix
···
1
1
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
2
-
, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
2
+
, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "marco";
6
-
version = "1.24.1";
6
+
version = "1.24.2";
7
7
8
8
src = fetchurl {
9
9
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10
-
sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54";
10
+
sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9";
11
11
};
12
12
13
13
nativeBuildInputs = [
···
31
31
32
32
enableParallelBuilding = true;
33
33
34
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
35
+
34
36
meta = with lib; {
35
37
description = "MATE default window manager";
36
38
homepage = "https://github.com/mate-desktop/marco";
37
-
license = [ licenses.gpl2 ];
39
+
license = [ licenses.gpl2Plus ];
38
40
platforms = platforms.unix;
39
41
maintainers = [ maintainers.romildo ];
40
42
};
+5
-1
pkgs/desktops/mate/mate-applets/default.nix
+5
-1
pkgs/desktops/mate/mate-applets/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3
2
+
, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
3
+
, mateUpdateScript }:
2
4
3
5
stdenv.mkDerivation rec {
4
6
pname = "mate-applets";
···
37
39
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
38
40
39
41
enableParallelBuilding = true;
42
+
43
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
40
44
41
45
meta = with lib; {
42
46
description = "Applets for use with the MATE panel";
+4
-2
pkgs/desktops/mate/mate-backgrounds/default.nix
+4
-2
pkgs/desktops/mate/mate-backgrounds/default.nix
···
1
-
{ lib, stdenv, fetchurl, meson, ninja, gettext }:
1
+
{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-backgrounds";
···
15
15
ninja
16
16
];
17
17
18
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
19
+
18
20
meta = with lib; {
19
21
description = "Background images and data for MATE";
20
22
homepage = "https://mate-desktop.org";
21
-
license = licenses.gpl2;
23
+
license = with licenses; [ gpl2Plus cc-by-sa-40 ];
22
24
platforms = platforms.unix;
23
25
maintainers = [ maintainers.romildo ];
24
26
};
+5
-3
pkgs/desktops/mate/mate-calc/default.nix
+5
-3
pkgs/desktops/mate/mate-calc/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-calc";
5
-
version = "1.24.1";
5
+
version = "1.24.2";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw";
9
+
sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
22
22
];
23
23
24
24
enableParallelBuilding = true;
25
+
26
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
25
27
26
28
meta = with lib; {
27
29
description = "Calculator for the MATE desktop";
+4
-2
pkgs/desktops/mate/mate-common/default.nix
+4
-2
pkgs/desktops/mate/mate-common/default.nix
···
1
-
{ lib, stdenv, fetchurl }:
1
+
{ lib, stdenv, fetchurl, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-common";
···
11
11
12
12
enableParallelBuilding = true;
13
13
14
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
15
+
14
16
meta = {
15
17
description = "Common files for development of MATE packages";
16
18
homepage = "https://mate-desktop.org";
17
-
license = lib.licenses.gpl3;
19
+
license = lib.licenses.gpl3Plus;
18
20
platforms = lib.platforms.unix;
19
21
maintainers = [ lib.maintainers.romildo ];
20
22
};
+9
-6
pkgs/desktops/mate/mate-control-center/default.nix
+9
-6
pkgs/desktops/mate/mate-control-center/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib,
2
-
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
3
-
desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib
2
+
, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3
3
+
, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
4
+
, mateUpdateScript
4
5
}:
5
6
6
7
stdenv.mkDerivation rec {
7
8
pname = "mate-control-center";
8
-
version = "1.24.1";
9
+
version = "1.24.2";
9
10
10
11
src = fetchurl {
11
12
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12
-
sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0";
13
+
sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39";
13
14
};
14
15
15
16
nativeBuildInputs = [
···
49
50
50
51
enableParallelBuilding = true;
51
52
53
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
54
+
52
55
meta = with lib; {
53
56
description = "Utilities to configure the MATE desktop";
54
57
homepage = "https://github.com/mate-desktop/mate-control-center";
55
-
license = licenses.gpl2;
58
+
license = licenses.gpl2Plus;
56
59
platforms = platforms.unix;
57
60
maintainers = [ maintainers.romildo ];
58
61
};
+4
-2
pkgs/desktops/mate/mate-desktop/default.nix
+4
-2
pkgs/desktops/mate/mate-desktop/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-desktop";
···
23
23
24
24
enableParallelBuilding = true;
25
25
26
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
27
+
26
28
meta = with lib; {
27
29
description = "Library with common API for various MATE modules";
28
30
homepage = "https://mate-desktop.org";
29
-
license = licenses.gpl2;
31
+
license = licenses.gpl2Plus;
30
32
platforms = platforms.linux;
31
33
maintainers = [ maintainers.romildo ];
32
34
};
+7
-5
pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+7
-5
pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
···
1
-
{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }:
1
+
{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-icon-theme-faenza";
···
23
23
24
24
enableParallelBuilding = true;
25
25
26
-
meta = {
26
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
27
+
28
+
meta = with lib; {
27
29
description = "Faenza icon theme from MATE";
28
30
homepage = "https://mate-desktop.org";
29
-
license = lib.licenses.gpl2;
30
-
platforms = lib.platforms.unix;
31
-
maintainers = [ lib.maintainers.romildo ];
31
+
license = licenses.gpl2Plus;
32
+
platforms = platforms.unix;
33
+
maintainers = [ maintainers.romildo ];
32
34
};
33
35
}
+4
-2
pkgs/desktops/mate/mate-icon-theme/default.nix
+4
-2
pkgs/desktops/mate/mate-icon-theme/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-icon-theme";
···
27
27
28
28
enableParallelBuilding = true;
29
29
30
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
31
+
30
32
meta = {
31
33
description = "Icon themes from MATE";
32
34
homepage = "https://mate-desktop.org";
33
-
license = lib.licenses.lgpl3;
35
+
license = lib.licenses.lgpl3Plus;
34
36
platforms = lib.platforms.linux;
35
37
maintainers = [ lib.maintainers.romildo ];
36
38
};
+3
-1
pkgs/desktops/mate/mate-indicator-applet/default.nix
+3
-1
pkgs/desktops/mate/mate-indicator-applet/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-indicator-applet";
···
23
23
];
24
24
25
25
enableParallelBuilding = true;
26
+
27
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
26
28
27
29
meta = with lib; {
28
30
homepage = "https://github.com/mate-desktop/mate-indicator-applet";
+4
-2
pkgs/desktops/mate/mate-media/default.nix
+4
-2
pkgs/desktops/mate/mate-media/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-media";
···
27
27
28
28
enableParallelBuilding = true;
29
29
30
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
31
+
30
32
meta = with lib; {
31
33
description = "Media tools for MATE";
32
34
homepage = "https://mate-desktop.org";
33
-
license = licenses.gpl3;
35
+
license = licenses.gpl2Plus;
34
36
platforms = platforms.unix;
35
37
maintainers = [ maintainers.romildo maintainers.chpatrick ];
36
38
};
+4
-2
pkgs/desktops/mate/mate-netbook/default.nix
+4
-2
pkgs/desktops/mate/mate-netbook/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-netbook";
···
25
25
26
26
enableParallelBuilding = true;
27
27
28
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
29
+
28
30
meta = with lib; {
29
31
description = "MATE utilities for netbooks";
30
32
longDescription = ''
···
35
37
devices with low resolution displays.
36
38
'';
37
39
homepage = "https://mate-desktop.org";
38
-
license = with licenses; [ gpl3 lgpl2Plus ];
40
+
license = with licenses; [ gpl3Only lgpl2Plus ];
39
41
platforms = platforms.unix;
40
42
maintainers = [ maintainers.romildo ];
41
43
};
+6
-4
pkgs/desktops/mate/mate-notification-daemon/default.nix
+6
-4
pkgs/desktops/mate/mate-notification-daemon/default.nix
···
1
1
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
2
-
libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
2
+
libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "mate-notification-daemon";
6
-
version = "1.24.1";
6
+
version = "1.24.2";
7
7
8
8
src = fetchurl {
9
9
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10
-
sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b";
10
+
sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q";
11
11
};
12
12
13
13
nativeBuildInputs = [
···
28
28
29
29
enableParallelBuilding = true;
30
30
31
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
32
+
31
33
meta = with lib; {
32
34
description = "Notification daemon for MATE Desktop";
33
35
homepage = "https://github.com/mate-desktop/mate-notification-daemon";
34
-
license = licenses.gpl2;
36
+
license = with licenses; [ gpl2Plus gpl3Plus ];
35
37
platforms = platforms.unix;
36
38
maintainers = [ maintainers.romildo ];
37
39
};
+6
-4
pkgs/desktops/mate/mate-panel/default.nix
+6
-4
pkgs/desktops/mate/mate-panel/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-panel";
5
-
version = "1.24.1";
5
+
version = "1.24.2";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l";
9
+
sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
39
39
40
40
enableParallelBuilding = true;
41
41
42
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
43
+
42
44
meta = with lib; {
43
45
description = "The MATE panel";
44
46
homepage = "https://github.com/mate-desktop/mate-panel";
45
-
license = with licenses; [ gpl2 lgpl2 ];
47
+
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
46
48
platforms = platforms.unix;
47
49
maintainers = [ maintainers.romildo ];
48
50
};
+3
-1
pkgs/desktops/mate/mate-polkit/default.nix
+3
-1
pkgs/desktops/mate/mate-polkit/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-polkit";
···
23
23
];
24
24
25
25
enableParallelBuilding = true;
26
+
27
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
26
28
27
29
meta = with lib; {
28
30
description = "Integrates polkit authentication for MATE desktop";
+6
-4
pkgs/desktops/mate/mate-power-manager/default.nix
+6
-4
pkgs/desktops/mate/mate-power-manager/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-power-manager";
5
-
version = "1.24.2";
5
+
version = "1.24.3";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj";
9
+
sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
34
34
35
35
enableParallelBuilding = true;
36
36
37
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
38
+
37
39
meta = with lib; {
38
40
description = "The MATE Power Manager";
39
41
homepage = "https://mate-desktop.org";
40
-
license = licenses.gpl3;
42
+
license = with licenses; [ gpl2Plus fdl11Plus ];
41
43
platforms = platforms.unix;
42
44
maintainers = with maintainers; [ romildo chpatrick ];
43
45
};
+5
-3
pkgs/desktops/mate/mate-screensaver/default.nix
+5
-3
pkgs/desktops/mate/mate-screensaver/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-screensaver";
5
-
version = "1.24.1";
5
+
version = "1.24.2";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw";
9
+
sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
32
32
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
33
33
34
34
enableParallelBuilding = true;
35
+
36
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
35
37
36
38
meta = with lib; {
37
39
description = "Screen saver and locker for the MATE desktop";
+4
-1
pkgs/desktops/mate/mate-sensors-applet/default.nix
+4
-1
pkgs/desktops/mate/mate-sensors-applet/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify
2
+
, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
2
3
3
4
stdenv.mkDerivation rec {
4
5
pname = "mate-sensors-applet";
···
29
30
];
30
31
31
32
enableParallelBuilding = true;
33
+
34
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
32
35
33
36
meta = with lib; {
34
37
homepage = "https://github.com/mate-desktop/mate-sensors-applet";
+7
-6
pkgs/desktops/mate/mate-session-manager/default.nix
+7
-6
pkgs/desktops/mate/mate-session-manager/default.nix
···
1
1
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
2
2
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
3
-
wrapGAppsHook, fetchpatch
3
+
wrapGAppsHook, fetchpatch, mateUpdateScript
4
4
}:
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "mate-session-manager";
8
-
version = "1.24.1";
8
+
version = "1.24.2";
9
9
10
10
src = fetchurl {
11
11
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12
-
sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51";
12
+
sha256 = "1jcb5k2fx2rwwbrslgv1xlzaiwiwjnxjwnp503qf8cg89w69q2vb";
13
13
};
14
14
15
15
patches = [
···
43
43
44
44
postFixup = ''
45
45
substituteInPlace $out/share/xsessions/mate.desktop \
46
-
--replace "Exec=mate-session" "Exec=$out/bin/mate-session" \
47
-
--replace "TryExec=mate-session" "TryExec=$out/bin/mate-session"
46
+
--replace "Exec=mate-session" "Exec=$out/bin/mate-session"
48
47
'';
49
48
50
49
passthru.providedSessions = [ "mate" ];
51
50
51
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
52
+
52
53
meta = with lib; {
53
54
description = "MATE Desktop session manager";
54
55
homepage = "https://github.com/mate-desktop/mate-session-manager";
55
-
license = with licenses; [ gpl2 lgpl2 ];
56
+
license = with licenses; [ gpl2Plus lgpl2Plus ];
56
57
platforms = platforms.unix;
57
58
maintainers = [ maintainers.romildo ];
58
59
};
+6
-4
pkgs/desktops/mate/mate-settings-daemon/default.nix
+6
-4
pkgs/desktops/mate/mate-settings-daemon/default.nix
···
1
1
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier,
2
2
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
3
3
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
4
-
wrapGAppsHook }:
4
+
wrapGAppsHook, mateUpdateScript }:
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "mate-settings-daemon";
8
-
version = "1.24.1";
8
+
version = "1.24.2";
9
9
10
10
src = fetchurl {
11
11
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12
-
sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab";
12
+
sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc";
13
13
};
14
14
15
15
nativeBuildInputs = [
···
38
38
39
39
enableParallelBuilding = true;
40
40
41
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
42
+
41
43
meta = with lib; {
42
44
description = "MATE settings daemon";
43
45
homepage = "https://github.com/mate-desktop/mate-settings-daemon";
44
-
license = with licenses; [ gpl2 lgpl21 ];
46
+
license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ];
45
47
platforms = platforms.unix;
46
48
maintainers = [ maintainers.romildo ];
47
49
};
+5
-3
pkgs/desktops/mate/mate-system-monitor/default.nix
+5
-3
pkgs/desktops/mate/mate-system-monitor/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-system-monitor";
5
-
version = "1.24.1";
5
+
version = "1.24.2";
6
6
7
7
src = fetchurl {
8
8
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz";
9
+
sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp";
10
10
};
11
11
12
12
nativeBuildInputs = [
···
29
29
configureFlags = [ "--enable-systemd" ];
30
30
31
31
enableParallelBuilding = true;
32
+
33
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
32
34
33
35
meta = with lib; {
34
36
description = "System monitor for the MATE desktop";
+4
-2
pkgs/desktops/mate/mate-terminal/default.nix
+4
-2
pkgs/desktops/mate/mate-terminal/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-terminal";
···
30
30
31
31
enableParallelBuilding = true;
32
32
33
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
34
+
33
35
meta = with lib; {
34
36
description = "The MATE Terminal Emulator";
35
37
homepage = "https://mate-desktop.org";
36
-
license = licenses.gpl3;
38
+
license = licenses.gpl3Plus;
37
39
platforms = platforms.unix;
38
40
maintainers = [ maintainers.romildo ];
39
41
};
+12
-7
pkgs/desktops/mate/mate-themes/default.nix
+12
-7
pkgs/desktops/mate/mate-themes/default.nix
···
1
1
{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3,
2
-
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
2
+
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "mate-themes";
6
-
version = "3.22.21";
6
+
version = "3.22.22";
7
7
8
8
src = fetchurl {
9
9
url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10
-
sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n";
10
+
sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x";
11
11
};
12
12
13
13
nativeBuildInputs = [ pkg-config gettext gtk3 ];
···
24
24
25
25
enableParallelBuilding = true;
26
26
27
-
meta = {
27
+
passthru.updateScript = mateUpdateScript {
28
+
inherit pname version;
29
+
url = "https://pub.mate-desktop.org/releases/themes";
30
+
};
31
+
32
+
meta = with lib; {
28
33
description = "A set of themes from MATE";
29
34
homepage = "https://mate-desktop.org";
30
-
license = lib.licenses.lgpl21;
31
-
platforms = lib.platforms.unix;
32
-
maintainers = [ lib.maintainers.romildo ];
35
+
license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ];
36
+
platforms = platforms.unix;
37
+
maintainers = [ maintainers.romildo ];
33
38
};
34
39
}
+10
-2
pkgs/desktops/mate/mate-tweak/default.nix
+10
-2
pkgs/desktops/mate/mate-tweak/default.nix
···
9
9
, gobject-introspection
10
10
, wrapGAppsHook
11
11
, glib
12
+
, genericUpdater
13
+
, common-updater-scripts
12
14
}:
13
15
14
16
python3Packages.buildPythonApplication rec {
15
17
pname = "mate-tweak";
16
-
version = "20.10.0";
18
+
version = "21.04.3";
17
19
18
20
src = fetchFromGitHub {
19
21
owner = "ubuntu-mate";
20
22
repo = pname;
21
23
rev = version;
22
-
sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6";
24
+
sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1";
23
25
};
24
26
25
27
nativeBuildInputs = [
···
71
73
sed -i "s,usr,run/current-system/sw,g" $out/$i
72
74
done
73
75
'';
76
+
77
+
passthru.updateScript = genericUpdater {
78
+
inherit pname version;
79
+
attrPath = "mate.${pname}";
80
+
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
81
+
};
74
82
75
83
meta = with lib; {
76
84
description = "Tweak tool for the MATE Desktop";
+3
-1
pkgs/desktops/mate/mate-user-guide/default.nix
+3
-1
pkgs/desktops/mate/mate-user-guide/default.nix
···
1
-
{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }:
1
+
{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mate-user-guide";
···
19
19
'';
20
20
21
21
enableParallelBuilding = true;
22
+
23
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
22
24
23
25
meta = with lib; {
24
26
description = "MATE User Guide";
+4
-1
pkgs/desktops/mate/mate-utils/default.nix
+4
-1
pkgs/desktops/mate/mate-utils/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3
2
+
, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
2
3
3
4
stdenv.mkDerivation rec {
4
5
pname = "mate-utils";
···
30
31
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
31
32
32
33
enableParallelBuilding = true;
34
+
35
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
33
36
34
37
meta = with lib; {
35
38
description = "Utilities for the MATE desktop";
+5
-3
pkgs/desktops/mate/mozo/default.nix
+5
-3
pkgs/desktops/mate/mozo/default.nix
···
1
-
{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
1
+
{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }:
2
2
3
3
python3.pkgs.buildPythonApplication rec {
4
4
pname = "mozo";
5
-
version = "1.24.0";
5
+
version = "1.24.1";
6
6
7
7
format = "other";
8
8
doCheck = false;
9
9
10
10
src = fetchurl {
11
11
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12
-
sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
12
+
sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0";
13
13
};
14
14
15
15
nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ];
···
19
19
buildInputs = [ gtk3 glib ];
20
20
21
21
enableParallelBuilding = true;
22
+
23
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
22
24
23
25
meta = with lib; {
24
26
description = "MATE Desktop menu editor";
+10
-7
pkgs/desktops/mate/pluma/default.nix
+10
-7
pkgs/desktops/mate/pluma/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3
2
+
, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }:
2
3
3
4
stdenv.mkDerivation rec {
4
5
pname = "pluma";
5
-
version = "1.24.1";
6
+
version = "1.24.2";
6
7
7
8
src = fetchurl {
8
9
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9
-
sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f";
10
+
sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4";
10
11
};
11
12
12
13
nativeBuildInputs = [
···
30
31
31
32
enableParallelBuilding = true;
32
33
33
-
meta = {
34
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
35
+
36
+
meta = with lib; {
34
37
description = "Powerful text editor for the MATE desktop";
35
38
homepage = "https://mate-desktop.org";
36
-
license = lib.licenses.gpl2;
37
-
platforms = lib.platforms.unix;
38
-
maintainers = [ lib.maintainers.romildo ];
39
+
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
40
+
platforms = platforms.unix;
41
+
maintainers = [ maintainers.romildo ];
39
42
};
40
43
}
+3
-1
pkgs/desktops/mate/python-caja/default.nix
+3
-1
pkgs/desktops/mate/python-caja/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }:
1
+
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "python-caja";
···
25
25
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
26
26
27
27
enableParallelBuilding = true;
28
+
29
+
passthru.updateScript = mateUpdateScript { inherit pname version; };
28
30
29
31
meta = with lib; {
30
32
description = "Python binding for Caja components";
-64
pkgs/desktops/mate/update.sh
-64
pkgs/desktops/mate/update.sh
···
1
-
#!/usr/bin/env nix-shell
2
-
#!nix-shell -i bash -p libarchive curl common-updater-scripts
3
-
4
-
set -eu -o pipefail
5
-
6
-
cd "$(dirname "${BASH_SOURCE[0]}")"
7
-
root=../../..
8
-
export NIXPKGS_ALLOW_UNFREE=1
9
-
10
-
mate_version=1.24
11
-
theme_version=3.22
12
-
materepo=https://pub.mate-desktop.org/releases/${mate_version}
13
-
themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}
14
-
15
-
version() {
16
-
(cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
17
-
}
18
-
19
-
update_package() {
20
-
local p=$1
21
-
echo $p
22
-
echo "# $p" >> git-commits.txt
23
-
24
-
local repo
25
-
if [ "$p" = "mate-themes" ]; then
26
-
repo=$themerepo
27
-
else
28
-
repo=$materepo
29
-
fi
30
-
31
-
local p_version_old=$(version mate.$p)
32
-
local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p")
33
-
local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1)
34
-
35
-
if [[ -z "$p_version" ]]; then
36
-
echo "unavailable $p"
37
-
echo "# $p not found" >> git-commits.txt
38
-
echo
39
-
return
40
-
fi
41
-
42
-
if [[ "$p_version" = "$p_version_old" ]]; then
43
-
echo "nothing to do, $p $p_version is current"
44
-
echo
45
-
return
46
-
fi
47
-
48
-
# Download package and save hash and file path.
49
-
local url="$repo/$p-${p_version}.tar.xz"
50
-
mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
51
-
local hash=${prefetch[0]}
52
-
local path=${prefetch[1]}
53
-
echo "$p: $p_version_old -> $p_version"
54
-
(cd "$root" && update-source-version mate.$p "$p_version" "$hash")
55
-
echo " git add pkgs/desktops/mate/$p" >> git-commits.txt
56
-
echo " git commit -m \"mate.$p: $p_version_old -> $p_version\"" >> git-commits.txt
57
-
echo
58
-
}
59
-
60
-
for d in $(ls -A --indicator-style=none); do
61
-
if [ -d $d ]; then
62
-
update_package $d
63
-
fi
64
-
done
pkgs/development/compilers/llvm/12/bintools.nix
pkgs/development/compilers/llvm/12/bintools/default.nix
pkgs/development/compilers/llvm/12/bintools.nix
pkgs/development/compilers/llvm/12/bintools/default.nix
+4
-4
pkgs/development/compilers/llvm/12/default.nix
+4
-4
pkgs/development/compilers/llvm/12/default.nix
···
108
108
# doesn’t support like LLVM. Probably we should move to some other
109
109
# file.
110
110
111
-
bintools = callPackage ./bintools.nix {};
111
+
bintools = callPackage ./bintools {};
112
112
113
113
lldClang = wrapCCWith rec {
114
114
cc = tools.clang-unwrapped;
···
192
192
193
193
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
194
194
195
-
libcxx = callPackage ./libc++ ({ inherit llvm_meta; } //
195
+
libcxx = callPackage ./libcxx ({ inherit llvm_meta; } //
196
196
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
197
197
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
198
198
}));
199
199
200
-
libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } //
200
+
libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } //
201
201
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
202
202
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
203
203
libunwind = libraries.libunwind;
204
204
}));
205
205
206
-
openmp = callPackage ./openmp.nix { inherit llvm_meta; };
206
+
openmp = callPackage ./openmp { inherit llvm_meta; };
207
207
208
208
libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
209
209
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+1
-1
pkgs/development/compilers/llvm/12/libc++/default.nix
pkgs/development/compilers/llvm/12/libcxx/default.nix
+1
-1
pkgs/development/compilers/llvm/12/libc++/default.nix
pkgs/development/compilers/llvm/12/libcxx/default.nix
+1
-1
pkgs/development/compilers/llvm/12/libc++abi/default.nix
pkgs/development/compilers/llvm/12/libcxxabi/default.nix
+1
-1
pkgs/development/compilers/llvm/12/libc++abi/default.nix
pkgs/development/compilers/llvm/12/libcxxabi/default.nix
pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch
pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch
pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch
pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch
pkgs/development/compilers/llvm/12/openmp.nix
pkgs/development/compilers/llvm/12/openmp/default.nix
pkgs/development/compilers/llvm/12/openmp.nix
pkgs/development/compilers/llvm/12/openmp/default.nix
+2
-2
pkgs/development/libraries/sqlcipher/default.nix
+2
-2
pkgs/development/libraries/sqlcipher/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "sqlcipher";
7
-
version = "4.4.2";
7
+
version = "4.4.3";
8
8
9
9
src = fetchFromGitHub {
10
10
owner = "sqlcipher";
11
11
repo = "sqlcipher";
12
12
rev = "v${version}";
13
-
sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na";
13
+
sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw=";
14
14
};
15
15
16
16
nativeBuildInputs = [ installShellFiles ];
+4
-4
pkgs/development/ocaml-modules/mirage-crypto/default.nix
+4
-4
pkgs/development/ocaml-modules/mirage-crypto/default.nix
···
1
-
{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
1
+
{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config
2
2
, withFreestanding ? false
3
3
, ocaml-freestanding
4
4
}:
···
7
7
minimumOCamlVersion = "4.08";
8
8
9
9
pname = "mirage-crypto";
10
-
version = "0.9.2";
10
+
version = "0.10.0";
11
11
12
12
src = fetchurl {
13
13
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
14
-
sha256 = "da200c0afdbe63474ab19f2bc616e26c10b0e4fbb53fb97fefb2794212f5d442";
14
+
sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d";
15
15
};
16
16
17
17
useDune2 = true;
···
21
21
22
22
nativeBuildInputs = [ dune-configurator pkg-config ];
23
23
propagatedBuildInputs = [
24
-
cstruct eqaf
24
+
cstruct eqaf bigarray-compat
25
25
] ++ lib.optionals withFreestanding [
26
26
ocaml-freestanding
27
27
];
+6
-6
pkgs/development/ocaml-modules/sedlex/2.nix
+6
-6
pkgs/development/ocaml-modules/sedlex/2.nix
···
4
4
, buildDunePackage
5
5
, ocaml
6
6
, gen
7
-
, ppx_tools_versioned
8
-
, ocaml-migrate-parsetree
7
+
, ppxlib
9
8
, uchar
10
9
}:
11
10
12
-
if lib.versionOlder ocaml.version "4.02.3"
11
+
if lib.versionOlder ocaml.version "4.08"
13
12
then throw "sedlex is not available for OCaml ${ocaml.version}"
14
13
else
15
14
···
32
31
in
33
32
buildDunePackage rec {
34
33
pname = "sedlex";
35
-
version = "2.2";
34
+
version = "2.3";
36
35
37
36
useDune2 = true;
38
37
···
40
39
owner = "ocaml-community";
41
40
repo = "sedlex";
42
41
rev = "v${version}";
43
-
sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
42
+
sha256 = "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar";
44
43
};
45
44
46
45
propagatedBuildInputs = [
47
-
gen uchar ocaml-migrate-parsetree ppx_tools_versioned
46
+
gen uchar ppxlib
48
47
];
49
48
50
49
preBuild = ''
···
60
59
61
60
meta = {
62
61
homepage = "https://github.com/ocaml-community/sedlex";
62
+
changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES";
63
63
description = "An OCaml lexer generator for Unicode";
64
64
license = lib.licenses.mit;
65
65
maintainers = [ lib.maintainers.marsam ];
+2
-2
pkgs/development/python-modules/ailment/default.nix
+2
-2
pkgs/development/python-modules/ailment/default.nix
···
7
7
8
8
buildPythonPackage rec {
9
9
pname = "ailment";
10
-
version = "9.0.6790";
10
+
version = "9.0.6852";
11
11
disabled = pythonOlder "3.6";
12
12
13
13
src = fetchFromGitHub {
14
14
owner = "angr";
15
15
repo = pname;
16
16
rev = "v${version}";
17
-
sha256 = "sha256-RcLa18JqQ7c8u+fhyNHmJEXt/Lg73JDAImtUtiaZbTw=";
17
+
sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo=";
18
18
};
19
19
20
20
propagatedBuildInputs = [ pyvex ];
+5
-3
pkgs/development/python-modules/angr/default.nix
+5
-3
pkgs/development/python-modules/angr/default.nix
···
42
42
43
43
buildPythonPackage rec {
44
44
pname = "angr";
45
-
version = "9.0.6790";
45
+
version = "9.0.6852";
46
46
disabled = pythonOlder "3.6";
47
47
48
48
src = fetchFromGitHub {
49
49
owner = pname;
50
50
repo = pname;
51
51
rev = "v${version}";
52
-
sha256 = "sha256-PRghK/BdgxGpPuinkGr+rREza1pQXz2gxnXiSmxBSTc=";
52
+
sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8=";
53
53
};
54
54
55
55
propagatedBuildInputs = [
···
81
81
# Tests have additional requirements, e.g., pypcode and angr binaries
82
82
# cle is executing the tests with the angr binaries
83
83
doCheck = false;
84
-
pythonImportsCheck = [ "angr" ];
84
+
85
+
# See http://angr.io/api-doc/
86
+
pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ];
85
87
86
88
meta = with lib; {
87
89
description = "Powerful and user-friendly binary analysis platform";
+2
-2
pkgs/development/python-modules/angrop/default.nix
+2
-2
pkgs/development/python-modules/angrop/default.nix
···
8
8
9
9
buildPythonPackage rec {
10
10
pname = "angrop";
11
-
version = "9.0.6790";
11
+
version = "9.0.6852";
12
12
disabled = pythonOlder "3.6";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "angr";
16
16
repo = pname;
17
17
rev = "v${version}";
18
-
sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy";
18
+
sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo=";
19
19
};
20
20
21
21
propagatedBuildInputs = [
+2
-2
pkgs/development/python-modules/archinfo/default.nix
+2
-2
pkgs/development/python-modules/archinfo/default.nix
···
7
7
8
8
buildPythonPackage rec {
9
9
pname = "archinfo";
10
-
version = "9.0.6790";
10
+
version = "9.0.6852";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "angr";
14
14
repo = pname;
15
15
rev = "v${version}";
16
-
sha256 = "sha256-A4WvRElahRv/XmlmS4WexMqm8FIZ1SSUnbdoAWWECMk=";
16
+
sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo=";
17
17
};
18
18
19
19
checkInputs = [
+4
-3
pkgs/development/python-modules/binwalk/default.nix
+4
-3
pkgs/development/python-modules/binwalk/default.nix
···
22
22
23
23
buildPythonPackage rec {
24
24
pname = "binwalk";
25
-
version = "27";
25
+
version = "2.3.1";
26
26
27
27
src = fetchFromGitHub {
28
28
owner = "ReFirmLabs";
29
29
repo = "binwalk";
30
-
rev = "python${version}";
31
-
sha256 = "03kqhs3j9czdc2pnr1v8iszwx254ljpvrmmj0j5ls0ssjrfxacyx";
30
+
rev = "v${version}";
31
+
sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm";
32
32
};
33
33
34
34
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
···
53
53
homepage = "https://github.com/ReFirmLabs/binwalk";
54
54
description = "A tool for searching a given binary image for embedded files";
55
55
maintainers = [ maintainers.koral ];
56
+
license = licenses.mit;
56
57
};
57
58
}
+2
-2
pkgs/development/python-modules/claripy/default.nix
+2
-2
pkgs/development/python-modules/claripy/default.nix
···
13
13
14
14
buildPythonPackage rec {
15
15
pname = "claripy";
16
-
version = "9.0.6790";
16
+
version = "9.0.6852";
17
17
disabled = pythonOlder "3.6";
18
18
19
19
src = fetchFromGitHub {
20
20
owner = "angr";
21
21
repo = pname;
22
22
rev = "v${version}";
23
-
sha256 = "sha256-GpWHj3bNgr7nQoIKM4VQtVkbObxqw6QkuEmfmPEiJmE=";
23
+
sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng=";
24
24
};
25
25
26
26
# Use upstream z3 implementation
+2
-2
pkgs/development/python-modules/cle/default.nix
+2
-2
pkgs/development/python-modules/cle/default.nix
···
15
15
16
16
let
17
17
# The binaries are following the argr projects release cycle
18
-
version = "9.0.6790";
18
+
version = "9.0.6852";
19
19
20
20
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
21
21
binaries = fetchFromGitHub {
···
35
35
owner = "angr";
36
36
repo = pname;
37
37
rev = "v${version}";
38
-
sha256 = "sha256-zQggVRdc8fV1ulFnOlzYLvSOSOP3+dY8j+6lo+pXSkM=";
38
+
sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs=";
39
39
};
40
40
41
41
propagatedBuildInputs = [
+33
pkgs/development/python-modules/homeconnect/default.nix
+33
pkgs/development/python-modules/homeconnect/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchPypi
4
+
, requests
5
+
, requests_oauthlib
6
+
}:
7
+
8
+
buildPythonPackage rec {
9
+
pname = "homeconnect";
10
+
version = "0.6.3";
11
+
12
+
src = fetchPypi {
13
+
inherit pname version;
14
+
sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn";
15
+
};
16
+
17
+
propagatedBuildInputs = [
18
+
requests
19
+
requests_oauthlib
20
+
];
21
+
22
+
# Project has no tests
23
+
doCheck = false;
24
+
pythonImportsCheck = [ "homeconnect" ];
25
+
26
+
meta = with lib; {
27
+
description = "Python client for the BSH Home Connect REST API";
28
+
homepage = "https://github.com/DavidMStraub/homeconnect";
29
+
changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}";
30
+
license = with licenses; [ mit ];
31
+
maintainers = with maintainers; [ fab ];
32
+
};
33
+
}
+37
pkgs/development/python-modules/pycocotools/default.nix
+37
pkgs/development/python-modules/pycocotools/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchPypi
4
+
, cython
5
+
, matplotlib
6
+
}:
7
+
8
+
buildPythonPackage rec {
9
+
pname = "pycocotools";
10
+
version = "2.0.2";
11
+
format = "setuptools";
12
+
13
+
src = fetchPypi {
14
+
inherit pname version;
15
+
sha256 = "06hz0iz4kqxhqby4j7bah8l41kg68bb118jawp172i4vg497lw94";
16
+
};
17
+
18
+
propagatedBuildInputs = [
19
+
cython
20
+
matplotlib
21
+
];
22
+
23
+
pythonImportsCheck = [
24
+
"pycocotools.coco"
25
+
"pycocotools.cocoeval"
26
+
];
27
+
28
+
# has no tests
29
+
doCheck = false;
30
+
31
+
meta = with lib; {
32
+
description = "Official APIs for the MS-COCO dataset";
33
+
homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI";
34
+
license = licenses.bsd2;
35
+
maintainers = with maintainers; [ hexa piegames ];
36
+
};
37
+
}
+5
-5
pkgs/development/python-modules/pymetno/default.nix
+5
-5
pkgs/development/python-modules/pymetno/default.nix
···
8
8
}:
9
9
10
10
buildPythonPackage rec {
11
-
pname = "PyMetno";
12
-
version = "0.8.2";
11
+
pname = "pymetno";
12
+
version = "0.8.3";
13
13
format = "setuptools";
14
14
15
15
src = fetchFromGitHub {
16
-
repo = pname;
17
16
owner = "Danielhiversen";
17
+
repo = "PyMetno";
18
18
rev = version;
19
-
sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5";
19
+
sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g=";
20
20
};
21
21
22
22
propagatedBuildInputs = [
···
34
34
doCheck = false;
35
35
36
36
meta = with lib; {
37
-
description = "A library to communicate with the met.no api";
37
+
description = "A library to communicate with the met.no API";
38
38
homepage = "https://github.com/Danielhiversen/pyMetno/";
39
39
license = licenses.mit;
40
40
maintainers = with maintainers; [ flyfloh ];
+38
pkgs/development/python-modules/pysmartapp/default.nix
+38
pkgs/development/python-modules/pysmartapp/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchFromGitHub
4
+
, httpsig
5
+
, pytest-asyncio
6
+
, pytestCheckHook
7
+
}:
8
+
9
+
buildPythonPackage rec {
10
+
pname = "pysmartapp";
11
+
version = "0.3.3";
12
+
13
+
src = fetchFromGitHub {
14
+
owner = "andrewsayre";
15
+
repo = pname;
16
+
rev = version;
17
+
sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh";
18
+
};
19
+
20
+
propagatedBuildInputs = [
21
+
httpsig
22
+
];
23
+
24
+
checkInputs = [
25
+
pytest-asyncio
26
+
pytestCheckHook
27
+
];
28
+
29
+
pythonImportsCheck = [ "pysmartapp" ];
30
+
31
+
meta = with lib; {
32
+
description = "Python implementation to work with SmartApp lifecycle events";
33
+
homepage = "https://github.com/andrewsayre/pysmartapp";
34
+
changelog = "https://github.com/andrewsayre/pysmartapp/releases/tag/${version}";
35
+
license = with licenses; [ mit ];
36
+
maintainers = with maintainers; [ fab ];
37
+
};
38
+
}
+38
pkgs/development/python-modules/pysmartthings/default.nix
+38
pkgs/development/python-modules/pysmartthings/default.nix
···
1
+
{ lib
2
+
, aiohttp
3
+
, buildPythonPackage
4
+
, fetchFromGitHub
5
+
, pytest-asyncio
6
+
, pytestCheckHook
7
+
}:
8
+
9
+
buildPythonPackage rec {
10
+
pname = "pysmartthings";
11
+
version = "0.7.6";
12
+
13
+
src = fetchFromGitHub {
14
+
owner = "andrewsayre";
15
+
repo = pname;
16
+
rev = version;
17
+
sha256 = "0m91lfzdbmq6qv6bihd278psi9ghldxpa1d0dsbii2zf338188qj";
18
+
};
19
+
20
+
propagatedBuildInputs = [
21
+
aiohttp
22
+
];
23
+
24
+
checkInputs = [
25
+
pytest-asyncio
26
+
pytestCheckHook
27
+
];
28
+
29
+
pythonImportsCheck = [ "pysmartthings" ];
30
+
31
+
meta = with lib; {
32
+
description = "Python library for interacting with the SmartThings cloud API";
33
+
homepage = "https://github.com/andrewsayre/pysmartthings";
34
+
changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${version}";
35
+
license = with licenses; [ mit ];
36
+
maintainers = with maintainers; [ fab ];
37
+
};
38
+
}
+2
-2
pkgs/development/python-modules/pyturbojpeg/default.nix
+2
-2
pkgs/development/python-modules/pyturbojpeg/default.nix
···
10
10
11
11
buildPythonPackage rec {
12
12
pname = "pyturbojpeg";
13
-
version = "1.4.2";
13
+
version = "1.4.3";
14
14
15
15
src = fetchPypi {
16
16
pname = "PyTurboJPEG";
17
17
inherit version;
18
-
sha256 = "sha256-dWmj/huCkborcShf2BT+L3ybEfgdKVIGiJnkz755xwo=";
18
+
sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg=";
19
19
};
20
20
21
21
patches = [
+2
-2
pkgs/development/python-modules/pyvex/default.nix
+2
-2
pkgs/development/python-modules/pyvex/default.nix
···
11
11
12
12
buildPythonPackage rec {
13
13
pname = "pyvex";
14
-
version = "9.0.6790";
14
+
version = "9.0.6852";
15
15
16
16
src = fetchPypi {
17
17
inherit pname version;
18
-
sha256 = "sha256-bqOLHGlLQ12nYzbv9H9nJ0/Q5APJb/9B82YtHk3IvYQ=";
18
+
sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM=";
19
19
};
20
20
21
21
propagatedBuildInputs = [
+49
pkgs/development/python-modules/seqeval/default.nix
+49
pkgs/development/python-modules/seqeval/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchFromGitHub
4
+
, numpy
5
+
, scikitlearn
6
+
, perl
7
+
, pytestCheckHook
8
+
}:
9
+
10
+
buildPythonPackage rec {
11
+
pname = "seqeval";
12
+
version = "1.2.2";
13
+
format = "setuptools";
14
+
15
+
src = fetchFromGitHub {
16
+
owner = "chakki-works";
17
+
repo = "seqeval";
18
+
rev = "v${version}";
19
+
sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j";
20
+
};
21
+
22
+
postPatch = ''
23
+
substituteInPlace setup.py \
24
+
--replace "use_scm_version=True," "version='${version}'," \
25
+
--replace "setup_requires=['setuptools_scm']," "setup_requires=[],"
26
+
'';
27
+
28
+
propagatedBuildInputs = [
29
+
numpy
30
+
scikitlearn
31
+
];
32
+
33
+
checkInputs = [
34
+
pytestCheckHook
35
+
];
36
+
37
+
disabledTests = [
38
+
# tests call perl script and get stuck in there
39
+
"test_statistical_tests"
40
+
"test_by_ground_truth"
41
+
];
42
+
43
+
meta = with lib; {
44
+
description = "A Python framework for sequence labeling evaluation";
45
+
homepage = "https://github.com/chakki-works/seqeval";
46
+
license = licenses.mit;
47
+
maintainers = with maintainers; [ hexa ];
48
+
};
49
+
}
+47
pkgs/development/python-modules/smhi-pkg/default.nix
+47
pkgs/development/python-modules/smhi-pkg/default.nix
···
1
+
{ lib
2
+
, aiohttp
3
+
, buildPythonPackage
4
+
, fetchFromGitHub
5
+
, pytest-asyncio
6
+
, pytestCheckHook
7
+
}:
8
+
9
+
buildPythonPackage rec {
10
+
pname = "smhi-pkg";
11
+
version = "1.0.14";
12
+
13
+
src = fetchFromGitHub {
14
+
owner = "joysoftware";
15
+
repo = "pypi_smhi";
16
+
rev = version;
17
+
sha256 = "186xwrg3hvr0hszq2kxvygd241q2sp11gfk6mwj9z4zqywwfcbn3";
18
+
};
19
+
20
+
propagatedBuildInputs = [
21
+
aiohttp
22
+
];
23
+
24
+
checkInputs = [
25
+
pytest-asyncio
26
+
pytestCheckHook
27
+
];
28
+
29
+
disabledTests = [
30
+
# Disable tests that needs network access
31
+
"test_smhi_integration_test"
32
+
"test_smhi_async_integration_test"
33
+
"test_smhi_async_integration_test_use_session"
34
+
"test_smhi_async_get_forecast_integration2"
35
+
"test_async_error_from_api"
36
+
];
37
+
38
+
pythonImportsCheck = [ "smhi" ];
39
+
40
+
meta = with lib; {
41
+
description = "Python library for accessing SMHI open forecast data";
42
+
homepage = "https://github.com/joysoftware/pypi_smhi";
43
+
changelog = "https://github.com/joysoftware/pypi_smhi/releases/tag/${version}";
44
+
license = with licenses; [ mit ];
45
+
maintainers = with maintainers; [ fab ];
46
+
};
47
+
}
+5
-2
pkgs/development/python-modules/survey/default.nix
+5
-2
pkgs/development/python-modules/survey/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
+
, pythonOlder
3
4
, fetchPypi
4
5
, wrapio
5
6
}:
6
7
7
8
buildPythonPackage rec {
8
9
pname = "survey";
9
-
version = "3.4.2";
10
+
version = "3.4.3";
11
+
12
+
disabled = pythonOlder "3.5";
10
13
11
14
src = fetchPypi {
12
15
inherit pname version;
13
-
sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY=";
16
+
sha256 = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I=";
14
17
};
15
18
16
19
propagatedBuildInputs = [
+2
-1
pkgs/development/tools/just/default.nix
+2
-1
pkgs/development/tools/just/default.nix
···
1
-
{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
1
+
{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }:
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "just";
···
14
14
cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
15
15
16
16
nativeBuildInputs = [ installShellFiles ];
17
+
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
17
18
18
19
postInstall = ''
19
20
installManPage man/just.1
+22
-46
pkgs/games/mar1d/default.nix
+22
-46
pkgs/games/mar1d/default.nix
···
1
-
{ lib, stdenv
2
-
, fetchFromGitHub
3
-
, cmake
1
+
{ stdenv
2
+
, lib
3
+
, SDL2
4
+
, SDL2_mixer
4
5
, libGLU
5
-
, xlibsWrapper
6
-
, xorg
7
-
, xinput_calibrator
8
-
, doxygen
9
-
, libpthreadstubs
10
-
, alsaLib
11
-
, alsaOss
12
-
, libao
13
-
, width ? 30
14
-
, mute ? false
15
-
, effects ? false
16
-
, sensitivity ? 5
17
-
, reverseY ? false
6
+
, libconfig
7
+
, meson
8
+
, ninja
9
+
, pkg-config
10
+
, fetchFromGitHub
18
11
}:
19
12
20
13
stdenv.mkDerivation rec {
21
14
pname = "MAR1D";
22
-
version = "0.2.0";
23
-
options = "-w${toString width}"
24
-
+ " -s${toString sensitivity}"
25
-
+ (if mute then " -m" else "")
26
-
+ (if effects then " -f" else "")
27
-
+ (if reverseY then " -r" else "");
15
+
version = "0.3.0";
28
16
29
17
src = fetchFromGitHub {
30
-
sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7";
18
+
sha256 = "sha256-/QZH2H0PFCLeweXUE11vimLnJTt86PjnTnHC9vWkKsk=";
31
19
rev = "v${version}";
32
-
repo = "fp_mario";
33
-
owner = "olynch";
20
+
repo = "MAR1D";
21
+
owner = "Radvendii";
34
22
};
35
23
36
-
buildInputs =
37
-
[
38
-
alsaLib
39
-
alsaOss
40
-
cmake
41
-
doxygen
42
-
libao
43
-
libpthreadstubs
44
-
libGLU
45
-
xlibsWrapper
46
-
xinput_calibrator
47
-
xorg.libXrandr
48
-
xorg.libXi
49
-
xorg.xinput
50
-
xorg.libXxf86vm
51
-
];
24
+
nativeBuildInputs = [ meson ninja pkg-config ];
52
25
53
-
preConfigure = ''
54
-
cd src
55
-
'';
26
+
buildInputs = [
27
+
SDL2
28
+
SDL2_mixer
29
+
libconfig
30
+
libGLU
31
+
];
56
32
57
33
meta = with lib; {
58
34
description = "First person Super Mario Bros";
···
62
38
original, however, the game still takes place in a two dimensional world.
63
39
You must view the world as mario does, as a one dimensional line.
64
40
'';
65
-
homepage = "https://github.com/olynch/fp_mario";
41
+
homepage = "https://mar1d.com";
66
42
license = licenses.agpl3;
67
43
maintainers = with maintainers; [ taeer ];
68
-
platforms = platforms.linux;
44
+
platforms = platforms.unix;
69
45
};
70
46
}
+3
-3
pkgs/games/steam/steam.nix
+3
-3
pkgs/games/steam/steam.nix
···
2
2
3
3
let
4
4
traceLog = "/tmp/steam-trace-dependencies.log";
5
-
version = "1.0.0.69";
5
+
version = "1.0.0.70";
6
6
7
7
in stdenv.mkDerivation {
8
8
pname = "steam-original";
9
9
inherit version;
10
10
11
11
src = fetchurl {
12
-
url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
13
-
sha256 = "sha256-b5g4AUprE/lTunJs59IDlGu5O/1dB0kBvCFq0Eqyx2c=";
12
+
url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz";
13
+
sha256 = "sha256-n/iKV3jHsA77GPMk1M0MKC1fQ42tEgG8Ppgi4/9qLf8=";
14
14
};
15
15
16
16
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+11
-4
pkgs/misc/emulators/wine/sources.nix
+11
-4
pkgs/misc/emulators/wine/sources.nix
···
44
44
45
45
unstable = fetchurl rec {
46
46
# NOTE: Don't forget to change the SHA256 for staging as well.
47
-
version = "6.5";
47
+
version = "6.7";
48
48
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
49
-
sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c=";
50
-
inherit (stable) mono gecko32 gecko64;
49
+
sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ=";
50
+
inherit (stable) gecko32 gecko64;
51
+
52
+
## see http://wiki.winehq.org/Mono
53
+
mono = fetchurl rec {
54
+
version = "6.1.1";
55
+
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
56
+
sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s=";
57
+
};
51
58
52
59
patches = [
53
60
# Also look for root certificates at $NIX_SSL_CERT_FILE
···
58
65
staging = fetchFromGitHub rec {
59
66
# https://github.com/wine-staging/wine-staging/releases
60
67
inherit (unstable) version;
61
-
sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc=";
68
+
sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M=";
62
69
owner = "wine-staging";
63
70
repo = "wine-staging";
64
71
rev = "v${version}";
+2
-2
pkgs/servers/dns/pdns-recursor/default.nix
+2
-2
pkgs/servers/dns/pdns-recursor/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "pdns-recursor";
8
-
version = "4.4.2";
8
+
version = "4.4.3";
9
9
10
10
src = fetchurl {
11
11
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
12
-
sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh";
12
+
sha256 = "01dypbqq6ynrdr3dqwbz8dzpkd2ykgaz9mqhaz3i1hqc21c14hgq";
13
13
};
14
14
15
15
nativeBuildInputs = [ pkg-config ];
+3
-3
pkgs/servers/home-assistant/component-packages.nix
+3
-3
pkgs/servers/home-assistant/component-packages.nix
···
351
351
"hitron_coda" = ps: with ps; [ ];
352
352
"hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
353
353
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
354
-
"home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect
354
+
"home_connect" = ps: with ps; [ aiohttp-cors homeconnect ];
355
355
"home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ];
356
356
"homeassistant" = ps: with ps; [ ];
357
357
"homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ];
···
757
757
"smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
758
758
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas
759
759
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
760
-
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings
760
+
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ];
761
761
"smarttub" = ps: with ps; [ python-smarttub ];
762
762
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
763
-
"smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
763
+
"smhi" = ps: with ps; [ smhi-pkg ];
764
764
"sms" = ps: with ps; [ python-gammu ];
765
765
"smtp" = ps: with ps; [ ];
766
766
"snapcast" = ps: with ps; [ snapcast ];
+3
pkgs/servers/home-assistant/default.nix
+3
pkgs/servers/home-assistant/default.nix
···
275
275
"hddtemp"
276
276
"history"
277
277
"history_stats"
278
+
"home_connect"
278
279
"home_plus_control"
279
280
"homekit"
280
281
"homekit_controller"
···
364
365
"simulated"
365
366
"sleepiq"
366
367
"sma"
368
+
"smhi"
367
369
"sensor"
368
370
"slack"
371
+
"smartthings"
369
372
"smarttub"
370
373
"smtp"
371
374
"smappee"
+3
-3
pkgs/servers/minio/default.nix
+3
-3
pkgs/servers/minio/default.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "minio";
5
-
version = "2021-04-06T23-11-00Z";
5
+
version = "2021-04-22T15-44-28Z";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "minio";
9
9
repo = "minio";
10
10
rev = "RELEASE.${version}";
11
-
sha256 = "sha256-gwf6qA63EFxGQxk8DiAiqLpIYVhVQDQYPffLNP5JfVw=";
11
+
sha256 = "147a4vgf2hdpbndska443axzvxx56bmc0011m3cq4ca1vm783k8q";
12
12
};
13
13
14
-
vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk=";
14
+
vendorSha256 = "0qj1zab97q8s5gy7a304wqi832y8m083cnk8hllz8lz9yjcw6q92";
15
15
16
16
doCheck = false;
17
17
+3
-2
pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
+3
-2
pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
···
2
2
3
3
python3Packages.buildPythonApplication rec {
4
4
pname = "check_systemd";
5
-
version = "2.2.1";
5
+
version = "2.3.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "Josef-Friedrich";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "04r14dhqzrdndn235dvr6afy4s4g4asynsgvj99cmyq55nah4asn";
11
+
sha256 = "11sc0gycxzq1vfvin501jnwnky2ky6ns64yjiw8vq9vmkbf8nni6";
12
12
};
13
13
14
14
propagatedBuildInputs = with python3Packages; [ nagiosplugin ];
···
29
29
meta = with lib; {
30
30
description = "Nagios / Icinga monitoring plugin to check systemd for failed units";
31
31
inherit (src.meta) homepage;
32
+
changelog = "https://github.com/Josef-Friedrich/check_systemd/releases";
32
33
maintainers = with maintainers; [ symphorien ];
33
34
license = licenses.lgpl2Only;
34
35
platforms = platforms.linux;
+2
-2
pkgs/servers/web-apps/wordpress/default.nix
+2
-2
pkgs/servers/web-apps/wordpress/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "wordpress";
5
-
version = "5.6.2";
5
+
version = "5.7.1";
6
6
7
7
src = fetchurl {
8
8
url = "https://wordpress.org/${pname}-${version}.tar.gz";
9
-
sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI=";
9
+
sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4";
10
10
};
11
11
12
12
installPhase = ''
+2
-1
pkgs/tools/filesystems/cryfs/default.nix
+2
-1
pkgs/tools/filesystems/cryfs/default.nix
···
62
62
"-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}"
63
63
] ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake";
64
64
65
-
doCheck = true;
65
+
# macFUSE needs to be installed for the test to succeed on Darwin
66
+
doCheck = !stdenv.isDarwin;
66
67
67
68
checkPhase = ''
68
69
# Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing)
+3
-3
pkgs/tools/games/ajour/default.nix
+3
-3
pkgs/tools/games/ajour/default.nix
···
34
34
35
35
in rustPlatform.buildRustPackage rec {
36
36
pname = "Ajour";
37
-
version = "1.0.0";
37
+
version = "1.1.0";
38
38
39
39
src = fetchFromGitHub {
40
40
owner = "casperstorm";
41
41
repo = "ajour";
42
42
rev = version;
43
-
sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y=";
43
+
sha256 = "1xzsgxkdwdqcr8xs9ajr1ykfjjz95z9k7b7l644yijg31xf1lbq6";
44
44
};
45
45
46
-
cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA=";
46
+
cargoSha256 = "02g25wr0f2bjr7zmpll3iicc6i8wk1j9iavagg1vhbpynp6z013x";
47
47
48
48
nativeBuildInputs = [
49
49
autoPatchelfHook
+2
-2
pkgs/tools/misc/ddcutil/default.nix
+2
-2
pkgs/tools/misc/ddcutil/default.nix
···
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "ddcutil";
6
-
version = "1.0.1";
6
+
version = "1.1.0";
7
7
8
8
src = fetchFromGitHub {
9
9
owner = "rockowitz";
10
10
repo = "ddcutil";
11
11
rev = "v${version}";
12
-
sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU=";
12
+
sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc";
13
13
};
14
14
15
15
patches = [
+26
-28
pkgs/tools/misc/ddcutil/nixos-paths.diff
+26
-28
pkgs/tools/misc/ddcutil/nixos-paths.diff
···
1
-
diff --git a/src/app_sysenv/query_sysenv_modules.c b/src/app_sysenv/query_sysenv_modules.c
2
-
index 59df64f1..fb244dd0 100644
3
-
--- a/src/app_sysenv/query_sysenv_modules.c
4
-
+++ b/src/app_sysenv/query_sysenv_modules.c
5
-
@@ -50,7 +50,9 @@ bool is_module_loadable(char * module_name, int depth) {
6
-
g_snprintf(module_name_ko, 100, "%s.ko", module_name);
7
-
8
-
char dirname[PATH_MAX];
9
-
- g_snprintf(dirname, PATH_MAX, "/lib/modules/%s/kernel/drivers/i2c", utsbuf.release);
10
-
+ g_snprintf(dirname, PATH_MAX,
11
-
+ "/run/booted-system/kernel-modules/lib/modules/%s/kernel/drivers/i2c",
12
-
+ utsbuf.release);
13
-
14
-
struct dirent *dent;
15
-
DIR *d;
16
-
diff --git a/src/util/linux_util.c b/src/util/linux_util.c
17
-
index 5eb8491c..3a129ccf 100644
18
1
--- a/src/util/linux_util.c
19
2
+++ b/src/util/linux_util.c
20
-
@@ -29,8 +29,10 @@ bool is_module_builtin(char * module_name)
21
-
int rc = uname(&utsbuf);
22
-
assert(rc == 0);
3
+
@@ -125,6 +125,7 @@
4
+
"lib64",
5
+
"lib32",
6
+
"usr/lib", // needed for arch?
7
+
+ "run/booted-system/kernel-modules/lib", // NixOS
8
+
NULL};
9
+
int result = -1;
10
+
int ndx = 0;
11
+
@@ -204,14 +205,15 @@
12
+
if (debug)
13
+
printf("(%s) machine: %s", __func__, utsbuf.machine);
23
14
24
-
- char modules_builtin_fn[100];
25
-
- snprintf(modules_builtin_fn, 100, "/lib/modules/%s/modules.builtin", utsbuf.release);
26
-
+ char modules_builtin_fn[PATH_MAX];
27
-
+ snprintf(modules_builtin_fn, PATH_MAX,
28
-
+ "/run/booted-system/kernel-modules/lib/modules/%s/modules.builtin",
29
-
+ utsbuf.release);
15
+
- char * libdirs[3];
16
+
+ char * libdirs[4];
17
+
libdirs[0] = "lib";
18
+
+ libdirs[1] = "run/booted-system/kernel-modules/lib";
19
+
if (streq(utsbuf.machine, "amd_64")){
20
+
- libdirs[1] = "lib64";
21
+
- libdirs[2] = NULL;
22
+
+ libdirs[2] = "lib64";
23
+
+ libdirs[3] = NULL;
24
+
}
25
+
else
26
+
- libdirs[1] = NULL;
27
+
+ libdirs[2] = NULL;
30
28
31
-
char ko_name[40];
32
-
snprintf(ko_name, 40, "%s.ko", module_name);
29
+
int libsndx = 0;
30
+
bool found = false;
+47
pkgs/tools/misc/flexoptix-app/default.nix
+47
pkgs/tools/misc/flexoptix-app/default.nix
···
1
+
{ lib, appimageTools, fetchurl }: let
2
+
pname = "flexoptix-app";
3
+
version = "5.9.0";
4
+
name = "${pname}-${version}";
5
+
6
+
src = fetchurl {
7
+
name = "${name}.AppImage";
8
+
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
9
+
sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj";
10
+
};
11
+
12
+
udevRules = fetchurl {
13
+
url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules";
14
+
sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr";
15
+
};
16
+
17
+
appimageContents = appimageTools.extractType2 {
18
+
inherit name src;
19
+
};
20
+
21
+
in appimageTools.wrapType2 {
22
+
inherit name src;
23
+
24
+
multiPkgs = null; # no 32bit needed
25
+
extraPkgs = { pkgs, ... }@args: [
26
+
pkgs.hidapi
27
+
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
28
+
29
+
extraInstallCommands = ''
30
+
mv $out/bin/{${name},${pname}}
31
+
install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications
32
+
install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps
33
+
substituteInPlace $out/share/applications/flexoptix-app.desktop \
34
+
--replace 'Exec=AppRun' "Exec=$out/bin/${pname}"
35
+
mkdir -p $out/lib/udev/rules.d
36
+
ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules
37
+
'';
38
+
39
+
meta = {
40
+
description = "Configure FLEXOPTIX Universal Transcievers in seconds";
41
+
homepage = "https://www.flexoptix.net";
42
+
changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog";
43
+
license = lib.licenses.unfree;
44
+
maintainers = with lib.maintainers; [ das_j ];
45
+
platforms = [ "x86_64-linux" ];
46
+
};
47
+
}
+9
-6
pkgs/tools/misc/handlr/default.nix
+9
-6
pkgs/tools/misc/handlr/default.nix
···
1
-
{ lib, rustPlatform, fetchFromGitHub }:
1
+
{ lib, rustPlatform, fetchFromGitHub, shared-mime-info }:
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "handlr";
5
-
version = "0.5.0";
5
+
version = "0.6.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "chmln";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg";
11
+
sha256 = "0mxkirsicagvfyihcb06g2bsz5h0zp7xc87vldp4amgddzaxhpbg";
12
12
};
13
13
14
-
cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p";
14
+
cargoSha256 = "11glh6f0cjrq76212h80na2rgwpzjmk0j78y3i98nv203rkrczid";
15
+
16
+
nativeBuildInputs = [ shared-mime-info ];
15
17
16
-
# Most tests fail (at least some due to directory permissions)
17
-
doCheck = false;
18
+
preCheck = ''
19
+
export HOME=$TEMPDIR
20
+
'';
18
21
19
22
meta = with lib; {
20
23
description = "Alternative to xdg-open to manage default applications with ease";
+3
-3
pkgs/tools/security/prs/default.nix
+3
-3
pkgs/tools/security/prs/default.nix
···
13
13
14
14
rustPlatform.buildRustPackage rec {
15
15
pname = "prs";
16
-
version = "0.2.8";
16
+
version = "0.2.9";
17
17
18
18
src = fetchFromGitLab {
19
19
owner = "timvisee";
20
20
repo = "prs";
21
21
rev = "v${version}";
22
-
sha256 = "sha256-TPgS3gtSfCAtQyQCZ0HadxvmX6+dP/3SE/WumzzYUAw=";
22
+
sha256 = "sha256-9qaRhTfdppU72w8jDwD1e8ABuGG+9GyrRIUVsry4Vos=";
23
23
};
24
24
25
-
cargoSha256 = "sha256-djKtmQHBVXEfn91avJCsVJwEJIE3xL1umvoLAIyXSrw=";
25
+
cargoSha256 = "sha256-j+kyllMcYj7/Ig5ho548L1wW+TtuQOc/zkxT6SNNN6w=";
26
26
27
27
postPatch = ''
28
28
# The GPGME backend is recommended
+2
-2
pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
+2
-2
pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
···
7
7
8
8
+#ifndef ALLOW_NON_TSS_CONFIG_FILE
9
9
/* make sure user/group TSS owns the conf file */
10
-
if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) {
10
+
if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) {
11
11
LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file,
12
12
@@ -775,6 +776,7 @@
13
-
LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file);
13
+
LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file);
14
14
return TCSERR(TSS_E_INTERNAL_ERROR);
15
15
}
16
16
+#endif
+4
-6
pkgs/tools/security/trousers/default.nix
+4
-6
pkgs/tools/security/trousers/default.nix
···
1
-
{ lib, stdenv, fetchurl, openssl, pkg-config }:
1
+
{ lib, stdenv, fetchurl, openssl, pkg-config, autoreconfHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "trousers";
5
-
version = "0.3.14";
5
+
version = "0.3.15";
6
6
7
7
src = fetchurl {
8
8
url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
9
-
sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f";
9
+
sha256 = "0zy7r9cnr2gvwr2fb1q4fc5xnvx405ymcbrdv7qsqwl3a4zfjnqy";
10
10
};
11
11
12
-
sourceRoot = ".";
13
-
14
-
nativeBuildInputs = [ pkg-config ];
12
+
nativeBuildInputs = [ pkg-config autoreconfHook ];
15
13
buildInputs = [ openssl ];
16
14
17
15
patches = [ ./allow-non-tss-config-file-owner.patch ];
+2
-2
pkgs/tools/security/vault/default.nix
+2
-2
pkgs/tools/security/vault/default.nix
···
2
2
3
3
buildGoPackage rec {
4
4
pname = "vault";
5
-
version = "1.7.0";
5
+
version = "1.7.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "hashicorp";
9
9
repo = "vault";
10
10
rev = "v${version}";
11
-
sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg";
11
+
sha256 = "0ncy99gw2pp5v2qbbgvri7qlirjj8qsvgjmjqyx3gddlpzpyiz3q";
12
12
};
13
13
14
14
goPackagePath = "github.com/hashicorp/vault";
+5
-5
pkgs/tools/security/vault/vault-bin.nix
+5
-5
pkgs/tools/security/vault/vault-bin.nix
···
1
1
{ lib, stdenv, fetchurl, unzip }:
2
2
3
3
let
4
-
version = "1.7.0";
4
+
version = "1.7.1";
5
5
6
6
sources = let
7
7
base = "https://releases.hashicorp.com/vault/${version}";
8
8
in {
9
9
x86_64-linux = fetchurl {
10
10
url = "${base}/vault_${version}_linux_amd64.zip";
11
-
sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma";
11
+
sha256 = "021qa8jcqwy27q83lvamvv5zqnkwk5y0jsb8al5yxpgzxqnmsyb1";
12
12
};
13
13
i686-linux = fetchurl {
14
14
url = "${base}/vault_${version}_linux_386.zip";
15
-
sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd";
15
+
sha256 = "02hhxpa8craa91nfgvwziswisfdnqw4gbwrxyxr753v1y00y1sz8";
16
16
};
17
17
x86_64-darwin = fetchurl {
18
18
url = "${base}/vault_${version}_darwin_amd64.zip";
19
-
sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp";
19
+
sha256 = "141zzfwrjdjv8ymrdc4mxs2f4cphdir4xjaa40s571ri38in33zh";
20
20
};
21
21
aarch64-linux = fetchurl {
22
22
url = "${base}/vault_${version}_linux_arm64.zip";
23
-
sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg";
23
+
sha256 = "1plrmmy86zb2ij49dk2mwn364i2n83ch4gjz5pln2d4wjx21gpaq";
24
24
};
25
25
};
26
26
+8
-2
pkgs/tools/system/gdu/default.nix
+8
-2
pkgs/tools/system/gdu/default.nix
···
1
1
{ lib
2
-
, stdenv
3
2
, buildGoModule
4
3
, fetchFromGitHub
5
4
, installShellFiles
···
35
34
installManPage gdu.1
36
35
'';
37
36
38
-
doCheck = !(stdenv.isAarch64 || stdenv.isDarwin);
37
+
# tests fail with:
38
+
# dir_test.go:76:
39
+
# Error Trace: dir_test.go:76
40
+
# Error: Not equal:
41
+
# expected: 0
42
+
# actual : 512
43
+
# Test: TestFlags
44
+
doCheck = false;
39
45
40
46
meta = with lib; {
41
47
description = "Disk usage analyzer with console interface";
+6
pkgs/top-level/all-packages.nix
+6
pkgs/top-level/all-packages.nix
···
4515
4515
4516
4516
flent = python3Packages.callPackage ../applications/networking/flent { };
4517
4517
4518
+
flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
4519
+
4518
4520
flpsed = callPackage ../applications/editors/flpsed { };
4519
4521
4520
4522
fluentd = callPackage ../tools/misc/fluentd { };
···
23693
23695
'' + (drv.postInstall or "");
23694
23696
});
23695
23697
23698
+
pixelnuke = callPackage ../applications/graphics/pixelnuke { };
23699
+
23696
23700
slack = callPackage ../applications/networking/instant-messengers/slack { };
23697
23701
23698
23702
slack-cli = callPackage ../tools/networking/slack-cli { };
···
23814
23818
waybox = callPackage ../applications/window-managers/waybox {
23815
23819
wlroots = wlroots_0_12;
23816
23820
};
23821
+
23822
+
workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
23817
23823
23818
23824
windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
23819
23825
+14
-2
pkgs/top-level/python-packages.nix
+14
-2
pkgs/top-level/python-packages.nix
···
3043
3043
3044
3044
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
3045
3045
3046
+
homeconnect = callPackage ../development/python-modules/homeconnect { };
3047
+
3046
3048
homematicip = callPackage ../development/python-modules/homematicip { };
3047
3049
3048
3050
homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
···
5354
5356
5355
5357
pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
5356
5358
5359
+
pycocotools = callPackage ../development/python-modules/pycocotools { };
5360
+
5357
5361
pycodestyle = callPackage ../development/python-modules/pycodestyle { };
5358
5362
5359
5363
pycognito = callPackage ../development/python-modules/pycognito { };
···
6074
6078
6075
6079
pysmappee = callPackage ../development/python-modules/pysmappee { };
6076
6080
6077
-
pysmb = callPackage ../development/python-modules/pysmb { };
6078
-
6079
6081
pysmart-smartx = callPackage ../development/python-modules/pysmart-smartx { };
6082
+
6083
+
pysmartapp = callPackage ../development/python-modules/pysmartapp { };
6084
+
6085
+
pysmartthings = callPackage ../development/python-modules/pysmartthings { };
6086
+
6087
+
pysmb = callPackage ../development/python-modules/pysmb { };
6080
6088
6081
6089
pysmbc = callPackage ../development/python-modules/pysmbc { };
6082
6090
···
7299
7307
7300
7308
seqdiag = callPackage ../development/python-modules/seqdiag { };
7301
7309
7310
+
seqeval = callPackage ../development/python-modules/seqeval { };
7311
+
7302
7312
sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override {
7303
7313
pythonPackages = self;
7304
7314
pythonSupport = true;
···
7450
7460
smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
7451
7461
7452
7462
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
7463
+
7464
+
smhi-pkg = callPackage ../development/python-modules/smhi-pkg { };
7453
7465
7454
7466
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
7455
7467