commit e5fef074d63de524cb40ebc609eabe51db90d80e · pyrox.dev/nixpkgs

-3

.editorconfig

···

       90
        
       indent_style = unset

     

       91
        
       trim_trailing_whitespace = unset

     

       92
        
       

     

       93
       -
       [pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**]

     

       94
       -
       indent_style = unset

     

       95
       -
       

     

       96
        
       [pkgs/servers/dict/wordnet_structures.py]

     

       97
        
       trim_trailing_whitespace = unset

     

       98

···

       90
        
       indent_style = unset

     

       91
        
       trim_trailing_whitespace = unset

     

       92
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       93
        
       [pkgs/servers/dict/wordnet_structures.py]

     

       94
        
       trim_trailing_whitespace = unset

     

       95

+6

doc/contributing/coding-conventions.xml

···

       180
        
          </listitem>

     

       181
        
          <listitem>

     

       182
        
           <para>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       183
        
            Prefer using the top-level <varname>lib</varname> over its alias

     

       184
        
            <literal>stdenv.lib</literal>.  <varname>lib</varname> is unrelated to

     

       185
        
            <varname>stdenv</varname>, and so <literal>stdenv.lib</literal> should only

···

       180
        
          </listitem>

     

       181
        
          <listitem>

     

       182
        
           <para>

     

       183
       +
            Arguments should be listed in the order they are used, with the

     

       184
       +
            exception of <varname>lib</varname>, which always goes first.

     

       185
       +
           </para>

     

       186
       +
          </listitem>

     

       187
       +
          <listitem>

     

       188
       +
           <para>

     

       189
        
            Prefer using the top-level <varname>lib</varname> over its alias

     

       190
        
            <literal>stdenv.lib</literal>.  <varname>lib</varname> is unrelated to

     

       191
        
            <varname>stdenv</varname>, and so <literal>stdenv.lib</literal> should only

+2 -2

doc/languages-frameworks/coq.section.md

···

       42
        
       Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`.

     

       43
        
       

     

       44
        
       ```nix

     

       45
       -
       { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough,

     

       46
       -
         lib, version ? null }:

     

       47
        
       with lib; mkCoqDerivation {

     

       48
        
         /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */

     

       49
        
         namePrefix = [ "coq" "mathcomp" ];

···

       42
        
       Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`.

     

       43
        
       

     

       44
        
       ```nix

     

       45
       +
       { lib, mkCoqDerivation, version ? null

     

       46
       +
       , coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }:

     

       47
        
       with lib; mkCoqDerivation {

     

       48
        
         /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */

     

       49
        
         namePrefix = [ "coq" "mathcomp" ];

+5 -5

doc/languages-frameworks/idris.section.md

···

       69
        
       As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`:

     

       70
        
       

     

       71
        
       ```nix

     

       72
       -
       { build-idris-package

     

       0
        
       
     

       73
        
       , fetchFromGitHub

     

       74
        
       , contrib

     

       75
        
       , lightyear

     

       76
       -
       , lib

     

       77
        
       }:

     

       78
        
       build-idris-package  {

     

       79
        
         name = "yaml";

     
···

       94
        
           sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";

     

       95
        
         };

     

       96
        
       

     

       97
       -
         meta = {

     

       98
        
           description = "Idris YAML lib";

     

       99
        
           homepage = "https://github.com/Heather/Idris.Yaml";

     

       100
       -
           license = lib.licenses.mit;

     

       101
       -
           maintainers = [ lib.maintainers.brainrape ];

     

       102
        
         };

     

       103
        
       }

     

       104
        
       ```

···

       69
        
       As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`:

     

       70
        
       

     

       71
        
       ```nix

     

       72
       +
       { lib

     

       73
       +
       , build-idris-package

     

       74
        
       , fetchFromGitHub

     

       75
        
       , contrib

     

       76
        
       , lightyear

     

       0
        
       
     

       77
        
       }:

     

       78
        
       build-idris-package  {

     

       79
        
         name = "yaml";

     
···

       94
        
           sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";

     

       95
        
         };

     

       96
        
       

     

       97
       +
         meta = with lib; {

     

       98
        
           description = "Idris YAML lib";

     

       99
        
           homepage = "https://github.com/Heather/Idris.Yaml";

     

       100
       +
           license = licenses.mit;

     

       101
       +
           maintainers = [ maintainers.brainrape ];

     

       102
        
         };

     

       103
        
       }

     

       104
        
       ```

+4 -4

doc/languages-frameworks/maven.section.md

···

       116
        
       > Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory.

     

       117
        
       

     

       118
        
       ```nix

     

       119
       -
       { stdenv, lib, maven }:

     

       120
        
       stdenv.mkDerivation {

     

       121
        
         name = "maven-repository";

     

       122
        
         buildInputs = [ maven ];

     
···

       168
        
       Regardless of which strategy is chosen above, the step to build the derivation is the same.

     

       169
        
       

     

       170
        
       ```nix

     

       171
       -
       { stdenv, lib, maven, callPackage }:

     

       172
        
       # pick a repository derivation, here we will use buildMaven

     

       173
        
       let repository = callPackage ./build-maven-repository.nix { };

     

       174
        
       in stdenv.mkDerivation rec {

     
···

       222
        
       We make sure to provide this classpath to the `makeWrapper`.

     

       223
        
       

     

       224
        
       ```nix

     

       225
       -
       { stdenv, lib, maven, callPackage, makeWrapper, jre }:

     

       226
        
       let

     

       227
        
         repository = callPackage ./build-maven-repository.nix { };

     

       228
        
       in stdenv.mkDerivation rec {

     
···

       298
        
       We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`.

     

       299
        
       

     

       300
        
       ```nix

     

       301
       -
       { stdenv, lib, maven, callPackage, makeWrapper, jre }:

     

       302
        
       # pick a repository derivation, here we will use buildMaven

     

       303
        
       let repository = callPackage ./build-maven-repository.nix { };

     

       304
        
       in stdenv.mkDerivation rec {

···

       116
        
       > Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory.

     

       117
        
       

     

       118
        
       ```nix

     

       119
       +
       { lib, stdenv, maven }:

     

       120
        
       stdenv.mkDerivation {

     

       121
        
         name = "maven-repository";

     

       122
        
         buildInputs = [ maven ];

     
···

       168
        
       Regardless of which strategy is chosen above, the step to build the derivation is the same.

     

       169
        
       

     

       170
        
       ```nix

     

       171
       +
       { stdenv, maven, callPackage }:

     

       172
        
       # pick a repository derivation, here we will use buildMaven

     

       173
        
       let repository = callPackage ./build-maven-repository.nix { };

     

       174
        
       in stdenv.mkDerivation rec {

     
···

       222
        
       We make sure to provide this classpath to the `makeWrapper`.

     

       223
        
       

     

       224
        
       ```nix

     

       225
       +
       { stdenv, maven, callPackage, makeWrapper, jre }:

     

       226
        
       let

     

       227
        
         repository = callPackage ./build-maven-repository.nix { };

     

       228
        
       in stdenv.mkDerivation rec {

     
···

       298
        
       We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`.

     

       299
        
       

     

       300
        
       ```nix

     

       301
       +
       { stdenv, maven, callPackage, makeWrapper, jre }:

     

       302
        
       # pick a repository derivation, here we will use buildMaven

     

       303
        
       let repository = callPackage ./build-maven-repository.nix { };

     

       304
        
       in stdenv.mkDerivation rec {

+3 -3

doc/languages-frameworks/ocaml.section.md

···

       32
        
         propagatedBuildInputs = [ bigstringaf result ];

     

       33
        
         doCheck = true;

     

       34
        
       

     

       35
       -
         meta = {

     

       36
        
           homepage = "https://github.com/inhabitedtype/angstrom";

     

       37
        
           description = "OCaml parser combinators built for speed and memory efficiency";

     

       38
       -
           license = lib.licenses.bsd3;

     

       39
       -
           maintainers = with lib.maintainers; [ sternenseemann ];

     

       40
        
         };

     

       41
        
       }

     

       42
        
       ```

···

       32
        
         propagatedBuildInputs = [ bigstringaf result ];

     

       33
        
         doCheck = true;

     

       34
        
       

     

       35
       +
         meta = with lib; {

     

       36
        
           homepage = "https://github.com/inhabitedtype/angstrom";

     

       37
        
           description = "OCaml parser combinators built for speed and memory efficiency";

     

       38
       +
           license = licenses.bsd3;

     

       39
       +
           maintainers = with maintainers; [ sternenseemann ];

     

       40
        
         };

     

       41
        
       }

     

       42
        
       ```

+1 -1

doc/languages-frameworks/perl.section.md

···

       110
        
       On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase:

     

       111
        
       

     

       112
        
       ```nix

     

       113
       -
       { stdenv, lib, buildPerlPackage, fetchurl, shortenPerlShebang }:

     

       114
        
       

     

       115
        
       ImageExifTool = buildPerlPackage {

     

       116
        
         pname = "Image-ExifTool";

···

       110
        
       On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase:

     

       111
        
       

     

       112
        
       ```nix

     

       113
       +
       { lib, stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }:

     

       114
        
       

     

       115
        
       ImageExifTool = buildPerlPackage {

     

       116
        
         pname = "Image-ExifTool";

+1 -1

doc/languages-frameworks/qt.section.md

···

       8
        
       

     

       9
        
       ```{=docbook}

     

       10
        
       <programlisting>

     

       11
       -
       { mkDerivation, lib, qtbase }: <co xml:id='qt-default-nix-co-1' />

     

       12
        
       

     

       13
        
       mkDerivation { <co xml:id='qt-default-nix-co-2' />

     

       14
        
         pname = "myapp";

···

       8
        
       

     

       9
        
       ```{=docbook}

     

       10
        
       <programlisting>

     

       11
       +
       { mkDerivation, qtbase }: <co xml:id='qt-default-nix-co-1' />

     

       12
        
       

     

       13
        
       mkDerivation { <co xml:id='qt-default-nix-co-2' />

     

       14
        
         pname = "myapp";

+3 -5

doc/languages-frameworks/r.section.md

···

       32
        
       environment available for other contributors, you can create a `default.nix`

     

       33
        
       file like so:

     

       34
        
       ```nix

     

       35
       -
       let

     

       36
       -
         pkgs = import <nixpkgs> {};

     

       37
       -
         stdenv = pkgs.stdenv;

     

       38
       -
       in with pkgs; {

     

       39
        
         myProject = stdenv.mkDerivation {

     

       40
        
           name = "myProject";

     

       41
        
           version = "1";

     

       42
       -
           src = if pkgs.lib.inNixShell then null else nix;

     

       43
        
       

     

       44
        
           buildInputs = with rPackages; [

     

       45
        
             R

···

       32
        
       environment available for other contributors, you can create a `default.nix`

     

       33
        
       file like so:

     

       34
        
       ```nix

     

       35
       +
       with import <nixpkgs> {};

     

       36
       +
       {

     

       0
        
       
     

       0
        
       
     

       37
        
         myProject = stdenv.mkDerivation {

     

       38
        
           name = "myProject";

     

       39
        
           version = "1";

     

       40
       +
           src = if lib.inNixShell then null else nix;

     

       41
        
       

     

       42
        
           buildInputs = with rPackages; [

     

       43
        
             R

+1 -1

doc/languages-frameworks/ruby.section.md

···

       232
        
       Now you can also also make a `default.nix` that looks like this:

     

       233
        
       

     

       234
        
       ```nix

     

       235
       -
       { lib, bundlerApp }:

     

       236
        
       

     

       237
        
       bundlerApp {

     

       238
        
         pname = "mdl";

···

       232
        
       Now you can also also make a `default.nix` that looks like this:

     

       233
        
       

     

       234
        
       ```nix

     

       235
       +
       { bundlerApp }:

     

       236
        
       

     

       237
        
       bundlerApp {

     

       238
        
         pname = "mdl";

+4 -4

doc/languages-frameworks/rust.section.md

···

       19
        
       Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:

     

       20
        
       

     

       21
        
       ```

     

       0
        
       
     

       0
        
       
     

       22
        
       rustPlatform.buildRustPackage rec {

     

       23
        
         pname = "ripgrep";

     

       24
        
         version = "12.1.1";

     
···

       226
        
       the `cargoPatches` attribute to update or add it.

     

       227
        
       

     

       228
        
       ```

     

       229
       -
       { lib, rustPlatform, fetchFromGitHub }:

     

       230
       -
       

     

       231
        
       rustPlatform.buildRustPackage rec {

     

       232
        
         (...)

     

       233
        
         cargoPatches = [

     
···

       263
        
       

     

       264
        
       ```

     

       265
        
       # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone

     

       266
       -
       { lib, stdenv, buildRustCrate, fetchgit }:

     

       267
        
       let kernel = stdenv.buildPlatform.parsed.kernel.name;

     

       268
        
           # ... (content skipped)

     

       269
        
       in

     
···

       292
        
       

     

       293
        
       ```

     

       294
        
       # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone

     

       295
       -
       { lib, stdenv, buildRustCrate, fetchgit }:

     

       296
        
       let kernel = stdenv.buildPlatform.parsed.kernel.name;

     

       297
        
           # ... (content skipped)

     

       298
        
       in

···

       19
        
       Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:

     

       20
        
       

     

       21
        
       ```

     

       22
       +
       { lib, rustPlatform }:

     

       23
       +
       

     

       24
        
       rustPlatform.buildRustPackage rec {

     

       25
        
         pname = "ripgrep";

     

       26
        
         version = "12.1.1";

     
···

       228
        
       the `cargoPatches` attribute to update or add it.

     

       229
        
       

     

       230
        
       ```

     

       0
        
       
     

       0
        
       
     

       231
        
       rustPlatform.buildRustPackage rec {

     

       232
        
         (...)

     

       233
        
         cargoPatches = [

     
···

       263
        
       

     

       264
        
       ```

     

       265
        
       # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone

     

       266
       +
       { stdenv, buildRustCrate, fetchgit }:

     

       267
        
       let kernel = stdenv.buildPlatform.parsed.kernel.name;

     

       268
        
           # ... (content skipped)

     

       269
        
       in

     
···

       292
        
       

     

       293
        
       ```

     

       294
        
       # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone

     

       295
       +
       { stdenv, buildRustCrate, fetchgit }:

     

       296
        
       let kernel = stdenv.buildPlatform.parsed.kernel.name;

     

       297
        
           # ... (content skipped)

     

       298
        
       in

+6

maintainers/maintainer-list.nix

···

       5138
        
           githubId = 42153076;

     

       5139
        
           name = "Alexey Nikashkin";

     

       5140
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5141
        
         lethalman = {

     

       5142
        
           email = "lucabru@src.gnome.org";

     

       5143
        
           github = "lethalman";

···

       5138
        
           githubId = 42153076;

     

       5139
        
           name = "Alexey Nikashkin";

     

       5140
        
         };

     

       5141
       +
         lesuisse = {

     

       5142
       +
           email = "thomas@gerbet.me";

     

       5143
       +
           github = "LeSuisse";

     

       5144
       +
           githubId = 737767;

     

       5145
       +
           name = "Thomas Gerbet";

     

       5146
       +
         };

     

       5147
        
         lethalman = {

     

       5148
        
           email = "lucabru@src.gnome.org";

     

       5149
        
           github = "lethalman";

+8 -2

nixos/modules/system/boot/binfmt.nix

···

       20
        
                        optionalString fixBinary "F";

     

       21
        
         in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}";

     

       22
        
       

     

       23
       -
         activationSnippet = name: { interpreter, ... }:

     

       24
       -
           "ln -sf ${interpreter} /run/binfmt/${name}";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
        
         getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs;

     

       27

···

       20
        
                        optionalString fixBinary "F";

     

       21
        
         in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}";

     

       22
        
       

     

       23
       +
         activationSnippet = name: { interpreter, ... }: ''

     

       24
       +
           rm -f /run/binfmt/${name}

     

       25
       +
           cat > /run/binfmt/${name} << 'EOF'

     

       26
       +
           #!/usr/bin/env sh

     

       27
       +
           exec -- ${interpreter} "$@"

     

       28
       +
           EOF

     

       29
       +
           chmod +x /run/binfmt/${name}

     

       30
       +
         '';

     

       31
        
       

     

       32
        
         getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs;

     

       33

+30 -6

nixos/tests/chromium.nix

···

       1
        
       { system ? builtins.currentSystem

     

       2
        
       , config ? {}

     

       3
        
       , pkgs ? import ../.. { inherit system config; }

     

       4
       -
       , channelMap ? {

     

       5
       -
           stable = pkgs.chromium;

     

       6
       -
           beta   = pkgs.chromiumBeta;

     

       7
       -
           dev    = pkgs.chromiumDev;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
         }

     

       9
        
       }:

     

       10
        
       

     
···

       14
        
       mapAttrs (channel: chromiumPkg: makeTest rec {

     

       15
        
         name = "chromium-${channel}";

     

       16
        
         meta = {

     

       17
       -
           maintainers = with maintainers; [ aszlig ];

     

       18
        
           # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621

     

       19
        
           inherit (chromiumPkg.meta) timeout;

     

       20
        
         };

     
···

       56
        
           # Run as user alice

     

       57
        
           def ru(cmd):

     

       58
        
               return "su - ${user} -c " + shlex.quote(cmd)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
       

     

       60
        
       

     

       61
        
           def create_new_win():

     
···

       153
        
           machine.wait_for_x()

     

       154
        
       

     

       155
        
           url = "file://${startupHTML}"

     

       156
       -
           machine.succeed(ru(f'ulimit -c unlimited; chromium "{url}" & disown'))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       157
        
           machine.wait_for_text("startup done")

     

       158
        
           machine.wait_until_succeeds(

     

       159
        
               ru(

···

       1
        
       { system ? builtins.currentSystem

     

       2
        
       , config ? {}

     

       3
        
       , pkgs ? import ../.. { inherit system config; }

     

       4
       +
       , channelMap ? { # Maps "channels" to packages

     

       5
       +
           stable        = pkgs.chromium;

     

       6
       +
           beta          = pkgs.chromiumBeta;

     

       7
       +
           dev           = pkgs.chromiumDev;

     

       8
       +
           ungoogled     = pkgs.ungoogled-chromium;

     

       9
       +
           chrome-stable = pkgs.google-chrome;

     

       10
       +
           chrome-beta   = pkgs.google-chrome-beta;

     

       11
       +
           chrome-dev    = pkgs.google-chrome-dev;

     

       12
        
         }

     

       13
        
       }:

     

       14
        
       

     
···

       18
        
       mapAttrs (channel: chromiumPkg: makeTest rec {

     

       19
        
         name = "chromium-${channel}";

     

       20
        
         meta = {

     

       21
       +
           maintainers = with maintainers; [ aszlig primeos ];

     

       22
        
           # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621

     

       23
        
           inherit (chromiumPkg.meta) timeout;

     

       24
        
         };

     
···

       60
        
           # Run as user alice

     

       61
        
           def ru(cmd):

     

       62
        
               return "su - ${user} -c " + shlex.quote(cmd)

     

       63
       +
       

     

       64
       +
       

     

       65
       +
           def get_browser_binary():

     

       66
       +
               """Returns the name of the browser binary."""

     

       67
       +
               pname = "${getName chromiumPkg.name}"

     

       68
       +
               if pname.find("chromium") != -1:

     

       69
       +
                   return "chromium"  # Same name for all channels and ungoogled-chromium

     

       70
       +
               if pname == "google-chrome":

     

       71
       +
                   return "google-chrome-stable"

     

       72
       +
               if pname == "google-chrome-dev":

     

       73
       +
                   return "google-chrome-unstable"

     

       74
       +
               # For google-chrome-beta and as fallback:

     

       75
       +
               return pname

     

       76
        
       

     

       77
        
       

     

       78
        
           def create_new_win():

     
···

       170
        
           machine.wait_for_x()

     

       171
        
       

     

       172
        
           url = "file://${startupHTML}"

     

       173
       +
           machine.succeed(ru(f'ulimit -c unlimited; "{get_browser_binary()}" "{url}" & disown'))

     

       174
       +
       

     

       175
       +
           if get_browser_binary().startswith("google-chrome"):

     

       176
       +
               # Need to click away the first window:

     

       177
       +
               machine.wait_for_text("Make Google Chrome the default browser")

     

       178
       +
               machine.screenshot("google_chrome_default_browser_prompt")

     

       179
       +
               machine.send_key("ret")

     

       180
       +
       

     

       181
        
           machine.wait_for_text("startup done")

     

       182
        
           machine.wait_until_succeeds(

     

       183
        
               ru(

+12

nixos/tests/cifs-utils.nix

···

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

     

       2
       +
         name = "cifs-utils";

     

       3
       +
       

     

       4
       +
         machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; };

     

       5
       +
       

     

       6
       +
         testScript = ''

     

       7
       +
           machine.succeed("smbinfo -h")

     

       8
       +
           machine.succeed("smb2-quota -h")

     

       9
       +
           assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v")

     

       10
       +
           assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V")

     

       11
       +
         '';

     

       12
       +
       })

+8 -5

nixos/tests/opentabletdriver.nix

···

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

     

       0
        
       
     

       0
        
       
     

       2
        
         name = "opentabletdriver";

     

       3
        
         meta = {

     

       4
        
           maintainers = with pkgs.lib.maintainers; [ thiagokokada ];

     
···

       10
        
               ./common/user-account.nix

     

       11
        
               ./common/x11.nix

     

       12
        
             ];

     

       13
       -
             test-support.displayManager.auto.user = "alice";

     

       14
        
             hardware.opentabletdriver.enable = true;

     

       15
        
           };

     

       16
        
       

     
···

       18
        
           ''

     

       19
        
             machine.start()

     

       20
        
             machine.wait_for_x()

     

       21
       -
             machine.wait_for_unit("opentabletdriver.service", "alice")

     

       22
        
       

     

       23
       -
             machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules")

     

       24
        
             # Will fail if service is not running

     

       25
       -
             machine.succeed("otd detect")

     

       0
        
       
     

       26
        
           '';

     

       27
        
       })

···

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

     

       2
       +
         testUser = "alice";

     

       3
       +
       in {

     

       4
        
         name = "opentabletdriver";

     

       5
        
         meta = {

     

       6
        
           maintainers = with pkgs.lib.maintainers; [ thiagokokada ];

     
···

       12
        
               ./common/user-account.nix

     

       13
        
               ./common/x11.nix

     

       14
        
             ];

     

       15
       +
             test-support.displayManager.auto.user = testUser;

     

       16
        
             hardware.opentabletdriver.enable = true;

     

       17
        
           };

     

       18
        
       

     
···

       20
        
           ''

     

       21
        
             machine.start()

     

       22
        
             machine.wait_for_x()

     

       23
       +
             machine.wait_for_unit("opentabletdriver.service", "${testUser}")

     

       24
        
       

     

       25
       +
             machine.succeed("cat /etc/udev/rules.d/99-opentabletdriver.rules")

     

       26
        
             # Will fail if service is not running

     

       27
       +
             # Needs to run as the same user that started the service

     

       28
       +
             machine.succeed("su - ${testUser} -c 'otd detect'")

     

       29
        
           '';

     

       30
        
       })

+14 -1

nixos/tests/podman.nix

···

       61
        
                 podman.succeed("podman stop sleeping")

     

       62
        
                 podman.succeed("podman rm sleeping")

     

       63
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       64
        
             with subtest("Run container rootless with crun"):

     

       65
        
                 podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))

     

       66
        
                 podman.succeed(

     
···

       71
        
                 podman.succeed(su_cmd("podman ps | grep sleeping"))

     

       72
        
                 podman.succeed(su_cmd("podman stop sleeping"))

     

       73
        
                 podman.succeed(su_cmd("podman rm sleeping"))

     

       74
       -
             # As of 2020-11-20, the runc backend doesn't work with cgroupsv2 yet, so we don't run that test.

     

       75
        
       

     

       76
        
             with subtest("Run container rootless with the default backend"):

     

       77
        
                 podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))

···

       61
        
                 podman.succeed("podman stop sleeping")

     

       62
        
                 podman.succeed("podman rm sleeping")

     

       63
        
       

     

       64
       +
             # create systemd session for rootless

     

       65
       +
             podman.succeed("loginctl enable-linger alice")

     

       66
       +
       

     

       67
       +
             with subtest("Run container rootless with runc"):

     

       68
       +
                 podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))

     

       69
       +
                 podman.succeed(

     

       70
       +
                     su_cmd(

     

       71
       +
                         "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

     

       72
       +
                     )

     

       73
       +
                 )

     

       74
       +
                 podman.succeed(su_cmd("podman ps | grep sleeping"))

     

       75
       +
                 podman.succeed(su_cmd("podman stop sleeping"))

     

       76
       +
                 podman.succeed(su_cmd("podman rm sleeping"))

     

       77
       +
       

     

       78
        
             with subtest("Run container rootless with crun"):

     

       79
        
                 podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))

     

       80
        
                 podman.succeed(

     
···

       85
        
                 podman.succeed(su_cmd("podman ps | grep sleeping"))

     

       86
        
                 podman.succeed(su_cmd("podman stop sleeping"))

     

       87
        
                 podman.succeed(su_cmd("podman rm sleeping"))

     

       0
        
       
     

       88
        
       

     

       89
        
             with subtest("Run container rootless with the default backend"):

     

       90
        
                 podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))

+2 -2

pkgs/applications/audio/mympd/default.nix

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "mympd";

     

       15
       -
         version = "6.8.3";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "jcorporation";

     

       19
        
           repo = "myMPD";

     

       20
        
           rev = "v${version}";

     

       21
       -
           sha256 = "1a3jrqslxk2a9h5gj6kch108lg9z0i5zwr0j9yd5viyfhr3ka4cq";

     

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "mympd";

     

       15
       +
         version = "6.10.0";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "jcorporation";

     

       19
        
           repo = "myMPD";

     

       20
        
           rev = "v${version}";

     

       21
       +
           sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [

+14 -8

pkgs/applications/graphics/fig2dev/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, ghostscript, libpng } :

     

       0
        
       
     

       2
        
       

     

       3
       -
       let

     

       4
       -
         version = "3.2.7b";

     

       5
       -
       

     

       6
       -
       in stdenv.mkDerivation {

     

       7
        
         pname = "fig2dev";

     

       8
       -
         inherit version;

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";

     

       12
       -
           sha256 = "1ck8gnqgg13xkxq4hrdy706i4xdgrlckx6bi6wxm1g514121pp27";

     

       13
        
         };

     

       14
        
       

     

       0
        
       
     

       15
        
         buildInputs = [ libpng ];

     

       16
        
       

     

       17
        
         GSEXE="${ghostscript}/bin/gs";

     

       18
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
         meta = with lib; {

     

       20
        
           description = "Tool to convert Xfig files to other formats";

     

       21
        
           homepage = "http://mcj.sourceforge.net/";

     

       22
        
           license = licenses.xfig;

     

       23
        
           platforms = platforms.linux;

     

       0
        
       
     

       24
        
         };

     

       25
        
       }

     

       26
       -

···

       1
       +
       { lib, stdenv, fetchurl, ghostscript, libpng, makeWrapper

     

       2
       +
       , coreutils, bc, gnugrep, gawk, gnused } :

     

       3
        
       

     

       4
       +
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
         pname = "fig2dev";

     

       6
       +
         version = "3.2.8";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";

     

       10
       +
           sha256 = "0zg29yqknfafyzmmln4k7kydfb2dapk3r8ffvlqhj3cm8fp5h4lk";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
        
         buildInputs = [ libpng ];

     

       15
        
       

     

       16
        
         GSEXE="${ghostscript}/bin/gs";

     

       17
        
       

     

       18
       +
         postInstall = ''

     

       19
       +
           wrapProgram $out/bin/fig2ps2tex \

     

       20
       +
               --set PATH ${lib.makeBinPath [ coreutils bc gnugrep gawk ]}

     

       21
       +
           wrapProgram $out/bin/pic2tpic \

     

       22
       +
               --set PATH ${lib.makeBinPath [ gnused ]}

     

       23
       +
         '';

     

       24
       +
       

     

       25
        
         meta = with lib; {

     

       26
        
           description = "Tool to convert Xfig files to other formats";

     

       27
        
           homepage = "http://mcj.sourceforge.net/";

     

       28
        
           license = licenses.xfig;

     

       29
        
           platforms = platforms.linux;

     

       30
       +
           maintainers = with maintainers; [ lesuisse ];

     

       31
        
         };

     

       32
        
       }

     

       0

+3 -3

pkgs/applications/graphics/pdfcpu/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "pdfcpu";

     

       5
       -
         version = "0.3.7";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "pdfcpu";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7";

     

       15
        
       

     

       16
        
         # No tests

     

       17
        
         doCheck = false;

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "pdfcpu";

     

       5
       +
         version = "0.3.8";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "pdfcpu";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-Rx/LUp5s2DhEKuLUklYXjtTXjqBju+5YzK1hNfBCnIE=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ=";

     

       15
        
       

     

       16
        
         # No tests

     

       17
        
         doCheck = false;

+15

pkgs/applications/networking/browsers/chromium/README.md

···

       36
        
       `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which

     

       37
        
       reuses `upstream-info.json`).

     

       38
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
       ## Backports

     

       40
        
       

     

       41
        
       All updates are considered security critical and should be ported to the stable

···

       36
        
       `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which

     

       37
        
       reuses `upstream-info.json`).

     

       38
        
       

     

       39
       +
       To run all automated NixOS VM tests for Chromium, ungoogled-chromium,

     

       40
       +
       and Google Chrome (not recommended, currently 6x tests!):

     

       41
       +
       ```

     

       42
       +
       nix-build nixos/tests/chromium.nix

     

       43
       +
       ```

     

       44
       +
       

     

       45
       +
       A single test can be selected, e.g. to test `ungoogled-chromium` (see

     

       46
       +
       `channelMap` in `nixos/tests/chromium.nix` for all available options):

     

       47
       +
       ```

     

       48
       +
       nix-build nixos/tests/chromium.nix -A ungoogled

     

       49
       +
       ```

     

       50
       +
       (Note: Testing Google Chrome requires `export NIXPKGS_ALLOW_UNFREE=1`.)

     

       51
       +
       

     

       52
       +
       For custom builds it's possible to "override" `channelMap`.

     

       53
       +
       

     

       54
        
       ## Backports

     

       55
        
       

     

       56
        
       All updates are considered security critical and should be ported to the stable

+3 -3

pkgs/applications/networking/cluster/nerdctl/default.nix

···

       14
        
       in

     

       15
        
       buildGoModule rec {

     

       16
        
         pname = "nerdctl";

     

       17
       -
         version = "0.4.0";

     

       18
        
       

     

       19
        
         src = fetchFromGitHub {

     

       20
        
           owner = "AkihiroSuda";

     

       21
        
           repo = pname;

     

       22
        
           rev = "v${version}";

     

       23
       -
           sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw";

     

       24
        
         };

     

       25
        
       

     

       26
       -
         vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr";

     

       27
        
       

     

       28
        
         nativeBuildInputs = [ makeWrapper ];

     

       29

···

       14
        
       in

     

       15
        
       buildGoModule rec {

     

       16
        
         pname = "nerdctl";

     

       17
       +
         version = "0.5.0";

     

       18
        
       

     

       19
        
         src = fetchFromGitHub {

     

       20
        
           owner = "AkihiroSuda";

     

       21
        
           repo = pname;

     

       22
        
           rev = "v${version}";

     

       23
       +
           sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw=";

     

       24
        
         };

     

       25
        
       

     

       26
       +
         vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM=";

     

       27
        
       

     

       28
        
         nativeBuildInputs = [ makeWrapper ];

     

       29

+4

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

···

       57
        
           qtgraphicaleffects

     

       58
        
         ] ++ lib.optional stdenv.isDarwin qtmacextras;

     

       59
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       60
        
         meta = with lib; {

     

       61
        
           description = "Desktop client for the Matrix protocol";

     

       62
        
           homepage = "https://github.com/Nheko-Reborn/nheko";

···

       57
        
           qtgraphicaleffects

     

       58
        
         ] ++ lib.optional stdenv.isDarwin qtmacextras;

     

       59
        
       

     

       60
       +
         cmakeFlags = [

     

       61
       +
           "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389

     

       62
       +
         ];

     

       63
       +
       

     

       64
        
         meta = with lib; {

     

       65
        
           description = "Desktop client for the Matrix protocol";

     

       66
        
           homepage = "https://github.com/Nheko-Reborn/nheko";

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

···

       25
        
             else "");

     

       26
        
       in stdenv.mkDerivation rec {

     

       27
        
         pname = "signal-desktop";

     

       28
       -
         version = "1.39.5"; # Please backport all updates to the stable channel.

     

       29
        
         # All releases have a limited lifetime and "expire" 90 days after the release.

     

       30
        
         # When releases "expire" the application becomes unusable until an update is

     

       31
        
         # applied. The expiration date for the current release can be extracted with:

     
···

       35
        
       

     

       36
        
         src = fetchurl {

     

       37
        
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       38
       -
           sha256 = "1x29ri4jxd1q2wbv5gf26x986x9sms4rxnhj7d5rhm6pz2ihzb2a";

     

       39
        
         };

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

···

       25
        
             else "");

     

       26
        
       in stdenv.mkDerivation rec {

     

       27
        
         pname = "signal-desktop";

     

       28
       +
         version = "1.39.6"; # Please backport all updates to the stable channel.

     

       29
        
         # All releases have a limited lifetime and "expire" 90 days after the release.

     

       30
        
         # When releases "expire" the application becomes unusable until an update is

     

       31
        
         # applied. The expiration date for the current release can be extracted with:

     
···

       35
        
       

     

       36
        
         src = fetchurl {

     

       37
        
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       38
       +
           sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk";

     

       39
        
         };

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/printing/pappl/default.nix

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "pappl";

     

       15
       -
         version = "1.0.0";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "michaelrsweet";

     

       19
        
           repo = pname;

     

       20
        
           rev = "v${version}";

     

       21
       -
           sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb";

     

       22
        
         };

     

       23
        
       

     

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

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "pappl";

     

       15
       +
         version = "1.0.1";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "michaelrsweet";

     

       19
        
           repo = pname;

     

       20
        
           rev = "v${version}";

     

       21
       +
           sha256 = "sha256-4evyOrPd8zb5y00L8h2t++ayW1S8WQ5P+6MXe6eju68=";

     

       22
        
         };

     

       23
        
       

     

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

+2 -2

pkgs/applications/science/biology/picard-tools/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "picard-tools";

     

       5
       -
         version = "2.23.9";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";

     

       9
       -
           sha256 = "1ygdl590sbcsxpk0qwr0bx163nx51h0545n1xxkbc3pk2r6n51lk";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "picard-tools";

     

       5
       +
         version = "2.24.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";

     

       9
       +
           sha256 = "sha256-cOkQObzMb222DxjEFxMhiozfRfWR8CwQEsBiFSsnzXs=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

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

···

       30
        
         meta = with lib; {

     

       31
        
           description = "Lightweight multitabbed feature-rich X11 terminal emulator";

     

       32
        
           longDescription = "

     

       33
       -
           	Multitabbed lightweight terminal emulator based on rxvt.

     

       34
       -
       	Supports transparency, backgroundimages, freetype fonts, ...

     

       35
        
           ";

     

       36
        
           homepage = "https://sourceforge.net/projects/materm";

     

       37
        
           license = licenses.gpl2;

···

       30
        
         meta = with lib; {

     

       31
        
           description = "Lightweight multitabbed feature-rich X11 terminal emulator";

     

       32
        
           longDescription = "

     

       33
       +
             Multitabbed lightweight terminal emulator based on rxvt.

     

       34
       +
             Supports transparency, backgroundimages, freetype fonts, ...

     

       35
        
           ";

     

       36
        
           homepage = "https://sourceforge.net/projects/materm";

     

       37
        
           license = licenses.gpl2;

+1 -1

pkgs/applications/version-management/commitizen/node-packages.nix

···

       9068
        
           bypassCache = true;

     

       9069
        
           reconstructLock = true;

     

       9070
        
         };

     

       9071
       -
       }

···

       9068
        
           bypassCache = true;

     

       9069
        
           reconstructLock = true;

     

       9070
        
         };

     

       9071
       +
       }

+1

pkgs/build-support/cc-wrapper/default.nix

···

       65
        
           && libcxx == null

     

       66
        
           && !(stdenv.targetPlatform.useLLVM or false)

     

       67
        
           && !(stdenv.targetPlatform.useAndroidPrebuilt or false)

     

       0
        
       
     

       68
        
           && gccForLibs != null;

     

       69
        
       

     

       70
        
         # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu

···

       65
        
           && libcxx == null

     

       66
        
           && !(stdenv.targetPlatform.useLLVM or false)

     

       67
        
           && !(stdenv.targetPlatform.useAndroidPrebuilt or false)

     

       68
       +
           && !(stdenv.targetPlatform.isiOS or false)

     

       69
        
           && gccForLibs != null;

     

       70
        
       

     

       71
        
         # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu

+1 -1

pkgs/development/compilers/elm/packages/node-composition.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+1 -1

pkgs/development/compilers/elm/packages/node-packages.nix

···

       15513
        
           bypassCache = true;

     

       15514
        
           reconstructLock = true;

     

       15515
        
         };

     

       15516
       -
       }

···

       15513
        
           bypassCache = true;

     

       15514
        
           reconstructLock = true;

     

       15515
        
         };

     

       15516
       +
       }

+3 -3

pkgs/development/compilers/gleam/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "gleam";

     

       5
       -
         version = "0.12.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "gleam-lang";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config ];

     
···

       16
        
         buildInputs = [ openssl ] ++

     

       17
        
           stdenv.lib.optionals stdenv.isDarwin [ Security ];

     

       18
        
       

     

       19
       -
         cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3";

     

       20
        
       

     

       21
        
         meta = with stdenv.lib; {

     

       22
        
           description = "A statically typed language for the Erlang VM";

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "gleam";

     

       5
       +
         version = "0.13.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "gleam-lang";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config ];

     
···

       16
        
         buildInputs = [ openssl ] ++

     

       17
        
           stdenv.lib.optionals stdenv.isDarwin [ Security ];

     

       18
        
       

     

       19
       +
         cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc=";

     

       20
        
       

     

       21
        
         meta = with stdenv.lib; {

     

       22
        
           description = "A statically typed language for the Erlang VM";

+2 -2

pkgs/development/compilers/go/1.14.nix

···

       36
        
       

     

       37
        
       stdenv.mkDerivation rec {

     

       38
        
         pname = "go";

     

       39
       -
         version = "1.14.13";

     

       40
        
       

     

       41
        
         src = fetchurl {

     

       42
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       43
       -
           sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds";

     

       44
        
         };

     

       45
        
       

     

       46
        
         # perl is used for testing go vet

···

       36
        
       

     

       37
        
       stdenv.mkDerivation rec {

     

       38
        
         pname = "go";

     

       39
       +
         version = "1.14.14";

     

       40
        
       

     

       41
        
         src = fetchurl {

     

       42
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       43
       +
           sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132";

     

       44
        
         };

     

       45
        
       

     

       46
        
         # perl is used for testing go vet

+2 -2

pkgs/development/compilers/go/1.15.nix

···

       36
        
       

     

       37
        
       stdenv.mkDerivation rec {

     

       38
        
         pname = "go";

     

       39
       -
         version = "1.15.6";

     

       40
        
       

     

       41
        
         src = fetchurl {

     

       42
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       43
       -
           sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9";

     

       44
        
         };

     

       45
        
       

     

       46
        
         # perl is used for testing go vet

···

       36
        
       

     

       37
        
       stdenv.mkDerivation rec {

     

       38
        
         pname = "go";

     

       39
       +
         version = "1.15.7";

     

       40
        
       

     

       41
        
         src = fetchurl {

     

       42
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       43
       +
           sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6";

     

       44
        
         };

     

       45
        
       

     

       46
        
         # perl is used for testing go vet

+2 -2

pkgs/development/libraries/libmodule/default.nix

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "libmodule";

     

       6
       -
         version = "5.0.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "FedeDP";

     

       10
        
           repo = "libmodule";

     

       11
        
           rev = version;

     

       12
       -
           sha256 = "1cf81sl33xmfn5g150iqcdrjn0lpjlgp53mganwi6x7jda2qk7r6";

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "libmodule";

     

       6
       +
         version = "5.0.1";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "FedeDP";

     

       10
        
           repo = "libmodule";

     

       11
        
           rev = version;

     

       12
       +
           sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [

+39

pkgs/development/libraries/libwpe/default.nix

···

       1
       +
       { stdenv

     

       2
       +
       , lib

     

       3
       +
       , fetchurl

     

       4
       +
       , meson

     

       5
       +
       , pkg-config

     

       6
       +
       , libxkbcommon

     

       7
       +
       , libGL

     

       8
       +
       , ninja

     

       9
       +
       , libX11 }:

     

       10
       +
       

     

       11
       +
       stdenv.mkDerivation rec {

     

       12
       +
         pname = "libwpe";

     

       13
       +
         version = "1.7.1";

     

       14
       +
       

     

       15
       +
         src = fetchurl {

     

       16
       +
           url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";

     

       17
       +
           sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157";

     

       18
       +
         };

     

       19
       +
       

     

       20
       +
         nativeBuildInputs = [

     

       21
       +
           pkg-config

     

       22
       +
           meson

     

       23
       +
           ninja

     

       24
       +
         ];

     

       25
       +
       

     

       26
       +
         buildInputs = [

     

       27
       +
           libxkbcommon

     

       28
       +
           libGL

     

       29
       +
           libX11

     

       30
       +
         ];

     

       31
       +
       

     

       32
       +
         meta = with lib; {

     

       33
       +
           description = "General-purpose library for WPE WebKit";

     

       34
       +
           license = licenses.bsd2;

     

       35
       +
           homepage = "https://wpewebkit.org";

     

       36
       +
           maintainers = with maintainers; [ matthewbauer ];

     

       37
       +
           platforms = platforms.linux;

     

       38
       +
         };

     

       39
       +
       }

+52

pkgs/development/libraries/libwpe/fdo.nix

···

       1
       +
       { stdenv

     

       2
       +
       , lib

     

       3
       +
       , fetchurl

     

       4
       +
       , meson

     

       5
       +
       , pkg-config

     

       6
       +
       , ninja

     

       7
       +
       , wayland

     

       8
       +
       , epoxy

     

       9
       +
       , glib

     

       10
       +
       , libwpe

     

       11
       +
       , libxkbcommon

     

       12
       +
       , libGL

     

       13
       +
       , libX11 }:

     

       14
       +
       

     

       15
       +
       stdenv.mkDerivation rec {

     

       16
       +
         pname = "wpebackend-fdo";

     

       17
       +
         version = "1.7.1";

     

       18
       +
       

     

       19
       +
         src = fetchurl {

     

       20
       +
           url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";

     

       21
       +
           sha256 = "1xf6akagvpyh0nyxkfijrx5avp6ravnivy28dhk64dsfx9rhm64v";

     

       22
       +
         };

     

       23
       +
       

     

       24
       +
         depsBuildBuild = [

     

       25
       +
           pkg-config

     

       26
       +
         ];

     

       27
       +
       

     

       28
       +
         nativeBuildInputs = [

     

       29
       +
           pkg-config

     

       30
       +
           meson

     

       31
       +
           ninja

     

       32
       +
           wayland

     

       33
       +
         ];

     

       34
       +
       

     

       35
       +
         buildInputs = [

     

       36
       +
           wayland

     

       37
       +
           epoxy

     

       38
       +
           glib

     

       39
       +
           libwpe

     

       40
       +
           libxkbcommon

     

       41
       +
           libGL

     

       42
       +
           libX11

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         meta = with lib; {

     

       46
       +
           description = "Freedesktop.org backend for WPE WebKit";

     

       47
       +
           license = licenses.bsd2;

     

       48
       +
           homepage = "https://wpewebkit.org";

     

       49
       +
           maintainers = with maintainers; [ matthewbauer ];

     

       50
       +
           platforms = platforms.linux;

     

       51
       +
         };

     

       52
       +
       }

+4 -1

pkgs/development/libraries/webkitgtk/default.nix

···

       51
        
       , xdg-dbus-proxy

     

       52
        
       , substituteAll

     

       53
        
       , glib

     

       0
        
       
     

       0
        
       
     

       54
        
       }:

     

       55
        
       

     

       56
        
       assert enableGeoLocation -> geoclue2 != null;

     
···

       120
        
           libsecret

     

       121
        
           libtasn1

     

       122
        
           libwebp

     

       0
        
       
     

       0
        
       
     

       123
        
           libxkbcommon

     

       124
        
           libxml2

     

       125
        
           libxslt

     
···

       154
        
           "-DENABLE_INTROSPECTION=ON"

     

       155
        
           "-DPORT=GTK"

     

       156
        
           "-DUSE_LIBHYPHEN=OFF"

     

       157
       -
           "-DUSE_WPE_RENDERER=OFF"

     

       158
        
         ] ++ optionals stdenv.isDarwin [

     

       159
        
           "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"

     

       160
        
           "-DENABLE_GTKDOC=OFF"

···

       51
        
       , xdg-dbus-proxy

     

       52
        
       , substituteAll

     

       53
        
       , glib

     

       54
       +
       , libwpe

     

       55
       +
       , libwpe-fdo

     

       56
        
       }:

     

       57
        
       

     

       58
        
       assert enableGeoLocation -> geoclue2 != null;

     
···

       122
        
           libsecret

     

       123
        
           libtasn1

     

       124
        
           libwebp

     

       125
       +
           libwpe

     

       126
       +
           libwpe-fdo

     

       127
        
           libxkbcommon

     

       128
        
           libxml2

     

       129
        
           libxslt

     
···

       158
        
           "-DENABLE_INTROSPECTION=ON"

     

       159
        
           "-DPORT=GTK"

     

       160
        
           "-DUSE_LIBHYPHEN=OFF"

     

       0
        
       
     

       161
        
         ] ++ optionals stdenv.isDarwin [

     

       162
        
           "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"

     

       163
        
           "-DENABLE_GTKDOC=OFF"

+1 -1

pkgs/development/misc/google-clasp/google-clasp.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+1 -1

pkgs/development/misc/google-clasp/node-packages.nix

···

       2102
        
           bypassCache = true;

     

       2103
        
           reconstructLock = true;

     

       2104
        
         };

     

       2105
       -
       }

···

       2102
        
           bypassCache = true;

     

       2103
        
           reconstructLock = true;

     

       2104
        
         };

     

       2105
       +
       }

+1 -1

pkgs/development/node-packages/node-packages.nix

···

       110969
        
           bypassCache = true;

     

       110970
        
           reconstructLock = true;

     

       110971
        
         };

     

       110972
       -
       }

···

       110969
        
           bypassCache = true;

     

       110970
        
           reconstructLock = true;

     

       110971
        
         };

     

       110972
       +
       }

+2 -2

pkgs/development/ocaml-modules/optint/default.nix

···

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         minimumOCamlVersion = "4.03";

     

       5
       -
         version = "0.0.3";

     

       6
        
         pname = "optint";

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";

     

       9
       -
           sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj";

     

       10
        
         };

     

       11
        
       

     

       12
        
         meta = {

···

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         minimumOCamlVersion = "4.03";

     

       5
       +
         version = "0.0.4";

     

       6
        
         pname = "optint";

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";

     

       9
       +
           sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a";

     

       10
        
         };

     

       11
        
       

     

       12
        
         meta = {

+2 -2

pkgs/development/php-packages/phpstan/default.nix

···

       1
        
       { mkDerivation, fetchurl, pkgs, lib, php }:

     

       2
        
       let

     

       3
        
         pname = "phpstan";

     

       4
       -
         version = "0.12.59";

     

       5
        
       in

     

       6
        
       mkDerivation {

     

       7
        
         inherit pname version;

     

       8
        
       

     

       9
        
         src = pkgs.fetchurl {

     

       10
        
           url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";

     

       11
       -
           sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa";

     

       12
        
         };

     

       13
        
       

     

       14
        
         phases = [ "installPhase" ];

···

       1
        
       { mkDerivation, fetchurl, pkgs, lib, php }:

     

       2
        
       let

     

       3
        
         pname = "phpstan";

     

       4
       +
         version = "0.12.68";

     

       5
        
       in

     

       6
        
       mkDerivation {

     

       7
        
         inherit pname version;

     

       8
        
       

     

       9
        
         src = pkgs.fetchurl {

     

       10
        
           url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";

     

       11
       +
           sha256 = "sha256-qplQi12ecZjtaM8XawiO+qSwEdTXByrxWZLf3N7gfNc=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         phases = [ "installPhase" ];

+2 -2

pkgs/development/php-packages/psalm/default.nix

···

       1
        
       { mkDerivation, fetchurl, pkgs, lib, php }:

     

       2
        
       let

     

       3
        
         pname = "psalm";

     

       4
       -
         version = "4.3.1";

     

       5
        
       in

     

       6
        
       mkDerivation {

     

       7
        
         inherit pname version;

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";

     

       11
       -
           sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5";

     

       12
        
         };

     

       13
        
       

     

       14
        
         phases = [ "installPhase" ];

···

       1
        
       { mkDerivation, fetchurl, pkgs, lib, php }:

     

       2
        
       let

     

       3
        
         pname = "psalm";

     

       4
       +
         version = "4.4.1";

     

       5
        
       in

     

       6
        
       mkDerivation {

     

       7
        
         inherit pname version;

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";

     

       11
       +
           sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         phases = [ "installPhase" ];

+2 -2

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

···

       23
        
         pythonImportsCheck = [ "azure.synapse.artifacts" ];

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
       -
           description = "CHANGE";

     

       27
       -
           homepage = "https://github.com/CHANGE/azure-synapse-artifacts/";

     

       28
        
           license = licenses.mit;

     

       29
        
           maintainers = with maintainers; [ jonringer ];

     

       30
        
         };

···

       23
        
         pythonImportsCheck = [ "azure.synapse.artifacts" ];

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
       +
           description = "Microsoft Azure Synapse Artifacts Client Library for Python";

     

       27
       +
           homepage = "https://github.com/Azure/azure-sdk-for-python";

     

       28
        
           license = licenses.mit;

     

       29
        
           maintainers = with maintainers; [ jonringer ];

     

       30
        
         };

+13 -12

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

···

       1
       -
       { lib, stdenv, buildPythonPackage, fetchPypi

     

       2
        
       , click, click-log, pure-pcapy3

     

       3
       -
       , pyserial, pyserial-asyncio, voluptuous, zigpy

     

       4
       -
       , asynctest, pytest, pytest-asyncio }:

     

       5
        
       

     

       6
       -
       let

     

       7
        
         pname = "bellows";

     

       8
        
         version = "0.21.0";

     

       9
        
       

     

       10
       -
       in buildPythonPackage rec {

     

       11
       -
         inherit pname version;

     

       12
       -
       

     

       13
       -
         src = fetchPypi {

     

       14
       -
           inherit pname version;

     

       15
       -
           sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = [

     

       19
       -
           click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy

     

       20
        
         ];

     

       21
        
       

     

       22
        
         checkInputs = [

     

       23
       -
           asynctest pytest pytest-asyncio

     

       0
        
       
     

       0
        
       
     

       24
        
         ];

     

       25
        
       

     

       26
        
         prePatch = ''

···

       1
       +
       { lib, stdenv, buildPythonPackage, fetchFromGitHub

     

       2
        
       , click, click-log, pure-pcapy3

     

       3
       +
       , pyserial-asyncio, voluptuous, zigpy

     

       4
       +
       , asynctest, pytestCheckHook, pytest-asyncio }:

     

       5
        
       

     

       6
       +
       buildPythonPackage rec {

     

       7
        
         pname = "bellows";

     

       8
        
         version = "0.21.0";

     

       9
        
       

     

       10
       +
         src = fetchFromGitHub {

     

       11
       +
           owner = "zigpy";

     

       12
       +
           repo = "bellows";

     

       13
       +
           rev = version;

     

       14
       +
           sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a";

     

       0
        
       
     

       15
        
         };

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [

     

       18
       +
           click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy

     

       19
        
         ];

     

       20
        
       

     

       21
        
         checkInputs = [

     

       22
       +
           asynctest

     

       23
       +
           pytestCheckHook

     

       24
       +
           pytest-asyncio

     

       25
        
         ];

     

       26
        
       

     

       27
        
         prePatch = ''

+2 -11

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

···

       3
        
       , sphinx

     

       4
        
       , hypothesis

     

       5
        
       , py

     

       6
       -
       , pytest

     

       7
        
       , pytest-benchmark

     

       8
        
       , sortedcollections

     

       9
        
       , sortedcontainers

     
···

       23
        
         nativeBuildInputs = [ setuptools_scm ];

     

       24
        
         propagatedBuildInputs = [ sphinx ];

     

       25
        
       

     

       26
       -
         # this can be removed >0.19.0

     

       27
       -
         postPatch = ''

     

       28
       -
           substituteInPlace setup.py \

     

       29
       -
             --replace "setuptools_scm < 4" "setuptools_scm"

     

       30
       -
         '';

     

       31
       -
       

     

       32
        
         checkInputs = [

     

       33
        
           hypothesis

     

       34
        
           py

     

       35
       -
           pytest

     

       36
        
           pytest-benchmark

     

       37
        
           sortedcollections

     

       38
        
           sortedcontainers

     

       39
        
         ];

     

       40
       -
         checkPhase = ''

     

       41
       -
           pytest tests

     

       42
       -
         '';

     

       43
        
       

     

       44
        
         meta = with lib; {

     

       45
        
           homepage = "https://github.com/jab/bidict";

···

       3
        
       , sphinx

     

       4
        
       , hypothesis

     

       5
        
       , py

     

       6
       +
       , pytestCheckHook

     

       7
        
       , pytest-benchmark

     

       8
        
       , sortedcollections

     

       9
        
       , sortedcontainers

     
···

       23
        
         nativeBuildInputs = [ setuptools_scm ];

     

       24
        
         propagatedBuildInputs = [ sphinx ];

     

       25
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
         checkInputs = [

     

       27
        
           hypothesis

     

       28
        
           py

     

       29
       +
           pytestCheckHook

     

       30
        
           pytest-benchmark

     

       31
        
           sortedcollections

     

       32
        
           sortedcontainers

     

       33
        
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
       

     

       35
        
         meta = with lib; {

     

       36
        
           homepage = "https://github.com/jab/bidict";

-5

pkgs/development/python-modules/google-music/default.nix

···

       19
        
           sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         postPatch = ''

     

       23
       -
           substituteInPlace setup.py \

     

       24
       -
             --replace "audio-metadata>=0.8,<0.9" "audio-metadata"

     

       25
       -
         '';

     

       26
       -
       

     

       27
        
         propagatedBuildInputs = [

     

       28
        
           appdirs

     

       29
        
           audio-metadata

···

       19
        
           sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";

     

       20
        
         };

     

       21
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         propagatedBuildInputs = [

     

       23
        
           appdirs

     

       24
        
           audio-metadata

+1 -3

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

···

       20
        
       

     

       21
        
         postPatch = ''

     

       22
        
           substituteInPlace python/setup.py \

     

       23
       -
             --replace "graphviz<0.9.0," "graphviz" \

     

       24
       -
             --replace "numpy<=1.15.2," "numpy" \

     

       25
       -
             --replace "requests<2.19.0," "requests"

     

       26
        
         '';

     

       27
        
       

     

       28
        
         preConfigure = ''

···

       20
        
       

     

       21
        
         postPatch = ''

     

       22
        
           substituteInPlace python/setup.py \

     

       23
       +
             --replace "graphviz<0.9.0," "graphviz"

     

       0
        
       
     

       0
        
       
     

       24
        
         '';

     

       25
        
       

     

       26
        
         preConfigure = ''

+1 -2

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

···

       44
        
           sed -i /pyqtwebengine/d setup.py

     

       45
        
           substituteInPlace setup.py \

     

       46
        
             --replace "pyqt5<5.13" "pyqt5" \

     

       47
       -
             --replace "parso==0.7.0" "parso" \

     

       48
       -
             --replace "jedi==0.17.1" "jedi"

     

       49
        
         '';

     

       50
        
       

     

       51
        
         postInstall = ''

···

       44
        
           sed -i /pyqtwebengine/d setup.py

     

       45
        
           substituteInPlace setup.py \

     

       46
        
             --replace "pyqt5<5.13" "pyqt5" \

     

       47
       +
             --replace "parso==0.7.0" "parso"

     

       0
        
       
     

       48
        
         '';

     

       49
        
       

     

       50
        
         postInstall = ''

+3 -3

pkgs/development/tools/operator-sdk/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "operator-sdk";

     

       5
       -
         version = "1.2.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "operator-framework";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "operator-sdk";

     

       5
       +
         version = "1.3.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "operator-framework";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

+70

pkgs/development/web/cog/default.nix

···

       1
       +
       { stdenv

     

       2
       +
       , lib

     

       3
       +
       , fetchpatch

     

       4
       +
       , fetchFromGitHub

     

       5
       +
       , cmake

     

       6
       +
       , pkg-config

     

       7
       +
       , wayland

     

       8
       +
       , wayland-protocols

     

       9
       +
       , libwpe

     

       10
       +
       , libwpe-fdo

     

       11
       +
       , glib

     

       12
       +
       , glib-networking

     

       13
       +
       , webkitgtk

     

       14
       +
       , makeWrapper

     

       15
       +
       , wrapGAppsHook

     

       16
       +
       , gnome3

     

       17
       +
       , gdk-pixbuf

     

       18
       +
       }:

     

       19
       +
       

     

       20
       +
       stdenv.mkDerivation rec {

     

       21
       +
         pname = "cog";

     

       22
       +
         version = "0.6.0";

     

       23
       +
       

     

       24
       +
         src = fetchFromGitHub {

     

       25
       +
           owner = "igalia";

     

       26
       +
           repo = "cog";

     

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

     

       28
       +
           sha256 = "0a0zpdki1whm5gb6ycbazvwmm1fz094mkfwjfy4a7zz0pk54h1jw";

     

       29
       +
         };

     

       30
       +
       

     

       31
       +
         buildInputs = [

     

       32
       +
           wayland-protocols

     

       33
       +
           wayland

     

       34
       +
           libwpe

     

       35
       +
           libwpe-fdo

     

       36
       +
           webkitgtk

     

       37
       +
           glib-networking

     

       38
       +
           gdk-pixbuf

     

       39
       +
           gnome3.adwaita-icon-theme

     

       40
       +
         ];

     

       41
       +
       

     

       42
       +
         nativeBuildInputs = [

     

       43
       +
           cmake

     

       44
       +
           pkg-config

     

       45
       +
           wayland

     

       46
       +
           makeWrapper

     

       47
       +
           wrapGAppsHook

     

       48
       +
         ];

     

       49
       +
       

     

       50
       +
         depsBuildsBuild = [

     

       51
       +
           pkg-config

     

       52
       +
         ];

     

       53
       +
       

     

       54
       +
         cmakeFlags = [

     

       55
       +
           "-DCOG_USE_WEBKITGTK=ON"

     

       56
       +
         ];

     

       57
       +
       

     

       58
       +
         # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59

     

       59
       +
         preFixup = ''

     

       60
       +
           wrapProgram $out/bin/cog \

     

       61
       +
             --prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib

     

       62
       +
         '';

     

       63
       +
       

     

       64
       +
         meta = with lib; {

     

       65
       +
           description = "A small single “window” launcher for the WebKit WPE port";

     

       66
       +
           license = licenses.mit;

     

       67
       +
           maintainers = [ maintainers.matthewbauer ];

     

       68
       +
           platforms = platforms.linux;

     

       69
       +
         };

     

       70
       +
       }

+1 -1

pkgs/development/web/newman/node-composition.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+1 -1

pkgs/development/web/newman/node-packages.nix

···

       5727
        
           bypassCache = true;

     

       5728
        
           reconstructLock = true;

     

       5729
        
         };

     

       5730
       -
       }

···

       5727
        
           bypassCache = true;

     

       5728
        
           reconstructLock = true;

     

       5729
        
         };

     

       5730
       +
       }

+1 -1

pkgs/development/web/remarkjs/nodepkgs.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+5 -5

pkgs/games/0ad/default.nix

···

       1
       -
       { wxGTK, newScope }:

     

       2
       -
       

     

       3
        
       let

     

       4
        
         callPackage = newScope self;

     

       5
        
       

     

       6
        
         self = {

     

       7
       -
           zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };

     

       8
        
       

     

       9
       -
           zeroad-data = callPackage ./data.nix { };

     

       10
        
       

     

       11
        
           zeroad = callPackage ./wrapper.nix { };

     

       12
        
         };

     

       13
        
       

     

       14
       -
       in self

     

       0

···

       1
       +
       { wxGTK, stdenv, newScope }:

     

       0
        
       
     

       2
        
       let

     

       3
        
         callPackage = newScope self;

     

       4
        
       

     

       5
        
         self = {

     

       6
       +
           zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; };

     

       7
        
       

     

       8
       +
           zeroad-data = callPackage ./data.nix { inherit stdenv; };

     

       9
        
       

     

       10
        
           zeroad = callPackage ./wrapper.nix { };

     

       11
        
         };

     

       12
        
       

     

       13
       +
       in

     

       14
       +
       self

+1 -1

pkgs/games/0ad/game.nix

···

       50
        
           # Workaround invalid pkg-config name for mozjs

     

       51
        
           mkdir pkg-config

     

       52
        
           ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc

     

       53
       -
           PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"

     

       54
        
       

     

       55
        
           # Update Makefiles

     

       56
        
           pushd build/workspaces

···

       50
        
           # Workaround invalid pkg-config name for mozjs

     

       51
        
           mkdir pkg-config

     

       52
        
           ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc

     

       53
       +
           PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"

     

       54
        
       

     

       55
        
           # Update Makefiles

     

       56
        
           pushd build/workspaces

+2 -2

pkgs/games/crispy-doom/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "crispy-doom";

     

       5
       -
         version = "5.9.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "fabiangreffrath";

     

       9
        
           repo = pname;

     

       10
        
           rev = "${pname}-${version}";

     

       11
       -
           sha256 = "0fkw9z66sjcz7k528wyla6mgi4impqimn93yhqmc194ycrjirraa";

     

       12
        
         };

     

       13
        
       

     

       14
        
         postPatch = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "crispy-doom";

     

       5
       +
         version = "5.10.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "fabiangreffrath";

     

       9
        
           repo = pname;

     

       10
        
           rev = "${pname}-${version}";

     

       11
       +
           sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         postPatch = ''

+1 -1

pkgs/misc/base16-builder/node-packages-generated.nix

···

       1634
        
           bypassCache = true;

     

       1635
        
           reconstructLock = true;

     

       1636
        
         };

     

       1637
       -
       }

···

       1634
        
           bypassCache = true;

     

       1635
        
           reconstructLock = true;

     

       1636
        
         };

     

       1637
       +
       }

+1 -1

pkgs/misc/base16-builder/node-packages.nix

···

       18
        
       import ./node-packages-generated.nix {

     

       19
        
         inherit (pkgs) fetchurl fetchgit;

     

       20
        
         inherit nodeEnv globalBuildInputs;

     

       21
       -
       }

···

       18
        
       import ./node-packages-generated.nix {

     

       19
        
         inherit (pkgs) fetchurl fetchgit;

     

       20
        
         inherit nodeEnv globalBuildInputs;

     

       21
       +
       }

+1 -1

pkgs/misc/base16-builder/supplement.nix

···

       690
        
           bypassCache = true;

     

       691
        
           reconstructLock = true;

     

       692
        
         };

     

       693
       -
       }

···

       690
        
           bypassCache = true;

     

       691
        
           reconstructLock = true;

     

       692
        
         };

     

       693
       +
       }

+21 -8

pkgs/misc/emulators/mednaffe/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkg-config, wrapGAppsHook

     

       2
       -
       , gtk2 ? null, gtk3 ? null, mednafen }:

     

       3
       -
       

     

       4
       -
       with lib;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "mednaffe";

     
···

       14
        
           sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";

     

       15
        
         };

     

       16
        
       

     

       17
       -
         nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config wrapGAppsHook ];

     

       18
        
         buildInputs = [ gtk2 gtk3 mednafen ];

     

       19
        
       

     

       20
       -
         configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];

     

       21
       -
         postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin";

     

       0
        
       
     

       22
        
       

     

       23
       -
         meta = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
           description = "GTK-based frontend for mednafen emulator";

     

       25
        
           homepage = "https://github.com/AmatCoder/mednaffe";

     

       26
        
           license = licenses.gpl3Plus;

···

       1
       +
       { stdenv

     

       2
       +
       , lib

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , autoreconfHook

     

       5
       +
       , pkg-config

     

       6
       +
       , mednafen

     

       7
       +
       , gtk2 ? null

     

       8
       +
       , gtk3 ? null

     

       9
       +
       , wrapGAppsHook

     

       10
       +
       }:

     

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "mednaffe";

     
···

       20
        
           sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";

     

       21
        
         };

     

       22
        
       

     

       23
       +
         nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];

     

       24
        
         buildInputs = [ gtk2 gtk3 mednafen ];

     

       25
        
       

     

       26
       +
         configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ];

     

       27
       +
       

     

       28
       +
         dontWrapGApps = true;

     

       29
        
       

     

       30
       +
         postInstall = ''

     

       31
       +
           wrapProgram $out/bin/mednaffe \

     

       32
       +
             --prefix PATH ':' "${mednafen}/bin" \

     

       33
       +
             "''${gappsWrapperArgs[@]}"

     

       34
       +
          '';

     

       35
       +
       

     

       36
       +
         meta = with lib; {

     

       37
        
           description = "GTK-based frontend for mednafen emulator";

     

       38
        
           homepage = "https://github.com/AmatCoder/mednaffe";

     

       39
        
           license = licenses.gpl3Plus;

+14 -6

pkgs/os-specific/darwin/duti/default.nix

···

       1
       -
       {stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "duti";

     

       5
       -
         version = "1.5.4pre";

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "moretension";

     

       8
        
           repo = pname;

     

       9
       -
           rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc";

     

       10
       -
           sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl";

     

       11
        
         };

     

       0
        
       
     

       12
        
         nativeBuildInputs = [autoreconfHook];

     

       13
       -
         buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices];

     

       14
       -
         configureFlags = ["--with-macosx-sdk=/homeless-shelter"];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
         meta = with lib; {

     

       16
        
           description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X";

     

       17
        
           longDescription = ''

···

       1
       +
       {stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "duti";

     

       5
       +
         version = "1.5.5pre";

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "moretension";

     

       8
        
           repo = pname;

     

       9
       +
           rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2";

     

       10
       +
           sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9";

     

       11
        
         };

     

       12
       +
       

     

       13
        
         nativeBuildInputs = [autoreconfHook];

     

       14
       +
         buildInputs = [ApplicationServices];

     

       15
       +
         configureFlags = [

     

       16
       +
           "--with-macosx-sdk=/homeless-shelter"

     

       17
       +
       

     

       18
       +
           # needed to prevent duti from trying to guess our sdk

     

       19
       +
           # NOTE: this is different than stdenv.hostPlatform.config!

     

       20
       +
           "--host=x86_64-apple-darwin18"

     

       21
       +
         ];

     

       22
       +
       

     

       23
        
         meta = with lib; {

     

       24
        
           description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X";

     

       25
        
           longDescription = ''

+2 -2

pkgs/os-specific/linux/cifs-utils/default.nix

···

       1
        
       { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config

     

       2
       -
       , kerberos, keyutils, pam, talloc }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "cifs-utils";

     
···

       12
        
       

     

       13
        
         nativeBuildInputs = [ autoreconfHook docutils pkg-config ];

     

       14
        
       

     

       15
       -
         buildInputs = [ kerberos keyutils pam talloc ];

     

       16
        
       

     

       17
        
         configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       18
        
           # AC_FUNC_MALLOC is broken on cross builds.

···

       1
        
       { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config

     

       2
       +
       , kerberos, keyutils, pam, talloc, python3 }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "cifs-utils";

     
···

       12
        
       

     

       13
        
         nativeBuildInputs = [ autoreconfHook docutils pkg-config ];

     

       14
        
       

     

       15
       +
         buildInputs = [ kerberos keyutils pam talloc python3 ];

     

       16
        
       

     

       17
        
         configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       18
        
           # AC_FUNC_MALLOC is broken on cross builds.

+1 -1

pkgs/os-specific/linux/sysklogd/default.nix

···

       8
        
           sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji";

     

       9
        
         };

     

       10
        
       

     

       11
       -
         patches = [ ./systemd.patch ./union-wait.patch ];

     

       12
        
       

     

       13
        
         NIX_CFLAGS_COMPILE = "-DSYSV";

     

       14

···

       8
        
           sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji";

     

       9
        
         };

     

       10
        
       

     

       11
       +
         patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ];

     

       12
        
       

     

       13
        
         NIX_CFLAGS_COMPILE = "-DSYSV";

     

       14

+120

pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch

···

       1
       +
       # this patch both fixes some include paths as well as removes glibc

     

       2
       +
       # gates around defines that musl-libc also depends on.

     

       3
       +
       diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c

     

       4
       +
       --- sysklogd-1.5.1.orig/klogd.c	2014-10-04 15:47:18.000000000 -0400

     

       5
       +
       +++ sysklogd-1.5.1/klogd.c	2021-01-18 23:09:23.000000000 -0500

     

       6
       +
       @@ -260,11 +260,8 @@

     

       7
       +
        #include <unistd.h>

     

       8
       +
        #include <signal.h>

     

       9
       +
        #include <errno.h>

     

       10
       +
       -#include <sys/fcntl.h>

     

       11
       +
       +#include <fcntl.h>

     

       12
       +
        #include <sys/stat.h>

     

       13
       +
       -#if !defined(__GLIBC__)

     

       14
       +
       -#include <linux/time.h>

     

       15
       +
       -#endif /* __GLIBC__ */

     

       16
       +
        #include <stdarg.h>

     

       17
       +
        #include <paths.h>

     

       18
       +
        #include <stdlib.h>

     

       19
       +
       @@ -277,13 +274,8 @@

     

       20
       +
        

     

       21
       +
        #define __LIBRARY__

     

       22
       +
        #include <linux/unistd.h>

     

       23
       +
       -#if !defined(__GLIBC__)

     

       24
       +
       -# define __NR_ksyslog __NR_syslog

     

       25
       +
       -_syscall3(int,ksyslog,int, type, char *, buf, int, len);

     

       26
       +
       -#else

     

       27
       +
        #include <sys/klog.h>

     

       28
       +
        #define ksyslog klogctl

     

       29
       +
       -#endif

     

       30
       +
        

     

       31
       +
        #define LOG_BUFFER_SIZE 4096

     

       32
       +
        #define LOG_LINE_LENGTH 1000

     

       33
       +
       diff -u sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c

     

       34
       +
       --- sysklogd-1.5.1.orig/ksym_mod.c	2014-10-04 15:47:18.000000000 -0400

     

       35
       +
       +++ sysklogd-1.5.1/ksym_mod.c	2021-01-18 23:09:57.000000000 -0500

     

       36
       +
       @@ -113,12 +113,9 @@

     

       37
       +
        #include <unistd.h>

     

       38
       +
        #include <signal.h>

     

       39
       +
        #include <errno.h>

     

       40
       +
       -#include <sys/fcntl.h>

     

       41
       +
       +#include <fcntl.h>

     

       42
       +
        #include <sys/stat.h>

     

       43
       +
        #include "module.h"

     

       44
       +
       -#if !defined(__GLIBC__)

     

       45
       +
       -#include <linux/time.h>

     

       46
       +
       -#endif /* __GLIBC__ */

     

       47
       +
        #include <stdarg.h>

     

       48
       +
        #include <paths.h>

     

       49
       +
        #include <linux/version.h>

     

       50
       +
       diff -u sysklogd-1.5.1.orig/pidfile.c sysklogd-1.5.1/pidfile.c

     

       51
       +
       --- sysklogd-1.5.1.orig/pidfile.c	2014-10-04 15:47:18.000000000 -0400

     

       52
       +
       +++ sysklogd-1.5.1/pidfile.c	2021-01-18 23:23:55.000000000 -0500

     

       53
       +
       @@ -25,6 +25,7 @@

     

       54
       +
         */

     

       55
       +
        

     

       56
       +
        #include <stdio.h>

     

       57
       +
       +#include <fcntl.h>

     

       58
       +
        #include <unistd.h>

     

       59
       +
        #include <sys/stat.h>

     

       60
       +
        #include <sys/file.h>

     

       61
       +
       diff -u sysklogd-1.5.1.orig/syslog.c sysklogd-1.5.1/syslog.c

     

       62
       +
       --- sysklogd-1.5.1.orig/syslog.c	2014-10-04 15:47:18.000000000 -0400

     

       63
       +
       +++ sysklogd-1.5.1/syslog.c	2021-01-18 23:11:45.000000000 -0500

     

       64
       +
       @@ -55,7 +55,6 @@

     

       65
       +
        #include <sys/types.h>

     

       66
       +
        #include <sys/socket.h>

     

       67
       +
        #include <sys/file.h>

     

       68
       +
       -#include <sys/signal.h>

     

       69
       +
        #include <sys/syslog.h>

     

       70
       +
        #if 0

     

       71
       +
        #include "syslog.h"

     

       72
       +
       @@ -64,6 +63,8 @@

     

       73
       +
        

     

       74
       +
        #include <sys/uio.h>

     

       75
       +
        #include <sys/wait.h>

     

       76
       +
       +#include <signal.h>

     

       77
       +
       +#include <fcntl.h>

     

       78
       +
        #include <netdb.h>

     

       79
       +
        #include <string.h>

     

       80
       +
        #include <time.h>

     

       81
       +
       diff -u sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c

     

       82
       +
       --- sysklogd-1.5.1.orig/syslogd.c	2014-10-04 15:47:18.000000000 -0400

     

       83
       +
       +++ sysklogd-1.5.1/syslogd.c	2021-01-18 23:13:25.000000000 -0500

     

       84
       +
       @@ -519,9 +519,9 @@

     

       85
       +
        #include <time.h>

     

       86
       +
        

     

       87
       +
        #define SYSLOG_NAMES

     

       88
       +
       +#include <errno.h>

     

       89
       +
        #include <sys/syslog.h>

     

       90
       +
        #include <sys/param.h>

     

       91
       +
       -#include <sys/errno.h>

     

       92
       +
        #include <sys/ioctl.h>

     

       93
       +
        #include <sys/stat.h>

     

       94
       +
        #include <sys/wait.h>

     

       95
       +
       @@ -818,9 +818,7 @@

     

       96
       +
        void init();

     

       97
       +
        void cfline(char *line, register struct filed *f);

     

       98
       +
        int decode(char *name, struct code *codetab);

     

       99
       +
       -#if defined(__GLIBC__)

     

       100
       +
        #define dprintf mydprintf

     

       101
       +
       -#endif /* __GLIBC__ */

     

       102
       +
        static void dprintf(char *, ...);

     

       103
       +
        static void allocate_log(void);

     

       104
       +
        void sighup_handler();

     

       105
       +
       @@ -840,15 +838,9 @@

     

       106
       +
        	register char *p;

     

       107
       +
        #ifndef TESTING

     

       108
       +
        	ssize_t msglen;

     

       109
       +
       -#endif

     

       110
       +
       -#if !defined(__GLIBC__)

     

       111
       +
       -	int len, num_fds;

     

       112
       +
       -#else /* __GLIBC__ */

     

       113
       +
       -#ifndef TESTING

     

       114
       +
        	socklen_t len;

     

       115
       +
        #endif

     

       116
       +
        	int num_fds;

     

       117
       +
       -#endif /* __GLIBC__ */

     

       118
       +
        	/*

     

       119
       +
        	 * It took me quite some time to figure out how this is

     

       120
       +
        	 * supposed to work so I guess I should better write it down.

+1 -1

pkgs/os-specific/linux/sysklogd/systemd.patch

···

       71
        
       +#include <sys/stat.h>

     

       72
        
       +#include <sys/socket.h>

     

       73
        
       +#include <sys/un.h>

     

       74
       -
       +#include <sys/fcntl.h>

     

       75
        
       +#include <netinet/in.h>

     

       76
        
       +#include <stdlib.h>

     

       0
        
       
     

       77
        
       +#include <errno.h>

     

       78
        
       +#include <unistd.h>

     

       79
        
       +#include <string.h>

···

       71
        
       +#include <sys/stat.h>

     

       72
        
       +#include <sys/socket.h>

     

       73
        
       +#include <sys/un.h>

     

       0
        
       
     

       74
        
       +#include <netinet/in.h>

     

       75
        
       +#include <stdlib.h>

     

       76
       +
       +#include <fcntl.h>

     

       77
        
       +#include <errno.h>

     

       78
        
       +#include <unistd.h>

     

       79
        
       +#include <string.h>

+2 -2

pkgs/servers/dns/knot-dns/default.nix

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "knot-dns";

     

       10
       -
         version = "3.0.3";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";

     

       14
       -
           sha256 = "fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38";

     

       15
        
         };

     

       16
        
       

     

       17
        
         outputs = [ "bin" "out" "dev" ];

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "knot-dns";

     

       10
       +
         version = "3.0.4";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";

     

       14
       +
           sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983";

     

       15
        
         };

     

       16
        
       

     

       17
        
         outputs = [ "bin" "out" "dev" ];

+1 -1

pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+3 -3

pkgs/servers/monitoring/prometheus/sql-exporter.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "sql_exporter";

     

       5
       -
         version = "0.3.0";

     

       6
        
       

     

       7
        
         vendorSha256 = null;

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "justwatchcom";

     

       11
       -
           repo = "sql_exporter";

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc";

     

       14
        
         };

     

       15
        
       

     

       16
        
         meta = with lib; {

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "sql_exporter";

     

       5
       +
         version = "0.4.0";

     

       6
        
       

     

       7
        
         vendorSha256 = null;

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "justwatchcom";

     

       11
       +
           repo = pname;

     

       12
        
           rev = "v${version}";

     

       13
       +
           sha256 = "0dxzcd3b430xby741fdc85k4d2380jrh34xxskmdzxbf2kqdc5k8";

     

       14
        
         };

     

       15
        
       

     

       16
        
         meta = with lib; {

+3 -3

pkgs/servers/plex/raw.nix

···

       12
        
       # server, and the FHS userenv and corresponding NixOS module should

     

       13
        
       # automatically pick up the changes.

     

       14
        
       stdenv.mkDerivation rec {

     

       15
       -
         version = "1.21.1.3842-b0c7a97d9";

     

       16
        
         pname = "plexmediaserver";

     

       17
        
       

     

       18
        
         # Fetch the source

     

       19
        
         src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {

     

       20
        
           url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";

     

       21
       -
           sha256 = "0wq8q9dvdwciazidvh9plxjzngjr6ibg077yksxhy41dv14vkw7s";

     

       22
        
         } else fetchurl {

     

       23
        
           url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";

     

       24
       -
           sha256 = "14pa50kvgi4m5hbw4a0q7y3s4xn9ghvnm4vdim9g18p1khfmwmwp";

     

       25
        
         };

     

       26
        
       

     

       27
        
         outputs = [ "out" "basedb" ];

···

       12
        
       # server, and the FHS userenv and corresponding NixOS module should

     

       13
        
       # automatically pick up the changes.

     

       14
        
       stdenv.mkDerivation rec {

     

       15
       +
         version = "1.21.1.3876-3c3adfcb4";

     

       16
        
         pname = "plexmediaserver";

     

       17
        
       

     

       18
        
         # Fetch the source

     

       19
        
         src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {

     

       20
        
           url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";

     

       21
       +
           sha256 = "1xpsmk5l0f0blqp5ba9n1w0npsk692p07hp4ipkq7yz3mfag50p0";

     

       22
        
         } else fetchurl {

     

       23
        
           url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";

     

       24
       +
           sha256 = "0dyw84x9h295428l7r8iqfb2vxkv0f1d68z1j2ka3wsw7cj1yq78";

     

       25
        
         };

     

       26
        
       

     

       27
        
         outputs = [ "out" "basedb" ];

+1 -1

pkgs/servers/web-apps/cryptpad/node-packages-generated.nix

···

       741
        
           bypassCache = true;

     

       742
        
           reconstructLock = true;

     

       743
        
         };

     

       744
       -
       }

···

       741
        
           bypassCache = true;

     

       742
        
           reconstructLock = true;

     

       743
        
         };

     

       744
       +
       }

+1 -1

pkgs/servers/web-apps/cryptpad/node-packages.nix

···

       14
        
       import ./node-packages-generated.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages-generated.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+1 -1

pkgs/servers/web-apps/whitebophir/node-packages-generated.nix

···

       1492
        
           bypassCache = true;

     

       1493
        
           reconstructLock = true;

     

       1494
        
         };

     

       1495
       -
       }

···

       1492
        
           bypassCache = true;

     

       1493
        
           reconstructLock = true;

     

       1494
        
         };

     

       1495
       +
       }

+1 -1

pkgs/servers/zigbee2mqtt/node-packages.nix

···

       10090
        
         tarball = nodeEnv.buildNodeSourceDist args;

     

       10091
        
         package = nodeEnv.buildNodePackage args;

     

       10092
        
         shell = nodeEnv.buildNodeShell args;

     

       10093
       -
       }

···

       10090
        
         tarball = nodeEnv.buildNodeSourceDist args;

     

       10091
        
         package = nodeEnv.buildNodePackage args;

     

       10092
        
         shell = nodeEnv.buildNodeShell args;

     

       10093
       +
       }

+1 -1

pkgs/servers/zigbee2mqtt/node.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+10 -7

pkgs/tools/X11/opentabletdriver/default.nix

···

       23
        
       

     

       24
        
       stdenv.mkDerivation rec {

     

       25
        
         pname = "OpenTabletDriver";

     

       26
       -
         version = "0.4.2";

     

       27
        
       

     

       28
        
         src = fetchFromGitHub {

     

       29
        
           owner = "InfinityGhost";

     

       30
        
           repo = "OpenTabletDriver";

     

       31
        
           rev = "v${version}";

     

       32
       -
           sha256 = "048y7gjlk2yw4vh62px1d9w0va6ap1a0cndcpbirlyj9q6b8jxax";

     

       33
        
         };

     

       34
        
       

     

       35
        
         debPkg = fetchurl {

     

       36
        
           url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";

     

       37
       -
           sha256 = "13gg0dhvjy88h9lhcrp30fjiwgb9dzjsgk1k760pi1ki71a5vz2r";

     

       38
        
         };

     

       39
        
       

     

       40
        
         nativeBuildInputs = [

     
···

       134
        
           install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps

     

       135
        
       

     

       136
        
           # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead

     

       137
       -
           dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules

     

       138
       -
           install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d

     

       139
        
       

     

       140
        
           runHook postInstall

     

       141
        
         '';

     
···

       155
        
         dontWrapGApps = true;

     

       156
        
         dontStrip = true;

     

       157
        
       

     

       158
       -
         passthru.tests = {

     

       159
       -
           otd-runs = nixosTests.opentabletdriver;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       160
        
         };

     

       161
        
       

     

       162
        
         meta = with lib; {

···

       23
        
       

     

       24
        
       stdenv.mkDerivation rec {

     

       25
        
         pname = "OpenTabletDriver";

     

       26
       +
         version = "0.5.0";

     

       27
        
       

     

       28
        
         src = fetchFromGitHub {

     

       29
        
           owner = "InfinityGhost";

     

       30
        
           repo = "OpenTabletDriver";

     

       31
        
           rev = "v${version}";

     

       32
       +
           sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp";

     

       33
        
         };

     

       34
        
       

     

       35
        
         debPkg = fetchurl {

     

       36
        
           url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";

     

       37
       +
           sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0";

     

       38
        
         };

     

       39
        
       

     

       40
        
         nativeBuildInputs = [

     
···

       134
        
           install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps

     

       135
        
       

     

       136
        
           # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead

     

       137
       +
           dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules

     

       138
       +
           install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d

     

       139
        
       

     

       140
        
           runHook postInstall

     

       141
        
         '';

     
···

       155
        
         dontWrapGApps = true;

     

       156
        
         dontStrip = true;

     

       157
        
       

     

       158
       +
         passthru = {

     

       159
       +
           updateScript = ./update.sh;

     

       160
       +
           tests = {

     

       161
       +
             otd-runs = nixosTests.opentabletdriver;

     

       162
       +
           };

     

       163
        
         };

     

       164
        
       

     

       165
        
         meta = with lib; {

+14 -19

pkgs/tools/X11/opentabletdriver/deps.nix

···

       11
        
         })

     

       12
        
         (fetchNuGet {

     

       13
        
           name = "Eto.Forms";

     

       14
       -
           version = "2.5.6";

     

       15
       -
           sha256 = "035ny8jlanchwq16gcq0xb6ywabjl71c7qbpv26sjwg96na8vz51";

     

       16
        
         })

     

       17
        
         (fetchNuGet {

     

       18
        
           name = "Eto.Platform.Gtk";

     

       19
       -
           version = "2.5.6";

     

       20
       -
           sha256 = "1ijkjd3lc7x59yk369kxipzgk1zhyr9g6k319wc0n033vij26mwl";

     

       21
        
         })

     

       22
        
         (fetchNuGet {

     

       23
        
           name = "GdkSharp";

     
···

       41
        
         })

     

       42
        
         (fetchNuGet {

     

       43
        
           name = "HidSharpCore";

     

       44
       -
           version = "1.1.0";

     

       45
       -
           sha256 = "122s5j3wrv8hcgnbxrnjqydvcfz7gdm8xq0wlwzrgwdjk44lr45a";

     

       46
        
         })

     

       47
        
         (fetchNuGet {

     

       48
        
           name = "MessagePack.Annotations";

     
···

       120
        
           sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";

     

       121
        
         })

     

       122
        
         (fetchNuGet {

     

       123
       -
           name = "Newtonsoft.Json";

     

       124
       -
           version = "12.0.3";

     

       125
       -
           sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";

     

       126
        
         })

     

       127
        
         (fetchNuGet {

     

       128
        
           name = "PangoSharp";

     
···

       205
        
           sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c";

     

       206
        
         })

     

       207
        
         (fetchNuGet {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       208
        
           name = "StreamJsonRpc";

     

       209
        
           version = "2.6.121";

     

       210
        
           sha256 = "0xzvpk17w2skndzdg47j7gkrrvw6521db4mv8lc3v8hm97vs9m76";

     
···

       230
        
           sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r";

     

       231
        
         })

     

       232
        
         (fetchNuGet {

     

       233
       -
           name = "System.CommandLine";

     

       234
       -
           version = "2.0.0-beta1.20303.1";

     

       235
       -
           sha256 = "0isnz8ipqlqim06hf56zlaq2vnsy5facvf5nvq6kzm5h1dm3l2vn";

     

       236
       -
         })

     

       237
       -
         (fetchNuGet {

     

       238
        
           name = "System.ComponentModel.Annotations";

     

       239
        
           version = "4.7.0";

     

       240
        
           sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z";

     
···

       318
        
           name = "System.Net.WebSockets";

     

       319
        
           version = "4.3.0";

     

       320
        
           sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p";

     

       321
       -
         })

     

       322
       -
         (fetchNuGet {

     

       323
       -
           name = "System.Numerics.Vectors";

     

       324
       -
           version = "4.5.0";

     

       325
       -
           sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59";

     

       326
        
         })

     

       327
        
         (fetchNuGet {

     

       328
        
           name = "System.Reflection.Emit.Lightweight";

···

       11
        
         })

     

       12
        
         (fetchNuGet {

     

       13
        
           name = "Eto.Forms";

     

       14
       +
           version = "2.5.10";

     

       15
       +
           sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7";

     

       16
        
         })

     

       17
        
         (fetchNuGet {

     

       18
        
           name = "Eto.Platform.Gtk";

     

       19
       +
           version = "2.5.10";

     

       20
       +
           sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g";

     

       21
        
         })

     

       22
        
         (fetchNuGet {

     

       23
        
           name = "GdkSharp";

     
···

       41
        
         })

     

       42
        
         (fetchNuGet {

     

       43
        
           name = "HidSharpCore";

     

       44
       +
           version = "1.2.1";

     

       45
       +
           sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2";

     

       46
        
         })

     

       47
        
         (fetchNuGet {

     

       48
        
           name = "MessagePack.Annotations";

     
···

       120
        
           sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";

     

       121
        
         })

     

       122
        
         (fetchNuGet {

     

       123
       +
           name = "Octokit";

     

       124
       +
           version = "0.48.0";

     

       125
       +
           sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8";

     

       126
        
         })

     

       127
        
         (fetchNuGet {

     

       128
        
           name = "PangoSharp";

     
···

       205
        
           sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c";

     

       206
        
         })

     

       207
        
         (fetchNuGet {

     

       208
       +
           name = "SharpZipLib";

     

       209
       +
           version = "1.3.1";

     

       210
       +
           sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0";

     

       211
       +
         })

     

       212
       +
         (fetchNuGet {

     

       213
        
           name = "StreamJsonRpc";

     

       214
        
           version = "2.6.121";

     

       215
        
           sha256 = "0xzvpk17w2skndzdg47j7gkrrvw6521db4mv8lc3v8hm97vs9m76";

     
···

       235
        
           sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r";

     

       236
        
         })

     

       237
        
         (fetchNuGet {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       238
        
           name = "System.ComponentModel.Annotations";

     

       239
        
           version = "4.7.0";

     

       240
        
           sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z";

     
···

       318
        
           name = "System.Net.WebSockets";

     

       319
        
           version = "4.3.0";

     

       320
        
           sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       321
        
         })

     

       322
        
         (fetchNuGet {

     

       323
        
           name = "System.Reflection.Emit.Lightweight";

+8

pkgs/tools/X11/opentabletdriver/update.sh

···

       14
        
         [[ "${1}" != "--force" ]] && exit 0

     

       15
        
       fi

     

       16
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
       cd ../../../..

     

       18
        
       update-source-version opentabletdriver "$new_version"

     

       19
        
       store_src="$(nix-build . -A opentabletdriver.src --no-out-link)"

···

       14
        
         [[ "${1}" != "--force" ]] && exit 0

     

       15
        
       fi

     

       16
        
       

     

       17
       +
       # Updating the hash of deb package manually since there seems to be no way to do it automatically

     

       18
       +
       oldDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb";

     

       19
       +
       newDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb";

     

       20
       +
       oldDebSha256=$(nix-prefetch-url "$oldDebPkgUrl")

     

       21
       +
       newDebSha256=$(nix-prefetch-url "$newDebPkgUrl")

     

       22
       +
       echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256"

     

       23
       +
       sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|"

     

       24
       +
       

     

       25
        
       cd ../../../..

     

       26
        
       update-source-version opentabletdriver "$new_version"

     

       27
        
       store_src="$(nix-build . -A opentabletdriver.src --no-out-link)"

+1 -1

pkgs/tools/compression/zdelta/default.nix

···

       9
        
         };

     

       10
        
       

     

       11
        
         meta = with lib; {

     

       12
       -
       	  homepage = "http://cis.poly.edu/zdelta";

     

       13
        
           platforms = platforms.linux;

     

       14
        
           license = licenses.zlib;

     

       15
        
         };

···

       9
        
         };

     

       10
        
       

     

       11
        
         meta = with lib; {

     

       12
       +
           homepage = "http://cis.poly.edu/zdelta";

     

       13
        
           platforms = platforms.linux;

     

       14
        
           license = licenses.zlib;

     

       15
        
         };

+1 -1

pkgs/tools/graphics/ldgallery/viewer/node-composition.nix

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       -
       }

···

       14
        
       import ./node-packages.nix {

     

       15
        
         inherit (pkgs) fetchurl fetchgit;

     

       16
        
         inherit nodeEnv;

     

       17
       +
       }

+1 -1

pkgs/tools/graphics/ldgallery/viewer/node-packages.nix

···

       13266
        
         tarball = nodeEnv.buildNodeSourceDist args;

     

       13267
        
         package = nodeEnv.buildNodePackage args;

     

       13268
        
         shell = nodeEnv.buildNodeShell args;

     

       13269
       -
       }

···

       13266
        
         tarball = nodeEnv.buildNodeSourceDist args;

     

       13267
        
         package = nodeEnv.buildNodePackage args;

     

       13268
        
         shell = nodeEnv.buildNodeShell args;

     

       13269
       +
       }

+2 -2

pkgs/tools/graphics/pdfredacttools/default.nix

···

       22
        
         meta = with lib; {

     

       23
        
           description = "Redact and strip metadata from documents before publishing";

     

       24
        
           longDescription = ''

     

       25
       -
       	PDF Redact Tools helps with securely redacting and stripping metadata

     

       26
       -
       	from documents before publishing. Note that this is not a security tool.

     

       27
        
               It uses ImageMagick to parse PDFs.  While ImageMagick is a versatile tool, it has

     

       28
        
               a history of several security bugs. A malicious PDF could exploit a bug in

     

       29
        
               ImageMagick to take over your computer. If you're working with potentially

···

       22
        
         meta = with lib; {

     

       23
        
           description = "Redact and strip metadata from documents before publishing";

     

       24
        
           longDescription = ''

     

       25
       +
               PDF Redact Tools helps with securely redacting and stripping metadata

     

       26
       +
               from documents before publishing. Note that this is not a security tool.

     

       27
        
               It uses ImageMagick to parse PDFs.  While ImageMagick is a versatile tool, it has

     

       28
        
               a history of several security bugs. A malicious PDF could exploit a bug in

     

       29
        
               ImageMagick to take over your computer. If you're working with potentially

+2 -2

pkgs/tools/misc/disfetch/default.nix

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "disfetch";

     

       7
       -
         version = "1.13";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "llathasa-veleth";

     

       11
        
           repo = "disfetch";

     

       12
        
           rev = version;

     

       13
       -
           sha256 = "14vccp1z0g2hr9alx2ydz29hfa4xfv9irdjsvqm94fbyi5fa87k0";

     

       14
        
         };

     

       15
        
       

     

       16
        
         dontBuild = true;

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "disfetch";

     

       7
       +
         version = "1.14";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "llathasa-veleth";

     

       11
        
           repo = "disfetch";

     

       12
        
           rev = version;

     

       13
       +
           sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p";

     

       14
        
         };

     

       15
        
       

     

       16
        
         dontBuild = true;

+2 -2

pkgs/tools/security/bitwarden/default.nix

···

       17
        
         pname = "bitwarden";

     

       18
        
       

     

       19
        
         version = {

     

       20
       -
           x86_64-linux = "1.23.0";

     

       21
        
         }.${system} or "";

     

       22
        
       

     

       23
        
         sha256 = {

     

       24
       -
           x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg";

     

       25
        
         }.${system} or "";

     

       26
        
       

     

       27
        
         meta = with lib; {

···

       17
        
         pname = "bitwarden";

     

       18
        
       

     

       19
        
         version = {

     

       20
       +
           x86_64-linux = "1.23.1";

     

       21
        
         }.${system} or "";

     

       22
        
       

     

       23
        
         sha256 = {

     

       24
       +
           x86_64-linux = "1jv6w1g6b9c4xa5zy7pgzrkn8k4pyy3cdkh0nw2czn1cw2gaccs1";

     

       25
        
         }.${system} or "";

     

       26
        
       

     

       27
        
         meta = with lib; {

+2 -2

pkgs/tools/security/chkrootkit/default.nix

···

       1
        
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "chkrootkit-0.53";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz";

     

       8
       -
           sha256 = "1da5ry3p7jb6xs6xlfml1ly09q2rs5q6n5axif17d29k7gixlqkj";

     

       9
        
         };

     

       10
        
       

     

       11
        
         # TODO: a lazy work-around for linux build failure ...

···

       1
        
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         name = "chkrootkit-0.54";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz";

     

       8
       +
           sha256 = "sha256-FUySaSH1PbYHKKfLyXyohli2lMFLfSiO/jg+CEmRVgc=";

     

       9
        
         };

     

       10
        
       

     

       11
        
         # TODO: a lazy work-around for linux build failure ...

+25

pkgs/tools/security/sigurlx/default.nix

···

       1
       +
       { buildGoModule

     

       2
       +
       , fetchFromGitHub

     

       3
       +
       , lib

     

       4
       +
       }:

     

       5
       +
       

     

       6
       +
       buildGoModule rec {

     

       7
       +
         pname = "sigurlx";

     

       8
       +
         version = "2.1.0";

     

       9
       +
       

     

       10
       +
         src = fetchFromGitHub {

     

       11
       +
           owner = "drsigned";

     

       12
       +
           repo = pname;

     

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

     

       14
       +
           sha256 = "1q5vy05387qx7h4xcccvn2z2ks1kiff3mfbd2w3w0l0a4qgz74xs";

     

       15
       +
         };

     

       16
       +
       

     

       17
       +
         vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238";

     

       18
       +
       

     

       19
       +
         meta = with lib; {

     

       20
       +
           description = "Tool to map the attack surface of web applications";

     

       21
       +
           homepage = "https://github.com/drsigned/sigurlx";

     

       22
       +
           license = with licenses; [ mit ];

     

       23
       +
           maintainers = with maintainers; [ fab ];

     

       24
       +
         };

     

       25
       +
       }

+2 -2

pkgs/tools/system/monit/default.nix

···

       6
        
       }:

     

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
       -
         name = "monit-5.27.1";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "${meta.homepage}dist/${name}.tar.gz";

     

       13
       -
           sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ bison flex ];

···

       6
        
       }:

     

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
       +
         name = "monit-5.27.2";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "${meta.homepage}dist/${name}.tar.gz";

     

       13
       +
           sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ bison flex ];

+13 -1

pkgs/top-level/all-packages.nix

···

       11626
        
         bingrep = callPackage ../development/tools/analysis/bingrep { };

     

       11627
        
       

     

       11628
        
         binutils-unwrapped = callPackage ../development/tools/misc/binutils {

     

       0
        
       
     

       11629
        
           # FHS sys dirs presumably only have stuff for the build platform

     

       11630
        
           noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;

     

       11631
        
         };

     
···

       13182
        
         CoinMP = callPackage ../development/libraries/CoinMP { };

     

       13183
        
       

     

       13184
        
         cointop = callPackage ../applications/misc/cointop { };

     

       0
        
       
     

       0
        
       
     

       13185
        
       

     

       13186
        
         ctl = callPackage ../development/libraries/ctl { };

     

       13187
        
       

     
···

       15454
        
         libxsmm = callPackage ../development/libraries/libxsmm { };

     

       15455
        
       

     

       15456
        
         libixp_hg = callPackage ../development/libraries/libixp-hg { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15457
        
       

     

       15458
        
         libyaml = callPackage ../development/libraries/libyaml { };

     

       15459
        
       

     
···

       18231
        
       

     

       18232
        
         sickrage = callPackage ../servers/sickbeard/sickrage.nix { };

     

       18233
        
       

     

       0
        
       
     

       0
        
       
     

       18234
        
         sipwitch = callPackage ../servers/sip/sipwitch { };

     

       18235
        
       

     

       18236
        
         slimserver = callPackage ../servers/slimserver { };

     
···

       27097
        
       

     

       27098
        
         zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {

     

       27099
        
           wxGTK = wxGTK30;

     

       0
        
       
     

       27100
        
         });

     

       27101
        
       

     

       27102
        
         zeroad = zeroadPackages.zeroad;

     
···

       29510
        
       

     

       29511
        
         phonetisaurus = callPackage ../development/libraries/phonetisaurus {};

     

       29512
        
       

     

       29513
       -
         duti = callPackage ../os-specific/darwin/duti {};

     

       0
        
       
     

       0
        
       
     

       29514
        
       

     

       29515
        
         dnstracer = callPackage ../tools/networking/dnstracer {

     

       29516
        
           inherit (darwin) libresolv;

···

       11626
        
         bingrep = callPackage ../development/tools/analysis/bingrep { };

     

       11627
        
       

     

       11628
        
         binutils-unwrapped = callPackage ../development/tools/misc/binutils {

     

       11629
       +
           autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;

     

       11630
        
           # FHS sys dirs presumably only have stuff for the build platform

     

       11631
        
           noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;

     

       11632
        
         };

     
···

       13183
        
         CoinMP = callPackage ../development/libraries/CoinMP { };

     

       13184
        
       

     

       13185
        
         cointop = callPackage ../applications/misc/cointop { };

     

       13186
       +
       

     

       13187
       +
         cog = callPackage ../development/web/cog { };

     

       13188
        
       

     

       13189
        
         ctl = callPackage ../development/libraries/ctl { };

     

       13190
        
       

     
···

       15457
        
         libxsmm = callPackage ../development/libraries/libxsmm { };

     

       15458
        
       

     

       15459
        
         libixp_hg = callPackage ../development/libraries/libixp-hg { };

     

       15460
       +
       

     

       15461
       +
         libwpe = callPackage ../development/libraries/libwpe { };

     

       15462
       +
       

     

       15463
       +
         libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };

     

       15464
        
       

     

       15465
        
         libyaml = callPackage ../development/libraries/libyaml { };

     

       15466
        
       

     
···

       18238
        
       

     

       18239
        
         sickrage = callPackage ../servers/sickbeard/sickrage.nix { };

     

       18240
        
       

     

       18241
       +
         sigurlx = callPackage ../tools/security/sigurlx { };

     

       18242
       +
       

     

       18243
        
         sipwitch = callPackage ../servers/sip/sipwitch { };

     

       18244
        
       

     

       18245
        
         slimserver = callPackage ../servers/slimserver { };

     
···

       27106
        
       

     

       27107
        
         zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {

     

       27108
        
           wxGTK = wxGTK30;

     

       27109
       +
           stdenv = gcc9Stdenv;

     

       27110
        
         });

     

       27111
        
       

     

       27112
        
         zeroad = zeroadPackages.zeroad;

     
···

       29520
        
       

     

       29521
        
         phonetisaurus = callPackage ../development/libraries/phonetisaurus {};

     

       29522
        
       

     

       29523
       +
         duti = callPackage ../os-specific/darwin/duti {

     

       29524
       +
           inherit (darwin.apple_sdk.frameworks) ApplicationServices;

     

       29525
       +
         };

     

       29526
        
       

     

       29527
        
         dnstracer = callPackage ../tools/networking/dnstracer {

     

       29528
        
           inherit (darwin) libresolv;

+1

pkgs/top-level/perl-packages.nix

···

       19038
        
             description = "lib/Safe/Hole.pm";

     

       19039
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       19040
        
             homepage = "https://github.com/toddr/Safe-Hole";

     

       0
        
       
     

       19041
        
           };

     

       19042
        
         };

     

       19043

···

       19038
        
             description = "lib/Safe/Hole.pm";

     

       19039
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       19040
        
             homepage = "https://github.com/toddr/Safe-Hole";

     

       19041
       +
             broken = stdenv.isDarwin;

     

       19042
        
           };

     

       19043
        
         };

     

       19044