Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
c1f851b2ee
|
|
@ -11,7 +11,7 @@
|
||||||
/.github/CODEOWNERS @edolstra
|
/.github/CODEOWNERS @edolstra
|
||||||
|
|
||||||
# GitHub actions
|
# GitHub actions
|
||||||
/.github/workflows @Mic92 @zowoq
|
/.github/workflows @NixOS/Security @Mic92 @zowoq
|
||||||
/.github/workflows/merge-staging @FRidh
|
/.github/workflows/merge-staging @FRidh
|
||||||
|
|
||||||
# EditorConfig
|
# EditorConfig
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,10 @@ on:
|
||||||
pull_request_target:
|
pull_request_target:
|
||||||
types: [edited, opened, synchronize, reopened]
|
types: [edited, opened, synchronize, reopened]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
labels:
|
labels:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
name: "Build NixOS manual"
|
name: "Build NixOS manual"
|
||||||
|
|
||||||
|
permissions: read-all
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request_target:
|
pull_request_target:
|
||||||
branches:
|
branches:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
name: "Build Nixpkgs manual"
|
name: "Build Nixpkgs manual"
|
||||||
|
|
||||||
|
permissions: read-all
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request_target:
|
pull_request_target:
|
||||||
branches:
|
branches:
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
<para>
|
<para>
|
||||||
This chapter describes tools for creating various types of images.
|
This chapter describes tools for creating various types of images.
|
||||||
</para>
|
</para>
|
||||||
<xi:include href="images/appimagetools.xml" />
|
<xi:include href="images/appimagetools.section.xml" />
|
||||||
<xi:include href="images/dockertools.section.xml" />
|
<xi:include href="images/dockertools.section.xml" />
|
||||||
<xi:include href="images/ocitools.section.xml" />
|
<xi:include href="images/ocitools.section.xml" />
|
||||||
<xi:include href="images/snaptools.xml" />
|
<xi:include href="images/snaptools.section.xml" />
|
||||||
</chapter>
|
</chapter>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
# pkgs.appimageTools {#sec-pkgs-appimageTools}
|
||||||
|
|
||||||
|
`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.
|
||||||
|
|
||||||
|
::: warning
|
||||||
|
The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future.
|
||||||
|
:::
|
||||||
|
|
||||||
|
## AppImage formats {#ssec-pkgs-appimageTools-formats}
|
||||||
|
|
||||||
|
There are different formats for AppImages, see [the specification](https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format) for details.
|
||||||
|
|
||||||
|
- Type 1 images are ISO 9660 files that are also ELF executables.
|
||||||
|
- Type 2 images are ELF executables with an appended filesystem.
|
||||||
|
|
||||||
|
They can be told apart with `file -k`:
|
||||||
|
|
||||||
|
```ShellSession
|
||||||
|
$ file -k type1.AppImage
|
||||||
|
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,
|
||||||
|
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
|
||||||
|
|
||||||
|
$ file -k type2.AppImage
|
||||||
|
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
|
||||||
|
```
|
||||||
|
|
||||||
|
Note how the type 1 AppImage is described as an `ISO 9660 CD-ROM filesystem`, and the type 2 AppImage is not.
|
||||||
|
|
||||||
|
## Wrapping {#ssec-pkgs-appimageTools-wrapping}
|
||||||
|
|
||||||
|
Depending on the type of AppImage you're wrapping, you'll have to use `wrapType1` or `wrapType2`.
|
||||||
|
|
||||||
|
```nix
|
||||||
|
appimageTools.wrapType2 { # or wrapType1
|
||||||
|
name = "patchwork";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
|
||||||
|
sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
|
||||||
|
};
|
||||||
|
extraPkgs = pkgs: with pkgs; [ ];
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- `name` specifies the name of the resulting image.
|
||||||
|
- `src` specifies the AppImage file to extract.
|
||||||
|
- `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:
|
||||||
|
- 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`.
|
||||||
|
- Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found.
|
||||||
|
|
@ -1,102 +0,0 @@
|
||||||
<section xmlns="http://docbook.org/ns/docbook"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
|
||||||
xml:id="sec-pkgs-appimageTools">
|
|
||||||
<title>pkgs.appimageTools</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
<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.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<warning>
|
|
||||||
<para>
|
|
||||||
The <varname>appimageTools</varname> API is unstable and may be subject to backwards-incompatible changes in the future.
|
|
||||||
</para>
|
|
||||||
</warning>
|
|
||||||
|
|
||||||
<section xml:id="ssec-pkgs-appimageTools-formats">
|
|
||||||
<title>AppImage formats</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
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.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<itemizedlist>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Type 1 images are ISO 9660 files that are also ELF executables.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Type 2 images are ELF executables with an appended filesystem.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</itemizedlist>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
They can be told apart with <command>file -k</command>:
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<screen>
|
|
||||||
<prompt>$ </prompt>file -k type1.AppImage
|
|
||||||
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,
|
|
||||||
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
|
|
||||||
|
|
||||||
<prompt>$ </prompt>file -k type2.AppImage
|
|
||||||
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
|
|
||||||
</screen>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM filesystem</literal>, and the type 2 AppImage is not.
|
|
||||||
</para>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section xml:id="ssec-pkgs-appimageTools-wrapping">
|
|
||||||
<title>Wrapping</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
Depending on the type of AppImage you're wrapping, you'll have to use <varname>wrapType1</varname> or <varname>wrapType2</varname>.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<programlisting>
|
|
||||||
appimageTools.wrapType2 { # or wrapType1
|
|
||||||
name = "patchwork"; <co xml:id='ex-appimageTools-wrapping-1' />
|
|
||||||
src = fetchurl { <co xml:id='ex-appimageTools-wrapping-2' />
|
|
||||||
url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
|
|
||||||
sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
|
|
||||||
};
|
|
||||||
extraPkgs = pkgs: with pkgs; [ ]; <co xml:id='ex-appimageTools-wrapping-3' />
|
|
||||||
}</programlisting>
|
|
||||||
|
|
||||||
<calloutlist>
|
|
||||||
<callout arearefs='ex-appimageTools-wrapping-1'>
|
|
||||||
<para>
|
|
||||||
<varname>name</varname> specifies the name of the resulting image.
|
|
||||||
</para>
|
|
||||||
</callout>
|
|
||||||
<callout arearefs='ex-appimageTools-wrapping-2'>
|
|
||||||
<para>
|
|
||||||
<varname>src</varname> specifies the AppImage file to extract.
|
|
||||||
</para>
|
|
||||||
</callout>
|
|
||||||
<callout arearefs='ex-appimageTools-wrapping-3'>
|
|
||||||
<para>
|
|
||||||
<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:
|
|
||||||
<itemizedlist>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
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>.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Running <command>strace -vfefile</command> on the wrapped executable, looking for libraries that can't be found.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</itemizedlist>
|
|
||||||
</para>
|
|
||||||
</callout>
|
|
||||||
</calloutlist>
|
|
||||||
</section>
|
|
||||||
</section>
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
let
|
|
||||||
inherit (import <nixpkgs> { }) snapTools firefox;
|
|
||||||
in snapTools.makeSnap {
|
|
||||||
meta = {
|
|
||||||
name = "nix-example-firefox";
|
|
||||||
summary = firefox.meta.description;
|
|
||||||
architectures = [ "amd64" ];
|
|
||||||
apps.nix-example-firefox = {
|
|
||||||
command = "${firefox}/bin/firefox";
|
|
||||||
plugs = [
|
|
||||||
"pulseaudio"
|
|
||||||
"camera"
|
|
||||||
"browser-support"
|
|
||||||
"avahi-observe"
|
|
||||||
"cups-control"
|
|
||||||
"desktop"
|
|
||||||
"desktop-legacy"
|
|
||||||
"gsettings"
|
|
||||||
"home"
|
|
||||||
"network"
|
|
||||||
"mount-observe"
|
|
||||||
"removable-media"
|
|
||||||
"x11"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
confinement = "strict";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
let
|
|
||||||
inherit (import <nixpkgs> { }) snapTools hello;
|
|
||||||
in snapTools.makeSnap {
|
|
||||||
meta = {
|
|
||||||
name = "hello";
|
|
||||||
summary = hello.meta.description;
|
|
||||||
description = hello.meta.longDescription;
|
|
||||||
architectures = [ "amd64" ];
|
|
||||||
confinement = "strict";
|
|
||||||
apps.hello.command = "${hello}/bin/hello";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
# pkgs.snapTools {#sec-pkgs-snapTools}
|
||||||
|
|
||||||
|
`pkgs.snapTools` is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
|
||||||
|
|
||||||
|
## The makeSnap Function {#ssec-pkgs-snapTools-makeSnap-signature}
|
||||||
|
|
||||||
|
`makeSnap` takes a single named argument, `meta`. This argument mirrors [the upstream `snap.yaml` format](https://docs.snapcraft.io/snap-format) exactly.
|
||||||
|
|
||||||
|
The `base` should not be specified, as `makeSnap` will force set it.
|
||||||
|
|
||||||
|
Currently, `makeSnap` does not support creating GUI stubs.
|
||||||
|
|
||||||
|
## Build a Hello World Snap {#ssec-pkgs-snapTools-build-a-snap-hello}
|
||||||
|
|
||||||
|
The following expression packages GNU Hello as a Snapcraft snap.
|
||||||
|
|
||||||
|
```{#ex-snapTools-buildSnap-hello .nix}
|
||||||
|
let
|
||||||
|
inherit (import <nixpkgs> { }) snapTools hello;
|
||||||
|
in snapTools.makeSnap {
|
||||||
|
meta = {
|
||||||
|
name = "hello";
|
||||||
|
summary = hello.meta.description;
|
||||||
|
description = hello.meta.longDescription;
|
||||||
|
architectures = [ "amd64" ];
|
||||||
|
confinement = "strict";
|
||||||
|
apps.hello.command = "${hello}/bin/hello";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`nix-build` this expression and install it with `snap install ./result --dangerous`. `hello` will now be the Snapcraft version of the package.
|
||||||
|
|
||||||
|
## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox}
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
```{#ex-snapTools-buildSnap-firefox .nix}
|
||||||
|
let
|
||||||
|
inherit (import <nixpkgs> { }) snapTools firefox;
|
||||||
|
in snapTools.makeSnap {
|
||||||
|
meta = {
|
||||||
|
name = "nix-example-firefox";
|
||||||
|
summary = firefox.meta.description;
|
||||||
|
architectures = [ "amd64" ];
|
||||||
|
apps.nix-example-firefox = {
|
||||||
|
command = "${firefox}/bin/firefox";
|
||||||
|
plugs = [
|
||||||
|
"pulseaudio"
|
||||||
|
"camera"
|
||||||
|
"browser-support"
|
||||||
|
"avahi-observe"
|
||||||
|
"cups-control"
|
||||||
|
"desktop"
|
||||||
|
"desktop-legacy"
|
||||||
|
"gsettings"
|
||||||
|
"home"
|
||||||
|
"network"
|
||||||
|
"mount-observe"
|
||||||
|
"removable-media"
|
||||||
|
"x11"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
confinement = "strict";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`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.
|
||||||
|
|
||||||
|
The specific meaning behind plugs can be looked up in the [Snapcraft interface documentation](https://docs.snapcraft.io/supported-interfaces).
|
||||||
|
|
@ -1,59 +0,0 @@
|
||||||
<section xmlns="http://docbook.org/ns/docbook"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
|
||||||
xml:id="sec-pkgs-snapTools">
|
|
||||||
<title>pkgs.snapTools</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
<varname>pkgs.snapTools</varname> is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<section xml:id="ssec-pkgs-snapTools-makeSnap-signature">
|
|
||||||
<title>The makeSnap Function</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
<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.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
The <parameter>base</parameter> should not be specified, as <function>makeSnap</function> will force set it.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
Currently, <function>makeSnap</function> does not support creating GUI stubs.
|
|
||||||
</para>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section xml:id="ssec-pkgs-snapTools-build-a-snap-hello">
|
|
||||||
<title>Build a Hello World Snap</title>
|
|
||||||
|
|
||||||
<example xml:id="ex-snapTools-buildSnap-hello">
|
|
||||||
<title>Making a Hello World Snap</title>
|
|
||||||
<para>
|
|
||||||
The following expression packages GNU Hello as a Snapcraft snap.
|
|
||||||
</para>
|
|
||||||
<programlisting><xi:include href="./snap/example-hello.nix" parse="text" /></programlisting>
|
|
||||||
<para>
|
|
||||||
<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.
|
|
||||||
</para>
|
|
||||||
</example>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section xml:id="ssec-pkgs-snapTools-build-a-snap-firefox">
|
|
||||||
<title>Build a Hello World Snap</title>
|
|
||||||
|
|
||||||
<example xml:id="ex-snapTools-buildSnap-firefox">
|
|
||||||
<title>Making a Graphical Snap</title>
|
|
||||||
<para>
|
|
||||||
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.
|
|
||||||
</para>
|
|
||||||
<programlisting><xi:include href="./snap/example-firefox.nix" parse="text" /></programlisting>
|
|
||||||
<para>
|
|
||||||
<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.
|
|
||||||
</para>
|
|
||||||
<para>
|
|
||||||
The specific meaning behind plugs can be looked up in the <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft interface documentation</link>.
|
|
||||||
</para>
|
|
||||||
</example>
|
|
||||||
</section>
|
|
||||||
</section>
|
|
||||||
|
|
@ -33,7 +33,9 @@ let
|
||||||
"mmix-mmixware"
|
"mmix-mmixware"
|
||||||
|
|
||||||
# NetBSD
|
# NetBSD
|
||||||
"i686-netbsd" "x86_64-netbsd"
|
"aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd"
|
||||||
|
"i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd"
|
||||||
|
"riscv64-netbsd" "x86_64-netbsd"
|
||||||
|
|
||||||
# none
|
# none
|
||||||
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
|
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,9 @@ in
|
||||||
with lib.systems.doubles; lib.runTests {
|
with lib.systems.doubles; lib.runTests {
|
||||||
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
|
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
|
||||||
|
|
||||||
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
|
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
|
||||||
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
|
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
|
||||||
testmips = mseteq mips [ "mipsel-linux" ];
|
testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ];
|
||||||
testmmix = mseteq mmix [ "mmix-mmixware" ];
|
testmmix = mseteq mmix [ "mmix-mmixware" ];
|
||||||
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" ];
|
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" ];
|
||||||
|
|
||||||
|
|
@ -29,7 +29,7 @@ with lib.systems.doubles; lib.runTests {
|
||||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||||
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" ];
|
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" ];
|
||||||
testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
|
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||||
testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);
|
testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);
|
||||||
|
|
|
||||||
|
|
@ -691,6 +691,13 @@ environment.systemPackages = [
|
||||||
In <option>services.xserver.xkbVariant</option> it's still <literal>dvp</literal>.
|
In <option>services.xserver.xkbVariant</option> it's still <literal>dvp</literal>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <package>babeld</package> service is now being run as an unprivileged user. To achieve that the module configures
|
||||||
|
<literal>skip-kernel-setup true</literal> and takes care of setting forwarding and rp_filter sysctls by itself as well
|
||||||
|
as for each interface in <varname>services.babeld.interfaces</varname>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,7 @@
|
||||||
./programs/file-roller.nix
|
./programs/file-roller.nix
|
||||||
./programs/firejail.nix
|
./programs/firejail.nix
|
||||||
./programs/fish.nix
|
./programs/fish.nix
|
||||||
|
./programs/flexoptix-app.nix
|
||||||
./programs/freetds.nix
|
./programs/freetds.nix
|
||||||
./programs/fuse.nix
|
./programs/fuse.nix
|
||||||
./programs/geary.nix
|
./programs/geary.nix
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.programs.flexoptix-app;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
programs.flexoptix-app = {
|
||||||
|
enable = mkEnableOption "FLEXOPTIX app + udev rules";
|
||||||
|
|
||||||
|
package = mkOption {
|
||||||
|
description = "FLEXOPTIX app package to use";
|
||||||
|
type = types.package;
|
||||||
|
default = pkgs.flexoptix-app;
|
||||||
|
defaultText = "\${pkgs.flexoptix-app}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
services.udev.packages = [ cfg.package ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -192,6 +192,7 @@ in
|
||||||
path = [ pkgs.nagios ] ++ cfg.plugins;
|
path = [ pkgs.nagios ] ++ cfg.plugins;
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
|
restartTriggers = [ nagiosCfgFile ];
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = "nagios";
|
User = "nagios";
|
||||||
|
|
@ -201,7 +202,6 @@ in
|
||||||
LogsDirectory = "nagios";
|
LogsDirectory = "nagios";
|
||||||
StateDirectory = "nagios";
|
StateDirectory = "nagios";
|
||||||
ExecStart = "${pkgs.nagios}/bin/nagios /etc/nagios.cfg";
|
ExecStart = "${pkgs.nagios}/bin/nagios /etc/nagios.cfg";
|
||||||
X-ReloadIfChanged = nagiosCfgFile;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,10 @@ let
|
||||||
"interface ${name} ${paramsString interface}\n";
|
"interface ${name} ${paramsString interface}\n";
|
||||||
|
|
||||||
configFile = with cfg; pkgs.writeText "babeld.conf" (
|
configFile = with cfg; pkgs.writeText "babeld.conf" (
|
||||||
(optionalString (cfg.interfaceDefaults != null) ''
|
''
|
||||||
|
skip-kernel-setup true
|
||||||
|
''
|
||||||
|
+ (optionalString (cfg.interfaceDefaults != null) ''
|
||||||
default ${paramsString cfg.interfaceDefaults}
|
default ${paramsString cfg.interfaceDefaults}
|
||||||
'')
|
'')
|
||||||
+ (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
|
+ (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
|
||||||
|
|
@ -84,13 +87,22 @@ in
|
||||||
|
|
||||||
config = mkIf config.services.babeld.enable {
|
config = mkIf config.services.babeld.enable {
|
||||||
|
|
||||||
|
boot.kernel.sysctl = {
|
||||||
|
"net.ipv6.conf.all.forwarding" = 1;
|
||||||
|
"net.ipv6.conf.all.accept_redirects" = 0;
|
||||||
|
"net.ipv4.conf.all.forwarding" = 1;
|
||||||
|
"net.ipv4.conf.all.rp_filter" = 0;
|
||||||
|
} // lib.mapAttrs' (ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)) config.services.babeld.interfaces;
|
||||||
|
|
||||||
systemd.services.babeld = {
|
systemd.services.babeld = {
|
||||||
description = "Babel routing daemon";
|
description = "Babel routing daemon";
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state";
|
ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state";
|
||||||
|
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||||
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
|
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
|
||||||
|
DynamicUser = true;
|
||||||
IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ];
|
IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ];
|
||||||
IPAddressDeny = "any";
|
IPAddressDeny = "any";
|
||||||
LockPersonality = true;
|
LockPersonality = true;
|
||||||
|
|
@ -98,7 +110,7 @@ in
|
||||||
MemoryDenyWriteExecute = true;
|
MemoryDenyWriteExecute = true;
|
||||||
ProtectSystem = "strict";
|
ProtectSystem = "strict";
|
||||||
ProtectClock = true;
|
ProtectClock = true;
|
||||||
ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system
|
ProtectKernelTunables = true;
|
||||||
ProtectKernelModules = true;
|
ProtectKernelModules = true;
|
||||||
ProtectKernelLogs = true;
|
ProtectKernelLogs = true;
|
||||||
ProtectControlGroups = true;
|
ProtectControlGroups = true;
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,8 @@ let
|
||||||
// (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {})
|
// (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {})
|
||||||
// cfg.extraConfig;
|
// cfg.extraConfig;
|
||||||
|
|
||||||
|
systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@resources" "@setuid" "@swap" ];
|
||||||
|
|
||||||
cfgService = {
|
cfgService = {
|
||||||
# User and group
|
# User and group
|
||||||
User = cfg.user;
|
User = cfg.user;
|
||||||
|
|
@ -68,7 +70,6 @@ let
|
||||||
PrivateMounts = true;
|
PrivateMounts = true;
|
||||||
# System Call Filtering
|
# System Call Filtering
|
||||||
SystemCallArchitectures = "native";
|
SystemCallArchitectures = "native";
|
||||||
SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") (
|
envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") (
|
||||||
|
|
@ -432,6 +433,8 @@ in {
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
WorkingDirectory = cfg.package;
|
WorkingDirectory = cfg.package;
|
||||||
|
# System Call Filtering
|
||||||
|
SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
|
||||||
} // cfgService;
|
} // cfgService;
|
||||||
|
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
|
|
@ -457,6 +460,8 @@ in {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
|
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
|
||||||
WorkingDirectory = cfg.package;
|
WorkingDirectory = cfg.package;
|
||||||
|
# System Call Filtering
|
||||||
|
SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
|
||||||
} // cfgService;
|
} // cfgService;
|
||||||
after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []);
|
after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []);
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
@ -481,6 +486,8 @@ in {
|
||||||
# Runtime directory and mode
|
# Runtime directory and mode
|
||||||
RuntimeDirectory = "mastodon-streaming";
|
RuntimeDirectory = "mastodon-streaming";
|
||||||
RuntimeDirectoryMode = "0750";
|
RuntimeDirectoryMode = "0750";
|
||||||
|
# System Call Filtering
|
||||||
|
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
|
||||||
} // cfgService;
|
} // cfgService;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -503,6 +510,8 @@ in {
|
||||||
# Runtime directory and mode
|
# Runtime directory and mode
|
||||||
RuntimeDirectory = "mastodon-web";
|
RuntimeDirectory = "mastodon-web";
|
||||||
RuntimeDirectoryMode = "0750";
|
RuntimeDirectoryMode = "0750";
|
||||||
|
# System Call Filtering
|
||||||
|
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
|
||||||
} // cfgService;
|
} // cfgService;
|
||||||
path = with pkgs; [ file imagemagick ffmpeg ];
|
path = with pkgs; [ file imagemagick ffmpeg ];
|
||||||
};
|
};
|
||||||
|
|
@ -522,6 +531,8 @@ in {
|
||||||
RestartSec = 20;
|
RestartSec = 20;
|
||||||
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
|
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
|
||||||
WorkingDirectory = cfg.package;
|
WorkingDirectory = cfg.package;
|
||||||
|
# System Call Filtering
|
||||||
|
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
|
||||||
} // cfgService;
|
} // cfgService;
|
||||||
path = with pkgs; [ file imagemagick ffmpeg ];
|
path = with pkgs; [ file imagemagick ffmpeg ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -887,6 +887,7 @@ in
|
||||||
users.users = optionalAttrs (cfg.user == "nginx") {
|
users.users = optionalAttrs (cfg.user == "nginx") {
|
||||||
nginx = {
|
nginx = {
|
||||||
group = cfg.group;
|
group = cfg.group;
|
||||||
|
isSystemUser = true;
|
||||||
uid = config.ids.uids.nginx;
|
uid = config.ids.uids.nginx;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||||
{
|
{
|
||||||
virtualisation.vlans = [ 10 20 ];
|
virtualisation.vlans = [ 10 20 ];
|
||||||
|
|
||||||
boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1;
|
|
||||||
boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
firewall.enable = false;
|
firewall.enable = false;
|
||||||
|
|
@ -74,9 +71,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||||
{
|
{
|
||||||
virtualisation.vlans = [ 20 30 ];
|
virtualisation.vlans = [ 20 30 ];
|
||||||
|
|
||||||
boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1;
|
|
||||||
boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
firewall.enable = false;
|
firewall.enable = false;
|
||||||
|
|
|
||||||
|
|
@ -118,6 +118,8 @@ let
|
||||||
metricProvider = {
|
metricProvider = {
|
||||||
services.bird2.enable = true;
|
services.bird2.enable = true;
|
||||||
services.bird2.config = ''
|
services.bird2.config = ''
|
||||||
|
router id 127.0.0.1;
|
||||||
|
|
||||||
protocol kernel MyObviousTestString {
|
protocol kernel MyObviousTestString {
|
||||||
ipv4 {
|
ipv4 {
|
||||||
import all;
|
import all;
|
||||||
|
|
@ -132,7 +134,9 @@ let
|
||||||
exporterTest = ''
|
exporterTest = ''
|
||||||
wait_for_unit("prometheus-bird-exporter.service")
|
wait_for_unit("prometheus-bird-exporter.service")
|
||||||
wait_for_open_port(9324)
|
wait_for_open_port(9324)
|
||||||
succeed("curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'")
|
wait_until_succeeds(
|
||||||
|
"curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'"
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,15 +46,13 @@ let
|
||||||
];
|
];
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "pulseeffects";
|
pname = "pulseeffects";
|
||||||
# 5.0.3 crashes. Test carefully before updating.
|
version = "5.0.3";
|
||||||
# https://github.com/wwmm/pulseeffects/issues/927
|
|
||||||
version = "5.0.2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wwmm";
|
owner = "wwmm";
|
||||||
repo = "pulseeffects";
|
repo = "pulseeffects";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm";
|
sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "drawing";
|
pname = "drawing";
|
||||||
version = "0.4.13";
|
version = "0.8.0";
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
|
|
@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
owner = "maoschanz";
|
owner = "maoschanz";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53";
|
sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "pixelnuke";
|
||||||
|
version = "unstable-2019-05-19";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "defnull";
|
||||||
|
repo = "pixelflut";
|
||||||
|
rev = "3458157a242ba1789de7ce308480f4e1cbacc916";
|
||||||
|
sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40";
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = "source/pixelnuke";
|
||||||
|
|
||||||
|
buildInputs = [ libevent glew glfw ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm755 ./pixelnuke $out/bin/pixelnuke
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Multiplayer canvas (C implementation)";
|
||||||
|
homepage = "https://cccgoe.de/wiki/Pixelflut";
|
||||||
|
license = licenses.unlicense;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ mrVanDalo ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -110,16 +110,19 @@ let
|
||||||
buildPath = "out/${buildType}";
|
buildPath = "out/${buildType}";
|
||||||
libExecPath = "$out/libexec/${packageName}";
|
libExecPath = "$out/libexec/${packageName}";
|
||||||
|
|
||||||
|
warnObsoleteVersionConditional = min-version: result:
|
||||||
|
let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
|
||||||
|
in if versionAtLeast ungoogled-version min-version
|
||||||
|
then warn "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
|
||||||
|
result
|
||||||
|
else result;
|
||||||
chromiumVersionAtLeast = min-version:
|
chromiumVersionAtLeast = min-version:
|
||||||
versionAtLeast upstream-info.version min-version;
|
let result = versionAtLeast upstream-info.version min-version;
|
||||||
|
in warnObsoleteVersionConditional min-version result;
|
||||||
versionRange = min-version: upto-version:
|
versionRange = min-version: upto-version:
|
||||||
let inherit (upstream-info) version;
|
let inherit (upstream-info) version;
|
||||||
result = versionAtLeast version min-version && versionOlder version upto-version;
|
result = versionAtLeast version min-version && versionOlder version upto-version;
|
||||||
ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
|
in warnObsoleteVersionConditional upto-version result;
|
||||||
in if versionAtLeast ungoogled-version upto-version
|
|
||||||
then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
|
|
||||||
result
|
|
||||||
else result;
|
|
||||||
|
|
||||||
ungoogler = ungoogled-chromium {
|
ungoogler = ungoogled-chromium {
|
||||||
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
|
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
|
||||||
|
|
@ -162,17 +165,9 @@ let
|
||||||
patches = [
|
patches = [
|
||||||
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
||||||
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
||||||
# ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
|
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
|
||||||
] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch
|
|
||||||
# To fix the build of chromiumBeta and chromiumDev:
|
|
||||||
"b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs
|
|
||||||
"1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x"
|
|
||||||
) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
|
|
||||||
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
|
|
||||||
}) ++ optional (chromiumVersionAtLeast "90")
|
|
||||||
./patches/fix-missing-atspi2-dependency.patch
|
./patches/fix-missing-atspi2-dependency.patch
|
||||||
++ optionals (chromiumVersionAtLeast "91") [
|
] ++ optionals (chromiumVersionAtLeast "91") [
|
||||||
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
|
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -285,12 +280,9 @@ let
|
||||||
} // optionalAttrs pulseSupport {
|
} // optionalAttrs pulseSupport {
|
||||||
use_pulseaudio = true;
|
use_pulseaudio = true;
|
||||||
link_pulseaudio = true;
|
link_pulseaudio = true;
|
||||||
} // optionalAttrs (chromiumVersionAtLeast "89") {
|
|
||||||
rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90
|
|
||||||
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
||||||
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
||||||
chrome_pgo_phase = 0;
|
chrome_pgo_phase = 0;
|
||||||
} // optionalAttrs (chromiumVersionAtLeast "90") {
|
|
||||||
# Disable build with TFLite library because it fails without additional changes:
|
# Disable build with TFLite library because it fails without additional changes:
|
||||||
# ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it
|
# ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it
|
||||||
# Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz
|
# Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz
|
||||||
|
|
|
||||||
|
|
@ -44,19 +44,19 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ungoogled-chromium": {
|
"ungoogled-chromium": {
|
||||||
"version": "89.0.4389.114",
|
"version": "90.0.4430.85",
|
||||||
"sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j",
|
"sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
|
||||||
"sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a",
|
"sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2021-01-07",
|
"version": "2021-02-09",
|
||||||
"url": "https://gn.googlesource.com/gn",
|
"url": "https://gn.googlesource.com/gn",
|
||||||
"rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
|
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
|
||||||
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
|
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
|
||||||
},
|
},
|
||||||
"ungoogled-patches": {
|
"ungoogled-patches": {
|
||||||
"rev": "89.0.4389.114-1",
|
"rev": "90.0.4430.85-1",
|
||||||
"sha256": "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s"
|
"sha256": "04nrx6fgkizmza50xj236m4rb1j8yaw0cw5790df1vlmbsc81667"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -823,11 +823,13 @@
|
||||||
"version": "1.5.0"
|
"version": "1.5.0"
|
||||||
},
|
},
|
||||||
"rancher2": {
|
"rancher2": {
|
||||||
"owner": "terraform-providers",
|
"owner": "rancher",
|
||||||
|
"provider-source-address": "registry.terraform.io/hashicorp/rancher2",
|
||||||
"repo": "terraform-provider-rancher2",
|
"repo": "terraform-provider-rancher2",
|
||||||
"rev": "v1.8.3",
|
"rev": "v1.13.0",
|
||||||
"sha256": "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna",
|
"sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89",
|
||||||
"version": "1.8.3"
|
"vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c",
|
||||||
|
"version": "1.13.0"
|
||||||
},
|
},
|
||||||
"random": {
|
"random": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
|
|
|
||||||
|
|
@ -11,16 +11,16 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "himalaya";
|
pname = "himalaya";
|
||||||
version = "0.2.6";
|
version = "0.2.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "soywod";
|
owner = "soywod";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1fl3lingb4wdh6bz4calzbibixg44wnnwi1qh0js1ijp8b6ll560";
|
sha256 = "0yp3gc5hmlrs5rcmb2qbi4iqb5ndflgqw20qa7ziqayrdd15kzpn";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "10p8di71w7hn36b1994wgk33fnj641lsp80zmccinlg5fiwyzncx";
|
cargoSha256 = "1abz3s9c3byqc0vaws839hjlf96ivq4zbjyijsbg004ffbmbccpn";
|
||||||
|
|
||||||
nativeBuildInputs = [ ]
|
nativeBuildInputs = [ ]
|
||||||
++ lib.optionals (enableCompletions) [ installShellFiles ]
|
++ lib.optionals (enableCompletions) [ installShellFiles ]
|
||||||
|
|
@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec {
|
||||||
openssl
|
openssl
|
||||||
];
|
];
|
||||||
|
|
||||||
# The completions are correctly installed, and there is issue that himalaya
|
|
||||||
# generate empty completion files without mail configure.
|
|
||||||
# This supposed to be fixed in 0.2.7
|
|
||||||
postInstall = lib.optionalString enableCompletions ''
|
postInstall = lib.optionalString enableCompletions ''
|
||||||
# Install shell function
|
# Install shell function
|
||||||
installShellCompletion --cmd himalaya \
|
installShellCompletion --cmd himalaya \
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "airspy";
|
pname = "airspy";
|
||||||
version = "1.0.9";
|
version = "1.0.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "airspy";
|
owner = "airspy";
|
||||||
repo = "airspyone_host";
|
repo = "airspyone_host";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
|
sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,25 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
{ lib, fetchFromGitHub, buildGoModule }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "git-chglog";
|
pname = "git-chglog";
|
||||||
version = "0.9.1";
|
version = "0.14.2";
|
||||||
|
|
||||||
goPackagePath = "github.com/git-chglog/git-chglog";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "git-chglog";
|
owner = "git-chglog";
|
||||||
repo = "git-chglog";
|
repo = "git-chglog";
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p";
|
sha256 = "124bqywkj37gv61fswgrg528bf3rjqms1664x22lkn0sqh22zyv1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "09zjypmcc3ra7sw81q1pbbrlpxxp4k00p1cfkrrih8wvb25z89h5";
|
||||||
|
|
||||||
|
buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ];
|
||||||
|
|
||||||
|
subPackages = [ "cmd/git-chglog" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "CHANGELOG generator implemented in Go (Golang)";
|
description = "CHANGELOG generator implemented in Go (Golang)";
|
||||||
|
homepage = "https://github.com/git-chglog/git-chglog";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ldenefle ];
|
maintainers = with maintainers; [ ldenefle ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,13 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mkvtoolnix";
|
pname = "mkvtoolnix";
|
||||||
version = "55.0.0";
|
version = "56.0.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "mbunkus";
|
owner = "mbunkus";
|
||||||
repo = "mkvtoolnix";
|
repo = "mkvtoolnix";
|
||||||
rev = "release-${version}";
|
rev = "release-${version}";
|
||||||
sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7";
|
sha256 = "0nhpp1zkggxqjj7lhj6as5mcjcz5yk3l1d1xcgs7i9153blam1yj";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "workstyle";
|
||||||
|
version = "0.2.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "pierrechevalier83";
|
||||||
|
repo = pname;
|
||||||
|
rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9";
|
||||||
|
sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54";
|
||||||
|
|
||||||
|
doCheck = false; # No tests
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Sway workspaces with style";
|
||||||
|
homepage = "https://github.com/pierrechevalier83/workstyle";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ FlorianFranzen ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -19,6 +19,7 @@ args=()
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
case $arg in
|
case $arg in
|
||||||
--system=*)
|
--system=*)
|
||||||
|
system="${arg#*=}"
|
||||||
systemArg="--system ${arg#*=}"
|
systemArg="--system ${arg#*=}"
|
||||||
;;
|
;;
|
||||||
--version-key=*)
|
--version-key=*)
|
||||||
|
|
@ -59,6 +60,9 @@ newVersion=${args[1]}
|
||||||
newHash=${args[2]}
|
newHash=${args[2]}
|
||||||
newUrl=${args[3]}
|
newUrl=${args[3]}
|
||||||
|
|
||||||
|
# Third-party repositories might not accept arguments in their default.nix.
|
||||||
|
importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)"
|
||||||
|
|
||||||
if (( "${#args[*]}" < 2 )); then
|
if (( "${#args[*]}" < 2 )); then
|
||||||
echo "$scriptName: Too few arguments"
|
echo "$scriptName: Too few arguments"
|
||||||
usage
|
usage
|
||||||
|
|
@ -75,11 +79,39 @@ if [[ -z "$versionKey" ]]; then
|
||||||
versionKey=version
|
versionKey=version
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Allow finding packages among flake outputs in repos using flake-compat.
|
||||||
|
pname=$(nix-instantiate $systemArg --eval --strict -A "$attr.name" || echo)
|
||||||
|
if [[ -z "$pname" ]]; then
|
||||||
|
if [[ -z "$system" ]]; then
|
||||||
|
system=$(nix-instantiate --eval -E 'builtins.currentSystem' | tr -d '"')
|
||||||
|
fi
|
||||||
|
|
||||||
|
pname=$(nix-instantiate $systemArg --eval --strict -A "packages.$system.$attr.name" || echo)
|
||||||
|
if [[ -n "$pname" ]]; then
|
||||||
|
attr="packages.$system.$attr"
|
||||||
|
else
|
||||||
|
pname=$(nix-instantiate $systemArg --eval --strict -A "legacyPackages.$system.$attr.name" || echo)
|
||||||
|
if [[ -n "$pname" ]]; then
|
||||||
|
attr="legacyPackages.$system.$attr"
|
||||||
|
else
|
||||||
|
die "Could not find attribute '$attr'!"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z "$nixFile" ]]; then
|
if [[ -z "$nixFile" ]]; then
|
||||||
nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
|
nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
|
||||||
if [[ ! -f "$nixFile" ]]; then
|
if [[ ! -f "$nixFile" ]]; then
|
||||||
die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
|
die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# flake-compat will return paths in the Nix store, we need to correct for that.
|
||||||
|
possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" | tr -d '"')
|
||||||
|
if [[ -n "$possiblyOutPath" ]]; then
|
||||||
|
outPathEscaped=$(echo "$possiblyOutPath" | sed 's#[$^*\\.[|]#\\&#g')
|
||||||
|
pwdEscaped=$(echo "$PWD" | sed 's#[$^*\\.[|]#\\&#g')
|
||||||
|
nixFile=$(echo "$nixFile" | sed "s|^$outPathEscaped|$pwdEscaped|")
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
|
oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
|
||||||
|
|
@ -93,17 +125,16 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then
|
||||||
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
|
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
|
oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
|
||||||
|
|
||||||
if [[ -z "$oldUrl" ]]; then
|
if [[ -z "$oldUrl" ]]; then
|
||||||
die "Couldn't evaluate source url from '$attr.src'!"
|
die "Couldn't evaluate source url from '$attr.src'!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
|
oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
|
||||||
oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')
|
|
||||||
|
|
||||||
if [[ -z "$drvName" || -z "$oldVersion" ]]; then
|
if [[ -z "$oldVersion" ]]; then
|
||||||
die "Couldn't evaluate name and version from '$attr.name'!"
|
die "Couldn't find out the old version of '$attr'!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$oldVersion" = "$newVersion" ]]; then
|
if [[ "$oldVersion" = "$newVersion" ]]; then
|
||||||
|
|
@ -115,7 +146,7 @@ if [[ "$oldVersion" = "$newVersion" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$newRevision" ]]; then
|
if [[ -n "$newRevision" ]]; then
|
||||||
oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"')
|
oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.src.rev" | tr -d '"')
|
||||||
if [[ -z "$oldRevision" ]]; then
|
if [[ -z "$oldRevision" ]]; then
|
||||||
die "Couldn't evaluate source revision from '$attr.src'!"
|
die "Couldn't evaluate source revision from '$attr.src'!"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -17,17 +17,18 @@
|
||||||
, enablePostScript ? true, libspectre
|
, enablePostScript ? true, libspectre
|
||||||
, enableXps ? true, libgxps
|
, enableXps ? true, libgxps
|
||||||
, enableImages ? false
|
, enableImages ? false
|
||||||
|
, mateUpdateScript
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "atril";
|
pname = "atril";
|
||||||
version = "1.24.0";
|
version = "1.24.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y";
|
sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -67,10 +68,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A simple multi-page document viewer for the MATE desktop";
|
description = "A simple multi-page document viewer for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, substituteAll
|
{ lib, stdenv, fetchurl, substituteAll
|
||||||
, pkg-config, gobject-introspection, gdk-pixbuf
|
, pkg-config, gobject-introspection, gdk-pixbuf
|
||||||
, gtk3, mate, python3, dropbox }:
|
, gtk3, mate, python3, dropbox, mateUpdateScript }:
|
||||||
|
|
||||||
let
|
let
|
||||||
dropboxd = "${dropbox}/bin/dropbox";
|
dropboxd = "${dropbox}/bin/dropbox";
|
||||||
|
|
@ -43,10 +43,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Dropbox extension for Caja file manager";
|
description = "Dropbox extension for Caja file manager";
|
||||||
homepage = "https://github.com/mate-desktop/caja-dropbox";
|
homepage = "https://github.com/mate-desktop/caja-dropbox";
|
||||||
license = with licenses; [ gpl3 cc-by-nd-30 ];
|
license = with licenses; [ gpl3Plus cc-by-nd-30 ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "caja-extensions";
|
pname = "caja-extensions";
|
||||||
|
|
@ -33,10 +33,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Set of extensions for Caja file manager";
|
description = "Set of extensions for Caja file manager";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }:
|
{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "${caja.pname}-with-extensions";
|
pname = "${caja.pname}-with-extensions";
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "caja";
|
pname = "caja";
|
||||||
version = "1.24.0";
|
version = "1.24.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0";
|
sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -33,11 +33,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "File manager for the MATE desktop";
|
description = "File manager for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = with lib.licenses; [ gpl2 lgpl2 ];
|
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,18 @@
|
||||||
{ newScope }:
|
{ pkgs, newScope }:
|
||||||
|
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
callPackage = newScope self;
|
||||||
|
|
||||||
self = rec {
|
self = rec {
|
||||||
|
|
||||||
|
# Update script tailored to mate packages from git repository
|
||||||
|
mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }:
|
||||||
|
pkgs.genericUpdater {
|
||||||
|
inherit pname version odd-unstable;
|
||||||
|
attrPath = "mate.${pname}";
|
||||||
|
versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}";
|
||||||
|
};
|
||||||
|
|
||||||
atril = callPackage ./atril { };
|
atril = callPackage ./atril { };
|
||||||
caja = callPackage ./caja { };
|
caja = callPackage ./caja { };
|
||||||
caja-dropbox = callPackage ./caja-dropbox { };
|
caja-dropbox = callPackage ./caja-dropbox { };
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "engrampa";
|
pname = "engrampa";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y";
|
sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -32,11 +32,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "Archive Manager for MATE";
|
description = "Archive Manager for MATE";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.gpl2;
|
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "eom";
|
pname = "eom";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f";
|
sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -32,10 +32,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "An image viewing and cataloging program for the MATE desktop";
|
description = "An image viewing and cataloging program for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ lib.maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libmatekbd";
|
pname = "libmatekbd";
|
||||||
|
|
@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Keyboard management library for MATE";
|
description = "Keyboard management library for MATE";
|
||||||
homepage = "https://github.com/mate-desktop/libmatekbd";
|
homepage = "https://github.com/mate-desktop/libmatekbd";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
, alsaSupport ? stdenv.isLinux, alsaLib
|
, alsaSupport ? stdenv.isLinux, alsaLib
|
||||||
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
|
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
|
||||||
, ossSupport ? false
|
, ossSupport ? false
|
||||||
}:
|
, mateUpdateScript
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libmatemixer";
|
pname = "libmatemixer";
|
||||||
|
|
@ -23,10 +24,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Mixer library for MATE";
|
description = "Mixer library for MATE";
|
||||||
homepage = "https://github.com/mate-desktop/libmatemixer";
|
homepage = "https://github.com/mate-desktop/libmatemixer";
|
||||||
license = with licenses; [ gpl2 lgpl2 ];
|
license = licenses.lgpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libmateweather";
|
pname = "libmateweather";
|
||||||
|
|
@ -22,10 +22,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Library to access weather information from online services for MATE";
|
description = "Library to access weather information from online services for MATE";
|
||||||
homepage = "https://github.com/mate-desktop/libmateweather";
|
homepage = "https://github.com/mate-desktop/libmateweather";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
|
||||||
, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
|
, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "marco";
|
pname = "marco";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54";
|
sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -31,10 +31,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "MATE default window manager";
|
description = "MATE default window manager";
|
||||||
homepage = "https://github.com/mate-desktop/marco";
|
homepage = "https://github.com/mate-desktop/marco";
|
||||||
license = [ licenses.gpl2 ];
|
license = [ licenses.gpl2Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3
|
||||||
|
, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
|
||||||
|
, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-applets";
|
pname = "mate-applets";
|
||||||
|
|
@ -38,6 +40,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Applets for use with the MATE panel";
|
description = "Applets for use with the MATE panel";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, meson, ninja, gettext }:
|
{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-backgrounds";
|
pname = "mate-backgrounds";
|
||||||
|
|
@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
];
|
];
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Background images and data for MATE";
|
description = "Background images and data for MATE";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl2;
|
license = with licenses; [ gpl2Plus cc-by-sa-40 ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-calc";
|
pname = "mate-calc";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw";
|
sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Calculator for the MATE desktop";
|
description = "Calculator for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl }:
|
{ lib, stdenv, fetchurl, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-common";
|
pname = "mate-common";
|
||||||
|
|
@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Common files for development of MATE packages";
|
description = "Common files for development of MATE packages";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.gpl3;
|
license = lib.licenses.gpl3Plus;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ lib.maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,16 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib,
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib
|
||||||
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
|
, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3
|
||||||
desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
|
, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
|
||||||
|
, mateUpdateScript
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-control-center";
|
pname = "mate-control-center";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0";
|
sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -49,10 +50,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Utilities to configure the MATE desktop";
|
description = "Utilities to configure the MATE desktop";
|
||||||
homepage = "https://github.com/mate-desktop/mate-control-center";
|
homepage = "https://github.com/mate-desktop/mate-control-center";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-desktop";
|
pname = "mate-desktop";
|
||||||
|
|
@ -23,10 +23,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Library with common API for various MATE modules";
|
description = "Library with common API for various MATE modules";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }:
|
{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-icon-theme-faenza";
|
pname = "mate-icon-theme-faenza";
|
||||||
|
|
@ -23,11 +23,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "Faenza icon theme from MATE";
|
description = "Faenza icon theme from MATE";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-icon-theme";
|
pname = "mate-icon-theme";
|
||||||
|
|
@ -27,10 +27,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Icon themes from MATE";
|
description = "Icon themes from MATE";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.lgpl3;
|
license = lib.licenses.lgpl3Plus;
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ lib.maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-indicator-applet";
|
pname = "mate-indicator-applet";
|
||||||
|
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/mate-desktop/mate-indicator-applet";
|
homepage = "https://github.com/mate-desktop/mate-indicator-applet";
|
||||||
description = "MATE panel indicator applet";
|
description = "MATE panel indicator applet";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-media";
|
pname = "mate-media";
|
||||||
|
|
@ -27,10 +27,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Media tools for MATE";
|
description = "Media tools for MATE";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo maintainers.chpatrick ];
|
maintainers = [ maintainers.romildo maintainers.chpatrick ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3 }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-menus";
|
pname = "mate-menus";
|
||||||
|
|
@ -20,10 +20,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Menu system for MATE";
|
description = "Menu system for MATE";
|
||||||
homepage = "https://github.com/mate-desktop/mate-menus";
|
homepage = "https://github.com/mate-desktop/mate-menus";
|
||||||
license = with licenses; [ gpl2 lgpl2 ];
|
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-netbook";
|
pname = "mate-netbook";
|
||||||
|
|
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "MATE utilities for netbooks";
|
description = "MATE utilities for netbooks";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
|
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
devices with low resolution displays.
|
devices with low resolution displays.
|
||||||
'';
|
'';
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = with licenses; [ gpl3 lgpl2Plus ];
|
license = with licenses; [ gpl3Only lgpl2Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
|
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
|
||||||
libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
|
libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-notification-daemon";
|
pname = "mate-notification-daemon";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b";
|
sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -28,10 +28,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Notification daemon for MATE Desktop";
|
description = "Notification daemon for MATE Desktop";
|
||||||
homepage = "https://github.com/mate-desktop/mate-notification-daemon";
|
homepage = "https://github.com/mate-desktop/mate-notification-daemon";
|
||||||
license = licenses.gpl2;
|
license = with licenses; [ gpl2Plus gpl3Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-panel";
|
pname = "mate-panel";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l";
|
sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -39,10 +39,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "The MATE panel";
|
description = "The MATE panel";
|
||||||
homepage = "https://github.com/mate-desktop/mate-panel";
|
homepage = "https://github.com/mate-desktop/mate-panel";
|
||||||
license = with licenses; [ gpl2 lgpl2 ];
|
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-polkit";
|
pname = "mate-polkit";
|
||||||
|
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Integrates polkit authentication for MATE desktop";
|
description = "Integrates polkit authentication for MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-power-manager";
|
pname = "mate-power-manager";
|
||||||
version = "1.24.2";
|
version = "1.24.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj";
|
sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -34,10 +34,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "The MATE Power Manager";
|
description = "The MATE Power Manager";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl3;
|
license = with licenses; [ gpl2Plus fdl11Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ romildo chpatrick ];
|
maintainers = with maintainers; [ romildo chpatrick ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-screensaver";
|
pname = "mate-screensaver";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw";
|
sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Screen saver and locker for the MATE desktop";
|
description = "Screen saver and locker for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify
|
||||||
|
, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-sensors-applet";
|
pname = "mate-sensors-applet";
|
||||||
|
|
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/mate-desktop/mate-sensors-applet";
|
homepage = "https://github.com/mate-desktop/mate-sensors-applet";
|
||||||
description = "MATE panel applet for hardware sensors";
|
description = "MATE panel applet for hardware sensors";
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
|
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
|
||||||
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
|
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
|
||||||
wrapGAppsHook, fetchpatch
|
wrapGAppsHook, fetchpatch, mateUpdateScript
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-session-manager";
|
pname = "mate-session-manager";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51";
|
sha256 = "1jcb5k2fx2rwwbrslgv1xlzaiwiwjnxjwnp503qf8cg89w69q2vb";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
@ -43,16 +43,17 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
substituteInPlace $out/share/xsessions/mate.desktop \
|
substituteInPlace $out/share/xsessions/mate.desktop \
|
||||||
--replace "Exec=mate-session" "Exec=$out/bin/mate-session" \
|
--replace "Exec=mate-session" "Exec=$out/bin/mate-session"
|
||||||
--replace "TryExec=mate-session" "TryExec=$out/bin/mate-session"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.providedSessions = [ "mate" ];
|
passthru.providedSessions = [ "mate" ];
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "MATE Desktop session manager";
|
description = "MATE Desktop session manager";
|
||||||
homepage = "https://github.com/mate-desktop/mate-session-manager";
|
homepage = "https://github.com/mate-desktop/mate-session-manager";
|
||||||
license = with licenses; [ gpl2 lgpl2 ];
|
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier,
|
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier,
|
||||||
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
|
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
|
||||||
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
|
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
|
||||||
wrapGAppsHook }:
|
wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-settings-daemon";
|
pname = "mate-settings-daemon";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab";
|
sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -38,10 +38,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "MATE settings daemon";
|
description = "MATE settings daemon";
|
||||||
homepage = "https://github.com/mate-desktop/mate-settings-daemon";
|
homepage = "https://github.com/mate-desktop/mate-settings-daemon";
|
||||||
license = with licenses; [ gpl2 lgpl21 ];
|
license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-system-monitor";
|
pname = "mate-system-monitor";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz";
|
sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "System monitor for the MATE desktop";
|
description = "System monitor for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-terminal";
|
pname = "mate-terminal";
|
||||||
|
|
@ -30,10 +30,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "The MATE Terminal Emulator";
|
description = "The MATE Terminal Emulator";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3,
|
{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3,
|
||||||
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
|
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-themes";
|
pname = "mate-themes";
|
||||||
version = "3.22.21";
|
version = "3.22.22";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n";
|
sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config gettext gtk3 ];
|
nativeBuildInputs = [ pkg-config gettext gtk3 ];
|
||||||
|
|
@ -24,11 +24,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
passthru.updateScript = mateUpdateScript {
|
||||||
|
inherit pname version;
|
||||||
|
url = "https://pub.mate-desktop.org/releases/themes";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "A set of themes from MATE";
|
description = "A set of themes from MATE";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.lgpl21;
|
license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,17 +9,19 @@
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, glib
|
, glib
|
||||||
|
, genericUpdater
|
||||||
|
, common-updater-scripts
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "mate-tweak";
|
pname = "mate-tweak";
|
||||||
version = "20.10.0";
|
version = "21.04.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ubuntu-mate";
|
owner = "ubuntu-mate";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6";
|
sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -72,6 +74,12 @@ python3Packages.buildPythonApplication rec {
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = genericUpdater {
|
||||||
|
inherit pname version;
|
||||||
|
attrPath = "mate.${pname}";
|
||||||
|
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tweak tool for the MATE Desktop";
|
description = "Tweak tool for the MATE Desktop";
|
||||||
homepage = "https://github.com/ubuntu-mate/mate-tweak";
|
homepage = "https://github.com/ubuntu-mate/mate-tweak";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }:
|
{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-user-guide";
|
pname = "mate-user-guide";
|
||||||
|
|
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "MATE User Guide";
|
description = "MATE User Guide";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2
|
||||||
|
, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-user-share";
|
pname = "mate-user-share";
|
||||||
|
|
@ -44,6 +45,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "User level public file sharing for the MATE desktop";
|
description = "User level public file sharing for the MATE desktop";
|
||||||
homepage = "https://github.com/mate-desktop/mate-user-share";
|
homepage = "https://github.com/mate-desktop/mate-user-share";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3
|
||||||
|
, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mate-utils";
|
pname = "mate-utils";
|
||||||
|
|
@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Utilities for the MATE desktop";
|
description = "Utilities for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
|
{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "mozo";
|
pname = "mozo";
|
||||||
version = "1.24.0";
|
version = "1.24.1";
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
|
sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ];
|
nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ];
|
||||||
|
|
@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "MATE Desktop menu editor";
|
description = "MATE Desktop menu editor";
|
||||||
homepage = "https://github.com/mate-desktop/mozo";
|
homepage = "https://github.com/mate-desktop/mozo";
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3
|
||||||
|
, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pluma";
|
pname = "pluma";
|
||||||
version = "1.24.1";
|
version = "1.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f";
|
sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -30,11 +31,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "Powerful text editor for the MATE desktop";
|
description = "Powerful text editor for the MATE desktop";
|
||||||
homepage = "https://mate-desktop.org";
|
homepage = "https://mate-desktop.org";
|
||||||
license = lib.licenses.gpl2;
|
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ lib.maintainers.romildo ];
|
maintainers = [ maintainers.romildo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "python-caja";
|
pname = "python-caja";
|
||||||
|
|
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python binding for Caja components";
|
description = "Python binding for Caja components";
|
||||||
homepage = "https://github.com/mate-desktop/python-caja";
|
homepage = "https://github.com/mate-desktop/python-caja";
|
||||||
|
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
#!/usr/bin/env nix-shell
|
|
||||||
#!nix-shell -i bash -p libarchive curl common-updater-scripts
|
|
||||||
|
|
||||||
set -eu -o pipefail
|
|
||||||
|
|
||||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
|
||||||
root=../../..
|
|
||||||
export NIXPKGS_ALLOW_UNFREE=1
|
|
||||||
|
|
||||||
mate_version=1.24
|
|
||||||
theme_version=3.22
|
|
||||||
materepo=https://pub.mate-desktop.org/releases/${mate_version}
|
|
||||||
themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}
|
|
||||||
|
|
||||||
version() {
|
|
||||||
(cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
|
|
||||||
}
|
|
||||||
|
|
||||||
update_package() {
|
|
||||||
local p=$1
|
|
||||||
echo $p
|
|
||||||
echo "# $p" >> git-commits.txt
|
|
||||||
|
|
||||||
local repo
|
|
||||||
if [ "$p" = "mate-themes" ]; then
|
|
||||||
repo=$themerepo
|
|
||||||
else
|
|
||||||
repo=$materepo
|
|
||||||
fi
|
|
||||||
|
|
||||||
local p_version_old=$(version mate.$p)
|
|
||||||
local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p")
|
|
||||||
local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1)
|
|
||||||
|
|
||||||
if [[ -z "$p_version" ]]; then
|
|
||||||
echo "unavailable $p"
|
|
||||||
echo "# $p not found" >> git-commits.txt
|
|
||||||
echo
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$p_version" = "$p_version_old" ]]; then
|
|
||||||
echo "nothing to do, $p $p_version is current"
|
|
||||||
echo
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Download package and save hash and file path.
|
|
||||||
local url="$repo/$p-${p_version}.tar.xz"
|
|
||||||
mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
|
|
||||||
local hash=${prefetch[0]}
|
|
||||||
local path=${prefetch[1]}
|
|
||||||
echo "$p: $p_version_old -> $p_version"
|
|
||||||
(cd "$root" && update-source-version mate.$p "$p_version" "$hash")
|
|
||||||
echo " git add pkgs/desktops/mate/$p" >> git-commits.txt
|
|
||||||
echo " git commit -m \"mate.$p: $p_version_old -> $p_version\"" >> git-commits.txt
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
for d in $(ls -A --indicator-style=none); do
|
|
||||||
if [ -d $d ]; then
|
|
||||||
update_package $d
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
@ -108,7 +108,7 @@ let
|
||||||
# doesn’t support like LLVM. Probably we should move to some other
|
# doesn’t support like LLVM. Probably we should move to some other
|
||||||
# file.
|
# file.
|
||||||
|
|
||||||
bintools = callPackage ./bintools.nix {};
|
bintools = callPackage ./bintools {};
|
||||||
|
|
||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
|
|
@ -192,18 +192,18 @@ let
|
||||||
|
|
||||||
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
|
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
|
||||||
|
|
||||||
libcxx = callPackage ./libc++ ({ inherit llvm_meta; } //
|
libcxx = callPackage ./libcxx ({ inherit llvm_meta; } //
|
||||||
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
||||||
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } //
|
libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } //
|
||||||
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
||||||
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
||||||
libunwind = libraries.libunwind;
|
libunwind = libraries.libunwind;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
openmp = callPackage ./openmp.nix { inherit llvm_meta; };
|
openmp = callPackage ./openmp { inherit llvm_meta; };
|
||||||
|
|
||||||
libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
|
libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
|
||||||
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "libc++";
|
pname = "libcxx";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
|
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "libc++abi";
|
pname = "libcxxabi";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
|
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
|
||||||
|
|
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn";
|
sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix build on 32-bit ARM
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch";
|
||||||
|
sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
# Upstream's configure script is not autoconf generated, but a hand written one.
|
# Upstream's configure script is not autoconf generated, but a hand written one.
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@ assert readline != null -> ncurses != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sqlcipher";
|
pname = "sqlcipher";
|
||||||
version = "4.4.2";
|
version = "4.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sqlcipher";
|
owner = "sqlcipher";
|
||||||
repo = "sqlcipher";
|
repo = "sqlcipher";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na";
|
sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
|
{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config
|
||||||
, withFreestanding ? false
|
, withFreestanding ? false
|
||||||
, ocaml-freestanding
|
, ocaml-freestanding
|
||||||
}:
|
}:
|
||||||
|
|
@ -7,11 +7,11 @@ buildDunePackage rec {
|
||||||
minimumOCamlVersion = "4.08";
|
minimumOCamlVersion = "4.08";
|
||||||
|
|
||||||
pname = "mirage-crypto";
|
pname = "mirage-crypto";
|
||||||
version = "0.9.2";
|
version = "0.10.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
|
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
|
||||||
sha256 = "da200c0afdbe63474ab19f2bc616e26c10b0e4fbb53fb97fefb2794212f5d442";
|
sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d";
|
||||||
};
|
};
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
@ -21,7 +21,7 @@ buildDunePackage rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ dune-configurator pkg-config ];
|
nativeBuildInputs = [ dune-configurator pkg-config ];
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
cstruct eqaf
|
cstruct eqaf bigarray-compat
|
||||||
] ++ lib.optionals withFreestanding [
|
] ++ lib.optionals withFreestanding [
|
||||||
ocaml-freestanding
|
ocaml-freestanding
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,11 @@
|
||||||
, buildDunePackage
|
, buildDunePackage
|
||||||
, ocaml
|
, ocaml
|
||||||
, gen
|
, gen
|
||||||
, ppx_tools_versioned
|
, ppxlib
|
||||||
, ocaml-migrate-parsetree
|
|
||||||
, uchar
|
, uchar
|
||||||
}:
|
}:
|
||||||
|
|
||||||
if lib.versionOlder ocaml.version "4.02.3"
|
if lib.versionOlder ocaml.version "4.08"
|
||||||
then throw "sedlex is not available for OCaml ${ocaml.version}"
|
then throw "sedlex is not available for OCaml ${ocaml.version}"
|
||||||
else
|
else
|
||||||
|
|
||||||
|
|
@ -32,7 +31,7 @@ let
|
||||||
in
|
in
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "sedlex";
|
pname = "sedlex";
|
||||||
version = "2.2";
|
version = "2.3";
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
|
|
@ -40,11 +39,11 @@ buildDunePackage rec {
|
||||||
owner = "ocaml-community";
|
owner = "ocaml-community";
|
||||||
repo = "sedlex";
|
repo = "sedlex";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
|
sha256 = "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
gen uchar ocaml-migrate-parsetree ppx_tools_versioned
|
gen uchar ppxlib
|
||||||
];
|
];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
|
@ -60,6 +59,7 @@ buildDunePackage rec {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/ocaml-community/sedlex";
|
homepage = "https://github.com/ocaml-community/sedlex";
|
||||||
|
changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES";
|
||||||
description = "An OCaml lexer generator for Unicode";
|
description = "An OCaml lexer generator for Unicode";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = [ lib.maintainers.marsam ];
|
maintainers = [ lib.maintainers.marsam ];
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ailment";
|
pname = "ailment";
|
||||||
version = "9.0.6790";
|
version = "9.0.6852";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-RcLa18JqQ7c8u+fhyNHmJEXt/Lg73JDAImtUtiaZbTw=";
|
sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ pyvex ];
|
propagatedBuildInputs = [ pyvex ];
|
||||||
|
|
|
||||||
|
|
@ -42,14 +42,14 @@ in
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "angr";
|
pname = "angr";
|
||||||
version = "9.0.6790";
|
version = "9.0.6852";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-PRghK/BdgxGpPuinkGr+rREza1pQXz2gxnXiSmxBSTc=";
|
sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
@ -81,7 +81,9 @@ buildPythonPackage rec {
|
||||||
# Tests have additional requirements, e.g., pypcode and angr binaries
|
# Tests have additional requirements, e.g., pypcode and angr binaries
|
||||||
# cle is executing the tests with the angr binaries
|
# cle is executing the tests with the angr binaries
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
pythonImportsCheck = [ "angr" ];
|
|
||||||
|
# See http://angr.io/api-doc/
|
||||||
|
pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Powerful and user-friendly binary analysis platform";
|
description = "Powerful and user-friendly binary analysis platform";
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "angrop";
|
pname = "angrop";
|
||||||
version = "9.0.6790";
|
version = "9.0.6852";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy";
|
sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "archinfo";
|
pname = "archinfo";
|
||||||
version = "9.0.6790";
|
version = "9.0.6852";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-A4WvRElahRv/XmlmS4WexMqm8FIZ1SSUnbdoAWWECMk=";
|
sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
||||||
|
|
@ -22,13 +22,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "binwalk";
|
pname = "binwalk";
|
||||||
version = "27";
|
version = "2.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ReFirmLabs";
|
owner = "ReFirmLabs";
|
||||||
repo = "binwalk";
|
repo = "binwalk";
|
||||||
rev = "python${version}";
|
rev = "v${version}";
|
||||||
sha256 = "03kqhs3j9czdc2pnr1v8iszwx254ljpvrmmj0j5ls0ssjrfxacyx";
|
sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
|
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
|
||||||
|
|
@ -53,5 +53,6 @@ buildPythonPackage rec {
|
||||||
homepage = "https://github.com/ReFirmLabs/binwalk";
|
homepage = "https://github.com/ReFirmLabs/binwalk";
|
||||||
description = "A tool for searching a given binary image for embedded files";
|
description = "A tool for searching a given binary image for embedded files";
|
||||||
maintainers = [ maintainers.koral ];
|
maintainers = [ maintainers.koral ];
|
||||||
|
license = licenses.mit;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "claripy";
|
pname = "claripy";
|
||||||
version = "9.0.6790";
|
version = "9.0.6852";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-GpWHj3bNgr7nQoIKM4VQtVkbObxqw6QkuEmfmPEiJmE=";
|
sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use upstream z3 implementation
|
# Use upstream z3 implementation
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# The binaries are following the argr projects release cycle
|
# The binaries are following the argr projects release cycle
|
||||||
version = "9.0.6790";
|
version = "9.0.6852";
|
||||||
|
|
||||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||||
binaries = fetchFromGitHub {
|
binaries = fetchFromGitHub {
|
||||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zQggVRdc8fV1ulFnOlzYLvSOSOP3+dY8j+6lo+pXSkM=";
|
sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
, scipy
|
, scipy
|
||||||
, scikitlearn
|
, scikitlearn
|
||||||
, pytest
|
, pytest
|
||||||
, setuptools-scm
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, requests
|
||||||
|
, requests_oauthlib
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "homeconnect";
|
||||||
|
version = "0.6.3";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
requests
|
||||||
|
requests_oauthlib
|
||||||
|
];
|
||||||
|
|
||||||
|
# Project has no tests
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "homeconnect" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Python client for the BSH Home Connect REST API";
|
||||||
|
homepage = "https://github.com/DavidMStraub/homeconnect";
|
||||||
|
changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -15,7 +15,7 @@ let
|
||||||
node = callPackage ./node {};
|
node = callPackage ./node {};
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "panel";
|
pname = "panel";
|
||||||
version = "0.11.1";
|
version = "0.11.3";
|
||||||
|
|
||||||
# Don't forget to also update the node packages
|
# Don't forget to also update the node packages
|
||||||
# 1. retrieve the package.json file
|
# 1. retrieve the package.json file
|
||||||
|
|
@ -23,7 +23,7 @@ in buildPythonPackage rec {
|
||||||
# 3. node2nix
|
# 3. node2nix
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "ce531e5c0c8a8ae74d523762aeb1666650caebbe1867aba16129d29791e921f9";
|
sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Since 0.10.0 panel attempts to fetch from the web.
|
# Since 0.10.0 panel attempts to fetch from the web.
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
sources = {
|
sources = {
|
||||||
"@bokeh/bokehjs-2.3.0" = {
|
"@bokeh/bokehjs-2.3.1" = {
|
||||||
name = "_at_bokeh_slash_bokehjs";
|
name = "_at_bokeh_slash_bokehjs";
|
||||||
packageName = "@bokeh/bokehjs";
|
packageName = "@bokeh/bokehjs";
|
||||||
version = "2.3.0";
|
version = "2.3.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.0.tgz";
|
url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz";
|
||||||
sha512 = "geKBhYUVJ5IaY0UNk9k2P0yiYLCj+DOeNjdDneuTJ8K5R9fs0Rpp4iiaQKUGr1yUyQHGHLU8sk4CFZ+Bd5ZILg==";
|
sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"@bokeh/numbro-1.6.2" = {
|
"@bokeh/numbro-1.6.2" = {
|
||||||
|
|
@ -476,10 +476,10 @@ let
|
||||||
args = {
|
args = {
|
||||||
name = "_at_holoviz_slash_panel";
|
name = "_at_holoviz_slash_panel";
|
||||||
packageName = "@holoviz/panel";
|
packageName = "@holoviz/panel";
|
||||||
version = "0.11.1";
|
version = "0.11.3";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
dependencies = [
|
dependencies = [
|
||||||
sources."@bokeh/bokehjs-2.3.0"
|
sources."@bokeh/bokehjs-2.3.1"
|
||||||
sources."@bokeh/numbro-1.6.2"
|
sources."@bokeh/numbro-1.6.2"
|
||||||
(sources."@bokeh/slickgrid-2.4.2702" // {
|
(sources."@bokeh/slickgrid-2.4.2702" // {
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, cython
|
||||||
|
, matplotlib
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pycocotools";
|
||||||
|
version = "2.0.2";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "06hz0iz4kqxhqby4j7bah8l41kg68bb118jawp172i4vg497lw94";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
cython
|
||||||
|
matplotlib
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"pycocotools.coco"
|
||||||
|
"pycocotools.cocoeval"
|
||||||
|
];
|
||||||
|
|
||||||
|
# has no tests
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Official APIs for the MS-COCO dataset";
|
||||||
|
homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI";
|
||||||
|
license = licenses.bsd2;
|
||||||
|
maintainers = with maintainers; [ hexa piegames ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -8,15 +8,15 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "PyMetno";
|
pname = "pymetno";
|
||||||
version = "0.8.2";
|
version = "0.8.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = pname;
|
|
||||||
owner = "Danielhiversen";
|
owner = "Danielhiversen";
|
||||||
|
repo = "PyMetno";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5";
|
sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A library to communicate with the met.no api";
|
description = "A library to communicate with the met.no API";
|
||||||
homepage = "https://github.com/Danielhiversen/pyMetno/";
|
homepage = "https://github.com/Danielhiversen/pyMetno/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ flyfloh ];
|
maintainers = with maintainers; [ flyfloh ];
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue