···

       
46
       
46
       
 
       
/nixos/default.nix          @nbp @infinisil

     

       
47
       
47
       
 
       
/nixos/lib/from-env.nix     @nbp @infinisil

     

       
48
       
48
       
 
       
/nixos/lib/eval-config.nix  @nbp @infinisil

     

       
49
       
49
       
+
       
/nixos/doc @ryantm

     

       
49
       
50
       
 
       
/nixos/doc/manual/configuration/abstractions.xml      @nbp

     

       
50
       
51
       
 
       
/nixos/doc/manual/configuration/config-file.xml       @nbp

     

       
51
       
52
       
 
       
/nixos/doc/manual/configuration/config-syntax.xml     @nbp

     

···

       
1
       
1
       
+
       
name: NixOS manual checks

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
on:

     

       
4
       
4
       
+
       
  pull_request:

     

       
5
       
5
       
+
       
    branches-ignore:

     

       
6
       
6
       
+
       
      - 'release-**'

     

       
7
       
7
       
+
       
    paths:

     

       
8
       
8
       
+
       
      - 'nixos/**/*.xml'

     

       
9
       
9
       
+
       
      - 'nixos/**/*.md'

     

       
10
       
10
       
+
       


     

       
11
       
11
       
+
       
jobs:

     

       
12
       
12
       
+
       
  tests:

     

       
13
       
13
       
+
       
    runs-on: ubuntu-latest

     

       
14
       
14
       
+
       
    steps:

     

       
15
       
15
       
+
       
    - uses: actions/checkout@v2

     

       
16
       
16
       
+
       
    - uses: cachix/install-nix-action@v12

     

       
17
       
17
       
+
       
    - name: Check DocBook files generated from Markdown are consistent

     

       
18
       
18
       
+
       
      run: |

     

       
19
       
19
       
+
       
        nixos/doc/manual/md-to-db.sh

     

       
20
       
20
       
+
       
        git diff --exit-code

     

···

       
1
       
1
       
-
       
21.05

     

       
1
       
1
       
+
       
21.11
     

···

       
171
       
171
       
 
       
     On each release the first letter is bumped and a new animal is chosen

     

       
172
       
172
       
 
       
     starting with that new letter.

     

       
173
       
173
       
 
       
  */

     

       
174
       
174
       
-
       
  codeName = "Okapi";

     

       
174
       
174
       
+
       
  codeName = "Porcupine";

     

       
175
       
175
       
 
       


     

       
176
       
176
       
 
       
  /* Returns the current nixpkgs version suffix as string. */

     

       
177
       
177
       
 
       
  versionSuffix =

     

···

       
5696
       
5696
       
 
       
    githubId = 6652840;

     

       
5697
       
5697
       
 
       
    name = "Jade";

     

       
5698
       
5698
       
 
       
  };

     

       
5699
       
5699
       
+
       
  lgcl = {

     

       
5700
       
5700
       
+
       
    email = "dev@lgcl.de";

     

       
5701
       
5701
       
+
       
    name = "Leon Vack";

     

       
5702
       
5702
       
+
       
    github = "LogicalOverflow";

     

       
5703
       
5703
       
+
       
    githubId = 5919957;

     

       
5704
       
5704
       
+
       
  };

     

       
5699
       
5705
       
 
       
  lheckemann = {

     

       
5700
       
5706
       
 
       
    email = "git@sphalerite.org";

     

       
5701
       
5707
       
 
       
    github = "lheckemann";

     
···

       
6452
       
6458
       
 
       
    email = "softs@metabarcoding.org";

     

       
6453
       
6459
       
 
       
    name = "Celine Mercier";

     

       
6454
       
6460
       
 
       
  };

     

       
6455
       
6455
       
-
       
  metadark = {

     

       
6461
       
6461
       
+
       
  kira-bruneau = {

     

       
6456
       
6462
       
 
       
    email = "kira.bruneau@pm.me";

     

       
6457
       
6463
       
 
       
    name = "Kira Bruneau";

     

       
6458
       
6458
       
-
       
    github = "metadark";

     

       
6464
       
6464
       
+
       
    github = "kira-bruneau";

     

       
6459
       
6465
       
 
       
    githubId = 382041;

     

       
6460
       
6466
       
 
       
  };

     

       
6461
       
6467
       
 
       
  meutraa = {

     

···

       
1
       
1
       
+
       
# Contributing to this manual {#chap-contributing}

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
The DocBook and CommonMark sources of NixOS' manual are in the [nixos/doc/manual](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the [Nixpkgs](https://github.com/NixOS/nixpkgs) repository.

     

       
4
       
4
       
+
       


     

       
5
       
5
       
+
       
You can quickly check your edits with the following:

     

       
6
       
6
       
+
       


     

       
7
       
7
       
+
       
```ShellSession

     

       
8
       
8
       
+
       
$ cd /path/to/nixpkgs

     

       
9
       
9
       
+
       
$ ./nixos/doc/manual/md-to-db.sh

     

       
10
       
10
       
+
       
$ nix-build nixos/release.nix -A manual.x86_64-linux

     

       
11
       
11
       
+
       
```

     

       
12
       
12
       
+
       


     

       
13
       
13
       
+
       
If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`.

     

···

       
1
       
1
       
-
       
<chapter xmlns="http://docbook.org/ns/docbook"

     

       
2
       
2
       
-
       
         xmlns:xlink="http://www.w3.org/1999/xlink"

     

       
3
       
3
       
-
       
         xml:id="chap-contributing">

     

       
4
       
4
       
-
       
 <title>Contributing to this manual</title>

     

       
5
       
5
       
-
       
 <para>

     

       
6
       
6
       
-
       
  The DocBook sources of NixOS' manual are in the <filename

     

       
7
       
7
       
-
       
xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">

     

       
8
       
8
       
-
       
nixos/doc/manual</filename> subdirectory of the <link

     

       
9
       
9
       
-
       
xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link> repository.

     

       
10
       
10
       
-
       
 </para>

     

       
11
       
11
       
-
       
 <para>

     

       
12
       
12
       
-
       
  You can quickly check your edits with the following:

     

       
13
       
13
       
-
       
 </para>

     

       
14
       
14
       
-
       
<screen>

     

       
15
       
15
       
-
       
<prompt>$ </prompt>cd /path/to/nixpkgs

     

       
16
       
16
       
-
       
<prompt>$ </prompt>nix-build nixos/release.nix -A manual.x86_64-linux

     

       
17
       
17
       
-
       
</screen>

     

       
18
       
18
       
-
       
 <para>

     

       
19
       
19
       
-
       
  If the build succeeds, the manual will be in

     

       
20
       
20
       
-
       
  <filename>./result/share/doc/nixos/index.html</filename>.

     

       
21
       
21
       
-
       
 </para>

     

       
22
       
22
       
-
       
</chapter>

     

···

       
1
       
1
       
+
       
# Building Your Own NixOS CD {#sec-building-cd}

     

       
2
       
2
       
+
       
Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your `configuration.nix` to configure the system that would be installed on the CD.

     

       
3
       
3
       
+
       


     

       
4
       
4
       
+
       
Default CD/DVD configurations are available inside `nixos/modules/installer/cd-dvd`

     

       
5
       
5
       
+
       


     

       
6
       
6
       
+
       
```ShellSession

     

       
7
       
7
       
+
       
$ git clone https://github.com/NixOS/nixpkgs.git

     

       
8
       
8
       
+
       
$ cd nixpkgs/nixos

     

       
9
       
9
       
+
       
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix

     

       
10
       
10
       
+
       
```

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command:

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
```ShellSession

     

       
15
       
15
       
+
       
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>

     

       
16
       
16
       
+
       
```

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
If you want to customize your NixOS CD in more detail, or generate other kinds of images, you might want to check out [nixos-generators](https://github.com/nix-community/nixos-generators). This can also be a good starting point when you want to use Nix to build a 'minimal' image that doesn't include a NixOS installation.

     

···

       
1
       
1
       
-
       
<chapter xmlns="http://docbook.org/ns/docbook"

     

       
2
       
2
       
-
       
        xmlns:xlink="http://www.w3.org/1999/xlink"

     

       
3
       
3
       
-
       
        xmlns:xi="http://www.w3.org/2001/XInclude"

     

       
4
       
4
       
-
       
        version="5.0"

     

       
5
       
5
       
-
       
        xml:id="sec-building-cd">

     

       
6
       
6
       
-
       
 <title>Building Your Own NixOS CD</title>

     

       
7
       
7
       
-
       
 <para>

     

       
8
       
8
       
-
       
  Building a NixOS CD is as easy as configuring your own computer. The idea is

     

       
9
       
9
       
-
       
  to use another module which will replace your

     

       
10
       
10
       
-
       
  <filename>configuration.nix</filename> to configure the system that would be

     

       
11
       
11
       
-
       
  installed on the CD.

     

       
12
       
12
       
-
       
 </para>

     

       
13
       
13
       
-
       
 <para>

     

       
14
       
14
       
-
       
  Default CD/DVD configurations are available inside

     

       
15
       
15
       
-
       
  <filename>nixos/modules/installer/cd-dvd</filename>.

     

       
16
       
16
       
-
       
<screen>

     

       
17
       
17
       
-
       
<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs.git

     

       
18
       
18
       
-
       
<prompt>$ </prompt>cd nixpkgs/nixos

     

       
19
       
19
       
-
       
<prompt>$ </prompt>nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>

     

       
20
       
20
       
-
       
 </para>

     

       
21
       
21
       
-
       
 <para>

     

       
22
       
22
       
-
       
  Before burning your CD/DVD, you can check the content of the image by

     

       
23
       
23
       
-
       
  mounting anywhere like suggested by the following command:

     

       
24
       
24
       
-
       
<screen>

     

       
25
       
25
       
-
       
<prompt># </prompt>mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>

     

       
26
       
26
       
-
       
 </para>

     

       
27
       
27
       
-
       
 <para>

     

       
28
       
28
       
-
       
 If you want to customize your NixOS CD in more detail, or generate other kinds

     

       
29
       
29
       
-
       
 of images, you might want to check out <link

     

       
30
       
30
       
-
       
 xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link>. This can also be a good starting point when you want to use Nix to build a

     

       
31
       
31
       
-
       
 'minimal' image that doesn't include a NixOS installation.

     

       
32
       
32
       
-
       
 </para>

     

       
33
       
33
       
-
       
</chapter>

     

···

       
13
       
13
       
 
       
 <xi:include href="writing-modules.xml" />

     

       
14
       
14
       
 
       
 <xi:include href="building-parts.xml" />

     

       
15
       
15
       
 
       
 <xi:include href="writing-documentation.xml" />

     

       
16
       
16
       
-
       
 <xi:include href="building-nixos.xml" />

     

       
16
       
16
       
+
       
 <xi:include href="../from_md/development/building-nixos.chapter.xml" />

     

       
17
       
17
       
 
       
 <xi:include href="nixos-tests.xml" />

     

       
18
       
18
       
 
       
 <xi:include href="testing-installer.xml" />

     

       
19
       
19
       
 
       
 <xi:include href="releases.xml" />

     

···

       
1
       
1
       
+
       
This directory is temporarily needed while we transition the manual to CommonMark. It stores the output of the ../md-to-db.sh script that converts CommonMark files back to DocBook.

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
We are choosing to convert the Markdown to DocBook at authoring time instead of manual building time, because we do not want the pandoc toolchain to become part of the NixOS closure.

     

       
4
       
4
       
+
       


     

       
5
       
5
       
+
       
Do not edit the DocBook files inside this directory or its subdirectories. Instead, edit the corresponding .md file in the normal manual directories, and run ../md-to-db.sh to update the file here.

     

···

       
1
       
1
       
+
       
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-contributing">

     

       
2
       
2
       
+
       
  <title>Contributing to this manual</title>

     

       
3
       
3
       
+
       
  <para>

     

       
4
       
4
       
+
       
    The DocBook and CommonMark sources of NixOS’ manual are in the

     

       
5
       
5
       
+
       
    <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">nixos/doc/manual</link>

     

       
6
       
6
       
+
       
    subdirectory of the

     

       
7
       
7
       
+
       
    <link xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link>

     

       
8
       
8
       
+
       
    repository.

     

       
9
       
9
       
+
       
  </para>

     

       
10
       
10
       
+
       
  <para>

     

       
11
       
11
       
+
       
    You can quickly check your edits with the following:

     

       
12
       
12
       
+
       
  </para>

     

       
13
       
13
       
+
       
  <programlisting>

     

       
14
       
14
       
+
       
$ cd /path/to/nixpkgs

     

       
15
       
15
       
+
       
$ ./nixos/doc/manual/md-to-db.sh

     

       
16
       
16
       
+
       
$ nix-build nixos/release.nix -A manual.x86_64-linux

     

       
17
       
17
       
+
       
</programlisting>

     

       
18
       
18
       
+
       
  <para>

     

       
19
       
19
       
+
       
    If the build succeeds, the manual will be in

     

       
20
       
20
       
+
       
    <literal>./result/share/doc/nixos/index.html</literal>.

     

       
21
       
21
       
+
       
  </para>

     

       
22
       
22
       
+
       
</chapter>

     

···

       
1
       
1
       
+
       
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-cd">

     

       
2
       
2
       
+
       
  <title>Building Your Own NixOS CD</title>

     

       
3
       
3
       
+
       
  <para>

     

       
4
       
4
       
+
       
    Building a NixOS CD is as easy as configuring your own computer. The

     

       
5
       
5
       
+
       
    idea is to use another module which will replace your

     

       
6
       
6
       
+
       
    <literal>configuration.nix</literal> to configure the system that

     

       
7
       
7
       
+
       
    would be installed on the CD.

     

       
8
       
8
       
+
       
  </para>

     

       
9
       
9
       
+
       
  <para>

     

       
10
       
10
       
+
       
    Default CD/DVD configurations are available inside

     

       
11
       
11
       
+
       
    <literal>nixos/modules/installer/cd-dvd</literal>

     

       
12
       
12
       
+
       
  </para>

     

       
13
       
13
       
+
       
  <programlisting>

     

       
14
       
14
       
+
       
$ git clone https://github.com/NixOS/nixpkgs.git

     

       
15
       
15
       
+
       
$ cd nixpkgs/nixos

     

       
16
       
16
       
+
       
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix

     

       
17
       
17
       
+
       
</programlisting>

     

       
18
       
18
       
+
       
  <para>

     

       
19
       
19
       
+
       
    Before burning your CD/DVD, you can check the content of the image

     

       
20
       
20
       
+
       
    by mounting anywhere like suggested by the following command:

     

       
21
       
21
       
+
       
  </para>

     

       
22
       
22
       
+
       
  <programlisting>

     

       
23
       
23
       
+
       
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso&lt;/screen&gt;

     

       
24
       
24
       
+
       
</programlisting>

     

       
25
       
25
       
+
       
  <para>

     

       
26
       
26
       
+
       
    If you want to customize your NixOS CD in more detail, or generate

     

       
27
       
27
       
+
       
    other kinds of images, you might want to check out

     

       
28
       
28
       
+
       
    <link xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link>.

     

       
29
       
29
       
+
       
    This can also be a good starting point when you want to use Nix to

     

       
30
       
30
       
+
       
    build a <quote>minimal</quote> image that doesn’t include a NixOS

     

       
31
       
31
       
+
       
    installation.

     

       
32
       
32
       
+
       
  </para>

     

       
33
       
33
       
+
       
</chapter>

     

···

       
1
       
1
       
+
       
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="release-21.11">

     

       
2
       
2
       
+
       
  <title>Release 21.11 (<quote>?</quote>, 2021.11/??)</title>

     

       
3
       
3
       
+
       
  <para>

     

       
4
       
4
       
+
       
    In addition to numerous new and upgraded packages, this release has

     

       
5
       
5
       
+
       
    the following highlights:

     

       
6
       
6
       
+
       
  </para>

     

       
7
       
7
       
+
       
  <itemizedlist spacing="compact">

     

       
8
       
8
       
+
       
    <listitem>

     

       
9
       
9
       
+
       
      <para>

     

       
10
       
10
       
+
       
        Support is planned until the end of April 2022, handing over to

     

       
11
       
11
       
+
       
        22.05.

     

       
12
       
12
       
+
       
      </para>

     

       
13
       
13
       
+
       
    </listitem>

     

       
14
       
14
       
+
       
  </itemizedlist>

     

       
15
       
15
       
+
       
</section>

     

···

       
19
       
19
       
 
       
  <xi:include href="./generated/options-db.xml"

     

       
20
       
20
       
 
       
                xpointer="configuration-variable-list" />

     

       
21
       
21
       
 
       
 </appendix>

     

       
22
       
22
       
-
       
 <xi:include href="contributing-to-this-manual.xml" />

     

       
22
       
22
       
+
       
 <xi:include href="./from_md/contributing-to-this-manual.chapter.xml" />

     

       
23
       
23
       
 
       
 <xi:include href="release-notes/release-notes.xml" />

     

       
24
       
24
       
 
       
</book>

     

···

       
1
       
1
       
+
       
#! /usr/bin/env nix-shell

     

       
2
       
2
       
+
       
#! nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p pandoc

     

       
3
       
3
       
+
       


     

       
4
       
4
       
+
       
# This script is temporarily needed while we transition the manual to

     

       
5
       
5
       
+
       
# CommonMark. It converts the .md files in the regular manual folder

     

       
6
       
6
       
+
       
# into DocBook files in the from_md folder.

     

       
7
       
7
       
+
       


     

       
8
       
8
       
+
       
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

     

       
9
       
9
       
+
       
pushd $DIR

     

       
10
       
10
       
+
       


     

       
11
       
11
       
+
       
OUT="$DIR/from_md"

     

       
12
       
12
       
+
       
mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$')

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
for mf in ${MD_FILES[*]}; do

     

       
15
       
15
       
+
       
  if [ "${mf: -11}" == ".section.md" ]; then

     

       
16
       
16
       
+
       
    mkdir -p $(dirname "$OUT/$mf")

     

       
17
       
17
       
+
       
    pandoc "$mf" -t docbook \

     

       
18
       
18
       
+
       
      --extract-media=media \

     

       
19
       
19
       
+
       
      -f markdown+smart \

     

       
20
       
20
       
+
       
    | cat  > "$OUT/${mf%".section.md"}.section.xml"

     

       
21
       
21
       
+
       
  fi

     

       
22
       
22
       
+
       


     

       
23
       
23
       
+
       
  if [ "${mf: -11}" == ".chapter.md" ]; then

     

       
24
       
24
       
+
       
    mkdir -p $(dirname "$OUT/$mf")

     

       
25
       
25
       
+
       
    pandoc "$mf" -t docbook \

     

       
26
       
26
       
+
       
      --top-level-division=chapter \

     

       
27
       
27
       
+
       
      --extract-media=media \

     

       
28
       
28
       
+
       
      -f markdown+smart \

     

       
29
       
29
       
+
       
    | cat  > "$OUT/${mf%".chapter.md"}.chapter.xml"

     

       
30
       
30
       
+
       
  fi

     

       
31
       
31
       
+
       
done

     

       
32
       
32
       
+
       


     

       
33
       
33
       
+
       
popd

     

···

       
8
       
8
       
 
       
  This section lists the release notes for each stable version of NixOS and

     

       
9
       
9
       
 
       
  current unstable revision.

     

       
10
       
10
       
 
       
 </para>

     

       
11
       
11
       
+
       
 <xi:include href="../from_md/release-notes/rl-2111.section.xml" />

     

       
11
       
12
       
 
       
 <xi:include href="rl-2105.xml" />

     

       
12
       
13
       
 
       
 <xi:include href="rl-2009.xml" />

     

       
13
       
14
       
 
       
 <xi:include href="rl-2003.xml" />

     

···

       
1
       
1
       
+
       
# Release 21.11 (“?”, 2021.11/??) {#release-21.11}

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
In addition to numerous new and upgraded packages, this release has the following highlights:

     

       
4
       
4
       
+
       


     

       
5
       
5
       
+
       
* Support is planned until the end of April 2022, handing over to 22.05.

     

···

       
24
       
24
       
 
       
  };

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  meta = {

     

       
27
       
27
       
-
       
    maintainers = with maintainers; [ metadark ];

     

       
27
       
27
       
+
       
    maintainers = with maintainers; [ kira-bruneau ];

     

       
28
       
28
       
 
       
  };

     

       
29
       
29
       
 
       
}

     

···

       
238
       
238
       
 
       
  ./services/amqp/activemq/default.nix

     

       
239
       
239
       
 
       
  ./services/amqp/rabbitmq.nix

     

       
240
       
240
       
 
       
  ./services/audio/alsa.nix

     

       
241
       
241
       
+
       
  ./services/audio/botamusique.nix

     

       
241
       
242
       
 
       
  ./services/audio/jack.nix

     

       
242
       
243
       
 
       
  ./services/audio/icecast.nix

     

       
243
       
244
       
 
       
  ./services/audio/jmusicbot.nix

     

···

       
31
       
31
       
 
       
  };

     

       
32
       
32
       
 
       


     

       
33
       
33
       
 
       
  meta = {

     

       
34
       
34
       
-
       
    maintainers = with maintainers; [ metadark ];

     

       
34
       
34
       
+
       
    maintainers = with maintainers; [ kira-bruneau ];

     

       
35
       
35
       
 
       
  };

     

       
36
       
36
       
 
       
}

     

···

       
1
       
1
       
+
       
{ config, lib, pkgs, ... }:

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
with lib;

     

       
4
       
4
       
+
       


     

       
5
       
5
       
+
       
let

     

       
6
       
6
       
+
       
  cfg = config.services.botamusique;

     

       
7
       
7
       
+
       


     

       
8
       
8
       
+
       
  format = pkgs.formats.ini {};

     

       
9
       
9
       
+
       
  configFile = format.generate "botamusique.ini" cfg.settings;

     

       
10
       
10
       
+
       
in

     

       
11
       
11
       
+
       
{

     

       
12
       
12
       
+
       
  meta.maintainers = with lib.maintainers; [ hexa ];

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
  options.services.botamusique = {

     

       
15
       
15
       
+
       
    enable = mkEnableOption "botamusique, a bot to play audio streams on mumble";

     

       
16
       
16
       
+
       


     

       
17
       
17
       
+
       
    package = mkOption {

     

       
18
       
18
       
+
       
      type = types.package;

     

       
19
       
19
       
+
       
      default = pkgs.botamusique;

     

       
20
       
20
       
+
       
      description = "The botamusique package to use.";

     

       
21
       
21
       
+
       
    };

     

       
22
       
22
       
+
       


     

       
23
       
23
       
+
       
    settings = mkOption {

     

       
24
       
24
       
+
       
      type = with types; submodule {

     

       
25
       
25
       
+
       
        freeformType = format.type;

     

       
26
       
26
       
+
       
        options = {

     

       
27
       
27
       
+
       
          server.host = mkOption {

     

       
28
       
28
       
+
       
            type = types.str;

     

       
29
       
29
       
+
       
            default = "localhost";

     

       
30
       
30
       
+
       
            example = "mumble.example.com";

     

       
31
       
31
       
+
       
            description = "Hostname of the mumble server to connect to.";

     

       
32
       
32
       
+
       
          };

     

       
33
       
33
       
+
       


     

       
34
       
34
       
+
       
          server.port = mkOption {

     

       
35
       
35
       
+
       
            type = types.port;

     

       
36
       
36
       
+
       
            default = 64738;

     

       
37
       
37
       
+
       
            description = "Port of the mumble server to connect to.";

     

       
38
       
38
       
+
       
          };

     

       
39
       
39
       
+
       


     

       
40
       
40
       
+
       
          bot.username = mkOption {

     

       
41
       
41
       
+
       
            type = types.str;

     

       
42
       
42
       
+
       
            default = "botamusique";

     

       
43
       
43
       
+
       
            description = "Name the bot should appear with.";

     

       
44
       
44
       
+
       
          };

     

       
45
       
45
       
+
       


     

       
46
       
46
       
+
       
          bot.comment = mkOption {

     

       
47
       
47
       
+
       
            type = types.str;

     

       
48
       
48
       
+
       
            default = "Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun!";

     

       
49
       
49
       
+
       
            description = "Comment displayed for the bot.";

     

       
50
       
50
       
+
       
          };

     

       
51
       
51
       
+
       
        };

     

       
52
       
52
       
+
       
      };

     

       
53
       
53
       
+
       
      default = {};

     

       
54
       
54
       
+
       
      description = ''

     

       
55
       
55
       
+
       
        Your <filename>configuration.ini</filename> as a Nix attribute set. Look up

     

       
56
       
56
       
+
       
        possible options in the <link xlink:href="https://github.com/azlux/botamusique/blob/master/configuration.example.ini">configuration.example.ini</link>.

     

       
57
       
57
       
+
       
      '';

     

       
58
       
58
       
+
       
    };

     

       
59
       
59
       
+
       
  };

     

       
60
       
60
       
+
       


     

       
61
       
61
       
+
       
  config = mkIf cfg.enable {

     

       
62
       
62
       
+
       
    systemd.services.botamusique = {

     

       
63
       
63
       
+
       
      after = [ "network.target" ];

     

       
64
       
64
       
+
       
      wantedBy = [ "multi-user.target" ];

     

       
65
       
65
       
+
       


     

       
66
       
66
       
+
       
      unitConfig.Documentation = "https://github.com/azlux/botamusique/wiki";

     

       
67
       
67
       
+
       


     

       
68
       
68
       
+
       
      environment.HOME = "/var/lib/botamusique";

     

       
69
       
69
       
+
       


     

       
70
       
70
       
+
       
      serviceConfig = {

     

       
71
       
71
       
+
       
        ExecStart = "${cfg.package}/bin/botamusique --config ${configFile}";

     

       
72
       
72
       
+
       
        Restart = "always"; # the bot exits when the server connection is lost

     

       
73
       
73
       
+
       


     

       
74
       
74
       
+
       
        # Hardening

     

       
75
       
75
       
+
       
        CapabilityBoundingSet = [ "" ];

     

       
76
       
76
       
+
       
        DynamicUser = true;

     

       
77
       
77
       
+
       
        IPAddressDeny = [

     

       
78
       
78
       
+
       
          "link-local"

     

       
79
       
79
       
+
       
          "multicast"

     

       
80
       
80
       
+
       
        ];

     

       
81
       
81
       
+
       
        LockPersonality = true;

     

       
82
       
82
       
+
       
        MemoryDenyWriteExecute = true;

     

       
83
       
83
       
+
       
        ProcSubset = "pid";

     

       
84
       
84
       
+
       
        PrivateDevices = true;

     

       
85
       
85
       
+
       
        PrivateUsers = true;

     

       
86
       
86
       
+
       
        PrivateTmp = true;

     

       
87
       
87
       
+
       
        ProtectClock = true;

     

       
88
       
88
       
+
       
        ProtectControlGroups = true;

     

       
89
       
89
       
+
       
        ProtectHome = true;

     

       
90
       
90
       
+
       
        ProtectHostname = true;

     

       
91
       
91
       
+
       
        ProtectKernelLogs = true;

     

       
92
       
92
       
+
       
        ProtectKernelModules = true;

     

       
93
       
93
       
+
       
        ProtectKernelTunables = true;

     

       
94
       
94
       
+
       
        ProtectProc = "invisible";

     

       
95
       
95
       
+
       
        ProtectSystem = "strict";

     

       
96
       
96
       
+
       
        RestrictNamespaces = true;

     

       
97
       
97
       
+
       
        RestrictRealtime = true;

     

       
98
       
98
       
+
       
        RestrictAddressFamilies = [

     

       
99
       
99
       
+
       
          "AF_INET"

     

       
100
       
100
       
+
       
          "AF_INET6"

     

       
101
       
101
       
+
       
        ];

     

       
102
       
102
       
+
       
        StateDirectory = "botamusique";

     

       
103
       
103
       
+
       
        SystemCallArchitectures = "native";

     

       
104
       
104
       
+
       
        SystemCallFilter = [

     

       
105
       
105
       
+
       
          "@system-service"

     

       
106
       
106
       
+
       
          "~@privileged"

     

       
107
       
107
       
+
       
          "~@resources"

     

       
108
       
108
       
+
       
        ];

     

       
109
       
109
       
+
       
        UMask = "0077";

     

       
110
       
110
       
+
       
        WorkingDirectory = "/var/lib/botamusique";

     

       
111
       
111
       
+
       
      };

     

       
112
       
112
       
+
       
    };

     

       
113
       
113
       
+
       
  };

     

       
114
       
114
       
+
       
}

     

···

       
197
       
197
       
 
       
               ])) (attrValues cfg.commands);

     

       
198
       
198
       
 
       
        after = [ "zfs.target" ];

     

       
199
       
199
       
 
       
        serviceConfig = {

     

       
200
       
200
       
-
       
          ExecStartPre = (map (pool: lib.escapeShellArgs [

     

       
201
       
201
       
-
       
            "+/run/booted-system/sw/bin/zfs" "allow"

     

       
202
       
202
       
-
       
            cfg.user "hold,send" pool

     

       
203
       
203
       
-
       
          ]) (getPools "source")) ++

     

       
204
       
204
       
-
       
          (map (pool: lib.escapeShellArgs [

     

       
205
       
205
       
-
       
            "+/run/booted-system/sw/bin/zfs" "allow"

     

       
206
       
206
       
-
       
            cfg.user "create,mount,receive,rollback" pool

     

       
207
       
207
       
-
       
          ]) (getPools "target"));

     

       
200
       
200
       
+
       
          ExecStartPre = let

     

       
201
       
201
       
+
       
            allowCmd = permissions: pool: lib.escapeShellArgs [

     

       
202
       
202
       
+
       
              "+/run/booted-system/sw/bin/zfs" "allow"

     

       
203
       
203
       
+
       
              cfg.user (concatStringsSep "," permissions) pool

     

       
204
       
204
       
+
       
            ];

     

       
205
       
205
       
+
       
          in

     

       
206
       
206
       
+
       
            (map (allowCmd [ "hold" "send" "snapshot" "destroy" ]) (getPools "source")) ++

     

       
207
       
207
       
+
       
            (map (allowCmd [ "create" "mount" "receive" "rollback" ]) (getPools "target"));

     

       
208
       
208
       
 
       
          User = cfg.user;

     

       
209
       
209
       
 
       
          Group = cfg.group;

     

       
210
       
210
       
 
       
        };

     

···

       
699
       
699
       
 
       
    ];

     

       
700
       
700
       
 
       


     

       
701
       
701
       
 
       
    users.users.matrix-synapse = {

     

       
702
       
702
       
-
       
        group = "matrix-synapse";

     

       
703
       
703
       
-
       
        home = cfg.dataDir;

     

       
704
       
704
       
-
       
        createHome = true;

     

       
705
       
705
       
-
       
        shell = "${pkgs.bash}/bin/bash";

     

       
706
       
706
       
-
       
        uid = config.ids.uids.matrix-synapse;

     

       
707
       
707
       
-
       
      };

     

       
702
       
702
       
+
       
      group = "matrix-synapse";

     

       
703
       
703
       
+
       
      home = cfg.dataDir;

     

       
704
       
704
       
+
       
      createHome = true;

     

       
705
       
705
       
+
       
      shell = "${pkgs.bash}/bin/bash";

     

       
706
       
706
       
+
       
      uid = config.ids.uids.matrix-synapse;

     

       
707
       
707
       
+
       
    };

     

       
708
       
708
       
 
       


     

       
709
       
709
       
 
       
    users.groups.matrix-synapse = {

     

       
710
       
710
       
 
       
      gid = config.ids.gids.matrix-synapse;

     
···

       
726
       
726
       
 
       
        User = "matrix-synapse";

     

       
727
       
727
       
 
       
        Group = "matrix-synapse";

     

       
728
       
728
       
 
       
        WorkingDirectory = cfg.dataDir;

     

       
729
       
729
       
+
       
        ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" ''

     

       
730
       
730
       
+
       
          chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key

     

       
731
       
731
       
+
       
          chmod 0600 ${cfg.dataDir}/homeserver.signing.key

     

       
732
       
732
       
+
       
        '')) ];

     

       
729
       
733
       
 
       
        ExecStart = ''

     

       
730
       
734
       
 
       
          ${cfg.package}/bin/homeserver \

     

       
731
       
735
       
 
       
            ${ concatMapStringsSep "\n  " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }

     
···

       
733
       
737
       
 
       
        '';

     

       
734
       
738
       
 
       
        ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";

     

       
735
       
739
       
 
       
        Restart = "on-failure";

     

       
740
       
740
       
+
       
        UMask = "0077";

     

       
736
       
741
       
 
       
      };

     

       
737
       
742
       
 
       
    };

     

       
738
       
743
       
 
       
  };

     

···

       
128
       
128
       
 
       
        cinnamon-session

     

       
129
       
129
       
 
       
        cinnamon-desktop

     

       
130
       
130
       
 
       
        cinnamon-menus

     

       
131
       
131
       
+
       
        cinnamon-translations

     

       
131
       
132
       
 
       


     

       
132
       
133
       
 
       
        # utils needed by some scripts

     

       
133
       
134
       
 
       
        killall

     
···

       
136
       
137
       
 
       
        cinnamon-screensaver

     

       
137
       
138
       
 
       
        # cinnamon-killer-daemon: provided by cinnamon-common

     

       
138
       
139
       
 
       
        gnome.networkmanagerapplet # session requirement - also nm-applet not needed

     

       
140
       
140
       
+
       


     

       
141
       
141
       
+
       
        # For a polkit authentication agent

     

       
142
       
142
       
+
       
        polkit_gnome

     

       
139
       
143
       
 
       


     

       
140
       
144
       
 
       
        # packages

     

       
141
       
145
       
 
       
        nemo

     

···

       
316
       
316
       
 
       
        ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ]

     

       
317
       
317
       
 
       
        ++ lib.optional config.networking.networkmanager.enable plasma-nm

     

       
318
       
318
       
 
       
        ++ lib.optional config.hardware.pulseaudio.enable plasma-pa

     

       
319
       
319
       
+
       
        ++ lib.optional config.services.pipewire.pulse.enable plasma-pa

     

       
319
       
320
       
 
       
        ++ lib.optional config.powerManagement.enable powerdevil

     

       
320
       
321
       
 
       
        ++ lib.optional config.services.colord.enable pkgs.colord-kde

     

       
321
       
322
       
 
       
        ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]

     

···

       
428
       
428
       
 
       
      extraVeths = {};

     

       
429
       
429
       
 
       
      additionalCapabilities = [];

     

       
430
       
430
       
 
       
      ephemeral = false;

     

       
431
       
431
       
-
       
      timeoutStartSec = "15s";

     

       
431
       
431
       
+
       
      timeoutStartSec = "1min";

     

       
432
       
432
       
 
       
      allowedDevices = [];

     

       
433
       
433
       
 
       
      hostAddress = null;

     

       
434
       
434
       
 
       
      hostAddress6 = null;

     

···

       
47
       
47
       
 
       
  boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64

     

       
48
       
48
       
 
       
  boot-stage1 = handleTest ./boot-stage1.nix {};

     

       
49
       
49
       
 
       
  borgbackup = handleTest ./borgbackup.nix {};

     

       
50
       
50
       
+
       
  botamusique = handleTest ./botamusique.nix {};

     

       
50
       
51
       
 
       
  buildbot = handleTest ./buildbot.nix {};

     

       
51
       
52
       
 
       
  buildkite-agents = handleTest ./buildkite-agents.nix {};

     

       
52
       
53
       
 
       
  caddy = handleTest ./caddy.nix {};

     

···

       
1
       
1
       
+
       
import ./make-test-python.nix ({ pkgs, lib, ...} :

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
{

     

       
4
       
4
       
+
       
  name = "botamusique";

     

       
5
       
5
       
+
       
  meta.maintainers = with lib.maintainers; [ hexa ];

     

       
6
       
6
       
+
       


     

       
7
       
7
       
+
       
  nodes = {

     

       
8
       
8
       
+
       
    machine = { config, ... }: {

     

       
9
       
9
       
+
       
      services.murmur = {

     

       
10
       
10
       
+
       
        enable = true;

     

       
11
       
11
       
+
       
        registerName = "NixOS tests";

     

       
12
       
12
       
+
       
      };

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
      services.botamusique = {

     

       
15
       
15
       
+
       
        enable = true;

     

       
16
       
16
       
+
       
        settings = {

     

       
17
       
17
       
+
       
          server = {

     

       
18
       
18
       
+
       
            channel = "NixOS tests";

     

       
19
       
19
       
+
       
          };

     

       
20
       
20
       
+
       
          bot = {

     

       
21
       
21
       
+
       
            version = false;

     

       
22
       
22
       
+
       
            auto_check_update = false;

     

       
23
       
23
       
+
       
          };

     

       
24
       
24
       
+
       
        };

     

       
25
       
25
       
+
       
      };

     

       
26
       
26
       
+
       
    };

     

       
27
       
27
       
+
       
  };

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  testScript = ''

     

       
30
       
30
       
+
       
    start_all()

     

       
31
       
31
       
+
       


     

       
32
       
32
       
+
       
    machine.wait_for_unit("murmur.service")

     

       
33
       
33
       
+
       
    machine.wait_for_unit("botamusique.service")

     

       
34
       
34
       
+
       


     

       
35
       
35
       
+
       
    machine.sleep(10)

     

       
36
       
36
       
+
       


     

       
37
       
37
       
+
       
    machine.wait_until_succeeds(

     

       
38
       
38
       
+
       
        "journalctl -u murmur.service -e | grep -q '<1:botamusique(-1)> Authenticated'"

     

       
39
       
39
       
+
       
    )

     

       
40
       
40
       
+
       


     

       
41
       
41
       
+
       
    with subtest("Check systemd hardening"):

     

       
42
       
42
       
+
       
        output = machine.execute("systemctl show botamusique.service")[1]

     

       
43
       
43
       
+
       
        machine.log(output)

     

       
44
       
44
       
+
       
        output = machine.execute("systemd-analyze security botamusique.service")[1]

     

       
45
       
45
       
+
       
        machine.log(output)

     

       
46
       
46
       
+
       
  '';

     

       
47
       
47
       
+
       
})

     

···

       
33
       
33
       
 
       


     

       
34
       
34
       
 
       
          autosnap = true;

     

       
35
       
35
       
 
       
        };

     

       
36
       
36
       
-
       
        datasets."pool/test".useTemplate = [ "test" ];

     

       
36
       
36
       
+
       
        datasets."pool/sanoid".useTemplate = [ "test" ];

     

       
37
       
37
       
+
       
        extraArgs = [ "--verbose" ];

     

       
37
       
38
       
 
       
      };

     

       
38
       
39
       
 
       


     

       
39
       
40
       
 
       
      services.syncoid = {

     

       
40
       
41
       
 
       
        enable = true;

     

       
41
       
42
       
 
       
        sshKey = "/var/lib/syncoid/id_ecdsa";

     

       
42
       
42
       
-
       
        commonArgs = [ "--no-sync-snap" ];

     

       
43
       
43
       
-
       
        commands."pool/test".target = "root@target:pool/test";

     

       
43
       
43
       
+
       
        commands = {

     

       
44
       
44
       
+
       
          # Sync snapshot taken by sanoid

     

       
45
       
45
       
+
       
          "pool/sanoid" = {

     

       
46
       
46
       
+
       
            target = "root@target:pool/sanoid";

     

       
47
       
47
       
+
       
            extraArgs = [ "--no-sync-snap" ];

     

       
48
       
48
       
+
       
          };

     

       
49
       
49
       
+
       
          # Take snapshot and sync

     

       
50
       
50
       
+
       
          "pool/syncoid".target = "root@target:pool/syncoid";

     

       
51
       
51
       
+
       
        };

     

       
44
       
52
       
 
       
      };

     

       
45
       
53
       
 
       
    };

     

       
46
       
54
       
 
       
    target = { ... }: {

     
···

       
54
       
62
       
 
       


     

       
55
       
63
       
 
       
  testScript = ''

     

       
56
       
64
       
 
       
    source.succeed(

     

       
57
       
57
       
-
       
        "mkdir /tmp/mnt",

     

       
65
       
65
       
+
       
        "mkdir /mnt",

     

       
58
       
66
       
 
       
        "parted --script /dev/vdb -- mklabel msdos mkpart primary 1024M -1s",

     

       
59
       
67
       
 
       
        "udevadm settle",

     

       
60
       
60
       
-
       
        "zpool create pool /dev/vdb1",

     

       
61
       
61
       
-
       
        "zfs create -o mountpoint=legacy pool/test",

     

       
62
       
62
       
-
       
        "mount -t zfs pool/test /tmp/mnt",

     

       
68
       
68
       
+
       
        "zpool create pool -R /mnt /dev/vdb1",

     

       
69
       
69
       
+
       
        "zfs create pool/sanoid",

     

       
70
       
70
       
+
       
        "zfs create pool/syncoid",

     

       
63
       
71
       
 
       
        "udevadm settle",

     

       
64
       
72
       
 
       
    )

     

       
65
       
73
       
 
       
    target.succeed(

     

       
74
       
74
       
+
       
        "mkdir /mnt",

     

       
66
       
75
       
 
       
        "parted --script /dev/vdb -- mklabel msdos mkpart primary 1024M -1s",

     

       
67
       
76
       
 
       
        "udevadm settle",

     

       
68
       
68
       
-
       
        "zpool create pool /dev/vdb1",

     

       
77
       
77
       
+
       
        "zpool create pool -R /mnt /dev/vdb1",

     

       
69
       
78
       
 
       
        "udevadm settle",

     

       
70
       
79
       
 
       
    )

     

       
71
       
80
       
 
       


     
···

       
76
       
85
       
 
       
        "chown -R syncoid:syncoid /var/lib/syncoid/",

     

       
77
       
86
       
 
       
    )

     

       
78
       
87
       
 
       


     

       
79
       
79
       
-
       
    source.succeed("touch /tmp/mnt/test.txt")

     

       
88
       
88
       
+
       
    # Take snapshot with sanoid

     

       
89
       
89
       
+
       
    source.succeed("touch /mnt/pool/sanoid/test.txt")

     

       
80
       
90
       
 
       
    source.systemctl("start --wait sanoid.service")

     

       
81
       
91
       
 
       


     

       
92
       
92
       
+
       
    # Sync snapshots

     

       
82
       
93
       
 
       
    target.wait_for_open_port(22)

     

       
94
       
94
       
+
       
    source.succeed("touch /mnt/pool/syncoid/test.txt")

     

       
83
       
95
       
 
       
    source.systemctl("start --wait syncoid.service")

     

       
84
       
84
       
-
       
    target.succeed(

     

       
85
       
85
       
-
       
        "mkdir /tmp/mnt",

     

       
86
       
86
       
-
       
        "zfs set mountpoint=legacy pool/test",

     

       
87
       
87
       
-
       
        "mount -t zfs pool/test /tmp/mnt",

     

       
88
       
88
       
-
       
    )

     

       
89
       
89
       
-
       
    target.succeed("cat /tmp/mnt/test.txt")

     

       
96
       
96
       
+
       
    target.succeed("cat /mnt/pool/sanoid/test.txt")

     

       
97
       
97
       
+
       
    target.succeed("cat /mnt/pool/syncoid/test.txt")

     

       
90
       
98
       
 
       
  '';

     

       
91
       
99
       
 
       
})

     

···

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
python3.pkgs.buildPythonApplication rec {

     

       
5
       
5
       
 
       
  pname = "whipper";

     

       
6
       
6
       
-
       
  version = "0.9.1.dev7+g${lib.substring 0 7 src.rev}";

     

       
6
       
6
       
+
       
  version = "0.10.0";

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
  src = fetchFromGitHub {

     

       
9
       
9
       
 
       
    owner = "whipper-team";

     

       
10
       
10
       
 
       
    repo = "whipper";

     

       
11
       
11
       
-
       
    rev = "9e95f0604fa30ab06445fe46e3bc93bba6092a05";

     

       
12
       
12
       
-
       
    sha256 = "1c2qldw9vxpvdfh5wl6mfcd7zzz3v8r86ffqll311lcp2zin33dg";

     

       
11
       
11
       
+
       
    rev = "v${version}";

     

       
12
       
12
       
+
       
    sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";

     

       
13
       
13
       
 
       
  };

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  pythonPath = with python3.pkgs; [

     

···

       
1
       
1
       
+
       
{ lib, fetchurl, appimageTools, }:

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
let

     

       
4
       
4
       
+
       
  pname = "ytmdesktop";

     

       
5
       
5
       
+
       
  version = "1.13.0";

     

       
6
       
6
       
+
       
  name = "${pname}-${version}";

     

       
7
       
7
       
+
       


     

       
8
       
8
       
+
       
  src = fetchurl {

     

       
9
       
9
       
+
       
    url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${version}/YouTube-Music-Desktop-App-${version}.AppImage";

     

       
10
       
10
       
+
       
    sha256 = "0f5l7hra3m3q9zd0ngc9dj4mh1lk0rgicvh9idpd27wr808vy28v";

     

       
11
       
11
       
+
       
  };

     

       
12
       
12
       
+
       


     

       
13
       
13
       
+
       
  appimageContents = appimageTools.extract { inherit name src; };

     

       
14
       
14
       
+
       
in appimageTools.wrapType2 rec {

     

       
15
       
15
       
+
       
  inherit name src;

     

       
16
       
16
       
+
       


     

       
17
       
17
       
+
       
  extraInstallCommands = ''

     

       
18
       
18
       
+
       
    mv $out/bin/{${name},${pname}}

     

       
19
       
19
       
+
       


     

       
20
       
20
       
+
       
    install -m 444 \

     

       
21
       
21
       
+
       
        -D ${appimageContents}/youtube-music-desktop-app.desktop \

     

       
22
       
22
       
+
       
        -t $out/share/applications

     

       
23
       
23
       
+
       
    substituteInPlace \

     

       
24
       
24
       
+
       
        $out/share/applications/youtube-music-desktop-app.desktop \

     

       
25
       
25
       
+
       
        --replace 'Exec=AppRun' 'Exec=${pname}'

     

       
26
       
26
       
+
       
    cp -r ${appimageContents}/usr/share/icons $out/share

     

       
27
       
27
       
+
       
  '';

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  meta = with lib; {

     

       
30
       
30
       
+
       
    description = "A Desktop App for YouTube Music";

     

       
31
       
31
       
+
       
    homepage = "https://ytmdesktop.app/";

     

       
32
       
32
       
+
       
    license = licenses.cc0;

     

       
33
       
33
       
+
       
    platforms = platforms.linux;

     

       
34
       
34
       
+
       
    maintainers = [ maintainers.lgcl ];

     

       
35
       
35
       
+
       
  };

     

       
36
       
36
       
+
       
}

     

···

       
111
       
111
       
 
       
      else "https://zynaddsubfx.sourceforge.io";

     

       
112
       
112
       
 
       


     

       
113
       
113
       
 
       
    license = licenses.gpl2;

     

       
114
       
114
       
-
       
    maintainers = with maintainers; [ goibhniu metadark ];

     

       
114
       
114
       
+
       
    maintainers = with maintainers; [ goibhniu kira-bruneau ];

     

       
115
       
115
       
 
       
    platforms = platforms.linux;

     

       
116
       
116
       
 
       
  };

     

       
117
       
117
       
 
       
}

     

···

       
103
       
103
       
 
       
    description = "The Zest Framework used in ZynAddSubFX's UI";

     

       
104
       
104
       
 
       
    homepage = "https://github.com/mruby-zest";

     

       
105
       
105
       
 
       
    license = licenses.lgpl21;

     

       
106
       
106
       
-
       
    maintainers = with maintainers; [ metadark ];

     

       
106
       
106
       
+
       
    maintainers = with maintainers; [ kira-bruneau ];

     

       
107
       
107
       
 
       
    platforms = platforms.all;

     

       
108
       
108
       
 
       
  };

     

       
109
       
109
       
 
       
}

     

···

       
4
       
4
       
 
       
, lua52Packages

     

       
5
       
5
       
 
       
, pkg-config

     

       
6
       
6
       
 
       
, makeWrapper

     

       
7
       
7
       
+
       
, openlibm

     

       
7
       
8
       
 
       
} :

     

       
8
       
9
       
 
       


     

       
9
       
10
       
 
       
stdenv.mkDerivation rec {

     
···

       
19
       
20
       
 
       


     

       
20
       
21
       
 
       
  nativeBuildInputs = [ makeWrapper pkg-config ];

     

       
21
       
22
       
 
       


     

       
22
       
22
       
-
       
  buildInputs = [ SDL2 lua52Packages.lua ];

     

       
23
       
23
       
+
       
  buildInputs = [ SDL2 lua52Packages.lua openlibm ];

     

       
23
       
24
       
 
       


     

       
24
       
25
       
 
       
  postPatch = ''

     

       
25
       
26
       
 
       
    # use system Lua 5.2

     
···

       
34
       
35
       
 
       
    # extracted and adapted from build.sh

     

       
35
       
36
       
 
       
    CC=$NIX_CC/bin/cc

     

       
36
       
37
       
 
       
    CFLAGS="-Wall -O3 -g -std=gnu11 -Isrc -DLUA_USE_POPEN $(pkg-config --cflags lua sdl2)"

     

       
37
       
37
       
-
       
    LDFLAGS="$(pkg-config --libs lua sdl2)"

     

       
38
       
38
       
+
       
    LDFLAGS="$(pkg-config --libs lua sdl2 openlibm)"

     

       
38
       
39
       
 
       
    for f in $(find src -name "*.c"); do

     

       
39
       
40
       
 
       
      $CC -c $CFLAGS $f -o "''${f//\//_}.o"

     

       
40
       
41
       
 
       
    done

     

···

       
66
       
66
       
 
       
    description = "Interactive, extensible editor for binary data";

     

       
67
       
67
       
 
       
    homepage = "http://www.jemarch.net/poke";

     

       
68
       
68
       
 
       
    license = licenses.gpl3Plus;

     

       
69
       
69
       
-
       
    maintainers = with maintainers; [ AndersonTorres metadark ];

     

       
69
       
69
       
+
       
    maintainers = with maintainers; [ AndersonTorres kira-bruneau ];

     

       
70
       
70
       
 
       
    platforms = platforms.unix;

     

       
71
       
71
       
 
       
    changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}";

     

       
72
       
72
       
 
       
  };

     

···

       
1
       
1
       
 
       
diff --git i/goldendict.pro w/goldendict.pro

     

       
2
       
2
       
-
       
index 328dc20..5202a07 100644

     

       
2
       
2
       
+
       
index 4a4a3094..082b728f 100644

     

       
3
       
3
       
 
       
--- i/goldendict.pro

     

       
4
       
4
       
 
       
+++ w/goldendict.pro

     

       
5
       
5
       
-
       
@@ -210,21 +210,18 @@ mac {

     

       
5
       
5
       
+
       
@@ -212,22 +212,19 @@ mac {

     

       
6
       
6
       
 
       
         -llzo2

     

       
7
       
7
       
 
       
     !CONFIG( no_ffmpeg_player ) {

     

       
8
       
8
       
 
       
         LIBS += -lao \

     

       
9
       
9
       
+
       
-            -lswresample-gd \

     

       
9
       
10
       
 
       
-            -lavutil-gd \

     

       
10
       
11
       
 
       
-            -lavformat-gd \

     

       
11
       
12
       
 
       
-            -lavcodec-gd

     

       
13
       
13
       
+
       
+            -lswresample \

     

       
12
       
14
       
 
       
+            -lavutil \

     

       
13
       
15
       
 
       
+            -lavformat \

     

       
14
       
16
       
 
       
+            -lavcodec

     
···

       
29
       
31
       
 
       
                       cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \

     

       
30
       
32
       
 
       
                       mkdir -p GoldenDict.app/Contents/MacOS/help & \

     

       
31
       
33
       
 
       
                       cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/

     

       
32
       
32
       
-
       
@@ -232,15 +229,6 @@ mac {

     

       
34
       
34
       
+
       
@@ -235,15 +232,6 @@ mac {

     

       
33
       
35
       
 
       
     CONFIG += zim_support

     

       
34
       
36
       
 
       
     !CONFIG( no_chinese_conversion_support ) {

     

       
35
       
37
       
 
       
         CONFIG += chinese_conversion_support

     
···

       
46
       
48
       
 
       
 }

     

       
47
       
49
       
 
       
 DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"

     

       
48
       
50
       
 
       
diff --git i/tiff.cc w/tiff.cc

     

       
49
       
49
       
-
       
index e3cb8bf..9ff880f 100644

     

       
51
       
51
       
+
       
index e3cb8bf5..95dd812f 100644

     

       
50
       
52
       
 
       
--- i/tiff.cc

     

       
51
       
53
       
 
       
+++ w/tiff.cc

     

       
52
       
52
       
-
       
@@ -6,8 +6,8 @@

     

       
54
       
54
       
+
       
@@ -5,7 +5,7 @@

     

       
55
       
55
       
+
       
 

     

       
53
       
56
       
 
       
 #include "tiff.hh"

     

       
54
       
57
       
 
       
 

     

       
55
       
55
       
-
       
 #if defined (Q_OS_MAC) || defined (Q_OS_WIN)

     

       
56
       
56
       
-
       
-#include "tiff/tiff.h"

     

       
57
       
57
       
-
       
-#include "tiff/tiffio.h"

     

       
58
       
58
       
-
       
+#include "tiff.h"

     

       
59
       
59
       
-
       
+#include "tiffio.h"

     

       
58
       
58
       
+
       
-#if defined (Q_OS_MAC) || defined (Q_OS_WIN)

     

       
59
       
59
       
+
       
+#if defined (Q_OS_WIN)

     

       
60
       
60
       
+
       
 #include "tiff/tiff.h"

     

       
61
       
61
       
+
       
 #include "tiff/tiffio.h"

     

       
60
       
62
       
 
       
 #else

     

       
61
       
61
       
-
       
 #include "tiff.h"

     

       
62
       
62
       
-
       
 #include "tiffio.h"

     

···

       
4
       
4
       
 
       
, withCC ? true, opencc

     

       
5
       
5
       
 
       
, withEpwing ? true, libeb

     

       
6
       
6
       
 
       
, withExtraTiff ? true, libtiff

     

       
7
       
7
       
-
       
, withFFmpeg ? true, libao, ffmpeg_3

     

       
7
       
7
       
+
       
, withFFmpeg ? true, libao, ffmpeg

     

       
8
       
8
       
 
       
, withMultimedia ? true

     

       
9
       
9
       
 
       
, withZim ? true, zstd }:

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
mkDerivation rec {

     

       
12
       
12
       
 
       
  pname = "goldendict";

     

       
13
       
13
       
-
       
  version = "2020-12-09";

     

       
13
       
13
       
+
       
  version = "2021-03-09";

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  src = fetchFromGitHub {

     

       
16
       
16
       
 
       
    owner = "goldendict";

     

       
17
       
17
       
 
       
    repo = pname;

     

       
18
       
18
       
-
       
    rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132";

     

       
19
       
19
       
-
       
    sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n";

     

       
18
       
18
       
+
       
    rev = "b2e673961d28ca5eb920a909091252d3321f09d6";

     

       
19
       
19
       
+
       
    sha256 = "sha256-+AAamnICq0/B54ggFpgF/Uupm1a4YiEYgHXrhIK4M0E=";

     

       
20
       
20
       
 
       
  };

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  patches = [

     
···

       
39
       
39
       
 
       
    ++ lib.optional withCC opencc

     

       
40
       
40
       
 
       
    ++ lib.optional withEpwing libeb

     

       
41
       
41
       
 
       
    ++ lib.optional withExtraTiff libtiff

     

       
42
       
42
       
-
       
    ++ lib.optionals withFFmpeg [ libao ffmpeg_3 ]

     

       
42
       
42
       
+
       
    ++ lib.optionals withFFmpeg [ libao ffmpeg ]

     

       
43
       
43
       
 
       
    ++ lib.optional withZim zstd;

     

       
44
       
44
       
 
       


     

       
45
       
45
       
 
       
  qmakeFlags = with lib; [

     

···

       
1
       
1
       
+
       
{ lib, stdenv, cmake, fetchFromGitHub, opencv4 }:

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
stdenv.mkDerivation {

     

       
4
       
4
       
+
       
  pname = "opentrack-aruco";

     

       
5
       
5
       
+
       
  version = "unstable-20190303";

     

       
6
       
6
       
+
       


     

       
7
       
7
       
+
       
  src = fetchFromGitHub {

     

       
8
       
8
       
+
       
    owner = "opentrack";

     

       
9
       
9
       
+
       
    repo = "aruco";

     

       
10
       
10
       
+
       
    rev = "12dc60efd61149227bd05c805208d9bcce308f6d";

     

       
11
       
11
       
+
       
    sha256 = "0gkrixgfbpg8pls4qqilphbz4935mg5z4p18a0vv6kclmfccw9ad";

     

       
12
       
12
       
+
       
  };

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
  nativeBuildInputs = [ cmake ];

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
  buildInputs = [ opencv4 ];

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
  NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";

     

       
19
       
19
       
+
       


     

       
20
       
20
       
+
       
  preInstall = ''

     

       
21
       
21
       
+
       
    mkdir -p $out/include/aruco

     

       
22
       
22
       
+
       
  '';

     

       
23
       
23
       
+
       


     

       
24
       
24
       
+
       
  # copy headers required by main package

     

       
25
       
25
       
+
       
  postInstall = ''

     

       
26
       
26
       
+
       
    cp $src/src/*.h $out/include/aruco

     

       
27
       
27
       
+
       
  '';

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  meta = with lib; {

     

       
30
       
30
       
+
       
    homepage = "https://github.com/opentrack/aruco";

     

       
31
       
31
       
+
       
    description = "C++ library for detection of AR markers based on OpenCV";

     

       
32
       
32
       
+
       
    license = licenses.isc;

     

       
33
       
33
       
+
       
    maintainers = with maintainers; [ zaninime ];

     

       
34
       
34
       
+
       
  };

     

       
35
       
35
       
+
       
}

     

···

       
1
       
1
       
+
       
{ mkDerivation, lib, callPackage, fetchzip, fetchFromGitHub, cmake, pkg-config

     

       
2
       
2
       
+
       
, ninja, copyDesktopItems, qtbase, qttools, opencv4, procps, eigen, libXdmcp

     

       
3
       
3
       
+
       
, libevdev, makeDesktopItem, fetchurl }:

     

       
4
       
4
       
+
       


     

       
5
       
5
       
+
       
let

     

       
6
       
6
       
+
       
  version = "2.3.13";

     

       
7
       
7
       
+
       


     

       
8
       
8
       
+
       
  aruco = callPackage ./aruco.nix { };

     

       
9
       
9
       
+
       


     

       
10
       
10
       
+
       
  # license.txt inside the zip file is MIT

     

       
11
       
11
       
+
       
  xplaneSdk = fetchzip {

     

       
12
       
12
       
+
       
    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip";

     

       
13
       
13
       
+
       
    sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba";

     

       
14
       
14
       
+
       
  };

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
in mkDerivation {

     

       
17
       
17
       
+
       
  pname = "opentrack";

     

       
18
       
18
       
+
       
  inherit version;

     

       
19
       
19
       
+
       


     

       
20
       
20
       
+
       
  src = fetchFromGitHub {

     

       
21
       
21
       
+
       
    owner = "opentrack";

     

       
22
       
22
       
+
       
    repo = "opentrack";

     

       
23
       
23
       
+
       
    rev = "opentrack-${version}";

     

       
24
       
24
       
+
       
    sha256 = "1s986lmm5l1pwbwvd1pfiq84n32s1q1dav7a0cbga4d1vcf0v1ay";

     

       
25
       
25
       
+
       
  };

     

       
26
       
26
       
+
       


     

       
27
       
27
       
+
       
  nativeBuildInputs = [ cmake pkg-config ninja copyDesktopItems ];

     

       
28
       
28
       
+
       
  buildInputs = [ qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco ];

     

       
29
       
29
       
+
       


     

       
30
       
30
       
+
       
  NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";

     

       
31
       
31
       
+
       


     

       
32
       
32
       
+
       
  cmakeFlags = [

     

       
33
       
33
       
+
       
    "-DCMAKE_BUILD_TYPE=RELEASE"

     

       
34
       
34
       
+
       
    "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"

     

       
35
       
35
       
+
       
    "-DSDK_XPLANE=${xplaneSdk}"

     

       
36
       
36
       
+
       
  ];

     

       
37
       
37
       
+
       


     

       
38
       
38
       
+
       
  desktopItems = [

     

       
39
       
39
       
+
       
    (makeDesktopItem rec {

     

       
40
       
40
       
+
       
      name = "opentrack";

     

       
41
       
41
       
+
       
      exec = "opentrack";

     

       
42
       
42
       
+
       
      icon = fetchurl {

     

       
43
       
43
       
+
       
        url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";

     

       
44
       
44
       
+
       
        sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn";

     

       
45
       
45
       
+
       
      };

     

       
46
       
46
       
+
       
      desktopName = name;

     

       
47
       
47
       
+
       
      genericName = "Head tracking software";

     

       
48
       
48
       
+
       
      categories = "Utility;";

     

       
49
       
49
       
+
       
    })

     

       
50
       
50
       
+
       
  ];

     

       
51
       
51
       
+
       


     

       
52
       
52
       
+
       
  meta = with lib; {

     

       
53
       
53
       
+
       
    homepage = "https://github.com/opentrack/opentrack";

     

       
54
       
54
       
+
       
    description = "Head tracking software for MS Windows, Linux, and Apple OSX";

     

       
55
       
55
       
+
       
    license = licenses.isc;

     

       
56
       
56
       
+
       
    maintainers = with maintainers; [ zaninime ];

     

       
57
       
57
       
+
       
  };

     

       
58
       
58
       
+
       
}

     

···

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
7
       
7
       
 
       
  pname = "synergy";

     

       
8
       
8
       
-
       
  version = "1.11.1";

     

       
8
       
8
       
+
       
  version = "1.13.1.41";

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  src = fetchFromGitHub {

     

       
11
       
11
       
 
       
    owner = "symless";

     

       
12
       
12
       
 
       
    repo = "synergy-core";

     

       
13
       
13
       
 
       
    rev = "${version}-stable";

     

       
14
       
14
       
-
       
    sha256 = "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh";

     

       
14
       
14
       
+
       
    fetchSubmodules = true;

     

       
15
       
15
       
+
       
    sha256 = "1phg0szc9g018zxs5wbys4drzq1cdhyzajfg45l6a3fmi6qdi1kw";

     

       
15
       
16
       
 
       
  };

     

       
16
       
17
       
 
       


     

       
17
       
17
       
-
       
  patches = [

     

       
18
       
18
       
-
       
    ./build-tests.patch

     

       
19
       
19
       
-
       
    (fetchpatch {

     

       
20
       
20
       
-
       
      name = "CVE-2020-15117.patch";

     

       
21
       
21
       
-
       
      url = "https://github.com/symless/synergy-core/commit/"

     

       
22
       
22
       
-
       
          + "0a97c2be0da2d0df25cb86dfd642429e7a8bea39.patch";

     

       
23
       
23
       
-
       
      sha256 = "03q8m5n50fms7fjfjgmqrgy9mrxwi9kkz3f3vlrs2x5h21dl6bmj";

     

       
24
       
24
       
-
       
    })

     

       
25
       
25
       
-
       
  ] ++ lib.optional stdenv.isDarwin ./macos_build_fix.patch;

     

       
26
       
26
       
-
       


     

       
27
       
27
       
-
       
  # Since the included gtest and gmock don't support clang and the

     

       
28
       
28
       
-
       
  # segfault when built with gcc9, we replace it with 1.10.0 for

     

       
29
       
29
       
-
       
  # synergy-1.11.0. This should become unnecessary when upstream

     

       
30
       
30
       
-
       
  # updates these dependencies.

     

       
31
       
31
       
-
       
  googletest = fetchFromGitHub {

     

       
32
       
32
       
-
       
    owner = "google";

     

       
33
       
33
       
-
       
    repo = "googletest";

     

       
34
       
34
       
-
       
    rev = "release-1.10.0";

     

       
35
       
35
       
-
       
    sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz";

     

       
36
       
36
       
-
       
  };

     

       
18
       
18
       
+
       
  patches = lib.optional stdenv.isDarwin ./macos_build_fix.patch;

     

       
37
       
19
       
 
       


     

       
38
       
20
       
 
       
  postPatch = ''

     

       
39
       
39
       
-
       
    rm -r ext/*

     

       
40
       
40
       
-
       
    cp -r ${googletest}/googlemock ext/gmock/

     

       
41
       
41
       
-
       
    cp -r ${googletest}/googletest ext/gtest/

     

       
42
       
42
       
-
       
    chmod -R +w ext/

     

       
21
       
21
       
+
       
    substituteInPlace src/gui/src/SslCertificate.cpp \

     

       
22
       
22
       
+
       
      --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'

     

       
43
       
23
       
 
       
  '';

     

       
44
       
24
       
 
       


     

       
45
       
25
       
 
       
  cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";

     
···

       
63
       
43
       
 
       
    cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/

     

       
64
       
44
       
 
       
  '' + lib.optionalString withGUI ''

     

       
65
       
45
       
 
       
    cp bin/synergy $out/bin/

     

       
66
       
66
       
-
       
    wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]}

     

       
46
       
46
       
+
       
    wrapQtApp $out/bin/synergy

     

       
67
       
47
       
 
       
  '' + lib.optionalString stdenv.isLinux ''

     

       
68
       
48
       
 
       
    mkdir -p $out/share/icons/hicolor/scalable/apps

     

       
69
       
49
       
 
       
    cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/

     
···

       
80
       
60
       
 
       


     

       
81
       
61
       
 
       
  meta = with lib; {

     

       
82
       
62
       
 
       
    description = "Share one mouse and keyboard between multiple computers";

     

       
83
       
83
       
-
       
    homepage = "http://synergy-project.org/";

     

       
63
       
63
       
+
       
    homepage = "https://synergy-project.org/";

     

       
84
       
64
       
 
       
    license = licenses.gpl2;

     

       
85
       
85
       
-
       
    maintainers = with maintainers; [ ];

     

       
65
       
65
       
+
       
    maintainers = with maintainers; [ talyz ];

     

       
86
       
66
       
 
       
    platforms = platforms.all;

     

       
87
       
67
       
 
       
  };

     

       
88
       
68
       
 
       
}

     

···

       
1
       
1
       
 
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
2
       
-
       
index a2297311..25a51f56 100644

     

       
2
       
2
       
+
       
index c1e78d1d..13639ba1 100644

     

       
3
       
3
       
 
       
--- a/CMakeLists.txt

     

       
4
       
4
       
 
       
+++ b/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -138,7 +138,7 @@ if (UNIX)

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
     if (APPLE)

     

       
9
       
9
       
-
       
-        set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")

     

       
10
       
10
       
-
       
+        set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
         find_library (lib_ScreenSaver ScreenSaver)

     

       
13
       
13
       
-
       
         find_library (lib_IOKit IOKit)

     

       
14
       
14
       
-
       
@@ -292,14 +292,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")

     

       
5
       
5
       
+
       
@@ -328,14 +328,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")

     

       
15
       
6
       
 
       
         ${OPENSSL_ROOT}/lib/libssl.lib

     

       
16
       
7
       
 
       
         ${OPENSSL_ROOT}/lib/libcrypto.lib

     

       
17
       
8
       
 
       
     )

     
···

       
22
       
13
       
 
       
-        ${OPENSSL_ROOT}/lib/libssl.a

     

       
23
       
14
       
 
       
-        ${OPENSSL_ROOT}/lib/libcrypto.a

     

       
24
       
15
       
 
       
-    )

     

       
25
       
25
       
-
       
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

     

       
26
       
26
       
-
       
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

     

       
16
       
16
       
+
       
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")

     

       
17
       
17
       
+
       
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin|.*BSD|DragonFly")

     

       
27
       
18
       
 
       
     set (OPENSSL_LIBS ssl crypto)

     

       
28
       
19
       
 
       
 else()

     

       
29
       
20
       
 
       
     message (FATAL_ERROR "Couldn't find OpenSSL")

     

···

       
51
       
51
       
 
       
    description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";

     

       
52
       
52
       
 
       
    homepage = "https://nyxt.atlas.engineer";

     

       
53
       
53
       
 
       
    license = licenses.bsd3;

     

       
54
       
54
       
-
       
    maintainers = with maintainers; [ lewo ];

     

       
54
       
54
       
+
       
    maintainers = with maintainers; [ lewo payas ];

     

       
55
       
55
       
 
       
    platforms = platforms.all;

     

       
56
       
56
       
 
       
  };

     

       
57
       
57
       
 
       
}

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
buildGoModule rec {

     

       
4
       
4
       
 
       
  pname = "starboard-octant-plugin";

     

       
5
       
5
       
-
       
  version = "0.10.0";

     

       
5
       
5
       
+
       
  version = "0.10.3";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  src = fetchFromGitHub {

     

       
8
       
8
       
 
       
    owner = "aquasecurity";

     

       
9
       
9
       
 
       
    repo = pname;

     

       
10
       
10
       
 
       
    rev = "v${version}";

     

       
11
       
11
       
-
       
    sha256 = "sha256-3BifigdAFuOCrhJRv/w4k7pT4BTHfINuEkeG6zaI0v8=";

     

       
11
       
11
       
+
       
    sha256 = "sha256-9vl068ZTw6Czf+cWQ0k1lU0pqh7P0YZgLguHkk3M918=";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
-
       
  vendorSha256 = "sha256-1NTneOGU4R1xzR9hAI9MJWYuYTPgYtLa5vH1H5wyHcM=";

     

       
14
       
14
       
+
       
  vendorSha256 = "sha256-HOvZPDVKZEoL91yyaJRuKThHirY77xlKOtLKARthxn8=";

     

       
15
       
15
       
 
       


     

       
16
       
16
       
-
       
  buildFlagsArray = [ "-ldflags=" "-s" "-w" ];

     

       
16
       
16
       
+
       
  preBuild = ''

     

       
17
       
17
       
+
       
    buildFlagsArray+=("-ldflags" "-s -w")

     

       
18
       
18
       
+
       
  '';

     

       
17
       
19
       
 
       


     

       
18
       
20
       
 
       
  meta = with lib; {

     

       
21
       
21
       
+
       
    homepage = "https://github.com/aquasecurity/starboard-octant-plugin";

     

       
22
       
22
       
+
       
    changelog = "https://github.com/aquasecurity/starboard-octant-plugin/releases/tag/v${version}";

     

       
19
       
23
       
 
       
    description = "Octant plugin for viewing Starboard security information";

     

       
20
       
24
       
 
       
    longDescription = ''

     

       
21
       
25
       
 
       
      This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for

     

       
22
       
26
       
 
       
      Kubernetes workloads stored as custom security resources.

     

       
23
       
27
       
 
       
    '';

     

       
24
       
24
       
-
       
    homepage = src.meta.homepage;

     

       
25
       
28
       
 
       
    license = licenses.asl20;

     

       
26
       
29
       
 
       
    maintainers = with maintainers; [ jk ];

     

       
27
       
30
       
 
       
  };