commit 11a9ac00fc34ca9948ae05c034fa730163626e40 · pyrox.dev/nixpkgs

+1

.github/CODEOWNERS

···

       46
        
       /nixos/default.nix          @nbp @infinisil

     

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

     

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

     

       0
        
       
     

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

     

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

     

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

···

       46
        
       /nixos/default.nix          @nbp @infinisil

     

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

     

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

     

       49
       +
       /nixos/doc @ryantm

     

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

     

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

     

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

+20

.github/workflows/nixos-manual.yml

···

       1
       +
       name: NixOS manual checks

     

       2
       +
       

     

       3
       +
       on:

     

       4
       +
         pull_request:

     

       5
       +
           branches-ignore:

     

       6
       +
             - 'release-**'

     

       7
       +
           paths:

     

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

     

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

     

       10
       +
       

     

       11
       +
       jobs:

     

       12
       +
         tests:

     

       13
       +
           runs-on: ubuntu-latest

     

       14
       +
           steps:

     

       15
       +
           - uses: actions/checkout@v2

     

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

     

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

     

       18
       +
             run: |

     

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

     

       20
       +
               git diff --exit-code

+1 -1

.version

+1 -1

lib/trivial.nix

···

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

     

       172
        
            starting with that new letter.

     

       173
        
         */

     

       174
       -
         codeName = "Okapi";

     

       175
        
       

     

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

     

       177
        
         versionSuffix =

···

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

     

       172
        
            starting with that new letter.

     

       173
        
         */

     

       174
       +
         codeName = "Porcupine";

     

       175
        
       

     

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

     

       177
        
         versionSuffix =

+8 -2

maintainers/maintainer-list.nix

···

       5696
        
           githubId = 6652840;

     

       5697
        
           name = "Jade";

     

       5698
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5699
        
         lheckemann = {

     

       5700
        
           email = "git@sphalerite.org";

     

       5701
        
           github = "lheckemann";

     
···

       6452
        
           email = "softs@metabarcoding.org";

     

       6453
        
           name = "Celine Mercier";

     

       6454
        
         };

     

       6455
       -
         metadark = {

     

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

     

       6457
        
           name = "Kira Bruneau";

     

       6458
       -
           github = "metadark";

     

       6459
        
           githubId = 382041;

     

       6460
        
         };

     

       6461
        
         meutraa = {

···

       5696
        
           githubId = 6652840;

     

       5697
        
           name = "Jade";

     

       5698
        
         };

     

       5699
       +
         lgcl = {

     

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

     

       5701
       +
           name = "Leon Vack";

     

       5702
       +
           github = "LogicalOverflow";

     

       5703
       +
           githubId = 5919957;

     

       5704
       +
         };

     

       5705
        
         lheckemann = {

     

       5706
        
           email = "git@sphalerite.org";

     

       5707
        
           github = "lheckemann";

     
···

       6458
        
           email = "softs@metabarcoding.org";

     

       6459
        
           name = "Celine Mercier";

     

       6460
        
         };

     

       6461
       +
         kira-bruneau = {

     

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

     

       6463
        
           name = "Kira Bruneau";

     

       6464
       +
           github = "kira-bruneau";

     

       6465
        
           githubId = 382041;

     

       6466
        
         };

     

       6467
        
         meutraa = {

+13

nixos/doc/manual/contributing-to-this-manual.chapter.md

···

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

     

       2
       +
       

     

       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
       +
       

     

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

     

       6
       +
       

     

       7
       +
       ```ShellSession

     

       8
       +
       $ cd /path/to/nixpkgs

     

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

     

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

     

       11
       +
       ```

     

       12
       +
       

     

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

-22

nixos/doc/manual/contributing-to-this-manual.xml

···

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

     

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

     

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

     

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

     

       5
       -
        <para>

     

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

     

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

     

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

     

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

     

       10
       -
        </para>

     

       11
       -
        <para>

     

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

     

       13
       -
        </para>

     

       14
       -
       <screen>

     

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

     

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

     

       17
       -
       </screen>

     

       18
       -
        <para>

     

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

     

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

     

       21
       -
        </para>

     

       22
       -
       </chapter>

+18

nixos/doc/manual/development/building-nixos.chapter.md

···

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

     

       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
       +
       

     

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

     

       5
       +
       

     

       6
       +
       ```ShellSession

     

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

     

       8
       +
       $ cd nixpkgs/nixos

     

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

     

       10
       +
       ```

     

       11
       +
       

     

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

     

       13
       +
       

     

       14
       +
       ```ShellSession

     

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

     

       16
       +
       ```

     

       17
       +
       

     

       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.

-33

nixos/doc/manual/development/building-nixos.xml

···

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

     

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

     

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

     

       4
       -
               version="5.0"

     

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

     

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

     

       7
       -
        <para>

     

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

     

       9
       -
         to use another module which will replace your

     

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

     

       11
       -
         installed on the CD.

     

       12
       -
        </para>

     

       13
       -
        <para>

     

       14
       -
         Default CD/DVD configurations are available inside

     

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

     

       16
       -
       <screen>

     

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

     

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

     

       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
       -
        </para>

     

       21
       -
        <para>

     

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

     

       23
       -
         mounting anywhere like suggested by the following command:

     

       24
       -
       <screen>

     

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

     

       26
       -
        </para>

     

       27
       -
        <para>

     

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

     

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

     

       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
       -
        'minimal' image that doesn't include a NixOS installation.

     

       32
       -
        </para>

     

       33
       -
       </chapter>

+1 -1

nixos/doc/manual/development/development.xml

···

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

     

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

     

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

     

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

     

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

     

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

     

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

···

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

     

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

     

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

     

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

     

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

     

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

     

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

+5

nixos/doc/manual/from_md/README.md

···

       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
       +
       

     

       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
       +
       

     

       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.

+22

nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml

···

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

     

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

     

       3
       +
         <para>

     

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

     

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

     

       6
       +
           subdirectory of the

     

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

     

       8
       +
           repository.

     

       9
       +
         </para>

     

       10
       +
         <para>

     

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

     

       12
       +
         </para>

     

       13
       +
         <programlisting>

     

       14
       +
       $ cd /path/to/nixpkgs

     

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

     

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

     

       17
       +
       </programlisting>

     

       18
       +
         <para>

     

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

     

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

     

       21
       +
         </para>

     

       22
       +
       </chapter>

+33

nixos/doc/manual/from_md/development/building-nixos.chapter.xml

···

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

     

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

     

       3
       +
         <para>

     

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

     

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

     

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

     

       7
       +
           would be installed on the CD.

     

       8
       +
         </para>

     

       9
       +
         <para>

     

       10
       +
           Default CD/DVD configurations are available inside

     

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

     

       12
       +
         </para>

     

       13
       +
         <programlisting>

     

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

     

       15
       +
       $ cd nixpkgs/nixos

     

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

     

       17
       +
       </programlisting>

     

       18
       +
         <para>

     

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

     

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

     

       21
       +
         </para>

     

       22
       +
         <programlisting>

     

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

     

       24
       +
       </programlisting>

     

       25
       +
         <para>

     

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

     

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

     

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

     

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

     

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

     

       31
       +
           installation.

     

       32
       +
         </para>

     

       33
       +
       </chapter>

+15

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

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

     

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

     

       3
       +
         <para>

     

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

     

       5
       +
           the following highlights:

     

       6
       +
         </para>

     

       7
       +
         <itemizedlist spacing="compact">

     

       8
       +
           <listitem>

     

       9
       +
             <para>

     

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

     

       11
       +
               22.05.

     

       12
       +
             </para>

     

       13
       +
           </listitem>

     

       14
       +
         </itemizedlist>

     

       15
       +
       </section>

+1 -1

nixos/doc/manual/manual.xml

···

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

     

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

     

       21
        
        </appendix>

     

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

     

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

     

       24
        
       </book>

···

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

     

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

     

       21
        
        </appendix>

     

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

     

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

     

       24
        
       </book>

+33

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

···

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

     

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

     

       3
       +
       

     

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

     

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

     

       6
       +
       # into DocBook files in the from_md folder.

     

       7
       +
       

     

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

     

       9
       +
       pushd $DIR

     

       10
       +
       

     

       11
       +
       OUT="$DIR/from_md"

     

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

     

       13
       +
       

     

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

     

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

     

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

     

       17
       +
           pandoc "$mf" -t docbook \

     

       18
       +
             --extract-media=media \

     

       19
       +
             -f markdown+smart \

     

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

     

       21
       +
         fi

     

       22
       +
       

     

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

     

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

     

       25
       +
           pandoc "$mf" -t docbook \

     

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

     

       27
       +
             --extract-media=media \

     

       28
       +
             -f markdown+smart \

     

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

     

       30
       +
         fi

     

       31
       +
       done

     

       32
       +
       

     

       33
       +
       popd

+1

nixos/doc/manual/release-notes/release-notes.xml

···

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

     

       9
        
         current unstable revision.

     

       10
        
        </para>

     

       0
        
       
     

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

     

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

     

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

···

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

     

       9
        
         current unstable revision.

     

       10
        
        </para>

     

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

     

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

     

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

     

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

+5

nixos/doc/manual/release-notes/rl-2111.section.md

···

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

     

       2
       +
       

     

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

     

       4
       +
       

     

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

+1 -1

nixos/modules/hardware/xpadneo.nix

···

       24
        
         };

     

       25
        
       

     

       26
        
         meta = {

     

       27
       -
           maintainers = with maintainers; [ metadark ];

     

       28
        
         };

     

       29
        
       }

···

       24
        
         };

     

       25
        
       

     

       26
        
         meta = {

     

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

     

       28
        
         };

     

       29
        
       }

+1

nixos/modules/module-list.nix

···

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

     

       239
        
         ./services/amqp/rabbitmq.nix

     

       240
        
         ./services/audio/alsa.nix

     

       0
        
       
     

       241
        
         ./services/audio/jack.nix

     

       242
        
         ./services/audio/icecast.nix

     

       243
        
         ./services/audio/jmusicbot.nix

···

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

     

       239
        
         ./services/amqp/rabbitmq.nix

     

       240
        
         ./services/audio/alsa.nix

     

       241
       +
         ./services/audio/botamusique.nix

     

       242
        
         ./services/audio/jack.nix

     

       243
        
         ./services/audio/icecast.nix

     

       244
        
         ./services/audio/jmusicbot.nix

+1 -1

nixos/modules/programs/bash/undistract-me.nix

···

       31
        
         };

     

       32
        
       

     

       33
        
         meta = {

     

       34
       -
           maintainers = with maintainers; [ metadark ];

     

       35
        
         };

     

       36
        
       }

···

       31
        
         };

     

       32
        
       

     

       33
        
         meta = {

     

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

     

       35
        
         };

     

       36
        
       }

+114

nixos/modules/services/audio/botamusique.nix

···

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

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         cfg = config.services.botamusique;

     

       7
       +
       

     

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

     

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

     

       10
       +
       in

     

       11
       +
       {

     

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

     

       13
       +
       

     

       14
       +
         options.services.botamusique = {

     

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

     

       16
       +
       

     

       17
       +
           package = mkOption {

     

       18
       +
             type = types.package;

     

       19
       +
             default = pkgs.botamusique;

     

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

     

       21
       +
           };

     

       22
       +
       

     

       23
       +
           settings = mkOption {

     

       24
       +
             type = with types; submodule {

     

       25
       +
               freeformType = format.type;

     

       26
       +
               options = {

     

       27
       +
                 server.host = mkOption {

     

       28
       +
                   type = types.str;

     

       29
       +
                   default = "localhost";

     

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

     

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

     

       32
       +
                 };

     

       33
       +
       

     

       34
       +
                 server.port = mkOption {

     

       35
       +
                   type = types.port;

     

       36
       +
                   default = 64738;

     

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

     

       38
       +
                 };

     

       39
       +
       

     

       40
       +
                 bot.username = mkOption {

     

       41
       +
                   type = types.str;

     

       42
       +
                   default = "botamusique";

     

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

     

       44
       +
                 };

     

       45
       +
       

     

       46
       +
                 bot.comment = mkOption {

     

       47
       +
                   type = types.str;

     

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

     

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

     

       50
       +
                 };

     

       51
       +
               };

     

       52
       +
             };

     

       53
       +
             default = {};

     

       54
       +
             description = ''

     

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

     

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

     

       57
       +
             '';

     

       58
       +
           };

     

       59
       +
         };

     

       60
       +
       

     

       61
       +
         config = mkIf cfg.enable {

     

       62
       +
           systemd.services.botamusique = {

     

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

     

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

     

       65
       +
       

     

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

     

       67
       +
       

     

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

     

       69
       +
       

     

       70
       +
             serviceConfig = {

     

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

     

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

     

       73
       +
       

     

       74
       +
               # Hardening

     

       75
       +
               CapabilityBoundingSet = [ "" ];

     

       76
       +
               DynamicUser = true;

     

       77
       +
               IPAddressDeny = [

     

       78
       +
                 "link-local"

     

       79
       +
                 "multicast"

     

       80
       +
               ];

     

       81
       +
               LockPersonality = true;

     

       82
       +
               MemoryDenyWriteExecute = true;

     

       83
       +
               ProcSubset = "pid";

     

       84
       +
               PrivateDevices = true;

     

       85
       +
               PrivateUsers = true;

     

       86
       +
               PrivateTmp = true;

     

       87
       +
               ProtectClock = true;

     

       88
       +
               ProtectControlGroups = true;

     

       89
       +
               ProtectHome = true;

     

       90
       +
               ProtectHostname = true;

     

       91
       +
               ProtectKernelLogs = true;

     

       92
       +
               ProtectKernelModules = true;

     

       93
       +
               ProtectKernelTunables = true;

     

       94
       +
               ProtectProc = "invisible";

     

       95
       +
               ProtectSystem = "strict";

     

       96
       +
               RestrictNamespaces = true;

     

       97
       +
               RestrictRealtime = true;

     

       98
       +
               RestrictAddressFamilies = [

     

       99
       +
                 "AF_INET"

     

       100
       +
                 "AF_INET6"

     

       101
       +
               ];

     

       102
       +
               StateDirectory = "botamusique";

     

       103
       +
               SystemCallArchitectures = "native";

     

       104
       +
               SystemCallFilter = [

     

       105
       +
                 "@system-service"

     

       106
       +
                 "~@privileged"

     

       107
       +
                 "~@resources"

     

       108
       +
               ];

     

       109
       +
               UMask = "0077";

     

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

     

       111
       +
             };

     

       112
       +
           };

     

       113
       +
         };

     

       114
       +
       }

+8 -8

nixos/modules/services/backup/syncoid.nix

···

       197
        
                      ])) (attrValues cfg.commands);

     

       198
        
               after = [ "zfs.target" ];

     

       199
        
               serviceConfig = {

     

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

     

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

     

       202
       -
                   cfg.user "hold,send" pool

     

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

     

       204
       -
                 (map (pool: lib.escapeShellArgs [

     

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

     

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

     

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

     

       208
        
                 User = cfg.user;

     

       209
        
                 Group = cfg.group;

     

       210
        
               };

···

       197
        
                      ])) (attrValues cfg.commands);

     

       198
        
               after = [ "zfs.target" ];

     

       199
        
               serviceConfig = {

     

       200
       +
                 ExecStartPre = let

     

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

     

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

     

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

     

       204
       +
                   ];

     

       205
       +
                 in

     

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

     

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

     

       208
        
                 User = cfg.user;

     

       209
        
                 Group = cfg.group;

     

       210
        
               };

+11 -6

nixos/modules/services/misc/matrix-synapse.nix

···

       699
        
           ];

     

       700
        
       

     

       701
        
           users.users.matrix-synapse = {

     

       702
       -
               group = "matrix-synapse";

     

       703
       -
               home = cfg.dataDir;

     

       704
       -
               createHome = true;

     

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

     

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

     

       707
       -
             };

     

       708
        
       

     

       709
        
           users.groups.matrix-synapse = {

     

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

     
···

       726
        
               User = "matrix-synapse";

     

       727
        
               Group = "matrix-synapse";

     

       728
        
               WorkingDirectory = cfg.dataDir;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       729
        
               ExecStart = ''

     

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

     

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

     
···

       733
        
               '';

     

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

     

       735
        
               Restart = "on-failure";

     

       0
        
       
     

       736
        
             };

     

       737
        
           };

     

       738
        
         };

···

       699
        
           ];

     

       700
        
       

     

       701
        
           users.users.matrix-synapse = {

     

       702
       +
             group = "matrix-synapse";

     

       703
       +
             home = cfg.dataDir;

     

       704
       +
             createHome = true;

     

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

     

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

     

       707
       +
           };

     

       708
        
       

     

       709
        
           users.groups.matrix-synapse = {

     

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

     
···

       726
        
               User = "matrix-synapse";

     

       727
        
               Group = "matrix-synapse";

     

       728
        
               WorkingDirectory = cfg.dataDir;

     

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

     

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

     

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

     

       732
       +
               '')) ];

     

       733
        
               ExecStart = ''

     

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

     

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

     
···

       737
        
               '';

     

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

     

       739
        
               Restart = "on-failure";

     

       740
       +
               UMask = "0077";

     

       741
        
             };

     

       742
        
           };

     

       743
        
         };

+4

nixos/modules/services/x11/desktop-managers/cinnamon.nix

···

       128
        
               cinnamon-session

     

       129
        
               cinnamon-desktop

     

       130
        
               cinnamon-menus

     

       0
        
       
     

       131
        
       

     

       132
        
               # utils needed by some scripts

     

       133
        
               killall

     
···

       136
        
               cinnamon-screensaver

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       139
        
       

     

       140
        
               # packages

     

       141
        
               nemo

···

       128
        
               cinnamon-session

     

       129
        
               cinnamon-desktop

     

       130
        
               cinnamon-menus

     

       131
       +
               cinnamon-translations

     

       132
        
       

     

       133
        
               # utils needed by some scripts

     

       134
        
               killall

     
···

       137
        
               cinnamon-screensaver

     

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

     

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

     

       140
       +
       

     

       141
       +
               # For a polkit authentication agent

     

       142
       +
               polkit_gnome

     

       143
        
       

     

       144
        
               # packages

     

       145
        
               nemo

+1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

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

     

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

     

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

     

       0
        
       
     

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

     

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

     

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

···

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

     

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

     

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

     

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

     

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

     

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

     

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

+1 -1

nixos/modules/virtualisation/nixos-containers.nix

···

       428
        
             extraVeths = {};

     

       429
        
             additionalCapabilities = [];

     

       430
        
             ephemeral = false;

     

       431
       -
             timeoutStartSec = "15s";

     

       432
        
             allowedDevices = [];

     

       433
        
             hostAddress = null;

     

       434
        
             hostAddress6 = null;

···

       428
        
             extraVeths = {};

     

       429
        
             additionalCapabilities = [];

     

       430
        
             ephemeral = false;

     

       431
       +
             timeoutStartSec = "1min";

     

       432
        
             allowedDevices = [];

     

       433
        
             hostAddress = null;

     

       434
        
             hostAddress6 = null;

+1

nixos/tests/all-tests.nix

···

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

     

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

     

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

     

       0
        
       
     

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

     

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

     

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

···

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

     

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

     

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

     

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

     

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

     

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

     

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

+47

nixos/tests/botamusique.nix

···

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

     

       2
       +
       

     

       3
       +
       {

     

       4
       +
         name = "botamusique";

     

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

     

       6
       +
       

     

       7
       +
         nodes = {

     

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

     

       9
       +
             services.murmur = {

     

       10
       +
               enable = true;

     

       11
       +
               registerName = "NixOS tests";

     

       12
       +
             };

     

       13
       +
       

     

       14
       +
             services.botamusique = {

     

       15
       +
               enable = true;

     

       16
       +
               settings = {

     

       17
       +
                 server = {

     

       18
       +
                   channel = "NixOS tests";

     

       19
       +
                 };

     

       20
       +
                 bot = {

     

       21
       +
                   version = false;

     

       22
       +
                   auto_check_update = false;

     

       23
       +
                 };

     

       24
       +
               };

     

       25
       +
             };

     

       26
       +
           };

     

       27
       +
         };

     

       28
       +
       

     

       29
       +
         testScript = ''

     

       30
       +
           start_all()

     

       31
       +
       

     

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

     

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

     

       34
       +
       

     

       35
       +
           machine.sleep(10)

     

       36
       +
       

     

       37
       +
           machine.wait_until_succeeds(

     

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

     

       39
       +
           )

     

       40
       +
       

     

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

     

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

     

       43
       +
               machine.log(output)

     

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

     

       45
       +
               machine.log(output)

     

       46
       +
         '';

     

       47
       +
       })

+23 -15

nixos/tests/sanoid.nix

···

       33
        
       

     

       34
        
                 autosnap = true;

     

       35
        
               };

     

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

     

       0
        
       
     

       37
        
             };

     

       38
        
       

     

       39
        
             services.syncoid = {

     

       40
        
               enable = true;

     

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

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
             };

     

       45
        
           };

     

       46
        
           target = { ... }: {

     
···

       54
        
       

     

       55
        
         testScript = ''

     

       56
        
           source.succeed(

     

       57
       -
               "mkdir /tmp/mnt",

     

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

     

       59
        
               "udevadm settle",

     

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

     

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

     

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

     

       63
        
               "udevadm settle",

     

       64
        
           )

     

       65
        
           target.succeed(

     

       0
        
       
     

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

     

       67
        
               "udevadm settle",

     

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

     

       69
        
               "udevadm settle",

     

       70
        
           )

     

       71
        
       

     
···

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

     

       77
        
           )

     

       78
        
       

     

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

     

       0
        
       
     

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

     

       81
        
       

     

       0
        
       
     

       82
        
           target.wait_for_open_port(22)

     

       0
        
       
     

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

     

       84
       -
           target.succeed(

     

       85
       -
               "mkdir /tmp/mnt",

     

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

     

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

     

       88
       -
           )

     

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

     

       90
        
         '';

     

       91
        
       })

···

       33
        
       

     

       34
        
                 autosnap = true;

     

       35
        
               };

     

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

     

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

     

       38
        
             };

     

       39
        
       

     

       40
        
             services.syncoid = {

     

       41
        
               enable = true;

     

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

     

       43
       +
               commands = {

     

       44
       +
                 # Sync snapshot taken by sanoid

     

       45
       +
                 "pool/sanoid" = {

     

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

     

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

     

       48
       +
                 };

     

       49
       +
                 # Take snapshot and sync

     

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

     

       51
       +
               };

     

       52
        
             };

     

       53
        
           };

     

       54
        
           target = { ... }: {

     
···

       62
        
       

     

       63
        
         testScript = ''

     

       64
        
           source.succeed(

     

       65
       +
               "mkdir /mnt",

     

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

     

       67
        
               "udevadm settle",

     

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

     

       69
       +
               "zfs create pool/sanoid",

     

       70
       +
               "zfs create pool/syncoid",

     

       71
        
               "udevadm settle",

     

       72
        
           )

     

       73
        
           target.succeed(

     

       74
       +
               "mkdir /mnt",

     

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

     

       76
        
               "udevadm settle",

     

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

     

       78
        
               "udevadm settle",

     

       79
        
           )

     

       80
        
       

     
···

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

     

       86
        
           )

     

       87
        
       

     

       88
       +
           # Take snapshot with sanoid

     

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

     

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

     

       91
        
       

     

       92
       +
           # Sync snapshots

     

       93
        
           target.wait_for_open_port(22)

     

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

     

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

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       98
        
         '';

     

       99
        
       })

+3 -3

pkgs/applications/audio/whipper/default.nix

···

       3
        
       

     

       4
        
       python3.pkgs.buildPythonApplication rec {

     

       5
        
         pname = "whipper";

     

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

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "whipper-team";

     

       10
        
           repo = "whipper";

     

       11
       -
           rev = "9e95f0604fa30ab06445fe46e3bc93bba6092a05";

     

       12
       -
           sha256 = "1c2qldw9vxpvdfh5wl6mfcd7zzz3v8r86ffqll311lcp2zin33dg";

     

       13
        
         };

     

       14
        
       

     

       15
        
         pythonPath = with python3.pkgs; [

···

       3
        
       

     

       4
        
       python3.pkgs.buildPythonApplication rec {

     

       5
        
         pname = "whipper";

     

       6
       +
         version = "0.10.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "whipper-team";

     

       10
        
           repo = "whipper";

     

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

     

       12
       +
           sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";

     

       13
        
         };

     

       14
        
       

     

       15
        
         pythonPath = with python3.pkgs; [

+36

pkgs/applications/audio/ytmdesktop/default.nix

···

       1
       +
       { lib, fetchurl, appimageTools, }:

     

       2
       +
       

     

       3
       +
       let

     

       4
       +
         pname = "ytmdesktop";

     

       5
       +
         version = "1.13.0";

     

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

     

       7
       +
       

     

       8
       +
         src = fetchurl {

     

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

     

       10
       +
           sha256 = "0f5l7hra3m3q9zd0ngc9dj4mh1lk0rgicvh9idpd27wr808vy28v";

     

       11
       +
         };

     

       12
       +
       

     

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

     

       14
       +
       in appimageTools.wrapType2 rec {

     

       15
       +
         inherit name src;

     

       16
       +
       

     

       17
       +
         extraInstallCommands = ''

     

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

     

       19
       +
       

     

       20
       +
           install -m 444 \

     

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

     

       22
       +
               -t $out/share/applications

     

       23
       +
           substituteInPlace \

     

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

     

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

     

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

     

       27
       +
         '';

     

       28
       +
       

     

       29
       +
         meta = with lib; {

     

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

     

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

     

       32
       +
           license = licenses.cc0;

     

       33
       +
           platforms = platforms.linux;

     

       34
       +
           maintainers = [ maintainers.lgcl ];

     

       35
       +
         };

     

       36
       +
       }

+1 -1

pkgs/applications/audio/zynaddsubfx/default.nix

···

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

     

       112
        
       

     

       113
        
           license = licenses.gpl2;

     

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

     

       115
        
           platforms = platforms.linux;

     

       116
        
         };

     

       117
        
       }

···

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

     

       112
        
       

     

       113
        
           license = licenses.gpl2;

     

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

     

       115
        
           platforms = platforms.linux;

     

       116
        
         };

     

       117
        
       }

+1 -1

pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix

···

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

     

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

     

       105
        
           license = licenses.lgpl21;

     

       106
       -
           maintainers = with maintainers; [ metadark ];

     

       107
        
           platforms = platforms.all;

     

       108
        
         };

     

       109
        
       }

···

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

     

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

     

       105
        
           license = licenses.lgpl21;

     

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

     

       107
        
           platforms = platforms.all;

     

       108
        
         };

     

       109
        
       }

+3 -2

pkgs/applications/editors/lite/default.nix

···

       4
        
       , lua52Packages

     

       5
        
       , pkg-config

     

       6
        
       , makeWrapper

     

       0
        
       
     

       7
        
       } :

     

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     
···

       19
        
       

     

       20
        
         nativeBuildInputs = [ makeWrapper pkg-config ];

     

       21
        
       

     

       22
       -
         buildInputs = [ SDL2 lua52Packages.lua ];

     

       23
        
       

     

       24
        
         postPatch = ''

     

       25
        
           # use system Lua 5.2

     
···

       34
        
           # extracted and adapted from build.sh

     

       35
        
           CC=$NIX_CC/bin/cc

     

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

     

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

     

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

     

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

     

       40
        
           done

···

       4
        
       , lua52Packages

     

       5
        
       , pkg-config

     

       6
        
       , makeWrapper

     

       7
       +
       , openlibm

     

       8
        
       } :

     

       9
        
       

     

       10
        
       stdenv.mkDerivation rec {

     
···

       20
        
       

     

       21
        
         nativeBuildInputs = [ makeWrapper pkg-config ];

     

       22
        
       

     

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

     

       24
        
       

     

       25
        
         postPatch = ''

     

       26
        
           # use system Lua 5.2

     
···

       35
        
           # extracted and adapted from build.sh

     

       36
        
           CC=$NIX_CC/bin/cc

     

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

     

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

     

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

     

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

     

       41
        
           done

+1 -1

pkgs/applications/editors/poke/default.nix

···

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

     

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

     

       68
        
           license = licenses.gpl3Plus;

     

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

     

       70
        
           platforms = platforms.unix;

     

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

     

       72
        
         };

···

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

     

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

     

       68
        
           license = licenses.gpl3Plus;

     

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

     

       70
        
           platforms = platforms.unix;

     

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

     

       72
        
         };

+12 -12

pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch

···

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

     

       2
       -
       index 328dc20..5202a07 100644

     

       3
        
       --- i/goldendict.pro

     

       4
        
       +++ w/goldendict.pro

     

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

     

       6
        
                -llzo2

     

       7
        
            !CONFIG( no_ffmpeg_player ) {

     

       8
        
                LIBS += -lao \

     

       0
        
       
     

       9
        
       -            -lavutil-gd \

     

       10
        
       -            -lavformat-gd \

     

       11
        
       -            -lavcodec-gd

     

       0
        
       
     

       12
        
       +            -lavutil \

     

       13
        
       +            -lavformat \

     

       14
        
       +            -lavcodec

     
···

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

     

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

     

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

     

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

     

       33
        
            CONFIG += zim_support

     

       34
        
            !CONFIG( no_chinese_conversion_support ) {

     

       35
        
                CONFIG += chinese_conversion_support

     
···

       46
        
        }

     

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

     

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

     

       49
       -
       index e3cb8bf..9ff880f 100644

     

       50
        
       --- i/tiff.cc

     

       51
        
       +++ w/tiff.cc

     

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

     

       0
        
       
     

       53
        
        #include "tiff.hh"

     

       54
        
        

     

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

     

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

     

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

     

       58
       -
       +#include "tiff.h"

     

       59
       -
       +#include "tiffio.h"

     

       60
        
        #else

     

       61
       -
        #include "tiff.h"

     

       62
       -
        #include "tiffio.h"

···

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

     

       2
       +
       index 4a4a3094..082b728f 100644

     

       3
        
       --- i/goldendict.pro

     

       4
        
       +++ w/goldendict.pro

     

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

     

       6
        
                -llzo2

     

       7
        
            !CONFIG( no_ffmpeg_player ) {

     

       8
        
                LIBS += -lao \

     

       9
       +
       -            -lswresample-gd \

     

       10
        
       -            -lavutil-gd \

     

       11
        
       -            -lavformat-gd \

     

       12
        
       -            -lavcodec-gd

     

       13
       +
       +            -lswresample \

     

       14
        
       +            -lavutil \

     

       15
        
       +            -lavformat \

     

       16
        
       +            -lavcodec

     
···

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

     

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

     

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

     

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

     

       35
        
            CONFIG += zim_support

     

       36
        
            !CONFIG( no_chinese_conversion_support ) {

     

       37
        
                CONFIG += chinese_conversion_support

     
···

       48
        
        }

     

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

     

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

     

       51
       +
       index e3cb8bf5..95dd812f 100644

     

       52
        
       --- i/tiff.cc

     

       53
        
       +++ w/tiff.cc

     

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

     

       55
       +
        

     

       56
        
        #include "tiff.hh"

     

       57
        
        

     

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

     

       59
       +
       +#if defined (Q_OS_WIN)

     

       60
       +
        #include "tiff/tiff.h"

     

       61
       +
        #include "tiff/tiffio.h"

     

       0
        
       
     

       62
        
        #else

     

       0
        
       
     

       0

+5 -5

pkgs/applications/misc/goldendict/default.nix

···

       4
        
       , withCC ? true, opencc

     

       5
        
       , withEpwing ? true, libeb

     

       6
        
       , withExtraTiff ? true, libtiff

     

       7
       -
       , withFFmpeg ? true, libao, ffmpeg_3

     

       8
        
       , withMultimedia ? true

     

       9
        
       , withZim ? true, zstd }:

     

       10
        
       

     

       11
        
       mkDerivation rec {

     

       12
        
         pname = "goldendict";

     

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

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "goldendict";

     

       17
        
           repo = pname;

     

       18
       -
           rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132";

     

       19
       -
           sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n";

     

       20
        
         };

     

       21
        
       

     

       22
        
         patches = [

     
···

       39
        
           ++ lib.optional withCC opencc

     

       40
        
           ++ lib.optional withEpwing libeb

     

       41
        
           ++ lib.optional withExtraTiff libtiff

     

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

     

       43
        
           ++ lib.optional withZim zstd;

     

       44
        
       

     

       45
        
         qmakeFlags = with lib; [

···

       4
        
       , withCC ? true, opencc

     

       5
        
       , withEpwing ? true, libeb

     

       6
        
       , withExtraTiff ? true, libtiff

     

       7
       +
       , withFFmpeg ? true, libao, ffmpeg

     

       8
        
       , withMultimedia ? true

     

       9
        
       , withZim ? true, zstd }:

     

       10
        
       

     

       11
        
       mkDerivation rec {

     

       12
        
         pname = "goldendict";

     

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

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "goldendict";

     

       17
        
           repo = pname;

     

       18
       +
           rev = "b2e673961d28ca5eb920a909091252d3321f09d6";

     

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

     

       20
        
         };

     

       21
        
       

     

       22
        
         patches = [

     
···

       39
        
           ++ lib.optional withCC opencc

     

       40
        
           ++ lib.optional withEpwing libeb

     

       41
        
           ++ lib.optional withExtraTiff libtiff

     

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

     

       43
        
           ++ lib.optional withZim zstd;

     

       44
        
       

     

       45
        
         qmakeFlags = with lib; [

+35

pkgs/applications/misc/opentrack/aruco.nix

···

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

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation {

     

       4
       +
         pname = "opentrack-aruco";

     

       5
       +
         version = "unstable-20190303";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "opentrack";

     

       9
       +
           repo = "aruco";

     

       10
       +
           rev = "12dc60efd61149227bd05c805208d9bcce308f6d";

     

       11
       +
           sha256 = "0gkrixgfbpg8pls4qqilphbz4935mg5z4p18a0vv6kclmfccw9ad";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         nativeBuildInputs = [ cmake ];

     

       15
       +
       

     

       16
       +
         buildInputs = [ opencv4 ];

     

       17
       +
       

     

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

     

       19
       +
       

     

       20
       +
         preInstall = ''

     

       21
       +
           mkdir -p $out/include/aruco

     

       22
       +
         '';

     

       23
       +
       

     

       24
       +
         # copy headers required by main package

     

       25
       +
         postInstall = ''

     

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

     

       27
       +
         '';

     

       28
       +
       

     

       29
       +
         meta = with lib; {

     

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

     

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

     

       32
       +
           license = licenses.isc;

     

       33
       +
           maintainers = with maintainers; [ zaninime ];

     

       34
       +
         };

     

       35
       +
       }

+58

pkgs/applications/misc/opentrack/default.nix

···

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

     

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

     

       3
       +
       , libevdev, makeDesktopItem, fetchurl }:

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         version = "2.3.13";

     

       7
       +
       

     

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

     

       9
       +
       

     

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

     

       11
       +
         xplaneSdk = fetchzip {

     

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

     

       13
       +
           sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba";

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
       in mkDerivation {

     

       17
       +
         pname = "opentrack";

     

       18
       +
         inherit version;

     

       19
       +
       

     

       20
       +
         src = fetchFromGitHub {

     

       21
       +
           owner = "opentrack";

     

       22
       +
           repo = "opentrack";

     

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

     

       24
       +
           sha256 = "1s986lmm5l1pwbwvd1pfiq84n32s1q1dav7a0cbga4d1vcf0v1ay";

     

       25
       +
         };

     

       26
       +
       

     

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

     

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

     

       29
       +
       

     

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

     

       31
       +
       

     

       32
       +
         cmakeFlags = [

     

       33
       +
           "-DCMAKE_BUILD_TYPE=RELEASE"

     

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

     

       35
       +
           "-DSDK_XPLANE=${xplaneSdk}"

     

       36
       +
         ];

     

       37
       +
       

     

       38
       +
         desktopItems = [

     

       39
       +
           (makeDesktopItem rec {

     

       40
       +
             name = "opentrack";

     

       41
       +
             exec = "opentrack";

     

       42
       +
             icon = fetchurl {

     

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

     

       44
       +
               sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn";

     

       45
       +
             };

     

       46
       +
             desktopName = name;

     

       47
       +
             genericName = "Head tracking software";

     

       48
       +
             categories = "Utility;";

     

       49
       +
           })

     

       50
       +
         ];

     

       51
       +
       

     

       52
       +
         meta = with lib; {

     

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

     

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

     

       55
       +
           license = licenses.isc;

     

       56
       +
           maintainers = with maintainers; [ zaninime ];

     

       57
       +
         };

     

       58
       +
       }

+9 -29

pkgs/applications/misc/synergy/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "synergy";

     

       8
       -
         version = "1.11.1";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "symless";

     

       12
        
           repo = "synergy-core";

     

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

     

       14
       -
           sha256 = "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh";

     

       0
        
       
     

       15
        
         };

     

       16
        
       

     

       17
       -
         patches = [

     

       18
       -
           ./build-tests.patch

     

       19
       -
           (fetchpatch {

     

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

     

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

     

       22
       -
                 + "0a97c2be0da2d0df25cb86dfd642429e7a8bea39.patch";

     

       23
       -
             sha256 = "03q8m5n50fms7fjfjgmqrgy9mrxwi9kkz3f3vlrs2x5h21dl6bmj";

     

       24
       -
           })

     

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

     

       26
       -
       

     

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

     

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

     

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

     

       30
       -
         # updates these dependencies.

     

       31
       -
         googletest = fetchFromGitHub {

     

       32
       -
           owner = "google";

     

       33
       -
           repo = "googletest";

     

       34
       -
           rev = "release-1.10.0";

     

       35
       -
           sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz";

     

       36
       -
         };

     

       37
        
       

     

       38
        
         postPatch = ''

     

       39
       -
           rm -r ext/*

     

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

     

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

     

       42
       -
           chmod -R +w ext/

     

       43
        
         '';

     

       44
        
       

     

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

     
···

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

     

       64
        
         '' + lib.optionalString withGUI ''

     

       65
        
           cp bin/synergy $out/bin/

     

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

     

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

     

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

     

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

     
···

       80
        
       

     

       81
        
         meta = with lib; {

     

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

     

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

     

       84
        
           license = licenses.gpl2;

     

       85
       -
           maintainers = with maintainers; [ ];

     

       86
        
           platforms = platforms.all;

     

       87
        
         };

     

       88
        
       }

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "synergy";

     

       8
       +
         version = "1.13.1.41";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "symless";

     

       12
        
           repo = "synergy-core";

     

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

     

       14
       +
           fetchSubmodules = true;

     

       15
       +
           sha256 = "1phg0szc9g018zxs5wbys4drzq1cdhyzajfg45l6a3fmi6qdi1kw";

     

       16
        
         };

     

       17
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         postPatch = ''

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       23
        
         '';

     

       24
        
       

     

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

     
···

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

     

       44
        
         '' + lib.optionalString withGUI ''

     

       45
        
           cp bin/synergy $out/bin/

     

       46
       +
           wrapQtApp $out/bin/synergy

     

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

     

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

     

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

     
···

       60
        
       

     

       61
        
         meta = with lib; {

     

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

     

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

     

       64
        
           license = licenses.gpl2;

     

       65
       +
           maintainers = with maintainers; [ talyz ];

     

       66
        
           platforms = platforms.all;

     

       67
        
         };

     

       68
        
       }

+4 -13

pkgs/applications/misc/synergy/macos_build_fix.patch

···

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

     

       2
       -
       index a2297311..25a51f56 100644

     

       3
        
       --- a/CMakeLists.txt

     

       4
        
       +++ b/CMakeLists.txt

     

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

     

       6
       -
        

     

       7
       -
        

     

       8
       -
            if (APPLE)

     

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

     

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

     

       11
       -
        

     

       12
       -
                find_library (lib_ScreenSaver ScreenSaver)

     

       13
       -
                find_library (lib_IOKit IOKit)

     

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

     

       15
        
                ${OPENSSL_ROOT}/lib/libssl.lib

     

       16
        
                ${OPENSSL_ROOT}/lib/libcrypto.lib

     

       17
        
            )

     
···

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

     

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

     

       24
        
       -    )

     

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

     

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

     

       27
        
            set (OPENSSL_LIBS ssl crypto)

     

       28
        
        else()

     

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

···

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

     

       2
       +
       index c1e78d1d..13639ba1 100644

     

       3
        
       --- a/CMakeLists.txt

     

       4
        
       +++ b/CMakeLists.txt

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
                ${OPENSSL_ROOT}/lib/libssl.lib

     

       7
        
                ${OPENSSL_ROOT}/lib/libcrypto.lib

     

       8
        
            )

     
···

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

     

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

     

       15
        
       -    )

     

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

     

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

     

       18
        
            set (OPENSSL_LIBS ssl crypto)

     

       19
        
        else()

     

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

+1 -1

pkgs/applications/networking/browsers/nyxt/default.nix

···

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

     

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

     

       53
        
           license = licenses.bsd3;

     

       54
       -
           maintainers = with maintainers; [ lewo ];

     

       55
        
           platforms = platforms.all;

     

       56
        
         };

     

       57
        
       }

···

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

     

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

     

       53
        
           license = licenses.bsd3;

     

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

     

       55
        
           platforms = platforms.all;

     

       56
        
         };

     

       57
        
       }

+8 -5

pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "starboard-octant-plugin";

     

       5
       -
         version = "0.10.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "aquasecurity";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

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

     

       12
        
         };

     

       13
        
       

     

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

     

       15
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       17
        
       

     

       18
        
         meta = with lib; {

     

       0
        
       
     

       0
        
       
     

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

     

       20
        
           longDescription = ''

     

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

     

       22
        
             Kubernetes workloads stored as custom security resources.

     

       23
        
           '';

     

       24
       -
           homepage = src.meta.homepage;

     

       25
        
           license = licenses.asl20;

     

       26
        
           maintainers = with maintainers; [ jk ];

     

       27
        
         };

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "starboard-octant-plugin";

     

       5
       +
         version = "0.10.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "aquasecurity";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

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

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-HOvZPDVKZEoL91yyaJRuKThHirY77xlKOtLKARthxn8=";

     

       15
        
       

     

       16
       +
         preBuild = ''

     

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

     

       18
       +
         '';

     

       19
        
       

     

       20
        
         meta = with lib; {

     

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

     

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

     

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

     

       24
        
           longDescription = ''

     

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

     

       26
        
             Kubernetes workloads stored as custom security resources.

     

       27
        
           '';

     

       0
        
       
     

       28
        
           license = licenses.asl20;

     

       29
        
           maintainers = with maintainers; [ jk ];

     

       30
        
         };

+1 -1

pkgs/applications/networking/feedreaders/newsflash/default.nix

···

       89
        
           description = "A modern feed reader designed for the GNOME desktop";

     

       90
        
           homepage = "https://gitlab.com/news-flash/news_flash_gtk";

     

       91
        
           license = licenses.gpl3Plus;

     

       92
       -
           maintainers = with maintainers; [ metadark ];

     

       93
        
         };

     

       94
        
       }

···

       89
        
           description = "A modern feed reader designed for the GNOME desktop";

     

       90
        
           homepage = "https://gitlab.com/news-flash/news_flash_gtk";

     

       91
        
           license = licenses.gpl3Plus;

     

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

     

       93
        
         };

     

       94
        
       }

+2 -2

pkgs/applications/networking/flexget/default.nix

···

       2
        
       

     

       3
        
       python3Packages.buildPythonApplication rec {

     

       4
        
         pname = "FlexGet";

     

       5
       -
         version = "3.1.121";

     

       6
        
       

     

       7
        
         src = python3Packages.fetchPypi {

     

       8
        
           inherit pname version;

     

       9
       -
           sha256 = "91270a51ed29e4a578c7549ebd01665f4bcf49bf7773a15db27f4ccb13659e00";

     

       10
        
         };

     

       11
        
       

     

       12
        
         postPatch = ''

···

       2
        
       

     

       3
        
       python3Packages.buildPythonApplication rec {

     

       4
        
         pname = "FlexGet";

     

       5
       +
         version = "3.1.127";

     

       6
        
       

     

       7
        
         src = python3Packages.fetchPypi {

     

       8
        
           inherit pname version;

     

       9
       +
           sha256 = "25a973eb54f2f9ccd422d536b29038c570de3584b8174d993119e3c6b434cc54";

     

       10
        
         };

     

       11
        
       

     

       12
        
         postPatch = ''

+2 -2

pkgs/applications/networking/ids/suricata/default.nix

···

       34
        
       in

     

       35
        
       stdenv.mkDerivation rec {

     

       36
        
         pname = "suricata";

     

       37
       -
         version = "5.0.3";

     

       38
        
       

     

       39
        
         src = fetchurl {

     

       40
        
           url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";

     

       41
       -
           sha256 = "1nv5aq5lpkpskkzw05hr2lshkzcs4zqj5kfv4qjlbwigmp6kwh9l";

     

       42
        
         };

     

       43
        
       

     

       44
        
         nativeBuildInputs = [

···

       34
        
       in

     

       35
        
       stdenv.mkDerivation rec {

     

       36
        
         pname = "suricata";

     

       37
       +
         version = "6.0.2";

     

       38
        
       

     

       39
        
         src = fetchurl {

     

       40
        
           url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";

     

       41
       +
           sha256 = "sha256-XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I=";

     

       42
        
         };

     

       43
        
       

     

       44
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       27
        
           pname = "discord-canary";

     

       28
        
           binaryName = "DiscordCanary";

     

       29
        
           desktopName = "Discord Canary";

     

       30
       -
           version = "0.0.121";

     

       31
        
           src = fetchurl {

     

       32
        
             url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       33
       -
             sha256 = "0s85nh31wv39adawfmllp128n0wgyisbi604n0cngzi28rdw7bph";

     

       34
        
           };

     

       35
        
         };

     

       36
        
       }.${branch}

···

       27
        
           pname = "discord-canary";

     

       28
        
           binaryName = "DiscordCanary";

     

       29
        
           desktopName = "Discord Canary";

     

       30
       +
           version = "0.0.122";

     

       31
        
           src = fetchurl {

     

       32
        
             url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       33
       +
             sha256 = "0ph7gp77wzjpr7nhv13fg64j97dxjwmivshr56ly3kjhmvvanj7k";

     

       34
        
           };

     

       35
        
         };

     

       36
        
       }.${branch}

+9 -1

pkgs/applications/science/biology/sambamba/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "sambamba";

     
···

       11
        
           sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";

     

       12
        
           fetchSubmodules = true;

     

       13
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       

     

       15
        
         nativeBuildInputs = [ which python3 ldc ];

     

       16
        
         buildInputs = [ zlib ];

···

       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, python3, which, ldc, zlib }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "sambamba";

     
···

       11
        
           sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";

     

       12
        
           fetchSubmodules = true;

     

       13
        
         };

     

       14
       +
       

     

       15
       +
         patches = [

     

       16
       +
           # Fixes hardcoded gcc, making clang build possible.

     

       17
       +
           (fetchpatch {

     

       18
       +
             url = "https://github.com/biod/sambamba/commit/c50a1c91e1ba062635467f197139bf6784e9be15.patch";

     

       19
       +
             sha256 = "1y0vlybmb9wpg4z1nca7m96mk9hxmvd3yrg7w8rxscj45hcqvf8q";

     

       20
       +
           })

     

       21
       +
         ];

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ which python3 ldc ];

     

       24
        
         buildInputs = [ zlib ];

+1 -1

pkgs/applications/science/misc/snakemake/default.nix

···

       18
        
           pyyaml

     

       19
        
           ratelimiter

     

       20
        
           requests

     

       21
       -
           smart_open

     

       22
        
           toposort

     

       23
        
           wrapt

     

       24
        
         ];

···

       18
        
           pyyaml

     

       19
        
           ratelimiter

     

       20
        
           requests

     

       21
       +
           smart-open

     

       22
        
           toposort

     

       23
        
           wrapt

     

       24
        
         ];

+35 -7

pkgs/applications/terminal-emulators/st/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses

     

       2
       -
       , libXft, conf ? null, patches ? [], extraLibs ? []}:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       with lib;

     

       5
        
       

     
···

       14
        
       

     

       15
        
         inherit patches;

     

       16
        
       

     

       17
       -
         configFile = optionalString (conf!=null) (writeText "config.def.h" conf);

     

       18
        
       

     

       19
       -
         postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"

     

       20
       -
                   + optionalString stdenv.isDarwin ''

     

       21
        
           substituteInPlace config.mk --replace "-lrt" ""

     

       22
        
         '';

     

       23
        
       

     

       24
       -
         nativeBuildInputs = [ pkg-config ncurses ];

     

       25
       -
         buildInputs = [ libX11 libXft ] ++ extraLibs;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
       

     

       27
        
         installPhase = ''

     

       0
        
       
     

       28
        
           TERMINFO=$out/share/terminfo make install PREFIX=$out

     

       0
        
       
     

       29
        
         '';

     

       30
        
       

     

       31
        
         meta = {

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchurl

     

       4
       +
       , pkg-config

     

       5
       +
       , writeText

     

       6
       +
       , libX11

     

       7
       +
       , ncurses

     

       8
       +
       , fontconfig

     

       9
       +
       , freetype

     

       10
       +
       , libXft

     

       11
       +
       , conf ? null

     

       12
       +
       , patches ? [ ]

     

       13
       +
       , extraLibs ? [ ]

     

       14
       +
       }:

     

       15
        
       

     

       16
        
       with lib;

     

       17
        
       

     
···

       26
        
       

     

       27
        
         inherit patches;

     

       28
        
       

     

       29
       +
         configFile = optionalString (conf != null) (writeText "config.def.h" conf);

     

       30
        
       

     

       31
       +
         postPatch = optionalString (conf != null) "cp ${configFile} config.def.h"

     

       32
       +
           + optionalString stdenv.isDarwin ''

     

       33
        
           substituteInPlace config.mk --replace "-lrt" ""

     

       34
        
         '';

     

       35
        
       

     

       36
       +
         strictDeps = true;

     

       37
       +
       

     

       38
       +
         makeFlags = [

     

       39
       +
           "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"

     

       40
       +
         ];

     

       41
       +
       

     

       42
       +
         nativeBuildInputs = [

     

       43
       +
           pkg-config

     

       44
       +
           ncurses

     

       45
       +
           fontconfig

     

       46
       +
           freetype

     

       47
       +
         ];

     

       48
       +
         buildInputs = [

     

       49
       +
           libX11

     

       50
       +
           libXft

     

       51
       +
         ] ++ extraLibs;

     

       52
        
       

     

       53
        
         installPhase = ''

     

       54
       +
           runHook preInstall

     

       55
        
           TERMINFO=$out/share/terminfo make install PREFIX=$out

     

       56
       +
           runHook postInstall

     

       57
        
         '';

     

       58
        
       

     

       59
        
         meta = {

+1 -1

pkgs/applications/version-management/git-review/default.nix

···

       39
        
           description = "Tool to submit code to Gerrit";

     

       40
        
           homepage = "https://opendev.org/opendev/git-review";

     

       41
        
           license = licenses.asl20;

     

       42
       -
           maintainers = with maintainers; [ metadark ];

     

       43
        
         };

     

       44
        
       }

···

       39
        
           description = "Tool to submit code to Gerrit";

     

       40
        
           homepage = "https://opendev.org/opendev/git-review";

     

       41
        
           license = licenses.asl20;

     

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

     

       43
        
         };

     

       44
        
       }

+16 -2

pkgs/applications/virtualization/virt-manager/default.nix

···

       5
        
       , gtksourceview4, docutils

     

       6
        
       , spiceSupport ? true, spice-gtk ? null

     

       7
        
       , cpio, e2fsprogs, findutils, gzip

     

       0
        
       
     

       8
        
       }:

     

       9
        
       

     

       10
        
       with lib;

     
···

       53
        
           gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")

     

       54
        
         '';

     

       55
        
       

     

       56
       -
         # Failed tests

     

       57
       -
         doCheck = false;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       58
        
       

     

       59
        
         meta = with lib; {

     

       60
        
           homepage = "http://virt-manager.org";

···

       5
        
       , gtksourceview4, docutils

     

       6
        
       , spiceSupport ? true, spice-gtk ? null

     

       7
        
       , cpio, e2fsprogs, findutils, gzip

     

       8
       +
       , cdrtools

     

       9
        
       }:

     

       10
        
       

     

       11
        
       with lib;

     
···

       54
        
           gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")

     

       55
        
         '';

     

       56
        
       

     

       57
       +
         checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ];

     

       58
       +
       

     

       59
       +
         disabledTestPaths = [

     

       60
       +
           "tests/test_cli.py"

     

       61
       +
           "tests/test_disk.py"

     

       62
       +
           "tests/test_checkprops.py"

     

       63
       +
         ]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5

     

       64
       +
       

     

       65
       +
         preCheck = ''

     

       66
       +
           export HOME=.

     

       67
       +
         ''; # <- Required for "tests/test_urldetect.py".

     

       68
       +
       

     

       69
       +
         postCheck = ''

     

       70
       +
           $out/bin/virt-manager --version | grep -Fw ${version} > /dev/null

     

       71
       +
         '';

     

       72
        
       

     

       73
        
         meta = with lib; {

     

       74
        
           homepage = "http://virt-manager.org";

+7 -6

pkgs/applications/window-managers/i3/gaps.nix

···

       1
       -
       { fetchurl, lib, i3, autoreconfHook }:

     

       2
        
       

     

       3
        
       i3.overrideAttrs (oldAttrs : rec {

     

       4
       -
       

     

       5
       -
         name = "i3-gaps-${version}";

     

       6
        
         version = "4.19.1";

     

       7
        
       

     

       8
       -
         src = fetchurl {

     

       9
       -
           url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz";

     

       10
       -
           sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0=";

     

       0
        
       
     

       0
        
       
     

       11
        
         };

     

       12
        
       

     

       13
        
         meta = with lib; {

···

       1
       +
       { fetchFromGitHub, lib, i3 }:

     

       2
        
       

     

       3
        
       i3.overrideAttrs (oldAttrs : rec {

     

       4
       +
         pname = "i3-gaps";

     

       0
        
       
     

       5
        
         version = "4.19.1";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "Airblader";

     

       9
       +
           repo = "i3";

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "sha256-Ydks0hioGAnVBGKraoy3a7Abq9/vHmSne+VFbrYXCug=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         meta = with lib; {

+1 -1

pkgs/build-support/fetchdocker/fetchDockerConfig.nix

···

       1
       -
       pkgargs@{ lib, haskellPackages, writeText, gawk }:

     

       2
        
       let

     

       3
        
         generic-fetcher =

     

       4
        
           import ./generic-fetcher.nix pkgargs;

···

       1
       +
       pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }:

     

       2
        
       let

     

       3
        
         generic-fetcher =

     

       4
        
           import ./generic-fetcher.nix pkgargs;

+1 -1

pkgs/build-support/fetchdocker/fetchDockerLayer.nix

···

       1
       -
       pkgargs@{ lib, haskellPackages, writeText, gawk }:

     

       2
        
       let

     

       3
        
         generic-fetcher =

     

       4
        
           import ./generic-fetcher.nix pkgargs;

···

       1
       +
       pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }:

     

       2
        
       let

     

       3
        
         generic-fetcher =

     

       4
        
           import ./generic-fetcher.nix pkgargs;

+4 -5

pkgs/data/fonts/sudo/default.nix

···

       1
        
       { lib, fetchzip }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "0.52";

     

       5
        
       in fetchzip {

     

       6
        
         name = "sudo-font-${version}";

     

       7
       -
         url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";

     

       8
       -
         sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja";

     

       9
        
       

     

       10
        
         postFetch = ''

     

       11
        
           mkdir -p $out/share/fonts/

     

       12
        
           unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/

     

       13
       -
           unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/

     

       14
       -
           unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/

     

       15
        
         '';

     

       16
        
         meta = with lib; {

     

       17
        
           description = "Font for programmers and command line users";

     

       18
        
           homepage = "https://www.kutilek.de/sudo-font/";

     

       0
        
       
     

       19
        
           license = licenses.ofl;

     

       20
        
           maintainers = with maintainers; [ dtzWill ];

     

       21
        
           platforms = platforms.all;

···

       1
        
       { lib, fetchzip }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "0.53.1";

     

       5
        
       in fetchzip {

     

       6
        
         name = "sudo-font-${version}";

     

       7
       +
         url = "https://github.com/jenskutilek/sudo-font/raw/v${version}/dist/sudo.zip";

     

       8
       +
         sha256 = "1jil43j9ngz4422m76x67bafvxz75rncqqi57xd7fdxgcff7i8dp";

     

       9
        
       

     

       10
        
         postFetch = ''

     

       11
        
           mkdir -p $out/share/fonts/

     

       12
        
           unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/

     

       0
        
       
     

       0
        
       
     

       13
        
         '';

     

       14
        
         meta = with lib; {

     

       15
        
           description = "Font for programmers and command line users";

     

       16
        
           homepage = "https://www.kutilek.de/sudo-font/";

     

       17
       +
           changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";

     

       18
        
           license = licenses.ofl;

     

       19
        
           maintainers = with maintainers; [ dtzWill ];

     

       20
        
           platforms = platforms.all;

+2 -2

pkgs/data/themes/matcha/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "matcha-gtk-theme";

     

       5
       -
         version = "2021-04-09";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "vinceliuice";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1989v2924g1pwycp44zlgryr73p82n9hmf71d0acs455jajf0pvv";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ gdk-pixbuf librsvg ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "matcha-gtk-theme";

     

       5
       +
         version = "2021-05-20";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "vinceliuice";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "0jx55dn9j0395ws7507mj8px4yq4jlmms6xr9jlhp0qxnr4y1smd";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ gdk-pixbuf librsvg ];

+2 -2

pkgs/data/themes/zuki/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "zuki-themes";

     

       5
       -
         version = "3.36-4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "lassekongo83";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "14r8dhfycpmwp2nj6vj0b2cwaaphc9sxbzglc4sr4q566whrhbgd";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ meson ninja sassc ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "zuki-themes";

     

       5
       +
         version = "3.38-1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "lassekongo83";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "0890i8kavgnrhm8ic4zpl16wc4ngpnf1zi8js9gvki2cl7dlj1xm";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ meson ninja sassc ];

+5 -1

pkgs/desktops/cinnamon/cinnamon-common/default.nix

···

       6
        
       , cinnamon-desktop

     

       7
        
       , cinnamon-menus

     

       8
        
       , cinnamon-session

     

       0
        
       
     

       9
        
       , cjs

     

       10
        
       , fetchFromGitHub

     

       11
        
       , gdk-pixbuf

     
···

       115
        
           gtk-doc

     

       116
        
         ];

     

       117
        
       

     

       118
       -
         configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       119
        
       

     

       120
        
         postPatch = ''

     

       121
        
           find . -type f -exec sed -i \

···

       6
        
       , cinnamon-desktop

     

       7
        
       , cinnamon-menus

     

       8
        
       , cinnamon-session

     

       9
       +
       , cinnamon-translations

     

       10
        
       , cjs

     

       11
        
       , fetchFromGitHub

     

       12
        
       , gdk-pixbuf

     
···

       116
        
           gtk-doc

     

       117
        
         ];

     

       118
        
       

     

       119
       +
         # use locales from cinnamon-translations (not using --localedir because datadir is used)

     

       120
       +
         postInstall = ''

     

       121
       +
           ln -s ${cinnamon-translations}/share/locale $out/share/locale

     

       122
       +
         '';

     

       123
        
       

     

       124
        
         postPatch = ''

     

       125
        
           find . -type f -exec sed -i \

+4

pkgs/desktops/cinnamon/cinnamon-control-center/default.nix

···

       28
        
       , gdk-pixbuf

     

       29
        
       , meson

     

       30
        
       , ninja

     

       0
        
       
     

       31
        
       }:

     

       32
        
       

     

       33
        
       stdenv.mkDerivation rec {

     
···

       83
        
         '';

     

       84
        
       

     

       85
        
         mesonFlags = [

     

       0
        
       
     

       86
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       0
        
       
     

       0
        
       
     

       87
        
         ];

     

       88
        
       

     

       89
        
         preInstall = ''

···

       28
        
       , gdk-pixbuf

     

       29
        
       , meson

     

       30
        
       , ninja

     

       31
       +
       , cinnamon-translations

     

       32
        
       }:

     

       33
        
       

     

       34
        
       stdenv.mkDerivation rec {

     
···

       84
        
         '';

     

       85
        
       

     

       86
        
         mesonFlags = [

     

       87
       +
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       88
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       89
       +
           # use locales from cinnamon-translations

     

       90
       +
           "--localedir=${cinnamon-translations}/share/locale"

     

       91
        
         ];

     

       92
        
       

     

       93
        
         preInstall = ''

+9 -2

pkgs/desktops/cinnamon/cinnamon-session/default.nix

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       3
        
       , cinnamon-settings-daemon

     

       0
        
       
     

       4
        
       , dbus-glib

     

       5
        
       , docbook_xsl

     

       6
        
       , docbook_xml_dtd_412

     
···

       80
        
           xmlto

     

       81
        
         ];

     

       82
        
       

     

       83
       -
         # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       84
       -
         mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
       

     

       86
        
         postPatch = ''

     

       87
        
           chmod +x data/meson_install_schemas.py # patchShebangs requires executable file

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       3
        
       , cinnamon-settings-daemon

     

       4
       +
       , cinnamon-translations

     

       5
        
       , dbus-glib

     

       6
        
       , docbook_xsl

     

       7
        
       , docbook_xml_dtd_412

     
···

       81
        
           xmlto

     

       82
        
         ];

     

       83
        
       

     

       84
       +
         mesonFlags = [

     

       85
       +
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       86
       +
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       87
       +
           "-Dgconf=false"

     

       88
       +
           "-DENABLE_IPV6=true"

     

       89
       +
           # use locales from cinnamon-translations

     

       90
       +
           "--localedir=${cinnamon-translations}/share/locale"

     

       91
       +
         ];

     

       92
        
       

     

       93
        
         postPatch = ''

     

       94
        
           chmod +x data/meson_install_schemas.py # patchShebangs requires executable file

+6

pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       0
        
       
     

       3
        
       , colord

     

       4
        
       , glib

     

       5
        
       , gsettings-desktop-schemas

     
···

       102
        
       

     

       103
        
         postPatch = ''

     

       104
        
           sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       105
        
         '';

     

       106
        
       

     

       107
        
         # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       3
       +
       , cinnamon-translations

     

       4
        
       , colord

     

       5
        
       , glib

     

       6
        
       , gsettings-desktop-schemas

     
···

       103
        
       

     

       104
        
         postPatch = ''

     

       105
        
           sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h

     

       106
       +
         '';

     

       107
       +
       

     

       108
       +
         # use locales from cinnamon-translations (not using --localedir because datadir is used)

     

       109
       +
         postInstall = ''

     

       110
       +
           ln -s ${cinnamon-translations}/share/locale $out/share/locale

     

       111
        
         '';

     

       112
        
       

     

       113
        
         # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper

+3

pkgs/desktops/cinnamon/nemo/default.nix

···

       16
        
       , exempi

     

       17
        
       , intltool

     

       18
        
       , shared-mime-info

     

       0
        
       
     

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     
···

       57
        
         mesonFlags = [

     

       58
        
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       59
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       0
        
       
     

       0
        
       
     

       60
        
         ];

     

       61
        
       

     

       62
        
         meta = with lib; {

···

       16
        
       , exempi

     

       17
        
       , intltool

     

       18
        
       , shared-mime-info

     

       19
       +
       , cinnamon-translations

     

       20
        
       }:

     

       21
        
       

     

       22
        
       stdenv.mkDerivation rec {

     
···

       58
        
         mesonFlags = [

     

       59
        
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       60
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       61
       +
           # use locales from cinnamon-translations

     

       62
       +
           "--localedir=${cinnamon-translations}/share/locale"

     

       63
        
         ];

     

       64
        
       

     

       65
        
         meta = with lib; {

+46 -13

pkgs/desktops/gnome/games/quadrapassel/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf

     

       2
       -
       , librsvg, gsound, libmanette

     

       3
       -
       , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook

     

       4
       -
       , meson, ninja, python3, vala, desktop-file-utils

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
       }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "quadrapassel";

     

       9
       -
         version = "3.38.1";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
       -
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       13
       -
           sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [

     

       17
       -
           meson ninja python3 vala desktop-file-utils

     

       18
       -
           pkg-config gnome.adwaita-icon-theme

     

       19
       -
           libxml2 itstool gettext wrapGAppsHook

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
         ];

     

       0
        
       
     

       21
        
         buildInputs = [

     

       22
       -
           gtk3 gdk-pixbuf librsvg libmanette

     

       23
       -
           gsound clutter libxml2 clutter-gtk

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
         ];

     

       25
        
       

     

       26
        
         passthru = {

     
···

       33
        
         meta = with lib; {

     

       34
        
           description = "Classic falling-block game, Tetris";

     

       35
        
           homepage = "https://wiki.gnome.org/Apps/Quadrapassel";

     

       36
       -
           license = licenses.gpl2;

     

       37
        
           maintainers = teams.gnome.members;

     

       38
        
           platforms = platforms.linux;

     

       39
        
         };

···

       1
       +
       {

     

       2
       +
         stdenv,

     

       3
       +
         lib,

     

       4
       +
         fetchurl,

     

       5
       +
         pkg-config,

     

       6
       +
         gtk3,

     

       7
       +
         gnome,

     

       8
       +
         gdk-pixbuf,

     

       9
       +
         librsvg,

     

       10
       +
         gsound,

     

       11
       +
         libmanette,

     

       12
       +
         gettext,

     

       13
       +
         itstool,

     

       14
       +
         libxml2,

     

       15
       +
         clutter,

     

       16
       +
         clutter-gtk,

     

       17
       +
         wrapGAppsHook,

     

       18
       +
         meson,

     

       19
       +
         ninja,

     

       20
       +
         python3,

     

       21
       +
         vala,

     

       22
       +
         desktop-file-utils,

     

       23
        
       }:

     

       24
        
       

     

       25
        
       stdenv.mkDerivation rec {

     

       26
        
         pname = "quadrapassel";

     

       27
       +
         version = "40.1";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
       +
           url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       31
       +
           sha256 = "1d59sxmmmhi611hvr5jmsm276j9w20hc5yq4rk0s4d3svadyap79";

     

       32
        
         };

     

       33
        
       

     

       34
        
         nativeBuildInputs = [

     

       35
       +
           meson

     

       36
       +
           ninja

     

       37
       +
           python3

     

       38
       +
           vala

     

       39
       +
           desktop-file-utils

     

       40
       +
           pkg-config

     

       41
       +
           gnome.adwaita-icon-theme

     

       42
       +
           libxml2

     

       43
       +
           itstool

     

       44
       +
           gettext

     

       45
       +
           wrapGAppsHook

     

       46
        
         ];

     

       47
       +
       

     

       48
        
         buildInputs = [

     

       49
       +
           gtk3

     

       50
       +
           gdk-pixbuf

     

       51
       +
           librsvg

     

       52
       +
           libmanette

     

       53
       +
           gsound

     

       54
       +
           clutter

     

       55
       +
           libxml2

     

       56
       +
           clutter-gtk

     

       57
        
         ];

     

       58
        
       

     

       59
        
         passthru = {

     
···

       66
        
         meta = with lib; {

     

       67
        
           description = "Classic falling-block game, Tetris";

     

       68
        
           homepage = "https://wiki.gnome.org/Apps/Quadrapassel";

     

       69
       +
           license = licenses.gpl2Plus;

     

       70
        
           maintainers = teams.gnome.members;

     

       71
        
           platforms = platforms.linux;

     

       72
        
         };

+45 -14

pkgs/desktops/gnome/games/tali/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf

     

       2
       -
       , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook

     

       3
       -
       , meson, ninja, python3, desktop-file-utils

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "tali";

     

       8
       -
         version = "40.0";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       12
       -
           sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         passthru = {

     

       16
       -
           updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; };

     

       17
       -
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
       -
         nativeBuildInputs = [

     

       20
       -
           meson ninja python3 desktop-file-utils

     

       21
       -
           pkg-config gnome.adwaita-icon-theme

     

       22
       -
           libxml2 itstool gettext wrapGAppsHook

     

       0
        
       
     

       23
        
         ];

     

       24
       -
         buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ];

     

       25
        
       

     

       26
        
         postPatch = ''

     

       27
        
           chmod +x build-aux/meson_post_install.py

     

       28
        
           patchShebangs build-aux/meson_post_install.py

     

       29
        
         '';

     

       30
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
         meta = with lib; {

     

       32
        
           homepage = "https://wiki.gnome.org/Apps/Tali";

     

       33
        
           description = "Sort of poker with dice and less money";

     

       34
        
           maintainers = teams.gnome.members;

     

       35
       -
           license = licenses.gpl2;

     

       36
        
           platforms = platforms.linux;

     

       37
        
         };

     

       38
        
       }

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         stdenv,

     

       4
       +
         fetchurl,

     

       5
       +
         pkg-config,

     

       6
       +
         gtk3,

     

       7
       +
         gnome,

     

       8
       +
         gdk-pixbuf,

     

       9
       +
         librsvg,

     

       10
       +
         libgnome-games-support,

     

       11
       +
         gettext,

     

       12
       +
         itstool,

     

       13
       +
         libxml2,

     

       14
       +
         wrapGAppsHook,

     

       15
       +
         meson,

     

       16
       +
         ninja,

     

       17
       +
         python3,

     

       18
       +
         desktop-file-utils,

     

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     

       22
        
         pname = "tali";

     

       23
       +
         version = "40.1";

     

       24
        
       

     

       25
        
         src = fetchurl {

     

       26
        
           url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       27
       +
           sha256 = "1xhp30c70bi8p4sm6v8zmxi1p55fs56dqgfbhfnsda5g1cxwir7h";

     

       28
        
         };

     

       29
        
       

     

       30
       +
         nativeBuildInputs = [

     

       31
       +
           meson

     

       32
       +
           ninja

     

       33
       +
           python3

     

       34
       +
           desktop-file-utils

     

       35
       +
           pkg-config

     

       36
       +
           gnome.adwaita-icon-theme

     

       37
       +
           libxml2

     

       38
       +
           itstool

     

       39
       +
           gettext

     

       40
       +
           wrapGAppsHook

     

       41
       +
         ];

     

       42
        
       

     

       43
       +
         buildInputs = [

     

       44
       +
           gtk3

     

       45
       +
           gdk-pixbuf

     

       46
       +
           librsvg

     

       47
       +
           libgnome-games-support

     

       48
        
         ];

     

       0
        
       
     

       49
        
       

     

       50
        
         postPatch = ''

     

       51
        
           chmod +x build-aux/meson_post_install.py

     

       52
        
           patchShebangs build-aux/meson_post_install.py

     

       53
        
         '';

     

       54
        
       

     

       55
       +
         passthru = {

     

       56
       +
           updateScript = gnome.updateScript {

     

       57
       +
             packageName = pname;

     

       58
       +
             attrPath = "gnome.${pname}";

     

       59
       +
           };

     

       60
       +
         };

     

       61
       +
       

     

       62
        
         meta = with lib; {

     

       63
        
           homepage = "https://wiki.gnome.org/Apps/Tali";

     

       64
        
           description = "Sort of poker with dice and less money";

     

       65
        
           maintainers = teams.gnome.members;

     

       66
       +
           license = licenses.gpl2Plus;

     

       67
        
           platforms = platforms.linux;

     

       68
        
         };

     

       69
        
       }

+2 -1

pkgs/development/interpreters/python/default.nix

···

       73
        
                 optionalExtensions = cond: as: if cond then as else [];

     

       74
        
                 python2Extension = import ../../../top-level/python2-packages.nix;

     

       75
        
                 extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);

     

       0
        
       
     

       76
        
               in lib.makeScopeWithSplicing

     

       77
        
                 pkgs.splicePackages

     

       78
        
                 pkgs.newScope

     

       79
        
                 otherSplices

     

       80
        
                 keep

     

       81
        
                 extra

     

       82
       -
                 (lib.extends extensions pythonPackagesFun))

     

       83
        
               {

     

       84
        
                 overrides = packageOverrides;

     

       85
        
               };

···

       73
        
                 optionalExtensions = cond: as: if cond then as else [];

     

       74
        
                 python2Extension = import ../../../top-level/python2-packages.nix;

     

       75
        
                 extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);

     

       76
       +
                 aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ../../../top-level/python-aliases.nix lib self super);

     

       77
        
               in lib.makeScopeWithSplicing

     

       78
        
                 pkgs.splicePackages

     

       79
        
                 pkgs.newScope

     

       80
        
                 otherSplices

     

       81
        
                 keep

     

       82
        
                 extra

     

       83
       +
                 (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))

     

       84
        
               {

     

       85
        
                 overrides = packageOverrides;

     

       86
        
               };

+15

pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch

···

       1
       +
       diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake

     

       2
       +
       index 1a80b5b..1fa57a7 100644

     

       3
       +
       --- a/CMake/AbseilHelpers.cmake

     

       4
       +
       +++ b/CMake/AbseilHelpers.cmake

     

       5
       +
       @@ -171,8 +171,8 @@ function(absl_cc_library)

     

       6
       +
              FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" CONTENT "\

     

       7
       +
        prefix=${CMAKE_INSTALL_PREFIX}\n\

     

       8
       +
        exec_prefix=\${prefix}\n\

     

       9
       +
       -libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}\n\

     

       10
       +
       -includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}\n\

     

       11
       +
       +libdir=${CMAKE_INSTALL_FULL_LIBDIR}\n\

     

       12
       +
       +includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}\n\

     

       13
       +
        \n\

     

       14
       +
        Name: absl_${_NAME}\n\

     

       15
       +
        Description: Abseil ${_NAME} library\n\

+12 -3

pkgs/development/libraries/abseil-cpp/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "abseil-cpp";

     

       5
       -
         version = "20200923.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "abseil";

     

       9
        
           repo = "abseil-cpp";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl";

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         cmakeFlags = [

     

       15
        
           "-DCMAKE_CXX_STANDARD=17"

···

       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, static ? stdenv.hostPlatform.isStatic }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "abseil-cpp";

     

       5
       +
         version = "20210324.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "abseil";

     

       9
        
           repo = "abseil-cpp";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "16w63brfwgiayiyhvawsnr14xyy5hpp68k8fj0z6yk0bjzw6jvjw";

     

       12
        
         };

     

       13
       +
       

     

       14
       +
         patches = [

     

       15
       +
           # Use CMAKE_INSTALL_FULL_{LIBDIR,INCLUDEDIR}

     

       16
       +
           # https://github.com/abseil/abseil-cpp/pull/963

     

       17
       +
           (fetchpatch {

     

       18
       +
             url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch";

     

       19
       +
             sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5";

     

       20
       +
           })

     

       21
       +
         ];

     

       22
        
       

     

       23
        
         cmakeFlags = [

     

       24
        
           "-DCMAKE_CXX_STANDARD=17"

+2 -2

pkgs/development/libraries/cairomm/1.16.nix

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "cairomm";

     

       16
       -
         version = "1.16.0";

     

       17
        
       

     

       18
        
         outputs = [ "out" "dev" ];

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
        
           url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";

     

       22
       -
           sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "cairomm";

     

       16
       +
         version = "1.16.1";

     

       17
        
       

     

       18
        
         outputs = [ "out" "dev" ];

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
        
           url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";

     

       22
       +
           sha256 = "sha256-b2Bg2OmN1Lis/uIpX92904z0h8B8JqrY0ag7ub/0osY=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

+14 -2

pkgs/development/libraries/cereal/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, cmake }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "cereal";

     

       4
        
         version = "1.3.0";

     
···

       12
        
           sha256 = "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
        
         meta = with lib; {

     

       18
        
           description = "A header-only C++11 serialization library";

···

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

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "cereal";

     

       4
        
         version = "1.3.0";

     
···

       12
        
           sha256 = "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p";

     

       13
        
         };

     

       14
        
       

     

       15
       +
         patches = [

     

       16
       +
           # https://nvd.nist.gov/vuln/detail/CVE-2020-11105

     

       17
       +
           # serialized std::shared_ptr variables cannot always be expected to

     

       18
       +
           # serialize back into their original values. This can have any number of

     

       19
       +
           # consequences, depending on the context within which this manifests.

     

       20
       +
           (fetchpatch {

     

       21
       +
             name = "CVE-2020-11105.patch";

     

       22
       +
             url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch";

     

       23
       +
             sha256 = "CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w=";

     

       24
       +
           })

     

       25
       +
         ];

     

       26
       +
       

     

       27
       +
         cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ];

     

       28
        
       

     

       29
        
         meta = with lib; {

     

       30
        
           description = "A header-only C++11 serialization library";

+2 -2

pkgs/development/libraries/glibmm/2.68.nix

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "glibmm";

     

       16
       -
         version = "2.68.0";

     

       17
        
       

     

       18
        
         outputs = [ "out" "dev" ];

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       22
       -
           sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "glibmm";

     

       16
       +
         version = "2.68.1";

     

       17
        
       

     

       18
        
         outputs = [ "out" "dev" ];

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       22
       +
           sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/liblinphone/default.nix

···

       46
        
       

     

       47
        
       stdenv.mkDerivation rec {

     

       48
        
         pname = "liblinphone";

     

       49
       -
         version = "4.5.15";

     

       50
        
       

     

       51
        
         src = fetchFromGitLab {

     

       52
        
           domain = "gitlab.linphone.org";

     
···

       54
        
           group = "BC";

     

       55
        
           repo = pname;

     

       56
        
           rev = version;

     

       57
       -
           sha256 = "sha256-lDj2OkWuodPHpvoJ5W2GivzVIeMnprb42kAnJKfKtdg=";

     

       58
        
         };

     

       59
        
       

     

       60
        
         # Do not build static libraries

···

       46
        
       

     

       47
        
       stdenv.mkDerivation rec {

     

       48
        
         pname = "liblinphone";

     

       49
       +
         version = "4.5.17";

     

       50
        
       

     

       51
        
         src = fetchFromGitLab {

     

       52
        
           domain = "gitlab.linphone.org";

     
···

       54
        
           group = "BC";

     

       55
        
           repo = pname;

     

       56
        
           rev = version;

     

       57
       +
           sha256 = "sha256-ryyT4bG3lnE72ydvCAoiT3IeHY4mZwX9nCqaTRC1wyc=";

     

       58
        
         };

     

       59
        
       

     

       60
        
         # Do not build static libraries

+2 -12

pkgs/development/libraries/science/math/or-tools/default.nix

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchFromGitHub

     

       4
       -
       , fetchpatch

     

       5
        
       , cmake

     

       6
        
       , abseil-cpp

     

       7
        
       , bzip2

     
···

       17
        
       

     

       18
        
       stdenv.mkDerivation rec {

     

       19
        
         pname = "or-tools";

     

       20
       -
         version = "8.1";

     

       21
        
         disabled = python.pythonOlder "3.6";  # not supported upstream

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "google";

     

       25
        
           repo = "or-tools";

     

       26
        
           rev = "v${version}";

     

       27
       -
           sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg";

     

       28
        
         };

     

       29
       -
       

     

       30
       -
         patches = [

     

       31
       -
           # This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect

     

       32
       -
           # USE_SCIP=OFF and then failing to find scip/scip.h

     

       33
       -
           (fetchpatch {

     

       34
       -
             url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch";

     

       35
       -
             sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0";

     

       36
       -
           })

     

       37
       -
         ];

     

       38
        
       

     

       39
        
         # The original build system uses cmake which does things like pull

     

       40
        
         # in dependencies through git and Makefile creation time. We

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchFromGitHub

     

       0
        
       
     

       4
        
       , cmake

     

       5
        
       , abseil-cpp

     

       6
        
       , bzip2

     
···

       16
        
       

     

       17
        
       stdenv.mkDerivation rec {

     

       18
        
         pname = "or-tools";

     

       19
       +
         version = "9.0";

     

       20
        
         disabled = python.pythonOlder "3.6";  # not supported upstream

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "google";

     

       24
        
           repo = "or-tools";

     

       25
        
           rev = "v${version}";

     

       26
       +
           sha256 = "0yihrsg8wj4b82xwg1hbn97my8zqd7xhw7dk7wm2axsyvqd6m3b3";

     

       27
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
       

     

       29
        
         # The original build system uses cmake which does things like pull

     

       30
        
         # in dependencies through git and Makefile creation time. We

+3 -6

pkgs/development/lisp-modules/lisp-packages.nix

···

       124
        
         };

     

       125
        
         nyxt = pkgs.lispPackages.buildLispPackage rec {

     

       126
        
           baseName = "nyxt";

     

       127
       -
           version = "2021-05-06";

     

       128
       -
       

     

       129
        
       

     

       130
        
           description = "Browser";

     

       131
        
       

     
···

       194
        
           src = pkgs.fetchFromGitHub {

     

       195
        
             owner = "atlas-engineer";

     

       196
        
             repo = "nyxt";

     

       197
       -
             rev = "940a5f9a19770771cf29f8fa7505e99c3a242b67";

     

       198
       -
             sha256 = "sha256:0d5mawka26gwi9nb45x1n33vgskwyn46jrvfz7nzmm2jfaq4ipn6";

     

       199
       -
             # Version 2 pre-release 7

     

       200
       -
             # date = "2021-05-06T11:30:27Z";

     

       201
        
           };

     

       202
        
       

     

       203
        
           packageName = "nyxt";

···

       124
        
         };

     

       125
        
         nyxt = pkgs.lispPackages.buildLispPackage rec {

     

       126
        
           baseName = "nyxt";

     

       127
       +
           version = "2.0.0";

     

       0
        
       
     

       128
        
       

     

       129
        
           description = "Browser";

     

       130
        
       

     
···

       193
        
           src = pkgs.fetchFromGitHub {

     

       194
        
             owner = "atlas-engineer";

     

       195
        
             repo = "nyxt";

     

       196
       +
             rev = "${version}";

     

       197
       +
             sha256 = "sha256-eSRNfzkAzGTorLjdHo1LQEKLx4ASdv3RGXIFZ5WFIXk=";

     

       0
        
       
     

       0
        
       
     

       198
        
           };

     

       199
        
       

     

       200
        
           packageName = "nyxt";

+2 -2

pkgs/development/python-modules/aiohomekit/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "aiohomekit";

     

       14
       -
         version = "0.2.61";

     

       15
        
         format = "pyproject";

     

       16
        
         disabled = pythonAtLeast "3.9";

     

       17
        
       

     
···

       19
        
           owner = "Jc2k";

     

       20
        
           repo = pname;

     

       21
        
           rev = version;

     

       22
       -
           sha256 = "047ql5a4i4354jgr8xr2waim8j522z58vbfi7aa62jqc9l8jzxzk";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ poetry ];

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "aiohomekit";

     

       14
       +
         version = "0.2.62";

     

       15
        
         format = "pyproject";

     

       16
        
         disabled = pythonAtLeast "3.9";

     

       17
        
       

     
···

       19
        
           owner = "Jc2k";

     

       20
        
           repo = pname;

     

       21
        
           rev = version;

     

       22
       +
           sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ poetry ];

+9 -4

pkgs/development/python-modules/azure-core/default.nix

···

       14
        
       }:

     

       15
        
       

     

       16
        
       buildPythonPackage rec {

     

       17
       -
         version = "1.13.0";

     

       18
        
         pname = "azure-core";

     

       19
        
         disabled = isPy27;

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

       23
        
           extension = "zip";

     

       24
       -
           sha256 = "624b46db407dbed9e03134ab65214efab5b5315949a1fbd6cd592c46fb272588";

     

       25
        
         };

     

       26
        
       

     

       27
        
         propagatedBuildInputs = [

     
···

       45
        
         pytestFlagsArray = [ "tests/" ];

     

       46
        
         # disable tests which touch network

     

       47
        
         disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ];

     

       48
       -
         # requires testing modules which aren't published, and likely to create cyclic dependencies

     

       49
       -
         disabledTestPaths = [ "tests/test_connection_string_parsing.py" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
        
         meta = with lib; {

     

       52
        
           description = "Microsoft Azure Core Library for Python";

···

       14
        
       }:

     

       15
        
       

     

       16
        
       buildPythonPackage rec {

     

       17
       +
         version = "1.14.0";

     

       18
        
         pname = "azure-core";

     

       19
        
         disabled = isPy27;

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

       23
        
           extension = "zip";

     

       24
       +
           sha256 = "f32bb64aabe61f496255c16dd6c555a027da628109460bf27311cee0caf78f96";

     

       25
        
         };

     

       26
        
       

     

       27
        
         propagatedBuildInputs = [

     
···

       45
        
         pytestFlagsArray = [ "tests/" ];

     

       46
        
         # disable tests which touch network

     

       47
        
         disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ];

     

       48
       +
         disabledTestPaths = [

     

       49
       +
           # requires testing modules which aren't published, and likely to create cyclic dependencies

     

       50
       +
           "tests/test_connection_string_parsing.py"

     

       51
       +
           # wants network

     

       52
       +
           "tests/async_tests/test_streaming_async.py"

     

       53
       +
           "tests/test_streaming.py"

     

       54
       +
         ];

     

       55
        
       

     

       56
        
         meta = with lib; {

     

       57
        
           description = "Microsoft Azure Core Library for Python";

+2 -2

pkgs/development/python-modules/azure-eventgrid/default.nix

···

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "azure-eventgrid";

     

       12
       -
         version = "4.1.1";

     

       13
        
       

     

       14
        
         src = fetchPypi {

     

       15
        
           inherit pname version;

     

       16
        
           extension = "zip";

     

       17
       -
           sha256 = "c3bd28ccf6c837b58b58fc61275dace5348a823660c3ca21166a88aa2a8377a4";

     

       18
        
         };

     

       19
        
       

     

       20
        
         propagatedBuildInputs = [

···

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "azure-eventgrid";

     

       12
       +
         version = "4.2.0";

     

       13
        
       

     

       14
        
         src = fetchPypi {

     

       15
        
           inherit pname version;

     

       16
        
           extension = "zip";

     

       17
       +
           sha256 = "77af2c20abde7d8342da7993781605b440aeac0f95c4af13bb87465c3bd5fe35";

     

       18
        
         };

     

       19
        
       

     

       20
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-identity/default.nix

···

       17
        
       

     

       18
        
       buildPythonPackage rec {

     

       19
        
         pname = "azure-identity";

     

       20
       -
         version = "1.5.0";

     

       21
        
       

     

       22
        
         src = fetchPypi {

     

       23
        
           inherit pname version;

     

       24
        
           extension = "zip";

     

       25
       -
           sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396";

     

       26
        
         };

     

       27
        
       

     

       28
        
         propagatedBuildInputs = [

···

       17
        
       

     

       18
        
       buildPythonPackage rec {

     

       19
        
         pname = "azure-identity";

     

       20
       +
         version = "1.6.0";

     

       21
        
       

     

       22
        
         src = fetchPypi {

     

       23
        
           inherit pname version;

     

       24
        
           extension = "zip";

     

       25
       +
           sha256 = "2e70b00874e4f288e37804bc06bfaf216de8565c759594bf79cccfbf9ca2c78a";

     

       26
        
         };

     

       27
        
       

     

       28
        
         propagatedBuildInputs = [

+4 -2

pkgs/development/python-modules/azure-mgmt-billing/default.nix

···

       3
        
       , fetchPypi

     

       4
        
       , msrestazure

     

       5
        
       , azure-common

     

       0
        
       
     

       6
        
       , azure-mgmt-nspkg

     

       7
        
       , python

     

       8
        
       , isPy3k

     
···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "azure-mgmt-billing";

     

       13
       -
         version = "1.0.0"; #pypi's 0.2.0 doesn't build ootb

     

       14
        
       

     

       15
        
         src = fetchPypi {

     

       16
        
           inherit pname version;

     

       17
       -
           sha256 = "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";

     

       18
        
           extension = "zip";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

     

       22
        
           msrestazure

     

       23
        
           azure-common

     

       0
        
       
     

       24
        
           azure-mgmt-nspkg

     

       25
        
         ];

     

       26

···

       3
        
       , fetchPypi

     

       4
        
       , msrestazure

     

       5
        
       , azure-common

     

       6
       +
       , azure-mgmt-core

     

       7
        
       , azure-mgmt-nspkg

     

       8
        
       , python

     

       9
        
       , isPy3k

     
···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-billing";

     

       14
       +
         version = "6.0.0"; #pypi's 0.2.0 doesn't build ootb

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
       +
           sha256 = "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f";

     

       19
        
           extension = "zip";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

     

       23
        
           msrestazure

     

       24
        
           azure-common

     

       25
       +
           azure-mgmt-core

     

       26
        
           azure-mgmt-nspkg

     

       27
        
         ];

     

       28

+9 -3

pkgs/development/python-modules/azure-mgmt-botservice/default.nix

···

       1
        
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
        
       , azure-common

     

       0
        
       
     

       3
        
       , msrest

     

       4
        
       , msrestazure

     

       5
        
       }:

     

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
       -
         version = "0.3.0";

     

       9
        
         pname = "azure-mgmt-botservice";

     

       10
        
         disabled = isPy27;

     

       11
        
       

     

       12
        
         src = fetchPypi {

     

       13
        
           inherit pname version;

     

       14
       -
           sha256 = "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";

     

       15
        
           extension = "zip";

     

       16
        
         };

     

       17
        
       

     

       18
       -
         propagatedBuildInputs = [ azure-common msrest msrestazure ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         # no tests included

     

       21
        
         doCheck = false;

···

       1
        
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
        
       , azure-common

     

       3
       +
       , azure-mgmt-core

     

       4
        
       , msrest

     

       5
        
       , msrestazure

     

       6
        
       }:

     

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
       +
         version = "1.0.0";

     

       10
        
         pname = "azure-mgmt-botservice";

     

       11
        
         disabled = isPy27;

     

       12
        
       

     

       13
        
         src = fetchPypi {

     

       14
        
           inherit pname version;

     

       15
       +
           sha256 = "9dae4d749a2a072e22703318ea36e379aec20876c553b2889037c7bdec4b9546";

     

       16
        
           extension = "zip";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         propagatedBuildInputs = [

     

       20
       +
           azure-common

     

       21
       +
           azure-mgmt-core

     

       22
       +
           msrest

     

       23
       +
           msrestazure

     

       24
       +
         ];

     

       25
        
       

     

       26
        
         # no tests included

     

       27
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-cosmosdb";

     

       14
       -
         version = "6.2.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-cosmosdb";

     

       14
       +
         version = "6.3.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

+9 -3

pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix

···

       1
        
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
        
       , azure-common

     

       0
        
       
     

       3
        
       , msrest

     

       4
        
       , msrestazure

     

       5
        
       }:

     

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
       -
         version = "0.2.0";

     

       9
        
         pname = "azure-mgmt-deploymentmanager";

     

       10
        
         disabled = isPy27;

     

       11
        
       

     

       12
        
         src = fetchPypi {

     

       13
        
           inherit pname version;

     

       14
       -
           sha256 = "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";

     

       15
        
           extension = "zip";

     

       16
        
         };

     

       17
        
       

     

       18
       -
         propagatedBuildInputs = [ azure-common msrest msrestazure ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         # no tests included

     

       21
        
         doCheck = false;

···

       1
        
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
        
       , azure-common

     

       3
       +
       , azure-mgmt-core

     

       4
        
       , msrest

     

       5
        
       , msrestazure

     

       6
        
       }:

     

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
       +
         version = "1.0.0";

     

       10
        
         pname = "azure-mgmt-deploymentmanager";

     

       11
        
         disabled = isPy27;

     

       12
        
       

     

       13
        
         src = fetchPypi {

     

       14
        
           inherit pname version;

     

       15
       +
           sha256 = "9badb768617209149c33e68ca2e59c35b1d3d11427e2969872f2e236e14eee78";

     

       16
        
           extension = "zip";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         propagatedBuildInputs = [

     

       20
       +
           azure-common

     

       21
       +
           azure-mgmt-core

     

       22
       +
           msrest

     

       23
       +
           msrestazure

     

       24
       +
         ];

     

       25
        
       

     

       26
        
         # no tests included

     

       27
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/azure-mgmt-iothub/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-iothub";

     

       14
       -
         version = "1.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "7acf24088395a299974dd26406db2686d8d59a3fffbe47c24617b36d445f2de8";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-iothub";

     

       14
       +
         version = "2.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix

···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "azure-mgmt-loganalytics";

     

       15
       -
         version = "9.0.0";

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
        
           extension = "zip";

     

       20
       -
           sha256 = "c0b702753c0774a25bcb49b967573b0ec2bef5262c24bc371c219a750ba3c4fd";

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "azure-mgmt-loganalytics";

     

       15
       +
         version = "10.0.0";

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
        
           extension = "zip";

     

       20
       +
           sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23";

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-mgmt-maps/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-maps";

     

       14
       -
         version = "1.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "dafbe23bdbe9c01f88ce91c5b8587eefc73ac2d637ebcdc59ded6d332932e3ab";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-maps";

     

       14
       +
         version = "2.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-mgmt-network/default.nix

···

       10
        
       }:

     

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
       -
         version = "18.0.0";

     

       14
        
         pname = "azure-mgmt-network";

     

       15
        
         disabled = !isPy3k;

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
        
           extension = "zip";

     

       20
       -
           sha256 = "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a";

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

···

       10
        
       }:

     

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
       +
         version = "19.0.0";

     

       14
        
         pname = "azure-mgmt-network";

     

       15
        
         disabled = !isPy3k;

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
        
           extension = "zip";

     

       20
       +
           sha256 = "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8";

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

+4 -2

pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix

···

       5
        
       , msrest

     

       6
        
       , msrestazure

     

       7
        
       , azure-common

     

       0
        
       
     

       8
        
       , isPy27

     

       9
        
       }:

     

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
       -
         version = "0.1.0";

     

       13
        
         pname = "azure-mgmt-redhatopenshift";

     

       14
        
         disabled = isPy27; # don't feel like fixing namespace issues on python2

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

     

       23
        
           msrest

     

       24
        
           msrestazure

     

       25
        
           azure-common

     

       0
        
       
     

       26
        
         ];

     

       27
        
       

     

       28
        
         pythonNamespaces = "azure.mgmt";

···

       5
        
       , msrest

     

       6
        
       , msrestazure

     

       7
        
       , azure-common

     

       8
       +
       , azure-mgmt-core

     

       9
        
       , isPy27

     

       10
        
       }:

     

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
       +
         version = "1.0.0";

     

       14
        
         pname = "azure-mgmt-redhatopenshift";

     

       15
        
         disabled = isPy27; # don't feel like fixing namespace issues on python2

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
        
           extension = "zip";

     

       20
       +
           sha256 = "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980";

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

     

       24
        
           msrest

     

       25
        
           msrestazure

     

       26
        
           azure-common

     

       27
       +
           azure-mgmt-core

     

       28
        
         ];

     

       29
        
       

     

       30
        
         pythonNamespaces = "azure.mgmt";

+4 -2

pkgs/development/python-modules/azure-mgmt-reservations/default.nix

···

       4
        
       , msrest

     

       5
        
       , msrestazure

     

       6
        
       , azure-common

     

       0
        
       
     

       7
        
       , azure-mgmt-nspkg

     

       8
        
       , isPy3k

     

       9
        
       }:

     

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "azure-mgmt-reservations";

     

       13
       -
         version = "0.9.0";

     

       14
        
       

     

       15
        
         src = fetchPypi {

     

       16
        
           inherit pname version;

     

       17
        
           extension = "zip";

     

       18
       -
           sha256 = "1dc97f48f3edb67116da8604ab76ef93233319f56455532be307f323e9ebf0e6";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

     

       22
        
           msrest

     

       23
        
           msrestazure

     

       24
        
           azure-common

     

       0
        
       
     

       25
        
         ] ++ lib.optionals (!isPy3k) [

     

       26
        
           azure-mgmt-nspkg

     

       27
        
         ];

···

       4
        
       , msrest

     

       5
        
       , msrestazure

     

       6
        
       , azure-common

     

       7
       +
       , azure-mgmt-core

     

       8
        
       , azure-mgmt-nspkg

     

       9
        
       , isPy3k

     

       10
        
       }:

     

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-reservations";

     

       14
       +
         version = "1.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "880df54fdf3869ee6b142d4fc7a3fce518c850523c42cc895b7fb8359956554e";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

     

       23
        
           msrest

     

       24
        
           msrestazure

     

       25
        
           azure-common

     

       26
       +
           azure-mgmt-core

     

       27
        
         ] ++ lib.optionals (!isPy3k) [

     

       28
        
           azure-mgmt-nspkg

     

       29
        
         ];

+2 -2

pkgs/development/python-modules/azure-mgmt-resource/default.nix

···

       8
        
       

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
       -
         version = "16.1.0";

     

       12
        
         pname = "azure-mgmt-resource";

     

       13
        
         disabled = !isPy3k;

     

       14
        
       

     

       15
        
         src = fetchPypi {

     

       16
        
           inherit pname version;

     

       17
        
           extension = "zip";

     

       18
       -
           sha256 = "b814ee27b37f030fe69461ef6f514661340dc8b1f28736362541e1c0d31d90ae";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

···

       8
        
       

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
       +
         version = "18.0.0";

     

       12
        
         pname = "azure-mgmt-resource";

     

       13
        
         disabled = !isPy3k;

     

       14
        
       

     

       15
        
         src = fetchPypi {

     

       16
        
           inherit pname version;

     

       17
        
           extension = "zip";

     

       18
       +
           sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-mgmt-sql/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-sql";

     

       14
       -
         version = "1.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-sql";

     

       14
       +
         version = "2.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "191accd6e5b47f93a10cebb94e2ca5086f0b6f4afd0290b8596206cd4acb0d5c";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-mgmt-storage/default.nix

···

       8
        
       }:

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
       -
         version = "17.1.0";

     

       12
        
         pname = "azure-mgmt-storage";

     

       13
        
         disabled = !isPy3k;

     

       14
        
       

     

       15
        
         src = fetchPypi {

     

       16
        
           inherit pname version;

     

       17
        
           extension = "zip";

     

       18
       -
           sha256 = "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

···

       8
        
       }:

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
       +
         version = "18.0.0";

     

       12
        
         pname = "azure-mgmt-storage";

     

       13
        
         disabled = !isPy3k;

     

       14
        
       

     

       15
        
         src = fetchPypi {

     

       16
        
           inherit pname version;

     

       17
        
           extension = "zip";

     

       18
       +
           sha256 = "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-servicebus/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-servicebus";

     

       14
       -
         version = "7.1.1";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "58797defe666dd17ae11a8895395e7e844f11d2076ba4a9ce63682ac02f665d9";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-servicebus";

     

       14
       +
         version = "7.2.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "919e81d6d9e6e098dbb7abf51d90282a73c0071846b104e70488417cd5d07863";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-synapse-artifacts/default.nix

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "azure-synapse-artifacts";

     

       9
       -
         version = "0.6.0";

     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
        
           extension = "zip";

     

       14
       -
           sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210";

     

       15
        
         };

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "azure-synapse-artifacts";

     

       9
       +
         version = "0.7.0";

     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
        
           extension = "zip";

     

       14
       +
           sha256 = "2a538d617dc5d2d167716226d0a24e416324efb35ef22b223e0d9fb6b9889a72";

     

       15
        
         };

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [

+1 -1

pkgs/development/python-modules/debugpy/default.nix

···

       94
        
           description = "An implementation of the Debug Adapter Protocol for Python";

     

       95
        
           homepage = "https://github.com/microsoft/debugpy";

     

       96
        
           license = licenses.mit;

     

       97
       -
           maintainers = with maintainers; [ metadark ];

     

       98
        
           platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];

     

       99
        
         };

     

       100
        
       }

···

       94
        
           description = "An implementation of the Debug Adapter Protocol for Python";

     

       95
        
           homepage = "https://github.com/microsoft/debugpy";

     

       96
        
           license = licenses.mit;

     

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

     

       98
        
           platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];

     

       99
        
         };

     

       100
        
       }

+5

pkgs/development/python-modules/flufl/lock.nix

···

       14
        
         propagatedBuildInputs = [ atpublic psutil ];

     

       15
        
         checkInputs = [ pytestCheckHook pytestcov sybil ];

     

       16
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
         meta = with lib; {

     

       18
        
           homepage = "https://flufllock.readthedocs.io/";

     

       19
        
           description = "NFS-safe file locking with timeouts for POSIX and Windows";

···

       14
        
         propagatedBuildInputs = [ atpublic psutil ];

     

       15
        
         checkInputs = [ pytestCheckHook pytestcov sybil ];

     

       16
        
       

     

       17
       +
         # disable code coverage checks for all OS. Upstream does not enforce these

     

       18
       +
         # checks on Darwin, and code coverage cannot be improved downstream nor is it

     

       19
       +
         # relevant to the user.

     

       20
       +
         pytestFlagsArray = [ "--no-cov" ];

     

       21
       +
       

     

       22
        
         meta = with lib; {

     

       23
        
           homepage = "https://flufllock.readthedocs.io/";

     

       24
        
           description = "NFS-safe file locking with timeouts for POSIX and Windows";

+2 -2

pkgs/development/python-modules/gensim/default.nix

···

       4
        
       , numpy

     

       5
        
       , six

     

       6
        
       , scipy

     

       7
       -
       , smart_open

     

       8
        
       , scikit-learn, testfixtures, unittest2

     

       9
        
       , isPy3k

     

       10
        
       }:

     
···

       19
        
           sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         propagatedBuildInputs = [ smart_open numpy six scipy ];

     

       23
        
       

     

       24
        
         checkInputs = [ scikit-learn testfixtures unittest2 ];

     

       25

···

       4
        
       , numpy

     

       5
        
       , six

     

       6
        
       , scipy

     

       7
       +
       , smart-open

     

       8
        
       , scikit-learn, testfixtures, unittest2

     

       9
        
       , isPy3k

     

       10
        
       }:

     
···

       19
        
           sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         propagatedBuildInputs = [ smart-open numpy six scipy ];

     

       23
        
       

     

       24
        
         checkInputs = [ scikit-learn testfixtures unittest2 ];

     

       25

+4

pkgs/development/python-modules/jupyter_server/default.nix

···

       1
        
       { lib

     

       0
        
       
     

       2
        
       , buildPythonPackage

     

       3
        
       , fetchPypi

     

       4
        
       , pythonOlder

     
···

       71
        
           "test_list_formats"

     

       72
        
           "test_base_url"

     

       73
        
           "test_culling"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
         ];

     

       75
        
       

     

       76
        
         meta = with lib; {

···

       1
        
       { lib

     

       2
       +
       , stdenv

     

       3
        
       , buildPythonPackage

     

       4
        
       , fetchPypi

     

       5
        
       , pythonOlder

     
···

       72
        
           "test_list_formats"

     

       73
        
           "test_base_url"

     

       74
        
           "test_culling"

     

       75
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       76
       +
           # attempts to use trashcan, build env doesn't allow this

     

       77
       +
           "test_delete"

     

       78
        
         ];

     

       79
        
       

     

       80
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/pathy/default.nix

···

       4
        
       , pytestCheckHook

     

       5
        
       , typer

     

       6
        
       , dataclasses

     

       7
       -
       , smart_open

     

       8
        
       , pytest

     

       9
        
       , mock

     

       10
        
       , google-cloud-storage

     
···

       19
        
           sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M=";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         propagatedBuildInputs = [ smart_open typer google-cloud-storage ];

     

       23
        
       

     

       24
        
         postPatch = ''

     

       25
        
           substituteInPlace requirements.txt \

···

       4
        
       , pytestCheckHook

     

       5
        
       , typer

     

       6
        
       , dataclasses

     

       7
       +
       , smart-open

     

       8
        
       , pytest

     

       9
        
       , mock

     

       10
        
       , google-cloud-storage

     
···

       19
        
           sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M=";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         propagatedBuildInputs = [ smart-open typer google-cloud-storage ];

     

       23
        
       

     

       24
        
         postPatch = ''

     

       25
        
           substituteInPlace requirements.txt \

+1 -1

pkgs/development/python-modules/pygls/default.nix

···

       25
        
           description = "Pythonic generic implementation of the Language Server Protocol";

     

       26
        
           homepage = "https://github.com/openlawlibrary/pygls";

     

       27
        
           license = licenses.asl20;

     

       28
       -
           maintainers = with maintainers; [ metadark ];

     

       29
        
         };

     

       30
        
       }

···

       25
        
           description = "Pythonic generic implementation of the Language Server Protocol";

     

       26
        
           homepage = "https://github.com/openlawlibrary/pygls";

     

       27
        
           license = licenses.asl20;

     

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

     

       29
        
         };

     

       30
        
       }

+14 -13

pkgs/development/python-modules/pymumble/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "pymumble";

     

       14
       -
         version = "1.6";

     

       15
        
         disabled = isPy27;

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "azlux";

     

       19
        
           repo = "pymumble";

     

       20
        
           rev = version;

     

       21
       -
           sha256 = "04nc66d554a98mbmdgzgsg6ncaz0jsn4zdr3mr14w6wnhrxpjkrs";

     

       22
        
         };

     

       23
       -
         patches = [

     

       24
       -
           # Compatibility with pycryptodome (which is what our pycrypto really is)

     

       25
       -
           # See https://github.com/azlux/pymumble/pull/99

     

       26
       -
           (fetchpatch {

     

       27
       -
             url = "https://github.com/azlux/pymumble/pull/99/commits/b85548a0e1deaac820954b1c0b308af214311a14.patch";

     

       28
       -
             sha256 = "0w9dpc87rny6vmhi634pih1p97b67jm26qajscpa9wp6nphdlxlj";

     

       29
       -
           })

     

       30
       -
         ];

     

       31
        
       

     

       32
        
         postPatch = ''

     

       33
        
           # Changes all `library==x.y.z` statements to just `library`

     
···

       35
        
           sed -i 's/\(.*\)==.*/\1/' requirements.txt

     

       36
        
         '';

     

       37
        
       

     

       38
       -
         propagatedBuildInputs = [ opuslib protobuf ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
       

     

       40
       -
         checkInputs = [ pytestCheckHook pycrypto ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       41
        
       

     

       42
       -
         pythonImportsCheck = [ "pymumble_py3" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       43
        
       

     

       44
        
         meta = with lib; {

     

       45
        
           description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "pymumble";

     

       14
       +
         version = "1.6.1";

     

       15
        
         disabled = isPy27;

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "azlux";

     

       19
        
           repo = "pymumble";

     

       20
        
           rev = version;

     

       21
       +
           sha256 = "1qbsd2zvwd9ksclgiyrl1z79ms0zximm4527mnmhvq36lykgki7s";

     

       22
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
       

     

       24
        
         postPatch = ''

     

       25
        
           # Changes all `library==x.y.z` statements to just `library`

     
···

       27
        
           sed -i 's/\(.*\)==.*/\1/' requirements.txt

     

       28
        
         '';

     

       29
        
       

     

       30
       +
         propagatedBuildInputs = [

     

       31
       +
           opuslib

     

       32
       +
           protobuf

     

       33
       +
         ];

     

       34
        
       

     

       35
       +
         checkInputs = [

     

       36
       +
           pycrypto

     

       37
       +
           pytestCheckHook

     

       38
       +
         ];

     

       39
        
       

     

       40
       +
         pythonImportsCheck = [

     

       41
       +
           "pymumble_py3"

     

       42
       +
           "pymumble_py3.constants"

     

       43
       +
         ];

     

       44
        
       

     

       45
        
         meta = with lib; {

     

       46
        
           description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";

+1 -1

pkgs/development/python-modules/pytest-datadir/default.nix

···

       27
        
           homepage = "https://github.com/gabrielcnr/pytest-datadir";

     

       28
        
           description = "pytest plugin for manipulating test data directories and files";

     

       29
        
           license = licenses.mit;

     

       30
       -
           maintainers = with maintainers; [ metadark ];

     

       31
        
         };

     

       32
        
       }

···

       27
        
           homepage = "https://github.com/gabrielcnr/pytest-datadir";

     

       28
        
           description = "pytest plugin for manipulating test data directories and files";

     

       29
        
           license = licenses.mit;

     

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

     

       31
        
         };

     

       32
        
       }

+4

pkgs/development/python-modules/pyvex/default.nix

···

       18
        
           sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E=";

     

       19
        
         };

     

       20
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
         propagatedBuildInputs = [

     

       22
        
           archinfo

     

       23
        
           bitstring

···

       18
        
           sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E=";

     

       19
        
         };

     

       20
        
       

     

       21
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       22
       +
           substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar'

     

       23
       +
         '';

     

       24
       +
       

     

       25
        
         propagatedBuildInputs = [

     

       26
        
           archinfo

     

       27
        
           bitstring

+5 -3

pkgs/development/python-modules/smart_open/default.nix pkgs/development/python-modules/smart-open/default.nix

···

       12
        
       }:

     

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
       -
         pname = "smart_open";

     

       16
        
         version = "4.2.0";

     

       17
        
         disabled = pythonOlder "3.5";

     

       18
        
       

     

       19
        
         src = fetchPypi {

     

       20
       -
           inherit pname version;

     

       0
        
       
     

       21
        
           sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb";

     

       22
        
         };

     

       23
        
       

     
···

       29
        
       

     

       30
        
         # upstream code requires both boto and boto3

     

       31
        
         propagatedBuildInputs = [ boto boto3 bz2file requests ];

     

       0
        
       
     

       32
        
         meta = {

     

       33
        
           license = lib.licenses.mit;

     

       34
       -
           description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file";

     

       35
        
           maintainers = with lib.maintainers; [ jyp ];

     

       36
        
         };

     

       37
        
       }

···

       12
        
       }:

     

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
       +
         pname = "smart-open";

     

       16
        
         version = "4.2.0";

     

       17
        
         disabled = pythonOlder "3.5";

     

       18
        
       

     

       19
        
         src = fetchPypi {

     

       20
       +
           pname = "smart_open";

     

       21
       +
           inherit version;

     

       22
        
           sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb";

     

       23
        
         };

     

       24
        
       

     
···

       30
        
       

     

       31
        
         # upstream code requires both boto and boto3

     

       32
        
         propagatedBuildInputs = [ boto boto3 bz2file requests ];

     

       33
       +
       

     

       34
        
         meta = {

     

       35
        
           license = lib.licenses.mit;

     

       36
       +
           description = "Library for efficient streaming of very large file";

     

       37
        
           maintainers = with lib.maintainers; [ jyp ];

     

       38
        
         };

     

       39
        
       }

+34

pkgs/development/python-modules/token-bucket/default.nix

···

       1
       +
       { lib

     

       2
       +
       , buildPythonPackage

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , pytestrunner

     

       5
       +
       , pytestCheckHook

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       buildPythonPackage rec {

     

       9
       +
         pname = "token-bucket";

     

       10
       +
         version = "0.2.0";

     

       11
       +
         format = "setuptools";

     

       12
       +
       

     

       13
       +
         src = fetchFromGitHub {

     

       14
       +
           owner = "falconry";

     

       15
       +
           repo = pname;

     

       16
       +
           rev = version;

     

       17
       +
           sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s";

     

       18
       +
         };

     

       19
       +
       

     

       20
       +
         nativeBuildInputs = [

     

       21
       +
           pytestrunner

     

       22
       +
         ];

     

       23
       +
       

     

       24
       +
         checkInputs = [

     

       25
       +
           pytestCheckHook

     

       26
       +
         ];

     

       27
       +
       

     

       28
       +
         meta = with lib; {

     

       29
       +
           description = "Token Bucket Implementation for Python Web Apps";

     

       30
       +
           homepage = "https://github.com/falconry/token-bucket";

     

       31
       +
           license = licenses.asl20;

     

       32
       +
           maintainers = with maintainers; [ hexa ];

     

       33
       +
         };

     

       34
       +
       }

+11 -7

pkgs/development/python-modules/vdf/default.nix

···

       1
       -
       { lib, buildPythonPackage, fetchFromGitHub

     

       2
       -
       , pytest, pytestcov, mock }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       buildPythonPackage rec {

     

       5
        
         pname = "vdf";

     

       6
       -
         version = "3.3";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "ValvePython";

     

       10
        
           repo = pname;

     

       11
        
           rev = "v${version}";

     

       12
       -
           sha256 = "0d9bhxdznry7kzyma00cxwjn6rqnd6vw8v5ym68k6qswgfzb569i";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         checkInputs = [ pytest pytestcov mock ];

     

       16
       -
         checkPhase = "make test";

     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           description = "Library for working with Valve's VDF text format";

     

       20
        
           homepage = "https://github.com/ValvePython/vdf";

     

       21
        
           license = licenses.mit;

     

       22
       -
           maintainers = with maintainers; [ metadark ];

     

       23
        
         };

     

       24
        
       }

···

       1
       +
       { lib

     

       2
       +
       , buildPythonPackage

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , mock

     

       5
       +
       , pytestCheckHook

     

       6
       +
       }:

     

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "vdf";

     

       10
       +
         version = "3.4";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "ValvePython";

     

       14
        
           repo = pname;

     

       15
        
           rev = "v${version}";

     

       16
       +
           hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU=";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         checkInputs = [ mock pytestCheckHook ];

     

       20
       +
         pythonImportsCheck = [ "vdf" ];

     

       21
        
       

     

       22
        
         meta = with lib; {

     

       23
        
           description = "Library for working with Valve's VDF text format";

     

       24
        
           homepage = "https://github.com/ValvePython/vdf";

     

       25
        
           license = licenses.mit;

     

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

     

       27
        
         };

     

       28
        
       }

+8

pkgs/development/ruby-modules/gem-config/default.nix

···

       528
        
             "--with-libvirt-include=${libvirt}/include"

     

       529
        
             "--with-libvirt-lib=${libvirt}/lib"

     

       530
        
           ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       531
        
         };

     

       532
        
       

     

       533
        
         ruby-lxc = attrs: {

···

       528
        
             "--with-libvirt-include=${libvirt}/include"

     

       529
        
             "--with-libvirt-lib=${libvirt}/lib"

     

       530
        
           ];

     

       531
       +
           dontBuild = false;

     

       532
       +
           postPatch = ''

     

       533
       +
             # https://gitlab.com/libvirt/libvirt-ruby/-/commit/43543991832c9623c00395092bcfb9e178243ba4

     

       534
       +
             substituteInPlace ext/libvirt/common.c \

     

       535
       +
               --replace 'st.h' 'ruby/st.h'

     

       536
       +
             substituteInPlace ext/libvirt/domain.c \

     

       537
       +
               --replace 'st.h' 'ruby/st.h'

     

       538
       +
           '';

     

       539
        
         };

     

       540
        
       

     

       541
        
         ruby-lxc = attrs: {

+3 -9

pkgs/development/tools/build-managers/cmake/default.nix

···

       7
        
       , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)

     

       8
        
       , useOpenSSL ? !isBootstrap, openssl

     

       9
        
       , useNcurses ? false, ncurses

     

       10
       -
       , useQt4 ? false, qt4

     

       11
        
       , withQt5 ? false, qtbase

     

       12
        
       }:

     

       13
        
       

     

       14
       -
       assert withQt5 -> useQt4 == false;

     

       15
       -
       assert useQt4 -> withQt5 == false;

     

       16
       -
       

     

       17
        
       stdenv.mkDerivation (rec {

     

       18
        
         pname = "cmake"

     

       19
        
                 + lib.optionalString isBootstrap "-boot"

     

       20
        
                 + lib.optionalString useNcurses "-cursesUI"

     

       21
       -
                 + lib.optionalString withQt5 "-qt5UI"

     

       22
       -
                 + lib.optionalString useQt4 "-qt4UI";

     

       23
        
         version = "3.19.7";

     

       24
        
       

     

       25
        
         src = fetchurl {

     
···

       53
        
           ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]

     

       54
        
           ++ lib.optional useOpenSSL openssl

     

       55
        
           ++ lib.optional useNcurses ncurses

     

       56
       -
           ++ lib.optional useQt4 qt4

     

       57
        
           ++ lib.optional withQt5 qtbase;

     

       58
        
       

     

       59
        
         propagatedBuildInputs = lib.optional stdenv.isDarwin ps;

     
···

       73
        
         configureFlags = [

     

       74
        
           "--docdir=share/doc/${pname}${version}"

     

       75
        
         ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup

     

       76
       -
           ++ lib.optional (useQt4 || withQt5) "--qt-gui"

     

       77
        
           # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568

     

       78
        
           ++ lib.optionals stdenv.hostPlatform.is32bit [

     

       79
        
             "CFLAGS=-D_FILE_OFFSET_BITS=64"

     
···

       124
        
             configuration files, and generate native makefiles and workspaces that

     

       125
        
             can be used in the compiler environment of your choice.

     

       126
        
           '';

     

       127
       -
           platforms = if useQt4 then qt4.meta.platforms else platforms.all;

     

       128
        
           maintainers = with maintainers; [ ttuegel lnl7 ];

     

       129
        
           license = licenses.bsd3;

     

       130
        
         };

···

       7
        
       , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)

     

       8
        
       , useOpenSSL ? !isBootstrap, openssl

     

       9
        
       , useNcurses ? false, ncurses

     

       0
        
       
     

       10
        
       , withQt5 ? false, qtbase

     

       11
        
       }:

     

       12
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       stdenv.mkDerivation (rec {

     

       14
        
         pname = "cmake"

     

       15
        
                 + lib.optionalString isBootstrap "-boot"

     

       16
        
                 + lib.optionalString useNcurses "-cursesUI"

     

       17
       +
                 + lib.optionalString withQt5 "-qt5UI";

     

       0
        
       
     

       18
        
         version = "3.19.7";

     

       19
        
       

     

       20
        
         src = fetchurl {

     
···

       48
        
           ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]

     

       49
        
           ++ lib.optional useOpenSSL openssl

     

       50
        
           ++ lib.optional useNcurses ncurses

     

       0
        
       
     

       51
        
           ++ lib.optional withQt5 qtbase;

     

       52
        
       

     

       53
        
         propagatedBuildInputs = lib.optional stdenv.isDarwin ps;

     
···

       67
        
         configureFlags = [

     

       68
        
           "--docdir=share/doc/${pname}${version}"

     

       69
        
         ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup

     

       70
       +
           ++ lib.optional withQt5 "--qt-gui"

     

       71
        
           # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568

     

       72
        
           ++ lib.optionals stdenv.hostPlatform.is32bit [

     

       73
        
             "CFLAGS=-D_FILE_OFFSET_BITS=64"

     
···

       118
        
             configuration files, and generate native makefiles and workspaces that

     

       119
        
             can be used in the compiler environment of your choice.

     

       120
        
           '';

     

       121
       +
           platforms = platforms.all;

     

       122
        
           maintainers = with maintainers; [ ttuegel lnl7 ];

     

       123
        
           license = licenses.bsd3;

     

       124
        
         };

+25

pkgs/development/tools/bunyan-rs/default.nix

···

       1
       +
       { rustPlatform

     

       2
       +
       , fetchFromGitHub

     

       3
       +
       , lib

     

       4
       +
       }:

     

       5
       +
       

     

       6
       +
       rustPlatform.buildRustPackage rec {

     

       7
       +
         pname = "bunyan-rs";

     

       8
       +
         version = "0.1.2";

     

       9
       +
       

     

       10
       +
         src = fetchFromGitHub {

     

       11
       +
           owner = "LukeMathWalker";

     

       12
       +
           repo = "bunyan";

     

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

     

       14
       +
           sha256 = "sha256-Rj0VoJMcl8UBuVNu88FwTNF1GBx8IEXxwLL8sGz9kVM=";

     

       15
       +
         };

     

       16
       +
       

     

       17
       +
         cargoSha256 = "sha256-UZAiXLbRhr2J7QFf7x+JbEjc6p2AoVHYMgyARuwaB7E=";

     

       18
       +
       

     

       19
       +
         meta = with lib; {

     

       20
       +
           description = "A CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)";

     

       21
       +
           homepage = "https://github.com/LukeMathWalker/bunyan";

     

       22
       +
           license = with licenses; [ asl20 mit ];

     

       23
       +
           maintainers = with maintainers; [ netcrns ];

     

       24
       +
         };

     

       25
       +
       }

+10 -6

pkgs/development/tools/cmake-language-server/default.nix

···

       16
        
           sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837";

     

       17
        
         };

     

       18
        
       

     

       19
       -
         # can be removed after v0.1.2

     

       20
       -
         patches = lib.optional stdenv.isDarwin (fetchpatch {

     

       21
       -
           url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch";

     

       22
       -
           sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0";

     

       23
       -
         });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
       

     

       25
        
         postPatch = ''

     

       26
        
           substituteInPlace pyproject.toml \

     
···

       38
        
           homepage = "https://github.com/regen100/cmake-language-server";

     

       39
        
           description = "CMake LSP Implementation";

     

       40
        
           license = licenses.mit;

     

       41
       -
           maintainers = with maintainers; [ metadark ];

     

       42
        
         };

     

       43
        
       }

···

       16
        
           sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         patches = [

     

       20
       +
           ./disable-test-timeouts.patch

     

       21
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       22
       +
           # can be removed after v0.1.2

     

       23
       +
           (fetchpatch {

     

       24
       +
             url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch";

     

       25
       +
             sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0";

     

       26
       +
           })

     

       27
       +
         ];

     

       28
        
       

     

       29
        
         postPatch = ''

     

       30
        
           substituteInPlace pyproject.toml \

     
···

       42
        
           homepage = "https://github.com/regen100/cmake-language-server";

     

       43
        
           description = "CMake LSP Implementation";

     

       44
        
           license = licenses.mit;

     

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

     

       46
        
         };

     

       47
        
       }

+13

pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch

···

       1
       +
       diff --git a/tests/test_server.py b/tests/test_server.py

     

       2
       +
       index c0777f5..1184fb3 100644

     

       3
       +
       --- a/tests/test_server.py

     

       4
       +
       +++ b/tests/test_server.py

     

       5
       +
       @@ -11,7 +11,7 @@ from pygls.types import (CompletionContext, CompletionParams,

     

       6
       +
                                 InitializeParams, Position, TextDocumentIdentifier,

     

       7
       +
                                 TextDocumentItem, TextDocumentPositionParams)

     

       8
       +
        

     

       9
       +
       -CALL_TIMEOUT = 2

     

       10
       +
       +CALL_TIMEOUT = None

     

       11
       +
        

     

       12
       +
        

     

       13
       +
        def _init(client: LanguageServer, root: Path):

+1 -1

pkgs/development/tools/continuous-integration/gitlab-runner/default.nix

···

       30
        
           owner = "gitlab-org";

     

       31
        
           repo = "gitlab-runner";

     

       32
        
           rev = "v${version}";

     

       33
       -
           sha256 = "0jh5ghjyzr7srl3xjsklv9yskq8k88kmylpiigjir0mkbn43fgzq";

     

       34
        
         };

     

       35
        
       

     

       36
        
         patches = [ ./fix-shell-path.patch ];

···

       30
        
           owner = "gitlab-org";

     

       31
        
           repo = "gitlab-runner";

     

       32
        
           rev = "v${version}";

     

       33
       +
           sha256 = "01ajl7zka5fnph5zcnp3z6ir8xr81wzkam69gxazwjb3nbs642an";

     

       34
        
         };

     

       35
        
       

     

       36
        
         patches = [ ./fix-shell-path.patch ];

+40

pkgs/development/tools/git-aggregator/default.nix

···

       1
       +
       { git, lib, python3Packages }:

     

       2
       +
       

     

       3
       +
       python3Packages.buildPythonApplication rec {

     

       4
       +
         pname = "git-aggregator";

     

       5
       +
         version = "1.8.1";

     

       6
       +
       

     

       7
       +
         src = python3Packages.fetchPypi {

     

       8
       +
           inherit pname version;

     

       9
       +
           hash = "sha256-LLsyhyhPmOOvPzwEEJwkhrDfBMFueA7kuDlnrqwr08k=";

     

       10
       +
         };

     

       11
       +
       

     

       12
       +
         nativeBuildInputs = with python3Packages; [

     

       13
       +
           setuptools-scm

     

       14
       +
         ];

     

       15
       +
         propagatedBuildInputs = with python3Packages; [

     

       16
       +
           argcomplete

     

       17
       +
           colorama

     

       18
       +
           git

     

       19
       +
           kaptan

     

       20
       +
           requests

     

       21
       +
         ];

     

       22
       +
       

     

       23
       +
         checkInputs = [

     

       24
       +
           git

     

       25
       +
         ];

     

       26
       +
       

     

       27
       +
         preCheck = ''

     

       28
       +
           export HOME=`mktemp -d`

     

       29
       +
           git config --global user.name John

     

       30
       +
           git config --global user.email john@localhost

     

       31
       +
         '';

     

       32
       +
       

     

       33
       +
         meta = with lib; {

     

       34
       +
           description = "Manage the aggregation of git branches from different remotes to build a consolidated one.";

     

       35
       +
           homepage = "https://github.com/acsone/git-aggregator";

     

       36
       +
           license = licenses.agpl3Plus;

     

       37
       +
           maintainers = with maintainers; [ lourkeur ];

     

       38
       +
           mainProgram = "gitaggregate";

     

       39
       +
         };

     

       40
       +
       }

+3 -3

pkgs/development/tools/kustomize/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "kustomize";

     

       5
       -
         version = "4.1.2";

     

       6
        
         # rev is the commit of the tag, mainly for kustomize version command output

     

       7
        
         rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";

     

       8
        
       

     
···

       17
        
           owner = "kubernetes-sigs";

     

       18
        
           repo = pname;

     

       19
        
           rev = "kustomize/v${version}";

     

       20
       -
           sha256 = "sha256-uomtW6PPs/UHvKRbHToot6kU4YJGLJuet8vJENbwEgI=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.

     
···

       26
        
         # avoid finding test and development commands

     

       27
        
         sourceRoot = "source/kustomize";

     

       28
        
       

     

       29
       -
         vendorSha256 = "sha256-fcsjxtCojahI6ZIcaSG5ubNqlWEC6DnNHtVYwTtbSw4=";

     

       30
        
       

     

       31
        
         meta = with lib; {

     

       32
        
           description = "Customization of kubernetes YAML configurations";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "kustomize";

     

       5
       +
         version = "4.1.3";

     

       6
        
         # rev is the commit of the tag, mainly for kustomize version command output

     

       7
        
         rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";

     

       8
        
       

     
···

       17
        
           owner = "kubernetes-sigs";

     

       18
        
           repo = pname;

     

       19
        
           rev = "kustomize/v${version}";

     

       20
       +
           sha256 = "sha256-NPWKInDHOoelWqDrUn/AlRItI4e8J6dbBxgLW078ecs=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.

     
···

       26
        
         # avoid finding test and development commands

     

       27
        
         sourceRoot = "source/kustomize";

     

       28
        
       

     

       29
       +
         vendorSha256 = "sha256-6maEpEPEV436NrVnVlvWV1q6YywGVILXbxn8Z8Ku/hs=";

     

       30
        
       

     

       31
        
         meta = with lib; {

     

       32
        
           description = "Customization of kubernetes YAML configurations";

+1 -1

pkgs/development/tools/misc/ccache/default.nix

···

       102
        
           homepage = "https://ccache.dev";

     

       103
        
           downloadPage = "https://ccache.dev/download.html";

     

       104
        
           license = licenses.gpl3Plus;

     

       105
       -
           maintainers = with maintainers; [ metadark r-burns ];

     

       106
        
           platforms = platforms.unix;

     

       107
        
         };

     

       108
        
       };

···

       102
        
           homepage = "https://ccache.dev";

     

       103
        
           downloadPage = "https://ccache.dev/download.html";

     

       104
        
           license = licenses.gpl3Plus;

     

       105
       +
           maintainers = with maintainers; [ kira-bruneau r-burns ];

     

       106
        
           platforms = platforms.unix;

     

       107
        
         };

     

       108
        
       };

+5 -4

pkgs/development/tools/misc/texlab/default.nix

···

       10
        
       

     

       11
        
       rustPlatform.buildRustPackage rec {

     

       12
        
         pname = "texlab";

     

       13
       -
         version = "3.0.0";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "latex-lsp";

     

       17
        
           repo = pname;

     

       18
        
           rev = "v${version}";

     

       19
       -
           hash = "sha256-jOxneMqeyvMQWKPNha59H6qWSFmx+Z71SU2+M5VWMsA=";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         cargoHash = "sha256-H6czxSTw93RNTaN0OJyv0RfwmGAiFkpDgUtXHCD+jrY=";

     

       23
        
       

     

       24
        
         outputs = [ "out" "man" ];

     

       25
        
       

     
···

       42
        
           description = "An implementation of the Language Server Protocol for LaTeX";

     

       43
        
           homepage = "https://texlab.netlify.app";

     

       44
        
           license = licenses.mit;

     

       45
       -
           maintainers = with maintainers; [ doronbehar metadark ];

     

       0
        
       
     

       46
        
         };

     

       47
        
       }

···

       10
        
       

     

       11
        
       rustPlatform.buildRustPackage rec {

     

       12
        
         pname = "texlab";

     

       13
       +
         version = "3.0.1";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "latex-lsp";

     

       17
        
           repo = pname;

     

       18
        
           rev = "v${version}";

     

       19
       +
           hash = "sha256-hiz3dMEYNKKd9dZiGghAhGqoXXKJiZG6sECfsCYVscU=";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         cargoHash = "sha256-sCvQFU9/ENVi1RHV3QDngzI/S1xuHvpWxsrxT73jdI0=";

     

       23
        
       

     

       24
        
         outputs = [ "out" "man" ];

     

       25
        
       

     
···

       42
        
           description = "An implementation of the Language Server Protocol for LaTeX";

     

       43
        
           homepage = "https://texlab.netlify.app";

     

       44
        
           license = licenses.mit;

     

       45
       +
           maintainers = with maintainers; [ doronbehar kira-bruneau ];

     

       46
       +
           platforms = platforms.all;

     

       47
        
         };

     

       48
        
       }

+2 -2

pkgs/games/chessx/default.nix

···

       12
        
       

     

       13
        
       mkDerivation rec {

     

       14
        
         pname = "chessx";

     

       15
       -
         version = "1.5.0";

     

       16
        
       

     

       17
        
         src = fetchurl {

     

       18
        
           url = "mirror://sourceforge/chessx/chessx-${version}.tgz";

     

       19
       -
           sha256 = "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [

···

       12
        
       

     

       13
        
       mkDerivation rec {

     

       14
        
         pname = "chessx";

     

       15
       +
         version = "1.5.6";

     

       16
        
       

     

       17
        
         src = fetchurl {

     

       18
        
           url = "mirror://sourceforge/chessx/chessx-${version}.tgz";

     

       19
       +
           sha256 = "sha256-0JpLU0qQnF8aOYxkBlBJov3zBJe8gcy98NlAQSNk0gU=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [

+1 -1

pkgs/games/clonehero/default.nix

···

       67
        
           description = "Clone of Guitar Hero and Rockband-style games";

     

       68
        
           homepage = "https://clonehero.net";

     

       69
        
           license = licenses.unfree;

     

       70
       -
           maintainers = with maintainers; [ metadark ];

     

       71
        
           platforms = [ "x86_64-linux" ];

     

       72
        
         };

     

       73
        
       }

···

       67
        
           description = "Clone of Guitar Hero and Rockband-style games";

     

       68
        
           homepage = "https://clonehero.net";

     

       69
        
           license = licenses.unfree;

     

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

     

       71
        
           platforms = [ "x86_64-linux" ];

     

       72
        
         };

     

       73
        
       }

+1 -3

pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix

···

       1
       -
       { stdenv, pkgs, cores, runtimeShell }:

     

       2
        
       

     

       3
        
       assert cores != [];

     

       4
       -
       

     

       5
       -
       with pkgs.lib;

     

       6
        
       

     

       7
        
       let

     

       8

···

       1
       +
       { stdenv, pkgs, lib, cores, runtimeShell }:

     

       2
        
       

     

       3
        
       assert cores != [];

     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       let

     

       6

+108 -24

pkgs/misc/vim-plugins/generated.nix

···

       413
        
       

     

       414
        
         chadtree = buildVimPluginFrom2Nix {

     

       415
        
           pname = "chadtree";

     

       416
       -
           version = "2021-05-21";

     

       417
        
           src = fetchFromGitHub {

     

       418
        
             owner = "ms-jpq";

     

       419
        
             repo = "chadtree";

     

       420
       -
             rev = "6769987c13e313497e0fe98a59ccee0e70388927";

     

       421
       -
             sha256 = "1xaddhij0f652rx2k5iar8892ly84nslw8j74l7srfxs7l91kpyi";

     

       422
        
           };

     

       423
        
           meta.homepage = "https://github.com/ms-jpq/chadtree/";

     

       424
        
         };

     
···

       712
        
           meta.homepage = "https://github.com/chikatoike/concealedyank.vim/";

     

       713
        
         };

     

       714
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       715
        
         conjure = buildVimPluginFrom2Nix {

     

       716
        
           pname = "conjure";

     

       717
        
           version = "2021-05-15";

     
···

       1304
        
       

     

       1305
        
         edge = buildVimPluginFrom2Nix {

     

       1306
        
           pname = "edge";

     

       1307
       -
           version = "2021-05-19";

     

       1308
        
           src = fetchFromGitHub {

     

       1309
        
             owner = "sainnhe";

     

       1310
        
             repo = "edge";

     

       1311
       -
             rev = "48b0c85e093a4fb9eeb00092b85ba66555e924b1";

     

       1312
       -
             sha256 = "0p033nxhwwk0dirdkbpcqjyv4k8sbif1m1df3xkqgydd0fj9yyp5";

     

       1313
        
           };

     

       1314
        
           meta.homepage = "https://github.com/sainnhe/edge/";

     

       1315
        
         };

     
···

       1893
        
           meta.homepage = "https://github.com/travitch/hasksyn/";

     

       1894
        
         };

     

       1895
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1896
        
         hlint-refactor-vim = buildVimPluginFrom2Nix {

     

       1897
        
           pname = "hlint-refactor-vim";

     

       1898
        
           version = "2015-12-05";

     
···

       2508
        
       

     

       2509
        
         lspkind-nvim = buildVimPluginFrom2Nix {

     

       2510
        
           pname = "lspkind-nvim";

     

       2511
       -
           version = "2021-02-06";

     

       2512
        
           src = fetchFromGitHub {

     

       2513
        
             owner = "onsails";

     

       2514
        
             repo = "lspkind-nvim";

     

       2515
       -
             rev = "953ca895203c095e13f97a8ece790bf546c82d1c";

     

       2516
       -
             sha256 = "15rfzcmfwig7x8pbgc1maimqkqwqr4dbpf7498a0s16vng673bgk";

     

       2517
        
           };

     

       2518
        
           meta.homepage = "https://github.com/onsails/lspkind-nvim/";

     

       2519
        
         };

     
···

       3322
        
           meta.homepage = "https://github.com/mfussenegger/nvim-dap/";

     

       3323
        
         };

     

       3324
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3325
        
         nvim-dap-virtual-text = buildVimPluginFrom2Nix {

     

       3326
        
           pname = "nvim-dap-virtual-text";

     

       3327
        
           version = "2021-05-16";

     
···

       3504
        
       

     

       3505
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       3506
        
           pname = "nvim-treesitter";

     

       3507
       -
           version = "2021-05-20";

     

       3508
        
           src = fetchFromGitHub {

     

       3509
        
             owner = "nvim-treesitter";

     

       3510
        
             repo = "nvim-treesitter";

     

       3511
       -
             rev = "9a3acbc48d61995d98cf073fef8b0b57b3cfb0b9";

     

       3512
       -
             sha256 = "1iggsissn8amhx9hp8fnya44rq5m7jnqm8mpgk4j7lgxq1zibgm4";

     

       3513
        
           };

     

       3514
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       3515
        
         };

     
···

       3526
        
           meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";

     

       3527
        
         };

     

       3528
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3529
        
         nvim-treesitter-refactor = buildVimPluginFrom2Nix {

     

       3530
        
           pname = "nvim-treesitter-refactor";

     

       3531
        
           version = "2021-05-03";

     
···

       3742
        
           meta.homepage = "https://github.com/tmsvg/pear-tree/";

     

       3743
        
         };

     

       3744
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3745
        
         peskcolor-vim = buildVimPluginFrom2Nix {

     

       3746
        
           pname = "peskcolor-vim";

     

       3747
        
           version = "2016-06-11";

     
···

       4021
        
       

     

       4022
        
         registers-nvim = buildVimPluginFrom2Nix {

     

       4023
        
           pname = "registers-nvim";

     

       4024
       -
           version = "2021-05-20";

     

       4025
        
           src = fetchFromGitHub {

     

       4026
        
             owner = "tversteeg";

     

       4027
        
             repo = "registers.nvim";

     

       4028
       -
             rev = "250297a3bdab7572c858fa8ca1816651c8016557";

     

       4029
       -
             sha256 = "1zxww3abnsaw57npiqh33d3s199w2jpc797gv21ys1w9h2g98m6k";

     

       4030
        
           };

     

       4031
        
           meta.homepage = "https://github.com/tversteeg/registers.nvim/";

     

       4032
        
         };

     
···

       4163
        
           meta.homepage = "https://github.com/saltstack/salt-vim/";

     

       4164
        
         };

     

       4165
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4166
        
         self = buildVimPluginFrom2Nix {

     

       4167
        
           pname = "self";

     

       4168
        
           version = "2014-05-28";

     
···

       4321
        
       

     

       4322
        
         sonokai = buildVimPluginFrom2Nix {

     

       4323
        
           pname = "sonokai";

     

       4324
       -
           version = "2021-05-19";

     

       4325
        
           src = fetchFromGitHub {

     

       4326
        
             owner = "sainnhe";

     

       4327
        
             repo = "sonokai";

     

       4328
       -
             rev = "2ab955b30545b7074aa28daae73bbc7050fc55f0";

     

       4329
       -
             sha256 = "0ya3xa9fq6dn2s77qg2snx68aigl9px3flaawpsa0nf8np3jl6kz";

     

       4330
        
           };

     

       4331
        
           meta.homepage = "https://github.com/sainnhe/sonokai/";

     

       4332
        
         };

     
···

       4634
        
       

     

       4635
        
         taskwiki = buildVimPluginFrom2Nix {

     

       4636
        
           pname = "taskwiki";

     

       4637
       -
           version = "2021-04-03";

     

       4638
        
           src = fetchFromGitHub {

     

       4639
        
             owner = "tools-life";

     

       4640
        
             repo = "taskwiki";

     

       4641
       -
             rev = "23a3c20a7d5185700e1e6504c3808cfa9eff78d4";

     

       4642
       -
             sha256 = "0jwb4hcyqwpjaxlissvi69d6fx4dwb7ypdigc2w5hnhfw8nv0kb1";

     

       4643
        
           };

     

       4644
        
           meta.homepage = "https://github.com/tools-life/taskwiki/";

     

       4645
        
         };

     
···

       4654
        
             sha256 = "0bl4shhk5ldqamq2zk8sv2bdswd9a4762fh2smj0h1jgs2ff5pkm";

     

       4655
        
           };

     

       4656
        
           meta.homepage = "https://github.com/tomtom/tcomment_vim/";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4657
        
         };

     

       4658
        
       

     

       4659
        
         telescope-frecency-nvim = buildVimPluginFrom2Nix {

     
···

       5908
        
       

     

       5909
        
         vim-dirvish-git = buildVimPluginFrom2Nix {

     

       5910
        
           pname = "vim-dirvish-git";

     

       5911
       -
           version = "2020-12-18";

     

       5912
        
           src = fetchFromGitHub {

     

       5913
        
             owner = "kristijanhusak";

     

       5914
        
             repo = "vim-dirvish-git";

     

       5915
       -
             rev = "0c8c1a2878074abb0ac24054810de427ebff5500";

     

       5916
       -
             sha256 = "0gan44cyjskzjx5wv20zyvw2jn4cs4537fpwh2m3vi6758s2bmwy";

     

       5917
        
           };

     

       5918
        
           meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/";

     

       5919
        
         };

···

       413
        
       

     

       414
        
         chadtree = buildVimPluginFrom2Nix {

     

       415
        
           pname = "chadtree";

     

       416
       +
           version = "2021-05-22";

     

       417
        
           src = fetchFromGitHub {

     

       418
        
             owner = "ms-jpq";

     

       419
        
             repo = "chadtree";

     

       420
       +
             rev = "dd54a707f372bc8f631d7c70f70f1b55a0f56926";

     

       421
       +
             sha256 = "16sbhn3711hqwv3qykg5lbf09fl6pn58aclsx5r3nnifdc531sc6";

     

       422
        
           };

     

       423
        
           meta.homepage = "https://github.com/ms-jpq/chadtree/";

     

       424
        
         };

     
···

       712
        
           meta.homepage = "https://github.com/chikatoike/concealedyank.vim/";

     

       713
        
         };

     

       714
        
       

     

       715
       +
         conflict-marker-vim = buildVimPluginFrom2Nix {

     

       716
       +
           pname = "conflict-marker-vim";

     

       717
       +
           version = "2020-09-23";

     

       718
       +
           src = fetchFromGitHub {

     

       719
       +
             owner = "rhysd";

     

       720
       +
             repo = "conflict-marker.vim";

     

       721
       +
             rev = "6a9b8f92a57ea8a90cbf62c960db9e5894be2d7a";

     

       722
       +
             sha256 = "0vw5kvnmwwia65gni97vk42b9s47r3p5bglrhpcxsvs3f4s250vq";

     

       723
       +
           };

     

       724
       +
           meta.homepage = "https://github.com/rhysd/conflict-marker.vim/";

     

       725
       +
         };

     

       726
       +
       

     

       727
        
         conjure = buildVimPluginFrom2Nix {

     

       728
        
           pname = "conjure";

     

       729
        
           version = "2021-05-15";

     
···

       1316
        
       

     

       1317
        
         edge = buildVimPluginFrom2Nix {

     

       1318
        
           pname = "edge";

     

       1319
       +
           version = "2021-05-22";

     

       1320
        
           src = fetchFromGitHub {

     

       1321
        
             owner = "sainnhe";

     

       1322
        
             repo = "edge";

     

       1323
       +
             rev = "af858776b6faf81b9eb50f8bbb87c639ee483c93";

     

       1324
       +
             sha256 = "07smppxp2wr4282vsz0zdx3kkhvrx9f5140dwx4h4p8chs1c1zc5";

     

       1325
        
           };

     

       1326
        
           meta.homepage = "https://github.com/sainnhe/edge/";

     

       1327
        
         };

     
···

       1905
        
           meta.homepage = "https://github.com/travitch/hasksyn/";

     

       1906
        
         };

     

       1907
        
       

     

       1908
       +
         hiPairs = buildVimPluginFrom2Nix {

     

       1909
       +
           pname = "hiPairs";

     

       1910
       +
           version = "2020-12-10";

     

       1911
       +
           src = fetchFromGitHub {

     

       1912
       +
             owner = "Yggdroot";

     

       1913
       +
             repo = "hiPairs";

     

       1914
       +
             rev = "8272bf6979d0ee65a3fdbbb97eff3dda79b661b2";

     

       1915
       +
             sha256 = "1hcskq9zdkf8vlxwd2n403m4rq7495v2fj35hjf6461hqx9v9dnw";

     

       1916
       +
           };

     

       1917
       +
           meta.homepage = "https://github.com/Yggdroot/hiPairs/";

     

       1918
       +
         };

     

       1919
       +
       

     

       1920
        
         hlint-refactor-vim = buildVimPluginFrom2Nix {

     

       1921
        
           pname = "hlint-refactor-vim";

     

       1922
        
           version = "2015-12-05";

     
···

       2532
        
       

     

       2533
        
         lspkind-nvim = buildVimPluginFrom2Nix {

     

       2534
        
           pname = "lspkind-nvim";

     

       2535
       +
           version = "2021-05-22";

     

       2536
        
           src = fetchFromGitHub {

     

       2537
        
             owner = "onsails";

     

       2538
        
             repo = "lspkind-nvim";

     

       2539
       +
             rev = "3469f0c9a6767625d532a74a167f5d6ba2b8c5bf";

     

       2540
       +
             sha256 = "1ff1i6m9kk3n36n24c109g6yddcbbzm10iigvi0pv1z2fdpsrl07";

     

       2541
        
           };

     

       2542
        
           meta.homepage = "https://github.com/onsails/lspkind-nvim/";

     

       2543
        
         };

     
···

       3346
        
           meta.homepage = "https://github.com/mfussenegger/nvim-dap/";

     

       3347
        
         };

     

       3348
        
       

     

       3349
       +
         nvim-dap-ui = buildVimPluginFrom2Nix {

     

       3350
       +
           pname = "nvim-dap-ui";

     

       3351
       +
           version = "2021-05-21";

     

       3352
       +
           src = fetchFromGitHub {

     

       3353
       +
             owner = "rcarriga";

     

       3354
       +
             repo = "nvim-dap-ui";

     

       3355
       +
             rev = "cf7a6bb4e7c93ef60a18097bd24a6db2baea7306";

     

       3356
       +
             sha256 = "0mv7230xpcicaypmlfjsyhzwb6mp8vyp0sdzis5z2ixvm7rmh70a";

     

       3357
       +
           };

     

       3358
       +
           meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

     

       3359
       +
         };

     

       3360
       +
       

     

       3361
        
         nvim-dap-virtual-text = buildVimPluginFrom2Nix {

     

       3362
        
           pname = "nvim-dap-virtual-text";

     

       3363
        
           version = "2021-05-16";

     
···

       3540
        
       

     

       3541
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       3542
        
           pname = "nvim-treesitter";

     

       3543
       +
           version = "2021-05-22";

     

       3544
        
           src = fetchFromGitHub {

     

       3545
        
             owner = "nvim-treesitter";

     

       3546
        
             repo = "nvim-treesitter";

     

       3547
       +
             rev = "9d1d9b1b9438f8c5b2d4c48fe040160b0ac6b316";

     

       3548
       +
             sha256 = "1slhsnkza7wrm0vybfx98r7767hjlzlymy66hh6py27a8bazr5aj";

     

       3549
        
           };

     

       3550
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       3551
        
         };

     
···

       3562
        
           meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";

     

       3563
        
         };

     

       3564
        
       

     

       3565
       +
         nvim-treesitter-pyfold = buildVimPluginFrom2Nix {

     

       3566
       +
           pname = "nvim-treesitter-pyfold";

     

       3567
       +
           version = "2021-05-20";

     

       3568
       +
           src = fetchFromGitHub {

     

       3569
       +
             owner = "eddiebergman";

     

       3570
       +
             repo = "nvim-treesitter-pyfold";

     

       3571
       +
             rev = "9a50e33acf6b6e711e6d5cc82456adb6f9b9dc3d";

     

       3572
       +
             sha256 = "0mbd5bp2c6kxn9dmc3vn3ia0silc7kb8mwwcm3q78n866ab4vpcc";

     

       3573
       +
           };

     

       3574
       +
           meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/";

     

       3575
       +
         };

     

       3576
       +
       

     

       3577
        
         nvim-treesitter-refactor = buildVimPluginFrom2Nix {

     

       3578
        
           pname = "nvim-treesitter-refactor";

     

       3579
        
           version = "2021-05-03";

     
···

       3790
        
           meta.homepage = "https://github.com/tmsvg/pear-tree/";

     

       3791
        
         };

     

       3792
        
       

     

       3793
       +
         pears-nvim = buildVimPluginFrom2Nix {

     

       3794
       +
           pname = "pears-nvim";

     

       3795
       +
           version = "2021-05-21";

     

       3796
       +
           src = fetchFromGitHub {

     

       3797
       +
             owner = "steelsojka";

     

       3798
       +
             repo = "pears.nvim";

     

       3799
       +
             rev = "658f9e25f46005aa0e12de81abbfadefaad56e39";

     

       3800
       +
             sha256 = "11v92n6qpy7ryhyg6yqq4b48mskzm6ypc9vgfpr2l5irppai1x1r";

     

       3801
       +
           };

     

       3802
       +
           meta.homepage = "https://github.com/steelsojka/pears.nvim/";

     

       3803
       +
         };

     

       3804
       +
       

     

       3805
        
         peskcolor-vim = buildVimPluginFrom2Nix {

     

       3806
        
           pname = "peskcolor-vim";

     

       3807
        
           version = "2016-06-11";

     
···

       4081
        
       

     

       4082
        
         registers-nvim = buildVimPluginFrom2Nix {

     

       4083
        
           pname = "registers-nvim";

     

       4084
       +
           version = "2021-05-22";

     

       4085
        
           src = fetchFromGitHub {

     

       4086
        
             owner = "tversteeg";

     

       4087
        
             repo = "registers.nvim";

     

       4088
       +
             rev = "c0b02c5d0884dcfdd1a4665a1eb55468f4e398d3";

     

       4089
       +
             sha256 = "1z7pd77gi313asy5d2qvv8nc76rrf2zi18w6gwavygvfkpn3hf65";

     

       4090
        
           };

     

       4091
        
           meta.homepage = "https://github.com/tversteeg/registers.nvim/";

     

       4092
        
         };

     
···

       4223
        
           meta.homepage = "https://github.com/saltstack/salt-vim/";

     

       4224
        
         };

     

       4225
        
       

     

       4226
       +
         scrollbar-nvim = buildVimPluginFrom2Nix {

     

       4227
       +
           pname = "scrollbar-nvim";

     

       4228
       +
           version = "2020-09-28";

     

       4229
       +
           src = fetchFromGitHub {

     

       4230
       +
             owner = "Xuyuanp";

     

       4231
       +
             repo = "scrollbar.nvim";

     

       4232
       +
             rev = "72a4174a47a89b7f89401fc66de0df95580fa48c";

     

       4233
       +
             sha256 = "10kk74pmbzc4v70n8vwb2zk0ayr147xy9zk2sbr78zwqf12gas9y";

     

       4234
       +
           };

     

       4235
       +
           meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/";

     

       4236
       +
         };

     

       4237
       +
       

     

       4238
        
         self = buildVimPluginFrom2Nix {

     

       4239
        
           pname = "self";

     

       4240
        
           version = "2014-05-28";

     
···

       4393
        
       

     

       4394
        
         sonokai = buildVimPluginFrom2Nix {

     

       4395
        
           pname = "sonokai";

     

       4396
       +
           version = "2021-05-22";

     

       4397
        
           src = fetchFromGitHub {

     

       4398
        
             owner = "sainnhe";

     

       4399
        
             repo = "sonokai";

     

       4400
       +
             rev = "53e874723f4564a12ca0af30541dca4a9d315556";

     

       4401
       +
             sha256 = "1wbwpawmlc25wdnmhidrj9k591zqc2srszh20xv60p0dg2aylmx5";

     

       4402
        
           };

     

       4403
        
           meta.homepage = "https://github.com/sainnhe/sonokai/";

     

       4404
        
         };

     
···

       4706
        
       

     

       4707
        
         taskwiki = buildVimPluginFrom2Nix {

     

       4708
        
           pname = "taskwiki";

     

       4709
       +
           version = "2021-05-22";

     

       4710
        
           src = fetchFromGitHub {

     

       4711
        
             owner = "tools-life";

     

       4712
        
             repo = "taskwiki";

     

       4713
       +
             rev = "48e24b03c079be43e296981b2ed0a464bbb710d2";

     

       4714
       +
             sha256 = "0x57cjzxhphvmxai4pl5752vvi6mlgf0d2mwwnwj0mwc8h0n5dhz";

     

       4715
        
           };

     

       4716
        
           meta.homepage = "https://github.com/tools-life/taskwiki/";

     

       4717
        
         };

     
···

       4726
        
             sha256 = "0bl4shhk5ldqamq2zk8sv2bdswd9a4762fh2smj0h1jgs2ff5pkm";

     

       4727
        
           };

     

       4728
        
           meta.homepage = "https://github.com/tomtom/tcomment_vim/";

     

       4729
       +
         };

     

       4730
       +
       

     

       4731
       +
         telescope-dap-nvim = buildVimPluginFrom2Nix {

     

       4732
       +
           pname = "telescope-dap-nvim";

     

       4733
       +
           version = "2021-03-26";

     

       4734
       +
           src = fetchFromGitHub {

     

       4735
       +
             owner = "nvim-telescope";

     

       4736
       +
             repo = "telescope-dap.nvim";

     

       4737
       +
             rev = "b4134fff5cbaf3b876e6011212ed60646e56f060";

     

       4738
       +
             sha256 = "1fcpw42bwl5iych3hxrrl08s5hm6r6k0qx2savw853f3ff982s38";

     

       4739
       +
           };

     

       4740
       +
           meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/";

     

       4741
        
         };

     

       4742
        
       

     

       4743
        
         telescope-frecency-nvim = buildVimPluginFrom2Nix {

     
···

       5992
        
       

     

       5993
        
         vim-dirvish-git = buildVimPluginFrom2Nix {

     

       5994
        
           pname = "vim-dirvish-git";

     

       5995
       +
           version = "2021-05-22";

     

       5996
        
           src = fetchFromGitHub {

     

       5997
        
             owner = "kristijanhusak";

     

       5998
        
             repo = "vim-dirvish-git";

     

       5999
       +
             rev = "1d938c826503059660d89f186d2e8affc686a0e8";

     

       6000
       +
             sha256 = "11vd07cy8bylh75hznddpkpjyr4jg8sgcq12rv1pig4p6wh4lzm5";

     

       6001
        
           };

     

       6002
        
           meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/";

     

       6003
        
         };

+7

pkgs/misc/vim-plugins/vim-plugin-names

···

       106
        
       eagletmt/ghcmod-vim

     

       107
        
       eagletmt/neco-ghc

     

       108
        
       easymotion/vim-easymotion

     

       0
        
       
     

       109
        
       editorconfig/editorconfig-vim

     

       110
        
       edluffy/hologram.nvim@main

     

       111
        
       edluffy/specs.nvim@main

     
···

       458
        
       nvim-lua/lsp_extensions.nvim

     

       459
        
       nvim-lua/plenary.nvim

     

       460
        
       nvim-lua/popup.nvim

     

       0
        
       
     

       461
        
       nvim-telescope/telescope-frecency.nvim

     

       462
        
       nvim-telescope/telescope-fzf-writer.nvim

     

       463
        
       nvim-telescope/telescope-fzy-native.nvim

     
···

       528
        
       ray-x/lsp_signature.nvim

     

       529
        
       rbgrouleff/bclose.vim

     

       530
        
       rbong/vim-flog

     

       0
        
       
     

       531
        
       rhysd/committia.vim

     

       0
        
       
     

       532
        
       rhysd/devdocs.vim

     

       533
        
       rhysd/git-messenger.vim

     

       534
        
       rhysd/vim-clang-format

     
···

       601
        
       sonph/onehalf

     

       602
        
       srcery-colors/srcery-vim

     

       603
        
       steelsojka/completion-buffers

     

       0
        
       
     

       604
        
       stefandtw/quickfix-reflector.vim

     

       605
        
       stephpy/vim-yaml

     

       606
        
       sunaku/vim-dasht

     
···

       774
        
       xolox/vim-misc

     

       775
        
       xuhdev/vim-latex-live-preview

     

       776
        
       Xuyuanp/nerdtree-git-plugin

     

       0
        
       
     

       777
        
       yamatsum/nvim-nonicons@main

     

       778
        
       ycm-core/YouCompleteMe

     

       0
        
       
     

       779
        
       Yggdroot/indentLine

     

       780
        
       Yggdroot/LeaderF

     

       781
        
       Yilin-Yang/vim-markbar

···

       106
        
       eagletmt/ghcmod-vim

     

       107
        
       eagletmt/neco-ghc

     

       108
        
       easymotion/vim-easymotion

     

       109
       +
       eddiebergman/nvim-treesitter-pyfold

     

       110
        
       editorconfig/editorconfig-vim

     

       111
        
       edluffy/hologram.nvim@main

     

       112
        
       edluffy/specs.nvim@main

     
···

       459
        
       nvim-lua/lsp_extensions.nvim

     

       460
        
       nvim-lua/plenary.nvim

     

       461
        
       nvim-lua/popup.nvim

     

       462
       +
       nvim-telescope/telescope-dap.nvim

     

       463
        
       nvim-telescope/telescope-frecency.nvim

     

       464
        
       nvim-telescope/telescope-fzf-writer.nvim

     

       465
        
       nvim-telescope/telescope-fzy-native.nvim

     
···

       530
        
       ray-x/lsp_signature.nvim

     

       531
        
       rbgrouleff/bclose.vim

     

       532
        
       rbong/vim-flog

     

       533
       +
       rcarriga/nvim-dap-ui

     

       534
        
       rhysd/committia.vim

     

       535
       +
       rhysd/conflict-marker.vim

     

       536
        
       rhysd/devdocs.vim

     

       537
        
       rhysd/git-messenger.vim

     

       538
        
       rhysd/vim-clang-format

     
···

       605
        
       sonph/onehalf

     

       606
        
       srcery-colors/srcery-vim

     

       607
        
       steelsojka/completion-buffers

     

       608
       +
       steelsojka/pears.nvim

     

       609
        
       stefandtw/quickfix-reflector.vim

     

       610
        
       stephpy/vim-yaml

     

       611
        
       sunaku/vim-dasht

     
···

       779
        
       xolox/vim-misc

     

       780
        
       xuhdev/vim-latex-live-preview

     

       781
        
       Xuyuanp/nerdtree-git-plugin

     

       782
       +
       Xuyuanp/scrollbar.nvim

     

       783
        
       yamatsum/nvim-nonicons@main

     

       784
        
       ycm-core/YouCompleteMe

     

       785
       +
       Yggdroot/hiPairs

     

       786
        
       Yggdroot/indentLine

     

       787
        
       Yggdroot/LeaderF

     

       788
        
       Yilin-Yang/vim-markbar

+3 -3

pkgs/os-specific/linux/kernel/linux-xanmod.nix

···

       1
        
       { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "5.11.16";

     

       5
        
         suffix = "xanmod1-cacule";

     

       6
        
       in

     

       7
        
         buildLinux (args // rec {

     
···

       12
        
             owner = "xanmod";

     

       13
        
             repo = "linux";

     

       14
        
             rev = modDirVersion;

     

       15
       -
             sha256 = "sha256-sK2DGJsmKP/gvPyT8HWjPa21OOXydMhGjJzrOkPo71Q=";

     

       16
        
             extraPostFetch = ''

     

       17
        
               rm $out/.config

     

       18
        
             '';

     

       19
        
           };

     

       20
        
       

     

       21
        
           extraMeta = {

     

       22
       -
             branch = "5.11";

     

       23
        
             maintainers = with lib.maintainers; [ fortuneteller2k ];

     

       24
        
             description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";

     

       25
        
             broken = stdenv.hostPlatform.isAarch64;

···

       1
        
       { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "5.12.5";

     

       5
        
         suffix = "xanmod1-cacule";

     

       6
        
       in

     

       7
        
         buildLinux (args // rec {

     
···

       12
        
             owner = "xanmod";

     

       13
        
             repo = "linux";

     

       14
        
             rev = modDirVersion;

     

       15
       +
             sha256 = "sha256-u9ebl2M8zrCNdangcUdk/78KwPCYV41PIB6YKTqCgIY=";

     

       16
        
             extraPostFetch = ''

     

       17
        
               rm $out/.config

     

       18
        
             '';

     

       19
        
           };

     

       20
        
       

     

       21
        
           extraMeta = {

     

       22
       +
             branch = "5.12-cacule";

     

       23
        
             maintainers = with lib.maintainers; [ fortuneteller2k ];

     

       24
        
             description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";

     

       25
        
             broken = stdenv.hostPlatform.isAarch64;

+9 -14

pkgs/os-specific/linux/libcgroup/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "libcgroup";

     

       5
       -
         version = "0.41";

     

       6
        
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2";

     

       9
       -
           sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ pam bison flex ];

     

       13
       -
       

     

       14
       -
         patches = [

     

       15
       -
           (fetchpatch {

     

       16
       -
             name = "CVE-2018-14348.patch";

     

       17
       -
             url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5";

     

       18
       -
             sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5";

     

       19
       -
           })

     

       20
       -
         ];

     

       21
        
       

     

       22
        
         postPatch = ''

     

       23
       -
           substituteInPlace src/tools/Makefile.in \

     

       24
        
             --replace 'chmod u+s' 'chmod +x'

     

       25
        
         '';

     

       26

···

       1
       +
       { lib, stdenv, fetchFromGitHub, pam, bison, flex, autoreconfHook }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "libcgroup";

     

       5
       +
         version = "0.42.2";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = pname;

     

       9
       +
           repo = pname;

     

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

     

       11
       +
           sha256 = "1h8s70lm6g7r0wj7j3xgj2g3j9fifvsy2pna6w0j3i5hh42qfms4";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ pam bison flex ];

     

       15
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
        
         postPatch = ''

     

       18
       +
           substituteInPlace src/tools/Makefile.am \

     

       19
        
             --replace 'chmod u+s' 'chmod +x'

     

       20
        
         '';

     

       21

+1 -1

pkgs/os-specific/linux/xpadneo/default.nix

···

       33
        
           description = "Advanced Linux driver for Xbox One wireless controllers";

     

       34
        
           homepage = "https://atar-axis.github.io/xpadneo";

     

       35
        
           license = licenses.gpl3Plus;

     

       36
       -
           maintainers = with maintainers; [ metadark ];

     

       37
        
           platforms = platforms.linux;

     

       38
        
         };

     

       39
        
       }

···

       33
        
           description = "Advanced Linux driver for Xbox One wireless controllers";

     

       34
        
           homepage = "https://atar-axis.github.io/xpadneo";

     

       35
        
           license = licenses.gpl3Plus;

     

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

     

       37
        
           platforms = platforms.linux;

     

       38
        
         };

     

       39
        
       }

+2 -2

pkgs/servers/nosql/influxdb/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "influxdb";

     

       5
       -
         version = "1.8.5";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "influxdata";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-qKkCTsSUejqJhMzAgFJYMGalAUepUaP/caocRwnKflg=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-t7uwrsrF4LYdRjOhwdsCouDJXvD9364Ma5gvKezvi5o=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "influxdb";

     

       5
       +
         version = "1.8.6";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "influxdata";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-v58druwTVeUOItbBUNr8lNsFlam9v0sxXlTeHlM0g6A=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-t7uwrsrF4LYdRjOhwdsCouDJXvD9364Ma5gvKezvi5o=";

+2 -2

pkgs/servers/osrm-backend/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "osrm-backend";

     

       5
       -
         version = "5.24.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner  = "Project-OSRM";

     

       9
        
           repo   = "osrm-backend";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-Srqe6XIF9Fs869Dp25+63ikgO7YlyT0IUJr0qMxunao=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ cmake pkg-config ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "osrm-backend";

     

       5
       +
         version = "5.25.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner  = "Project-OSRM";

     

       9
        
           repo   = "osrm-backend";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-wmhm3q93HTv4+VMlF9rhms4uw4LJBozOKTtHpDgAbrU=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ cmake pkg-config ];

+3 -10

pkgs/servers/pinnwand/default.nix

···

       7
        
       

     

       8
        
       with python3.pkgs; buildPythonApplication rec {

     

       9
        
         pname = "pinnwand";

     

       10
       -
         version = "1.2.3";

     

       11
        
         format = "pyproject";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "supakeen";

     

       15
        
           repo = pname;

     

       16
        
           rev = "v${version}";

     

       17
       -
           sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh";

     

       18
        
         };

     

       19
        
       

     

       20
       -
         patches = [

     

       21
       -
           (fetchpatch {

     

       22
       -
             # https://github.com/supakeen/pinnwand/issues/110

     

       23
       -
             url = "https://github.com/supakeen/pinnwand/commit/b9e72abb7f25104f5e57248294ed9ae1dbc87240.patch";

     

       24
       -
             sha256 = "098acif9ck165398bp7vwfr9g7sj9q3pcdc42z5y63m1nbf8naan";

     

       25
       -
           })

     

       26
       -
         ];

     

       27
       -
       

     

       28
        
         nativeBuildInputs = [

     

       29
        
           poetry-core

     

       30
        
         ];

     
···

       35
        
           pygments

     

       36
        
           pygments-better-html

     

       37
        
           sqlalchemy

     

       0
        
       
     

       38
        
           toml

     

       39
        
           tornado

     

       40
        
         ];

···

       7
        
       

     

       8
        
       with python3.pkgs; buildPythonApplication rec {

     

       9
        
         pname = "pinnwand";

     

       10
       +
         version = "1.3.0";

     

       11
        
         format = "pyproject";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "supakeen";

     

       15
        
           repo = pname;

     

       16
        
           rev = "v${version}";

     

       17
       +
           sha256 = "046xk2y59wa0pdp7s3hp1gh8sqdw0yl4xab22r2x44iwwcyb0gy5";

     

       18
        
         };

     

       19
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
         nativeBuildInputs = [

     

       21
        
           poetry-core

     

       22
        
         ];

     
···

       27
        
           pygments

     

       28
        
           pygments-better-html

     

       29
        
           sqlalchemy

     

       30
       +
           token-bucket

     

       31
        
           toml

     

       32
        
           tornado

     

       33
        
         ];

+6

pkgs/servers/reproxy/default.nix

···

       15
        
           # Requires network access

     

       16
        
           substituteInPlace app/main_test.go \

     

       17
        
             --replace "Test_Main" "Skip_Main"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
         '';

     

       19
        
       

     

       20
        
         vendorSha256 = null;

···

       15
        
           # Requires network access

     

       16
        
           substituteInPlace app/main_test.go \

     

       17
        
             --replace "Test_Main" "Skip_Main"

     

       18
       +
       

     

       19
       +
           # Fails on Darwin.

     

       20
       +
           # https://github.com/umputun/reproxy/issues/77

     

       21
       +
           substituteInPlace app/discovery/provider/file_test.go \

     

       22
       +
             --replace "TestFile_Events" "SkipFile_Events" \

     

       23
       +
             --replace "TestFile_Events_BusyListener" "SkipFile_Events_BusyListener"

     

       24
        
         '';

     

       25
        
       

     

       26
        
         vendorSha256 = null;

+2 -2

pkgs/servers/rippled/default.nix

···

       32
        
         nudb = fetchgit rec {

     

       33
        
           url = "https://github.com/CPPAlliance/NuDB.git";

     

       34
        
           rev = "2.0.5";

     

       35
       -
           sha256 = "02zbd07qvdjjsm4ivvhxah5n466bncvm6m03vmq0qdbbrlnp6s37";

     

       36
        
           leaveDotGit = true;

     

       37
        
           fetchSubmodules = true;

     

       38
        
           postFetch = "cd $out && git tag ${rev}";

     
···

       41
        
         rocksdb = fetchgit rec {

     

       42
        
           url = "https://github.com/facebook/rocksdb.git";

     

       43
        
           rev = "v6.7.3";

     

       44
       -
           sha256 = "16qb636qs2yxqmz30hmvq8mllf038s80p37b0vyc0bazwlr93d9z";

     

       45
        
           deepClone = true;

     

       46
        
           fetchSubmodules = false;

     

       47
        
           leaveDotGit = true;

···

       32
        
         nudb = fetchgit rec {

     

       33
        
           url = "https://github.com/CPPAlliance/NuDB.git";

     

       34
        
           rev = "2.0.5";

     

       35
       +
           sha256 = "07dwvglhyzpqnhzd33a2vs80wrdxy55a3sirnd739xp1k5v8s2fx";

     

       36
        
           leaveDotGit = true;

     

       37
        
           fetchSubmodules = true;

     

       38
        
           postFetch = "cd $out && git tag ${rev}";

     
···

       41
        
         rocksdb = fetchgit rec {

     

       42
        
           url = "https://github.com/facebook/rocksdb.git";

     

       43
        
           rev = "v6.7.3";

     

       44
       +
           sha256 = "0dzn5jg3i2mnnjj24dn9lzi3aajj5ga2akjf64lybyj481lq445k";

     

       45
        
           deepClone = true;

     

       46
        
           fetchSubmodules = false;

     

       47
        
           leaveDotGit = true;

+1 -1

pkgs/shells/bash/undistract-me/default.nix

···

       74
        
           description = "Notifies you when long-running terminal commands complete";

     

       75
        
           homepage = "https://github.com/jml/undistract-me";

     

       76
        
           license = licenses.mit;

     

       77
       -
           maintainers = with maintainers; [ metadark ];

     

       78
        
         };

     

       79
        
       }

···

       74
        
           description = "Notifies you when long-running terminal commands complete";

     

       75
        
           homepage = "https://github.com/jml/undistract-me";

     

       76
        
           license = licenses.mit;

     

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

     

       78
        
         };

     

       79
        
       }

+19 -9

pkgs/tools/X11/xpra/default.nix

···

       1
       -
       { lib, fetchurl, substituteAll, python3, pkg-config, writeText

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc

     

       3
        
       , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which

     

       4
       -
       , ffmpeg, x264, libvpx, libwebp, x265

     

       5
        
       , libfakeXinerama

     

       6
        
       , gst_all_1, pulseaudio, gobject-introspection

     

       7
        
       , pam }:

     
···

       33
        
       

     

       34
        
       in buildPythonApplication rec {

     

       35
        
         pname = "xpra";

     

       36
       -
         version = "4.1.3";

     

       37
        
       

     

       38
        
         src = fetchurl {

     

       39
        
           url = "https://xpra.org/src/${pname}-${version}.tar.gz";

     

       40
       -
           sha256 = "TesmPRmfWy+IqqxoNFd04oX/b2ryGreZPeh2r4sL8JQ=";

     

       41
        
         };

     

       42
        
       

     

       43
        
         patches = [

     

       44
        
           (substituteAll {  # correct hardcoded paths

     

       45
        
             src = ./fix-paths.patch;

     

       46
       -
             inherit (xorg) xkeyboardconfig;

     

       47
        
             inherit libfakeXinerama;

     

       48
        
           })

     

       49
        
           ./fix-41106.patch  # https://github.com/NixOS/nixpkgs/issues/41106

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
         ];

     

       51
        
       

     

       52
        
         postPatch = ''

     
···

       60
        
           libXrandr libxkbfile

     

       61
        
           ] ++ [

     

       62
        
           cython

     

       0
        
       
     

       63
        
       

     

       64
        
           pango cairo gdk-pixbuf atk.out gtk3 glib

     

       65
        
       

     
···

       78
        
           pillow rencode pycrypto cryptography pycups lz4 dbus-python

     

       79
        
           netifaces numpy pygobject3 pycairo gst-python pam

     

       80
        
           pyopengl paramiko opencv4 python-uinput pyxdg

     

       81
       -
           ipaddress idna

     

       82
        
         ];

     

       83
        
       

     

       84
        
           # error: 'import_cairo' defined but not used

     
···

       86
        
       

     

       87
        
         setupPyBuildFlags = [

     

       88
        
           "--with-Xdummy"

     

       0
        
       
     

       89
        
           "--without-strict"

     

       90
        
           "--with-gtk3"

     

       91
        
           # Override these, setup.py checks for headers in /usr/* paths

     
···

       99
        
             "''${gappsWrapperArgs[@]}"

     

       100
        
             --set XPRA_INSTALL_PREFIX "$out"

     

       101
        
             --set XPRA_COMMAND "$out/bin/xpra"

     

       0
        
       
     

       102
        
             --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib

     

       103
        
             --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}

     

       104
        
           )

     
···

       119
        
         };

     

       120
        
       

     

       121
        
         meta = {

     

       122
       -
           homepage = "http://xpra.org/";

     

       123
        
           downloadPage = "https://xpra.org/src/";

     

       124
       -
           downloadURLRegexp = "xpra-.*[.]tar[.]xz$";

     

       125
        
           description = "Persistent remote applications for X";

     

       126
        
           platforms = platforms.linux;

     

       127
        
           license = licenses.gpl2;

     

       128
       -
           maintainers = with maintainers; [ tstrobel offline numinit ];

     

       129
        
         };

     

       130
        
       }

···

       1
       +
       { lib

     

       2
       +
       , fetchurl

     

       3
       +
       , fetchpatch

     

       4
       +
       , substituteAll, python3, pkg-config, writeText

     

       5
        
       , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc

     

       6
        
       , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which

     

       7
       +
       , ffmpeg, x264, libvpx, libwebp, x265, librsvg

     

       8
        
       , libfakeXinerama

     

       9
        
       , gst_all_1, pulseaudio, gobject-introspection

     

       10
        
       , pam }:

     
···

       36
        
       

     

       37
        
       in buildPythonApplication rec {

     

       38
        
         pname = "xpra";

     

       39
       +
         version = "4.2";

     

       40
        
       

     

       41
        
         src = fetchurl {

     

       42
        
           url = "https://xpra.org/src/${pname}-${version}.tar.gz";

     

       43
       +
           hash = "sha256-KkQw4FJeH4G5jZ4GdP3aXZ3zxu4GALbiOI6POKJW6fk=";

     

       44
        
         };

     

       45
        
       

     

       46
        
         patches = [

     

       47
        
           (substituteAll {  # correct hardcoded paths

     

       48
        
             src = ./fix-paths.patch;

     

       0
        
       
     

       49
        
             inherit libfakeXinerama;

     

       50
        
           })

     

       51
        
           ./fix-41106.patch  # https://github.com/NixOS/nixpkgs/issues/41106

     

       52
       +
           # Xorg won't start without. Remove on next version!

     

       53
       +
           (fetchpatch {

     

       54
       +
             url = "https://github.com/Xpra-org/xpra/commit/f9f242abad69363dfa558e1f6f7956ae99164b67.patch";

     

       55
       +
             sha256 = "sha256-TOP9RuXPuqxyKY/7LSSrCWnAmJstEE+D5EwjMiVmchM=";

     

       56
       +
           })

     

       57
        
         ];

     

       58
        
       

     

       59
        
         postPatch = ''

     
···

       67
        
           libXrandr libxkbfile

     

       68
        
           ] ++ [

     

       69
        
           cython

     

       70
       +
           librsvg

     

       71
        
       

     

       72
        
           pango cairo gdk-pixbuf atk.out gtk3 glib

     

       73
        
       

     
···

       86
        
           pillow rencode pycrypto cryptography pycups lz4 dbus-python

     

       87
        
           netifaces numpy pygobject3 pycairo gst-python pam

     

       88
        
           pyopengl paramiko opencv4 python-uinput pyxdg

     

       89
       +
           ipaddress idna pyinotify

     

       90
        
         ];

     

       91
        
       

     

       92
        
           # error: 'import_cairo' defined but not used

     
···

       94
        
       

     

       95
        
         setupPyBuildFlags = [

     

       96
        
           "--with-Xdummy"

     

       97
       +
           "--without-Xdummy_wrapper"

     

       98
        
           "--without-strict"

     

       99
        
           "--with-gtk3"

     

       100
        
           # Override these, setup.py checks for headers in /usr/* paths

     
···

       108
        
             "''${gappsWrapperArgs[@]}"

     

       109
        
             --set XPRA_INSTALL_PREFIX "$out"

     

       110
        
             --set XPRA_COMMAND "$out/bin/xpra"

     

       111
       +
             --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb"

     

       112
        
             --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib

     

       113
        
             --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}

     

       114
        
           )

     
···

       129
        
         };

     

       130
        
       

     

       131
        
         meta = {

     

       132
       +
           homepage = "https://xpra.org/";

     

       133
        
           downloadPage = "https://xpra.org/src/";

     

       134
       +
           downloadURLRegexp = "xpra-.*[.]tar[.][gx]z$";

     

       135
        
           description = "Persistent remote applications for X";

     

       136
        
           platforms = platforms.linux;

     

       137
        
           license = licenses.gpl2;

     

       138
       +
           maintainers = with maintainers; [ tstrobel offline numinit mvnetbiz ];

     

       139
        
         };

     

       140
        
       }

-13

pkgs/tools/X11/xpra/fix-paths.patch

···

       16
        
                    f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS)

     

       17
        
            cython_add(Extension("xpra.codecs.v4l2.pusher",

     

       18
        
            

     

       19
       -
       diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx

     

       20
       -
       index bd7023d..064c6b5 100644

     

       21
       -
       --- a/xpra/x11/bindings/keyboard_bindings.pyx

     

       22
       -
       +++ b/xpra/x11/bindings/keyboard_bindings.pyx

     

       23
       -
       @@ -21,7 +21,7 @@ from libc.stdlib cimport free, malloc

     

       24
       -
       

     

       25
       -
        DEF PATH_MAX = 1024

     

       26
       -
        DEF DFLT_XKB_RULES_FILE = b"base"

     

       27
       -
       -DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"

     

       28
       -
       +DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"

     

       29
       -
       

     

       30
       -
        ###################################

     

       31
       -
        # Headers, python magic

     

       32
        
       diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py

     

       33
        
       index c867258..617af7c 100755

     

       34
        
       --- a/xpra/x11/fakeXinerama.py

···

       16
        
                    f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS)

     

       17
        
            cython_add(Extension("xpra.codecs.v4l2.pusher",

     

       18
        
            

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py

     

       20
        
       index c867258..617af7c 100755

     

       21
        
       --- a/xpra/x11/fakeXinerama.py

+5

pkgs/tools/audio/botamusique/default.nix

···

       5
        
       , python3Packages

     

       6
        
       , ffmpeg

     

       7
        
       , makeWrapper

     

       0
        
       
     

       8
        
       

     

       9
        
       # For the update script

     

       10
        
       , coreutils

     
···

       139
        
             --composition /dev/null \

     

       140
        
             --output ${toString ./node-packages.nix}

     

       141
        
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       142
        
       

     

       143
        
         meta = with lib; {

     

       144
        
           description = "Bot to play youtube / soundcloud / radio / local music on Mumble";

···

       5
        
       , python3Packages

     

       6
        
       , ffmpeg

     

       7
        
       , makeWrapper

     

       8
       +
       , nixosTests

     

       9
        
       

     

       10
        
       # For the update script

     

       11
        
       , coreutils

     
···

       140
        
             --composition /dev/null \

     

       141
        
             --output ${toString ./node-packages.nix}

     

       142
        
         '';

     

       143
       +
       

     

       144
       +
         passthru.tests = {

     

       145
       +
           inherit (nixosTests) botamusique;

     

       146
       +
         };

     

       147
        
       

     

       148
        
         meta = with lib; {

     

       149
        
           description = "Bot to play youtube / soundcloud / radio / local music on Mumble";

+26 -36

pkgs/tools/audio/botamusique/node-packages.nix

···

       1624
        
               sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";

     

       1625
        
             };

     

       1626
        
           };

     

       1627
       -
           "colorette-1.2.1" = {

     

       1628
        
             name = "colorette";

     

       1629
        
             packageName = "colorette";

     

       1630
       -
             version = "1.2.1";

     

       1631
        
             src = fetchurl {

     

       1632
       -
               url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";

     

       1633
       -
               sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";

     

       1634
        
             };

     

       1635
        
           };

     

       1636
        
           "command-line-usage-6.1.1" = {

     
···

       2497
        
               sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";

     

       2498
        
             };

     

       2499
        
           };

     

       2500
       -
           "hosted-git-info-2.8.8" = {

     

       2501
        
             name = "hosted-git-info";

     

       2502
        
             packageName = "hosted-git-info";

     

       2503
       -
             version = "2.8.8";

     

       2504
        
             src = fetchurl {

     

       2505
       -
               url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";

     

       2506
       -
               sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";

     

       2507
        
             };

     

       2508
        
           };

     

       2509
        
           "html-minifier-terser-5.1.1" = {

     
···

       2992
        
               sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";

     

       2993
        
             };

     

       2994
        
           };

     

       2995
       -
           "lodash-4.17.20" = {

     

       2996
        
             name = "lodash";

     

       2997
        
             packageName = "lodash";

     

       2998
       -
             version = "4.17.20";

     

       2999
        
             src = fetchurl {

     

       3000
       -
               url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";

     

       3001
       -
               sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";

     

       3002
        
             };

     

       3003
        
           };

     

       3004
        
           "lower-case-2.0.1" = {

     
···

       3109
        
               sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";

     

       3110
        
             };

     

       3111
        
           };

     

       3112
       -
           "nanoid-3.1.18" = {

     

       3113
        
             name = "nanoid";

     

       3114
        
             packageName = "nanoid";

     

       3115
       -
             version = "3.1.18";

     

       3116
        
             src = fetchurl {

     

       3117
       -
               url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";

     

       3118
       -
               sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";

     

       3119
        
             };

     

       3120
        
           };

     

       3121
        
           "natural-compare-1.4.0" = {

     
···

       3523
        
               sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==";

     

       3524
        
             };

     

       3525
        
           };

     

       3526
       -
           "postcss-8.1.10" = {

     

       3527
        
             name = "postcss";

     

       3528
        
             packageName = "postcss";

     

       3529
       -
             version = "8.1.10";

     

       3530
        
             src = fetchurl {

     

       3531
       -
               url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";

     

       3532
       -
               sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";

     

       3533
        
             };

     

       3534
        
           };

     

       3535
        
           "postcss-loader-4.1.0" = {

     
···

       4414
        
               sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";

     

       4415
        
             };

     

       4416
        
           };

     

       4417
       -
           "vfile-location-3.2.0" = {

     

       4418
       -
             name = "vfile-location";

     

       4419
       -
             packageName = "vfile-location";

     

       4420
       -
             version = "3.2.0";

     

       4421
       -
             src = fetchurl {

     

       4422
       -
               url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";

     

       4423
       -
               sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";

     

       4424
       -
             };

     

       4425
       -
           };

     

       4426
        
           "watchpack-2.0.1" = {

     

       4427
        
             name = "watchpack";

     

       4428
        
             packageName = "watchpack";

     
···

       4536
        
           name = "botamusique";

     

       4537
        
           packageName = "botamusique";

     

       4538
        
           version = "0.0.0";

     

       4539
       -
           src = ../../../../../../../../run/user/1000/tmp.ioJA7NbZmp;

     

       4540
        
           dependencies = [

     

       4541
        
             sources."@babel/code-frame-7.10.4"

     

       4542
        
             sources."@babel/compat-data-7.12.7"

     
···

       4735
        
             })

     

       4736
        
             sources."color-convert-1.9.3"

     

       4737
        
             sources."color-name-1.1.3"

     

       4738
       -
             sources."colorette-1.2.1"

     

       4739
        
             sources."command-line-usage-6.1.1"

     

       4740
        
             sources."commander-4.1.1"

     

       4741
        
             sources."comment-parser-0.7.6"

     
···

       4886
        
             sources."has-flag-3.0.0"

     

       4887
        
             sources."has-symbols-1.0.1"

     

       4888
        
             sources."he-1.2.0"

     

       4889
       -
             sources."hosted-git-info-2.8.8"

     

       4890
        
             sources."html-minifier-terser-5.1.1"

     

       4891
        
             sources."html-webpack-plugin-4.5.0"

     

       4892
        
             (sources."htmlparser2-3.10.1" // {

     
···

       4964
        
               ];

     

       4965
        
             })

     

       4966
        
             sources."locate-path-2.0.0"

     

       4967
       -
             sources."lodash-4.17.20"

     

       4968
        
             sources."lower-case-2.0.1"

     

       4969
        
             sources."make-dir-2.1.0"

     

       4970
        
             sources."merge-stream-2.0.0"

     
···

       4981
        
             sources."minimist-1.2.5"

     

       4982
        
             sources."mkdirp-0.5.5"

     

       4983
        
             sources."ms-2.1.2"

     

       4984
       -
             sources."nanoid-3.1.18"

     

       4985
        
             sources."natural-compare-1.4.0"

     

       4986
        
             sources."neo-async-2.6.2"

     

       4987
        
             sources."no-case-3.0.3"

     
···

       5024
        
             sources."pify-4.0.1"

     

       5025
        
             sources."pkg-dir-2.0.0"

     

       5026
        
             sources."popper.js-1.16.1"

     

       5027
       -
             (sources."postcss-8.1.10" // {

     

       5028
        
               dependencies = [

     

       5029
        
                 sources."source-map-0.6.1"

     

       5030
        
               ];

     
···

       5179
        
             sources."utila-0.4.0"

     

       5180
        
             sources."v8-compile-cache-2.2.0"

     

       5181
        
             sources."validate-npm-package-license-3.0.4"

     

       5182
       -
             sources."vfile-location-3.2.0"

     

       5183
        
             sources."watchpack-2.0.1"

     

       5184
        
             (sources."webpack-5.6.0" // {

     

       5185
        
               dependencies = [

···

       1624
        
               sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";

     

       1625
        
             };

     

       1626
        
           };

     

       1627
       +
           "colorette-1.2.2" = {

     

       1628
        
             name = "colorette";

     

       1629
        
             packageName = "colorette";

     

       1630
       +
             version = "1.2.2";

     

       1631
        
             src = fetchurl {

     

       1632
       +
               url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz";

     

       1633
       +
               sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==";

     

       1634
        
             };

     

       1635
        
           };

     

       1636
        
           "command-line-usage-6.1.1" = {

     
···

       2497
        
               sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";

     

       2498
        
             };

     

       2499
        
           };

     

       2500
       +
           "hosted-git-info-2.8.9" = {

     

       2501
        
             name = "hosted-git-info";

     

       2502
        
             packageName = "hosted-git-info";

     

       2503
       +
             version = "2.8.9";

     

       2504
        
             src = fetchurl {

     

       2505
       +
               url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz";

     

       2506
       +
               sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==";

     

       2507
        
             };

     

       2508
        
           };

     

       2509
        
           "html-minifier-terser-5.1.1" = {

     
···

       2992
        
               sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";

     

       2993
        
             };

     

       2994
        
           };

     

       2995
       +
           "lodash-4.17.21" = {

     

       2996
        
             name = "lodash";

     

       2997
        
             packageName = "lodash";

     

       2998
       +
             version = "4.17.21";

     

       2999
        
             src = fetchurl {

     

       3000
       +
               url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz";

     

       3001
       +
               sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";

     

       3002
        
             };

     

       3003
        
           };

     

       3004
        
           "lower-case-2.0.1" = {

     
···

       3109
        
               sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";

     

       3110
        
             };

     

       3111
        
           };

     

       3112
       +
           "nanoid-3.1.23" = {

     

       3113
        
             name = "nanoid";

     

       3114
        
             packageName = "nanoid";

     

       3115
       +
             version = "3.1.23";

     

       3116
        
             src = fetchurl {

     

       3117
       +
               url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz";

     

       3118
       +
               sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==";

     

       3119
        
             };

     

       3120
        
           };

     

       3121
        
           "natural-compare-1.4.0" = {

     
···

       3523
        
               sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==";

     

       3524
        
             };

     

       3525
        
           };

     

       3526
       +
           "postcss-8.2.15" = {

     

       3527
        
             name = "postcss";

     

       3528
        
             packageName = "postcss";

     

       3529
       +
             version = "8.2.15";

     

       3530
        
             src = fetchurl {

     

       3531
       +
               url = "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz";

     

       3532
       +
               sha512 = "2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==";

     

       3533
        
             };

     

       3534
        
           };

     

       3535
        
           "postcss-loader-4.1.0" = {

     
···

       4414
        
               sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";

     

       4415
        
             };

     

       4416
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4417
        
           "watchpack-2.0.1" = {

     

       4418
        
             name = "watchpack";

     

       4419
        
             packageName = "watchpack";

     
···

       4527
        
           name = "botamusique";

     

       4528
        
           packageName = "botamusique";

     

       4529
        
           version = "0.0.0";

     

       4530
       +
           src = ../../../../../../../../../tmp/tmp.hWY9btrx5g;

     

       4531
        
           dependencies = [

     

       4532
        
             sources."@babel/code-frame-7.10.4"

     

       4533
        
             sources."@babel/compat-data-7.12.7"

     
···

       4726
        
             })

     

       4727
        
             sources."color-convert-1.9.3"

     

       4728
        
             sources."color-name-1.1.3"

     

       4729
       +
             sources."colorette-1.2.2"

     

       4730
        
             sources."command-line-usage-6.1.1"

     

       4731
        
             sources."commander-4.1.1"

     

       4732
        
             sources."comment-parser-0.7.6"

     
···

       4877
        
             sources."has-flag-3.0.0"

     

       4878
        
             sources."has-symbols-1.0.1"

     

       4879
        
             sources."he-1.2.0"

     

       4880
       +
             sources."hosted-git-info-2.8.9"

     

       4881
        
             sources."html-minifier-terser-5.1.1"

     

       4882
        
             sources."html-webpack-plugin-4.5.0"

     

       4883
        
             (sources."htmlparser2-3.10.1" // {

     
···

       4955
        
               ];

     

       4956
        
             })

     

       4957
        
             sources."locate-path-2.0.0"

     

       4958
       +
             sources."lodash-4.17.21"

     

       4959
        
             sources."lower-case-2.0.1"

     

       4960
        
             sources."make-dir-2.1.0"

     

       4961
        
             sources."merge-stream-2.0.0"

     
···

       4972
        
             sources."minimist-1.2.5"

     

       4973
        
             sources."mkdirp-0.5.5"

     

       4974
        
             sources."ms-2.1.2"

     

       4975
       +
             sources."nanoid-3.1.23"

     

       4976
        
             sources."natural-compare-1.4.0"

     

       4977
        
             sources."neo-async-2.6.2"

     

       4978
        
             sources."no-case-3.0.3"

     
···

       5015
        
             sources."pify-4.0.1"

     

       5016
        
             sources."pkg-dir-2.0.0"

     

       5017
        
             sources."popper.js-1.16.1"

     

       5018
       +
             (sources."postcss-8.2.15" // {

     

       5019
        
               dependencies = [

     

       5020
        
                 sources."source-map-0.6.1"

     

       5021
        
               ];

     
···

       5170
        
             sources."utila-0.4.0"

     

       5171
        
             sources."v8-compile-cache-2.2.0"

     

       5172
        
             sources."validate-npm-package-license-3.0.4"

     

       0
        
       
     

       5173
        
             sources."watchpack-2.0.1"

     

       5174
        
             (sources."webpack-5.6.0" // {

     

       5175
        
               dependencies = [

+4 -4

pkgs/tools/audio/botamusique/src.json

···

       1
        
       {

     

       2
        
         "url": "https://github.com/azlux/botamusique",

     

       3
       -
         "rev": "df38c7dbd6d59c6790cf2364d1f344b7f6f72107",

     

       4
       -
         "date": "2021-03-13T15:44:40+08:00",

     

       5
       -
         "path": "/nix/store/30ds4gp7aldj9rqix1xf7j2ps5blrx8w-botamusique",

     

       6
       -
         "sha256": "06xw1pif145zcm9z8l9kzl8ayl7vy5ywr0m3a5yswybcp2fzj087",

     

       7
        
         "fetchSubmodules": false,

     

       8
        
         "deepClone": false,

     

       9
        
         "leaveDotGit": false

···

       1
        
       {

     

       2
        
         "url": "https://github.com/azlux/botamusique",

     

       3
       +
         "rev": "33a9e75ba9d0a382f7a76d23a0ceb626924a8b49",

     

       4
       +
         "date": "2021-05-19T22:37:39+08:00",

     

       5
       +
         "path": "/nix/store/dqc2vjd43cixm49w8g66wvi9zmdfwsdd-botamusique",

     

       6
       +
         "sha256": "18lbgslx9vdwd5nrbkqfjvzaikp2swvv375v9gql7cg8p46w7i11",

     

       7
        
         "fetchSubmodules": false,

     

       8
        
         "deepClone": false,

     

       9
        
         "leaveDotGit": false

+1 -1

pkgs/tools/audio/yabridge/default.nix

···

       149
        
           description = "Yet Another VST bridge, run Windows VST2 plugins under Linux";

     

       150
        
           homepage = "https://github.com/robbert-vdh/yabridge";

     

       151
        
           license = licenses.gpl3Plus;

     

       152
       -
           maintainers = with maintainers; [ metadark ];

     

       153
        
           platforms = [ "x86_64-linux" ];

     

       154
        
         };

     

       155
        
       }

···

       149
        
           description = "Yet Another VST bridge, run Windows VST2 plugins under Linux";

     

       150
        
           homepage = "https://github.com/robbert-vdh/yabridge";

     

       151
        
           license = licenses.gpl3Plus;

     

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

     

       153
        
           platforms = [ "x86_64-linux" ];

     

       154
        
         };

     

       155
        
       }

+1 -1

pkgs/tools/audio/yabridgectl/default.nix

···

       33
        
           description = "A small, optional utility to help set up and update yabridge for several directories at once";

     

       34
        
           homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl";

     

       35
        
           license = licenses.gpl3Plus;

     

       36
       -
           maintainers = with maintainers; [ metadark ];

     

       37
        
         };

     

       38
        
       }

···

       33
        
           description = "A small, optional utility to help set up and update yabridge for several directories at once";

     

       34
        
           homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl";

     

       35
        
           license = licenses.gpl3Plus;

     

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

     

       37
        
         };

     

       38
        
       }

+2 -2

pkgs/tools/filesystems/ceph/default.nix

···

       131
        
         ]);

     

       132
        
         sitePackages = ceph-python-env.python.sitePackages;

     

       133
        
       

     

       134
       -
         version = "16.2.1";

     

       135
        
         src = fetchurl {

     

       136
        
           url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";

     

       137
       -
           sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh";

     

       138
        
         };

     

       139
        
       in rec {

     

       140
        
         ceph = stdenv.mkDerivation {

···

       131
        
         ]);

     

       132
        
         sitePackages = ceph-python-env.python.sitePackages;

     

       133
        
       

     

       134
       +
         version = "16.2.3";

     

       135
        
         src = fetchurl {

     

       136
        
           url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";

     

       137
       +
           sha256 = "sha256-K3T1Lob19p8ykYEmYumHS8hqj2uysCuE0EAKb1TMJ0Q=";

     

       138
        
         };

     

       139
        
       in rec {

     

       140
        
         ceph = stdenv.mkDerivation {

+2 -2

pkgs/tools/graphics/ldgallery/default.nix

···

       1
       -
       { lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       with haskell.lib;

     

       5
        
       

     

       6
        
       let

     

       7
       -
         ldgallery-viewer = pkgs.callPackage ./viewer { };

     

       8
        
         inherit (haskellPackages) ldgallery-compiler;

     

       9
        
       

     

       10
        
       in

···

       1
       +
       { lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       with haskell.lib;

     

       5
        
       

     

       6
        
       let

     

       7
       +
         ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; };

     

       8
        
         inherit (haskellPackages) ldgallery-compiler;

     

       9
        
       

     

       10
        
       in

+2 -1

pkgs/tools/graphics/ldgallery/viewer/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     
···

       24
        
         nodePkg = nodePackages.package.override {

     

       25
        
           src = "${sourcePkg}/viewer";

     

       26
        
           postInstall = "npm run build";

     

       0
        
       
     

       27
        
         };

     

       28
        
       

     

       29
        
       in

···

       1
       +
       { lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     
···

       24
        
         nodePkg = nodePackages.package.override {

     

       25
        
           src = "${sourcePkg}/viewer";

     

       26
        
           postInstall = "npm run build";

     

       27
       +
           buildInputs = optionals stdenv.isDarwin [ CoreServices ];

     

       28
        
         };

     

       29
        
       

     

       30
        
       in

+1 -1

pkgs/tools/graphics/mangohud/default.nix

···

       120
        
           homepage = "https://github.com/flightlessmango/MangoHud";

     

       121
        
           platforms = platforms.linux;

     

       122
        
           license = licenses.mit;

     

       123
       -
           maintainers = with maintainers; [ metadark zeratax ];

     

       124
        
         };

     

       125
        
       }

···

       120
        
           homepage = "https://github.com/flightlessmango/MangoHud";

     

       121
        
           platforms = platforms.linux;

     

       122
        
           license = licenses.mit;

     

       123
       +
           maintainers = with maintainers; [ kira-bruneau zeratax ];

     

       124
        
         };

     

       125
        
       }

+1 -1

pkgs/tools/graphics/vkBasalt/default.nix

···

       36
        
           description = "A Vulkan post processing layer for Linux";

     

       37
        
           homepage = "https://github.com/DadSchoorse/vkBasalt";

     

       38
        
           license = licenses.zlib;

     

       39
       -
           maintainers = with maintainers; [ metadark ];

     

       40
        
           platforms = platforms.linux;

     

       41
        
         };

     

       42
        
       }

···

       36
        
           description = "A Vulkan post processing layer for Linux";

     

       37
        
           homepage = "https://github.com/DadSchoorse/vkBasalt";

     

       38
        
           license = licenses.zlib;

     

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

     

       40
        
           platforms = platforms.linux;

     

       41
        
         };

     

       42
        
       }

+29

pkgs/tools/misc/bfetch/default.nix

···

       1
       +
       { lib, stdenvNoCC, fetchFromGitHub, bash }:

     

       2
       +
       

     

       3
       +
       stdenvNoCC.mkDerivation rec {

     

       4
       +
         pname = "bfetch";

     

       5
       +
         version = "unstable-2021-05-21";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "NNBnh";

     

       9
       +
           repo = pname;

     

       10
       +
           rev = "ef88e9d3f815e5074efc8ef4b7f32be6818130f2";

     

       11
       +
           sha256 = "sha256-jS9zI8b+z3KbI+LeHFwIMJfEmAKSzO8HRZ2rk35hJCk=";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         buildInputs = [ bash ];

     

       15
       +
       

     

       16
       +
         postPatch = ''

     

       17
       +
           patchShebangs --host bin/bfetch

     

       18
       +
         '';

     

       19
       +
       

     

       20
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       21
       +
       

     

       22
       +
         meta = with lib; {

     

       23
       +
           description = "A SuperB general-purpose fetch displayer written in portable sh";

     

       24
       +
           homepage = "https://github.com/NNBnh/bfetch";

     

       25
       +
           license = licenses.gpl3Only;

     

       26
       +
           platforms = platforms.all;

     

       27
       +
           maintainers = with maintainers; [ fortuneteller2k ];

     

       28
       +
         };

     

       29
       +
       }

+2 -2

pkgs/tools/misc/fzf/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "fzf";

     

       5
       -
         version = "0.27.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "junegunn";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "sha256-q0rAAD6du0WLcd46LUpkG3gBIvmtOE/foEMW5QCoIak=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "fzf";

     

       5
       +
         version = "0.27.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "junegunn";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "sha256-TMzyUhgOfcWXKhxy+2SeBy0mws/M+4YoitlPpYt6k9g=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw=";

-40

pkgs/tools/networking/openconnect_pa/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, pkg-config, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } :

     

       2
       -
       

     

       3
       -
       assert (openssl != null) == (gnutls == null);

     

       4
       -
       

     

       5
       -
       stdenv.mkDerivation {

     

       6
       -
         version = "unstable-2018-10-08";

     

       7
       -
         pname = "openconnect_pa";

     

       8
       -
       

     

       9
       -
         outputs = [ "out" "dev" ];

     

       10
       -
       

     

       11
       -
         src = fetchFromGitHub {

     

       12
       -
           owner = "dlenski";

     

       13
       -
           repo = "openconnect";

     

       14
       -
           rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b";

     

       15
       -
           sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";

     

       16
       -
         };

     

       17
       -
       

     

       18
       -
         preConfigure = ''

     

       19
       -
             export PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config

     

       20
       -
             export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"

     

       21
       -
             export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2"

     

       22
       -
         '';

     

       23
       -
       

     

       24
       -
         configureFlags = [

     

       25
       -
           "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"

     

       26
       -
           "--disable-nls"

     

       27
       -
           "--without-openssl-version-check"

     

       28
       -
         ];

     

       29
       -
       

     

       30
       -
         nativeBuildInputs = [ pkg-config autoreconfHook ];

     

       31
       -
         propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];

     

       32
       -
       

     

       33
       -
         meta = with lib; {

     

       34
       -
           description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN";

     

       35
       -
           homepage = "https://github.com/dlenski/openconnect/";

     

       36
       -
           license = licenses.lgpl21;

     

       37
       -
           maintainers = with maintainers; [ chessai ];

     

       38
       -
           platforms = platforms.linux;

     

       39
       -
         };

     

       40
       -
       }

+3 -3

pkgs/tools/networking/xh/default.nix

···

       3
        
       

     

       4
        
       rustPlatform.buildRustPackage rec {

     

       5
        
         pname = "xh";

     

       6
       -
         version = "0.9.2";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "ducaale";

     

       10
        
           repo = "xh";

     

       11
        
           rev = "v${version}";

     

       12
       -
           sha256 = "cOlya3ngIoaoqzh0fIbNAjwO7S7wZCQk7WVqgZona8A=";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         cargoSha256 = "sha256-jjC7G4JsLyj5LC29DBI996E+Ha/tVrcv7A95MmB7A08=";

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ pkg-config ];

     

       18

···

       3
        
       

     

       4
        
       rustPlatform.buildRustPackage rec {

     

       5
        
         pname = "xh";

     

       6
       +
         version = "0.10.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "ducaale";

     

       10
        
           repo = "xh";

     

       11
        
           rev = "v${version}";

     

       12
       +
           sha256 = "sha256-eOP9sc1qmQuc3HecNNZDMarVkXmEfGZkan0H9598LC0=";

     

       13
        
         };

     

       14
        
       

     

       15
       +
         cargoSha256 = "sha256-JXywHuZPQVhuWBVUNi9k8TwgE8KCNDtucjxxDi6unVM=";

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ pkg-config ];

     

       18

+1 -1

pkgs/tools/package-management/protontricks/default.nix

···

       50
        
           description = "A simple wrapper for running Winetricks commands for Proton-enabled games";

     

       51
        
           homepage = "https://github.com/Matoking/protontricks";

     

       52
        
           license = licenses.gpl3Only;

     

       53
       -
           maintainers = with maintainers; [ metadark ];

     

       54
        
           platforms = platforms.linux;

     

       55
        
         };

     

       56
        
       }

···

       50
        
           description = "A simple wrapper for running Winetricks commands for Proton-enabled games";

     

       51
        
           homepage = "https://github.com/Matoking/protontricks";

     

       52
        
           license = licenses.gpl3Only;

     

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

     

       54
        
           platforms = platforms.linux;

     

       55
        
         };

     

       56
        
       }

+41 -28

pkgs/tools/security/eid-mw/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub

     

       2
       -
       , autoreconfHook, pkg-config

     

       3
       -
       , gtk3, nssTools, pcsclite

     

       4
       -
       , libxml2, libproxy

     

       5
       -
       , openssl, curl

     

       0
        
       
     

       6
        
       , makeWrapper

     

       7
       -
       , substituteAll }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "eid-mw";

     

       11
       -
         version = "4.4.27";

     

       0
        
       
     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           rev = "v${version}";

     

       15
       -
           sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1";

     

       16
        
           repo = "eid-mw";

     

       17
        
           owner = "Fedict";

     

       18
        
         };

     

       19
        
       

     

       20
       -
         nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];

     

       21
       -
         buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];

     

       22
        
         preConfigure = ''

     

       23
        
           mkdir openssl

     

       24
        
           ln -s ${openssl.out}/lib openssl

     
···

       27
        
           export SSL_PREFIX=$(realpath openssl)

     

       28
        
           substituteInPlace plugins_tools/eid-viewer/Makefile.in \

     

       29
        
             --replace "c_rehash" "openssl rehash"

     

       30
       -
           '';

     

       0
        
       
     

       0
        
       
     

       31
        
       

     

       32
        
         postPatch = ''

     

       33
        
           sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac

     

       34
        
         '';

     

       35
       -
       

     

       36
       -
         configureFlags = [ "--enable-dialogs=yes" ];

     

       37
        
       

     

       38
        
         postInstall =

     

       39
       -
         let

     

       40
       -
           eid-nssdb-in = substituteAll {

     

       41
       -
             inherit (stdenv) shell;

     

       42
       -
             isExecutable = true;

     

       43
       -
             src = ./eid-nssdb.in;

     

       44
       -
           };

     

       45
       -
         in

     

       46
       -
         ''

     

       47
       -
           install -D ${eid-nssdb-in} $out/bin/eid-nssdb

     

       48
       -
           substituteInPlace $out/bin/eid-nssdb \

     

       49
       -
             --replace "modutil" "${nssTools}/bin/modutil"

     

       50
        
       

     

       51
       -
           rm $out/bin/about-eid-mw

     

       52
       -
           wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"

     

       53
       -
         '';

     

       54
        
       

     

       55
        
         enableParallelBuilding = true;

     

       56
        
       

     
···

       83
        
                 firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }

     

       84
        
           '';

     

       85
        
           platforms = platforms.linux;

     

       86
       -
           maintainers = with maintainers; [ bfortz ];

     

       87
        
         };

     

       88
        
       }

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , autoreconfHook

     

       5
       +
       , autoconf-archive

     

       6
       +
       , pkg-config

     

       7
        
       , makeWrapper

     

       8
       +
       , curl

     

       9
       +
       , gtk3

     

       10
       +
       , libassuan

     

       11
       +
       , libbsd

     

       12
       +
       , libproxy

     

       13
       +
       , libxml2

     

       14
       +
       , openssl

     

       15
       +
       , p11-kit

     

       16
       +
       , pcsclite

     

       17
       +
       , nssTools

     

       18
       +
       , substituteAll

     

       19
       +
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     

       22
        
         pname = "eid-mw";

     

       23
       +
         # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.

     

       24
       +
         version = "5.0.21";

     

       25
        
       

     

       26
        
         src = fetchFromGitHub {

     

       27
        
           rev = "v${version}";

     

       28
       +
           sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh";

     

       29
        
           repo = "eid-mw";

     

       30
        
           owner = "Fedict";

     

       31
        
         };

     

       32
        
       

     

       33
       +
         nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];

     

       34
       +
         buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ];

     

       35
        
         preConfigure = ''

     

       36
        
           mkdir openssl

     

       37
        
           ln -s ${openssl.out}/lib openssl

     
···

       40
        
           export SSL_PREFIX=$(realpath openssl)

     

       41
        
           substituteInPlace plugins_tools/eid-viewer/Makefile.in \

     

       42
        
             --replace "c_rehash" "openssl rehash"

     

       43
       +
         '';

     

       44
       +
         # pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.

     

       45
       +
         configureFlags = [ "--disable-pinentry" ];

     

       46
        
       

     

       47
        
         postPatch = ''

     

       48
        
           sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac

     

       49
        
         '';

     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
        
         postInstall =

     

       52
       +
           let

     

       53
       +
             eid-nssdb-in = substituteAll {

     

       54
       +
               inherit (stdenv) shell;

     

       55
       +
               isExecutable = true;

     

       56
       +
               src = ./eid-nssdb.in;

     

       57
       +
             };

     

       58
       +
           in

     

       59
       +
           ''

     

       60
       +
             install -D ${eid-nssdb-in} $out/bin/eid-nssdb

     

       61
       +
             substituteInPlace $out/bin/eid-nssdb \

     

       62
       +
               --replace "modutil" "${nssTools}/bin/modutil"

     

       63
        
       

     

       64
       +
             rm $out/bin/about-eid-mw

     

       65
       +
             wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"

     

       66
       +
           '';

     

       67
        
       

     

       68
        
         enableParallelBuilding = true;

     

       69
        
       

     
···

       96
        
                 firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }

     

       97
        
           '';

     

       98
        
           platforms = platforms.linux;

     

       99
       +
           maintainers = with maintainers; [ bfortz chvp ];

     

       100
        
         };

     

       101
        
       }

+2 -2

pkgs/tools/security/vault/default.nix

···

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
        
         pname = "vault";

     

       5
       -
         version = "1.7.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "hashicorp";

     

       9
        
           repo = "vault";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0ncy99gw2pp5v2qbbgvri7qlirjj8qsvgjmjqyx3gddlpzpyiz3q";

     

       12
        
         };

     

       13
        
       

     

       14
        
         goPackagePath = "github.com/hashicorp/vault";

···

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
        
         pname = "vault";

     

       5
       +
         version = "1.7.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "hashicorp";

     

       9
        
           repo = "vault";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "0nd77lfccl71qn98cq1yz85aiafplxbr58nafbbflijs1fz1771q";

     

       12
        
         };

     

       13
        
       

     

       14
        
         goPackagePath = "github.com/hashicorp/vault";

+5 -5

pkgs/tools/security/vault/vault-bin.nix

···

       1
        
       { lib, stdenv, fetchurl, unzip }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "1.7.1";

     

       5
        
       

     

       6
        
         sources = let

     

       7
        
           base = "https://releases.hashicorp.com/vault/${version}";

     

       8
        
         in {

     

       9
        
           x86_64-linux = fetchurl {

     

       10
        
             url = "${base}/vault_${version}_linux_amd64.zip";

     

       11
       -
             sha256 = "021qa8jcqwy27q83lvamvv5zqnkwk5y0jsb8al5yxpgzxqnmsyb1";

     

       12
        
           };

     

       13
        
           i686-linux = fetchurl {

     

       14
        
             url = "${base}/vault_${version}_linux_386.zip";

     

       15
       -
             sha256 = "02hhxpa8craa91nfgvwziswisfdnqw4gbwrxyxr753v1y00y1sz8";

     

       16
        
           };

     

       17
        
           x86_64-darwin = fetchurl {

     

       18
        
             url = "${base}/vault_${version}_darwin_amd64.zip";

     

       19
       -
             sha256 = "141zzfwrjdjv8ymrdc4mxs2f4cphdir4xjaa40s571ri38in33zh";

     

       20
        
           };

     

       21
        
           aarch64-linux = fetchurl {

     

       22
        
             url = "${base}/vault_${version}_linux_arm64.zip";

     

       23
       -
             sha256 = "1plrmmy86zb2ij49dk2mwn364i2n83ch4gjz5pln2d4wjx21gpaq";

     

       24
        
           };

     

       25
        
         };

     

       26

···

       1
        
       { lib, stdenv, fetchurl, unzip }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "1.7.2";

     

       5
        
       

     

       6
        
         sources = let

     

       7
        
           base = "https://releases.hashicorp.com/vault/${version}";

     

       8
        
         in {

     

       9
        
           x86_64-linux = fetchurl {

     

       10
        
             url = "${base}/vault_${version}_linux_amd64.zip";

     

       11
       +
             sha256 = "1g37pgj7hbi6vfpwq9rrh6is980lfwbq5jb4736jfp5m360vprjy";

     

       12
        
           };

     

       13
        
           i686-linux = fetchurl {

     

       14
        
             url = "${base}/vault_${version}_linux_386.zip";

     

       15
       +
             sha256 = "0777xkkfiy0s3nyygcfpw0nbfsm6yz1n5hxcvfafhzcdyr58fpb7";

     

       16
        
           };

     

       17
        
           x86_64-darwin = fetchurl {

     

       18
        
             url = "${base}/vault_${version}_darwin_amd64.zip";

     

       19
       +
             sha256 = "0wzmah542bhyvrm9brhrx7drjyzan8vxhqnm0gjak5wlrcnf2dvx";

     

       20
        
           };

     

       21
        
           aarch64-linux = fetchurl {

     

       22
        
             url = "${base}/vault_${version}_linux_arm64.zip";

     

       23
       +
             sha256 = "0cs56ircad2z2msqgb0l5h53cwmwybi5rs4y2jigz4rq4ndx9f9b";

     

       24
        
           };

     

       25
        
         };

     

       26

+23

pkgs/tools/system/wslu/default.nix

···

       1
       +
       { lib, stdenv, fetchFromGitHub }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "wslu";

     

       5
       +
         version = "3.2.3";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "wslutilities";

     

       9
       +
           repo = pname;

     

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

     

       11
       +
           sha512 = "2mkvdl65hnwflmi635ngmsm1aqsablz2gypn3a1adby1mwwdc57xym8kkg5359g3mvksac6n43ji2z48lfpvlay64z793q2v0z6by02";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       15
       +
       

     

       16
       +
         meta = with lib; {

     

       17
       +
           description = "A collection of utilities for Windows 10 Linux Subsystems";

     

       18
       +
           homepage = "https://github.com/wslutilities/wslu";

     

       19
       +
           license = licenses.gpl3Plus;

     

       20
       +
           maintainers = with maintainers; [ jamiemagee ];

     

       21
       +
           platforms = platforms.linux;

     

       22
       +
         };

     

       23
       +
       }

+7 -4

pkgs/tools/typesetting/htmldoc/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "htmldoc";

     

       5
       -
         version = "1.9.11";

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "michaelrsweet";

     

       8
        
           repo = "htmldoc";

     

       9
        
           rev = "v${version}";

     

       10
       -
           sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n";

     

       11
        
         };

     

       12
       -
         buildInputs = [ zlib libpng ]

     

       0
        
       
     

       0
        
       
     

       13
        
           ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ];

     

       14
        
       

     

       15
        
         meta = with lib; {

     

       16
        
           description = "Converts HTML files to PostScript and PDF";

     

       17
        
           homepage    = "https://michaelrsweet.github.io/htmldoc";

     

       0
        
       
     

       18
        
           license     = licenses.gpl2Only;

     

       19
        
           maintainers = with maintainers; [ shanemikel ];

     

       20
        
           platforms   = platforms.unix;

···

       1
       +
       { lib, stdenv, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "htmldoc";

     

       5
       +
         version = "1.9.12";

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "michaelrsweet";

     

       8
        
           repo = "htmldoc";

     

       9
        
           rev = "v${version}";

     

       10
       +
           sha256 = "1dqima0g3j301wwzjxdhzk5pvfj724rl615gf8ssxxajfnid1gl0";

     

       11
        
         };

     

       12
       +
       

     

       13
       +
         nativeBuildInputs = [ pkg-config ];

     

       14
       +
         buildInputs = [ zlib libpng libjpeg ]

     

       15
        
           ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ];

     

       16
        
       

     

       17
        
         meta = with lib; {

     

       18
        
           description = "Converts HTML files to PostScript and PDF";

     

       19
        
           homepage    = "https://michaelrsweet.github.io/htmldoc";

     

       20
       +
           changelog   = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}";

     

       21
        
           license     = licenses.gpl2Only;

     

       22
        
           maintainers = with maintainers; [ shanemikel ];

     

       23
        
           platforms   = platforms.unix;

+2

pkgs/top-level/aliases.nix

···

       115
        
         clangAnalyzer = clang-analyzer;  # added 2015-02-20

     

       116
        
         clawsMail = claws-mail; # added 2016-04-29

     

       117
        
         clutter_gtk = clutter-gtk; # added 2018-02-25

     

       0
        
       
     

       118
        
         codimd = hedgedoc; # added 2020-11-29

     

       119
        
         compton = picom; # added 2019-12-02

     

       120
        
         compton-git = compton; # added 2019-05-20

     
···

       502
        
         opencascade_oce = opencascade; # added 2018-04-25

     

       503
        
         oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10

     

       504
        
         opencl-icd = ocl-icd; # added 2017-01-20

     

       0
        
       
     

       505
        
         openexr_ctl = ctl; # added 2018-04-25

     

       506
        
         openisns = open-isns; # added 2020-01-28

     

       507
        
         openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24

···

       115
        
         clangAnalyzer = clang-analyzer;  # added 2015-02-20

     

       116
        
         clawsMail = claws-mail; # added 2016-04-29

     

       117
        
         clutter_gtk = clutter-gtk; # added 2018-02-25

     

       118
       +
         cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05

     

       119
        
         codimd = hedgedoc; # added 2020-11-29

     

       120
        
         compton = picom; # added 2019-12-02

     

       121
        
         compton-git = compton; # added 2019-05-20

     
···

       503
        
         opencascade_oce = opencascade; # added 2018-04-25

     

       504
        
         oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10

     

       505
        
         opencl-icd = ocl-icd; # added 2017-01-20

     

       506
       +
         openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21

     

       507
        
         openexr_ctl = ctl; # added 2018-04-25

     

       508
        
         openisns = open-isns; # added 2020-01-28

     

       509
        
         openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24

+20 -7

pkgs/top-level/all-packages.nix

···

       1297
        
       

     

       1298
        
         bunny = callPackage ../tools/package-management/bunny { };

     

       1299
        
       

     

       0
        
       
     

       0
        
       
     

       1300
        
         callaudiod = callPackage ../applications/audio/callaudiod { };

     

       1301
        
       

     

       1302
        
         calls = callPackage ../applications/networking/calls { };

     
···

       1899
        
         };

     

       1900
        
       

     

       1901
        
         behdad-fonts = callPackage ../data/fonts/behdad-fonts { };

     

       0
        
       
     

       0
        
       
     

       1902
        
       

     

       1903
        
         bless = callPackage ../applications/editors/bless { };

     

       1904
        
       

     
···

       4005
        
       

     

       4006
        
         diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };

     

       4007
        
       

     

       4008
       -
         diffoscope = callPackage ../tools/misc/diffoscope {

     

       4009
        
           inherit (androidenv.androidPkgs_9_0) build-tools;

     

       4010
        
           jdk = jdk8;

     

       4011
        
         };

     

       4012
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4013
        
         diffr = callPackage ../tools/text/diffr {

     

       4014
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4015
        
         };

     
···

       6085
        
       

     

       6086
        
         ldc = callPackage ../development/compilers/ldc { };

     

       6087
        
       

     

       6088
       -
         ldgallery = callPackage ../tools/graphics/ldgallery { };

     

       0
        
       
     

       0
        
       
     

       6089
        
       

     

       6090
        
         lbreakout2 = callPackage ../games/lbreakout2 { };

     

       6091
        
       

     
···

       7395
        
         ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { };

     

       7396
        
       

     

       7397
        
         opensp = callPackage ../tools/text/sgml/opensp { };

     

       0
        
       
     

       0
        
       
     

       7398
        
       

     

       7399
        
         opentracker = callPackage ../applications/networking/p2p/opentracker { };

     

       7400
        
       

     
···

       9407
        
           SDL = SDL_sixel;

     

       9408
        
         };

     

       9409
        
       

     

       9410
       -
         openconnect_pa = callPackage ../tools/networking/openconnect_pa {

     

       9411
       -
           openssl = null;

     

       9412
       -
         };

     

       9413
       -
       

     

       9414
        
         openconnect = openconnect_gnutls;

     

       9415
        
       

     

       9416
        
         openconnect_openssl = callPackage ../tools/networking/openconnect {

     
···

       9766
        
         };

     

       9767
        
       

     

       9768
        
         woeusb = callPackage ../tools/misc/woeusb { };

     

       0
        
       
     

       0
        
       
     

       9769
        
       

     

       9770
        
         chase = callPackage ../tools/system/chase { };

     

       9771
        
       

     
···

       12943
        
         cmakeCurses = cmake.override { useNcurses = true; };

     

       12944
        
       

     

       12945
        
         cmakeWithGui = cmakeCurses.override { withQt5 = true; };

     

       12946
       -
         cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };

     

       12947
        
       

     

       12948
        
         cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };

     

       12949
        
       

     
···

       13211
        
         };

     

       13212
        
       

     

       13213
        
         gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };

     

       0
        
       
     

       0
        
       
     

       13214
        
       

     

       13215
        
         github-release = callPackage ../development/tools/github/github-release { };

     

       13216
        
       

     
···

       27669
        
         ytalk = callPackage ../applications/networking/instant-messengers/ytalk { };

     

       27670
        
       

     

       27671
        
         ytcc = callPackage ../tools/networking/ytcc { };

     

       0
        
       
     

       0
        
       
     

       27672
        
       

     

       27673
        
         zam-plugins = callPackage ../applications/audio/zam-plugins { };

     

       27674

···

       1297
        
       

     

       1298
        
         bunny = callPackage ../tools/package-management/bunny { };

     

       1299
        
       

     

       1300
       +
         bunyan-rs = callPackage ../development/tools/bunyan-rs { };

     

       1301
       +
       

     

       1302
        
         callaudiod = callPackage ../applications/audio/callaudiod { };

     

       1303
        
       

     

       1304
        
         calls = callPackage ../applications/networking/calls { };

     
···

       1901
        
         };

     

       1902
        
       

     

       1903
        
         behdad-fonts = callPackage ../data/fonts/behdad-fonts { };

     

       1904
       +
       

     

       1905
       +
         bfetch = callPackage ../tools/misc/bfetch { };

     

       1906
        
       

     

       1907
        
         bless = callPackage ../applications/editors/bless { };

     

       1908
        
       

     
···

       4009
        
       

     

       4010
        
         diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };

     

       4011
        
       

     

       4012
       +
         diffoscopeMinimal = callPackage ../tools/misc/diffoscope {

     

       4013
        
           inherit (androidenv.androidPkgs_9_0) build-tools;

     

       4014
        
           jdk = jdk8;

     

       4015
        
         };

     

       4016
        
       

     

       4017
       +
         diffoscope = diffoscopeMinimal.override {

     

       4018
       +
           enableBloat = true;

     

       4019
       +
         };

     

       4020
       +
       

     

       4021
        
         diffr = callPackage ../tools/text/diffr {

     

       4022
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4023
        
         };

     
···

       6093
        
       

     

       6094
        
         ldc = callPackage ../development/compilers/ldc { };

     

       6095
        
       

     

       6096
       +
         ldgallery = callPackage ../tools/graphics/ldgallery {

     

       6097
       +
           inherit (darwin.apple_sdk.frameworks) CoreServices;

     

       6098
       +
         };

     

       6099
        
       

     

       6100
        
         lbreakout2 = callPackage ../games/lbreakout2 { };

     

       6101
        
       

     
···

       7405
        
         ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { };

     

       7406
        
       

     

       7407
        
         opensp = callPackage ../tools/text/sgml/opensp { };

     

       7408
       +
       

     

       7409
       +
         opentrack = libsForQt5.callPackage ../applications/misc/opentrack { };

     

       7410
        
       

     

       7411
        
         opentracker = callPackage ../applications/networking/p2p/opentracker { };

     

       7412
        
       

     
···

       9419
        
           SDL = SDL_sixel;

     

       9420
        
         };

     

       9421
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9422
        
         openconnect = openconnect_gnutls;

     

       9423
        
       

     

       9424
        
         openconnect_openssl = callPackage ../tools/networking/openconnect {

     
···

       9774
        
         };

     

       9775
        
       

     

       9776
        
         woeusb = callPackage ../tools/misc/woeusb { };

     

       9777
       +
       

     

       9778
       +
         wslu = callPackage ../tools/system/wslu { };

     

       9779
        
       

     

       9780
        
         chase = callPackage ../tools/system/chase { };

     

       9781
        
       

     
···

       12953
        
         cmakeCurses = cmake.override { useNcurses = true; };

     

       12954
        
       

     

       12955
        
         cmakeWithGui = cmakeCurses.override { withQt5 = true; };

     

       0
        
       
     

       12956
        
       

     

       12957
        
         cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };

     

       12958
        
       

     
···

       13220
        
         };

     

       13221
        
       

     

       13222
        
         gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };

     

       13223
       +
       

     

       13224
       +
         git-aggregator = callPackage ../development/tools/git-aggregator { };

     

       13225
        
       

     

       13226
        
         github-release = callPackage ../development/tools/github/github-release { };

     

       13227
        
       

     
···

       27680
        
         ytalk = callPackage ../applications/networking/instant-messengers/ytalk { };

     

       27681
        
       

     

       27682
        
         ytcc = callPackage ../tools/networking/ytcc { };

     

       27683
       +
       

     

       27684
       +
         ytmdesktop = callPackage ../applications/audio/ytmdesktop { };

     

       27685
        
       

     

       27686
        
         zam-plugins = callPackage ../applications/audio/zam-plugins { };

     

       27687

+39

pkgs/top-level/python-aliases.nix

···

       1
       +
       lib: self: super:

     

       2
       +
       

     

       3
       +
       with self;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         # Removing recurseForDerivation prevents derivations of aliased attribute

     

       7
       +
         # set to appear while listing all the packages available.

     

       8
       +
         removeRecurseForDerivations = alias: with lib;

     

       9
       +
             if alias.recurseForDerivations or false then

     

       10
       +
                   removeAttrs alias ["recurseForDerivations"]

     

       11
       +
                       else alias;

     

       12
       +
       

     

       13
       +
         # Disabling distribution prevents top-level aliases for non-recursed package

     

       14
       +
         # sets from building on Hydra.

     

       15
       +
         removeDistribute = alias: with lib;

     

       16
       +
           if isDerivation alias then

     

       17
       +
             dontDistribute alias

     

       18
       +
           else alias;

     

       19
       +
       

     

       20
       +
         # Make sure that we are not shadowing something from

     

       21
       +
         # python-packages.nix.

     

       22
       +
         checkInPkgs = n: alias: if builtins.hasAttr n super

     

       23
       +
                                 then throw "Alias ${n} is still in python-packages.nix"

     

       24
       +
                                 else alias;

     

       25
       +
       

     

       26
       +
         mapAliases = aliases:

     

       27
       +
           lib.mapAttrs (n: alias: removeDistribute

     

       28
       +
                                    (removeRecurseForDerivations

     

       29
       +
                                     (checkInPkgs n alias)))

     

       30
       +
                            aliases;

     

       31
       +
       in

     

       32
       +
       

     

       33
       +
         ### Deprecated aliases - for backward compatibility

     

       34
       +
       

     

       35
       +
       mapAliases ({

     

       36
       +
         smart_open = smart-open; # added 2021-03-14

     

       37
       +
         google_api_python_client = google-api-python-client; # added 2021-03-19

     

       38
       +
         googleapis_common_protos = googleapis-common-protos; # added 2021-03-19

     

       39
       +
       })

+3 -1

pkgs/top-level/python-packages.nix

···

       7684
        
       

     

       7685
        
         sly = callPackage ../development/python-modules/sly { };

     

       7686
        
       

     

       7687
       -
         smart_open = callPackage ../development/python-modules/smart_open { };

     

       7688
        
       

     

       7689
        
         smartypants = callPackage ../development/python-modules/smartypants { };

     

       7690
        
       

     
···

       8288
        
         todoist = callPackage ../development/python-modules/todoist { };

     

       8289
        
       

     

       8290
        
         toggl-cli = callPackage ../development/python-modules/toggl-cli { };

     

       0
        
       
     

       0
        
       
     

       8291
        
       

     

       8292
        
         tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { });

     

       8293

···

       7684
        
       

     

       7685
        
         sly = callPackage ../development/python-modules/sly { };

     

       7686
        
       

     

       7687
       +
         smart-open = callPackage ../development/python-modules/smart-open { };

     

       7688
        
       

     

       7689
        
         smartypants = callPackage ../development/python-modules/smartypants { };

     

       7690
        
       

     
···

       8288
        
         todoist = callPackage ../development/python-modules/todoist { };

     

       8289
        
       

     

       8290
        
         toggl-cli = callPackage ../development/python-modules/toggl-cli { };

     

       8291
       +
       

     

       8292
       +
         token-bucket = callPackage ../development/python-modules/token-bucket { };

     

       8293
        
       

     

       8294
        
         tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { });

     

       8295

+6 -4

pkgs/top-level/ruby-packages.nix

···

       2226
        
           groups = ["default"];

     

       2227
        
           platforms = [];

     

       2228
        
           source = {

     

       2229
       -
             remotes = ["https://rubygems.org"];

     

       2230
       -
             sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";

     

       2231
       -
             type = "gem";

     

       0
        
       
     

       0
        
       
     

       2232
        
           };

     

       2233
       -
           version = "0.1.1";

     

       2234
        
         };

     

       2235
        
         ruby-vips = {

     

       2236
        
           dependencies = ["ffi"];

···

       2226
        
           groups = ["default"];

     

       2227
        
           platforms = [];

     

       2228
        
           source = {

     

       2229
       +
             url = "https://github.com/akr/ruby-terminfo";

     

       2230
       +
             rev = "8aaa20b15fcf922239c200a1cccbc8853c397bb4";

     

       2231
       +
             fetchSubmodules = false;

     

       2232
       +
             sha256 = "1ak85bmnaqwpyx07wb6wfa2cr06gb30gnmv9knijnsbv4q583xlz";

     

       2233
       +
             type = "git";

     

       2234
        
           };

     

       2235
       +
           version = "0.2";

     

       2236
        
         };

     

       2237
        
         ruby-vips = {

     

       2238
        
           dependencies = ["ffi"];