commit 39e3f7c2cc3d5ad71561136df41beca52bfa35c6 · pyrox.dev/nixpkgs

+6 -4

doc/builders/special/mkshell.section.md

···

       1
        
       # pkgs.mkShell {#sec-pkgs-mkShell}

     

       2
        
       

     

       3
       -
       `pkgs.mkShell` is a special kind of derivation that is only useful when using it combined with `nix-shell`. It will in fact fail to instantiate when invoked with `nix-build`.

     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       ## Usage {#sec-pkgs-mkShell-usage}

     

       6
        
       

     

       7
        
       ```nix

     

       8
        
       { pkgs ? import <nixpkgs> {} }:

     

       9
        
       pkgs.mkShell {

     

       10
       -
         # this will make all the build inputs from hello and gnutar

     

       11
       -
         # available to the shell environment

     

       0
        
       
     

       12
        
         inputsFrom = with pkgs; [ hello gnutar ];

     

       13
       -
         buildInputs = [ pkgs.gnumake ];

     

       14
        
       }

     

       15
        
       ```

···

       1
        
       # pkgs.mkShell {#sec-pkgs-mkShell}

     

       2
        
       

     

       3
       +
       `pkgs.mkShell` is a special kind of derivation that is only useful when using

     

       4
       +
       it combined with `nix-shell`. It will in fact fail to instantiate when invoked

     

       5
       +
       with `nix-build`.

     

       6
        
       

     

       7
        
       ## Usage {#sec-pkgs-mkShell-usage}

     

       8
        
       

     

       9
        
       ```nix

     

       10
        
       { pkgs ? import <nixpkgs> {} }:

     

       11
        
       pkgs.mkShell {

     

       12
       +
         # specify which packages to add to the shell environment

     

       13
       +
         packages = [ pkgs.gnumake ];

     

       14
       +
         # add all the dependencies, of the given packages, to the shell environment

     

       15
        
         inputsFrom = with pkgs; [ hello gnutar ];

     

       0
        
       
     

       16
        
       }

     

       17
        
       ```

+2 -2

doc/languages-frameworks/dotnet.section.md

···

       10
        
       

     

       11
        
       mkShell {

     

       12
        
         name = "dotnet-env";

     

       13
       -
         buildInputs = [

     

       14
        
           dotnet-sdk_3

     

       15
        
         ];

     

       16
        
       }

     
···

       25
        
       

     

       26
        
       mkShell {

     

       27
        
         name = "dotnet-env";

     

       28
       -
         buildInputs = [

     

       29
        
           (with dotnetCorePackages; combinePackages [

     

       30
        
             sdk_3_1

     

       31
        
             sdk_3_0

···

       10
        
       

     

       11
        
       mkShell {

     

       12
        
         name = "dotnet-env";

     

       13
       +
         packages = [

     

       14
        
           dotnet-sdk_3

     

       15
        
         ];

     

       16
        
       }

     
···

       25
        
       

     

       26
        
       mkShell {

     

       27
        
         name = "dotnet-env";

     

       28
       +
         packages = [

     

       29
        
           (with dotnetCorePackages; combinePackages [

     

       30
        
             sdk_3_1

     

       31
        
             sdk_3_0

+1 -1

doc/languages-frameworks/python.section.md

···

       245
        
           ps.toolz

     

       246
        
         ]);

     

       247
        
       in mkShell {

     

       248
       -
         buildInputs = [

     

       249
        
           pythonEnv

     

       250
        
       

     

       251
        
           black

···

       245
        
           ps.toolz

     

       246
        
         ]);

     

       247
        
       in mkShell {

     

       248
       +
         packages = [

     

       249
        
           pythonEnv

     

       250
        
       

     

       251
        
           black

+1 -1

doc/languages-frameworks/ruby.section.md

···

       106
        
           name = "gems-for-some-project";

     

       107
        
           gemdir = ./.;

     

       108
        
         };

     

       109
       -
       in mkShell { buildInputs = [ gems gems.wrappedRuby ]; }

     

       110
        
       ```

     

       111
        
       

     

       112
        
       With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`.

···

       106
        
           name = "gems-for-some-project";

     

       107
        
           gemdir = ./.;

     

       108
        
         };

     

       109
       +
       in mkShell { packages = [ gems gems.wrappedRuby ]; }

     

       110
        
       ```

     

       111
        
       

     

       112
        
       With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`.

+5 -2

maintainers/scripts/update-luarocks-shell.nix

···

       2
        
       }:

     

       3
        
       with nixpkgs;

     

       4
        
       mkShell {

     

       5
       -
         buildInputs = [

     

       6
       -
           bash luarocks-nix nix-prefetch-scripts parallel

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
         ];

     

       8
        
         LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path;

     

       9
        
       }

···

       2
        
       }:

     

       3
        
       with nixpkgs;

     

       4
        
       mkShell {

     

       5
       +
         packages = [

     

       6
       +
           bash

     

       7
       +
           luarocks-nix

     

       8
       +
           nix-prefetch-scripts

     

       9
       +
           parallel

     

       10
        
         ];

     

       11
        
         LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path;

     

       12
        
       }

+1 -1

nixos/doc/manual/shell.nix

···

       4
        
       pkgs.mkShell {

     

       5
        
         name = "nixos-manual";

     

       6
        
       

     

       7
       -
         buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ];

     

       8
        
       }

···

       4
        
       pkgs.mkShell {

     

       5
        
         name = "nixos-manual";

     

       6
        
       

     

       7
       +
         packages = with pkgs; [ xmlformat jing xmloscopy ruby ];

     

       8
        
       }

+2 -2

nixos/modules/virtualisation/docker.nix

···

       151
        
         config = mkIf cfg.enable (mkMerge [{

     

       152
        
             boot.kernelModules = [ "bridge" "veth" ];

     

       153
        
             boot.kernel.sysctl = {

     

       154
       -
               "net.ipv4.conf.all.forwarding" = mkOverride 99 true;

     

       155
       -
               "net.ipv4.conf.default.forwarding" = mkOverride 99 true;

     

       156
        
             };

     

       157
        
             environment.systemPackages = [ cfg.package ]

     

       158
        
               ++ optional cfg.enableNvidia pkgs.nvidia-docker;

···

       151
        
         config = mkIf cfg.enable (mkMerge [{

     

       152
        
             boot.kernelModules = [ "bridge" "veth" ];

     

       153
        
             boot.kernel.sysctl = {

     

       154
       +
               "net.ipv4.conf.all.forwarding" = mkOverride 98 true;

     

       155
       +
               "net.ipv4.conf.default.forwarding" = mkOverride 98 true;

     

       156
        
             };

     

       157
        
             environment.systemPackages = [ cfg.package ]

     

       158
        
               ++ optional cfg.enableNvidia pkgs.nvidia-docker;

+2 -2

pkgs/applications/blockchains/ergo/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "ergo";

     

       5
       -
         version = "4.0.9";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";

     

       9
       -
           sha256 = "sha256-FstAKUZVKW9U6QTqqCEDybvbBl+0H9qVHqFMPubdDpk=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "ergo";

     

       5
       +
         version = "4.0.10";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";

     

       9
       +
           sha256 = "sha256-o3+yL81WO5/UGh0gl4MOewPHTDch/Vij8mzZWOlEkjg=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/applications/editors/emacs-modes/emacs2nix.nix

···

       7
        
           rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923";

     

       8
        
           sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df";

     

       9
        
         };

     

       10
       -
       

     

       11
       -
       in pkgs.mkShell {

     

       12
        
       

     

       13
       -
         buildInputs = [

     

       14
        
           pkgs.bash

     

       15
        
         ];

     

       16

···

       7
        
           rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923";

     

       8
        
           sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df";

     

       9
        
         };

     

       10
       +
       in

     

       11
       +
       pkgs.mkShell {

     

       12
        
       

     

       13
       +
         packages = [

     

       14
        
           pkgs.bash

     

       15
        
         ];

     

       16

+1 -1

pkgs/applications/editors/emacs-modes/updater-emacs.nix

···

       29
        
         in [ promise semaphore ]);

     

       30
        
       

     

       31
        
       in pkgs.mkShell {

     

       32
       -
         buildInputs = [

     

       33
        
           pkgs.git

     

       34
        
           pkgs.nix

     

       35
        
           pkgs.bash

···

       29
        
         in [ promise semaphore ]);

     

       30
        
       

     

       31
        
       in pkgs.mkShell {

     

       32
       +
         packages = [

     

       33
        
           pkgs.git

     

       34
        
           pkgs.nix

     

       35
        
           pkgs.bash

+2 -2

pkgs/applications/misc/gpsprune/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "gpsprune";

     

       5
       -
         version = "20.3";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";

     

       9
       -
           sha256 = "sha256-hmAksLPQxzB4O+ET+O/pmL/J4FG4+Dt0ulSsgjBWKxw=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "gpsprune";

     

       5
       +
         version = "20.4";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";

     

       9
       +
           sha256 = "sha256-ZTYkKyu0/axf2uLUmQHRW/2bQ6p2zK7xBF66ozbPS2c=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

+9 -12

pkgs/applications/misc/sweethome3d/default.nix

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchurl

     

       4
       -
       , fetchsvn

     

       5
        
       , makeWrapper

     

       6
        
       , makeDesktopItem

     

       7
       -
       # sweethome3d 6.4.2 does not yet build with jdk 9 and later.

     

       8
       -
       # this is fixed on trunk (7699?) but let's build with jdk8 until then.

     

       9
        
       , jdk8

     

       10
       -
       # it can run on the latest stable jre fine though

     

       11
       -
       , jre

     

       12
        
       , ant

     

       13
        
       , gtk3

     

       14
        
       , gsettings-desktop-schemas

     

       15
        
       , p7zip

     

       16
        
       , libXxf86vm

     

       0
        
       
     

       17
        
       }:

     

       18
        
       

     

       19
        
       let

     
···

       49
        
             patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so

     

       50
        
           '';

     

       51
        
       

     

       52
       -
           nativeBuildInputs = [ makeWrapper ];

     

       53
        
           buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ];

     

       54
        
       

     

       55
        
           buildPhase = ''

     
···

       77
        
             # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null"

     

       78
        
             # exception is thrown on startup.

     

       79
        
             # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753

     

       80
       -
             makeWrapper ${jre}/bin/java $out/bin/$exec \

     

       81
        
               --set MESA_GL_VERSION_OVERRIDE 2.1 \

     

       82
        
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       83
        
               --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"

     
···

       102
        
       

     

       103
        
         application = mkSweetHome3D rec {

     

       104
        
           pname = lib.toLower module + "-application";

     

       105
       -
           version = "6.4.2";

     

       106
        
           module = "SweetHome3D";

     

       107
        
           description = "Design and visualize your future home";

     

       108
        
           license = lib.licenses.gpl2Plus;

     

       109
       -
           src = fetchsvn {

     

       110
       -
             url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/";

     

       111
       -
             sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4";

     

       112
       -
             rev = "7504";

     

       113
        
           };

     

       114
        
           desktopName = "Sweet Home 3D";

     

       115
        
           icons = {

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchurl

     

       0
        
       
     

       4
        
       , makeWrapper

     

       5
        
       , makeDesktopItem

     

       6
       +
       # sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later?

     

       0
        
       
     

       7
        
       , jdk8

     

       8
       +
       , jre8

     

       0
        
       
     

       9
        
       , ant

     

       10
        
       , gtk3

     

       11
        
       , gsettings-desktop-schemas

     

       12
        
       , p7zip

     

       13
        
       , libXxf86vm

     

       14
       +
       , unzip

     

       15
        
       }:

     

       16
        
       

     

       17
        
       let

     
···

       47
        
             patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so

     

       48
        
           '';

     

       49
        
       

     

       50
       +
           nativeBuildInputs = [ makeWrapper unzip ];

     

       51
        
           buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ];

     

       52
        
       

     

       53
        
           buildPhase = ''

     
···

       75
        
             # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null"

     

       76
        
             # exception is thrown on startup.

     

       77
        
             # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753

     

       78
       +
             makeWrapper ${jre8}/bin/java $out/bin/$exec \

     

       79
        
               --set MESA_GL_VERSION_OVERRIDE 2.1 \

     

       80
        
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       81
        
               --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"

     
···

       100
        
       

     

       101
        
         application = mkSweetHome3D rec {

     

       102
        
           pname = lib.toLower module + "-application";

     

       103
       +
           version = "6.5.2";

     

       104
        
           module = "SweetHome3D";

     

       105
        
           description = "Design and visualize your future home";

     

       106
        
           license = lib.licenses.gpl2Plus;

     

       107
       +
           src = fetchurl {

     

       108
       +
             url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";

     

       109
       +
             sha256 = "1j0xm2vmcxxjmf12k8rfnisq9hd7hqaiyxrfbrbjxis9iq3kycp3";

     

       0
        
       
     

       110
        
           };

     

       111
        
           desktopName = "Sweet Home 3D";

     

       112
        
           icons = {

+27 -23

pkgs/applications/misc/sweethome3d/editors.nix

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
       -
       , fetchcvs

     

       4
        
       , makeWrapper

     

       5
        
       , makeDesktopItem

     

       6
       -
       # sweethome3d 6.4.2 does not yet build with jdk 9 and later.

     

       7
       -
       # this is fixed on trunk (7699?) but let's build with jdk8 until then.

     

       8
        
       , jdk8

     

       9
       -
       # it can run on the latest stable jre fine though

     

       10
       -
       , jre

     

       11
        
       , ant

     

       12
        
       , gtk3

     

       13
        
       , gsettings-desktop-schemas

     

       14
       -
       , sweethome3dApp }:

     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
       let

     

       17
        
       

     
···

       20
        
           + removeSuffix "libraryeditor" (toLower m)

     

       21
        
           + "-editor";

     

       22
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
         mkEditorProject =

     

       24
        
         { pname, module, version, src, license, description, desktopName }:

     

       25
        
       

     
···

       35
        
             categories = "Graphics;2DGraphics;3DGraphics;";

     

       36
        
           };

     

       37
        
       

     

       38
       -
           nativeBuildInputs = [ makeWrapper ];

     

       39
       -
           buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ];

     

       40
        
       

     

       41
        
           postPatch = ''

     

       42
       -
             sed -i -e 's,../SweetHome3D,${application.src},g' build.xml

     

       43
        
             sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml

     

       44
        
           '';

     

       45
        
       

     

       46
        
           buildPhase = ''

     

       47
        
             runHook preBuild

     

       48
        
       

     

       49
       -
             ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib

     

       50
        
       

     

       51
        
             runHook postBuild

     

       52
        
           '';

     
···

       56
        
             mkdir -p $out/share/{java,applications}

     

       57
        
             cp ${module}-${version}.jar $out/share/java/.

     

       58
        
             cp "${editorItem}/share/applications/"* $out/share/applications

     

       59
       -
             makeWrapper ${jre}/bin/java $out/bin/$exec \

     

       60
        
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       61
        
               --add-flags "-jar $out/share/java/${module}-${version}.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"

     

       62
        
           '';

     
···

       78
        
       in {

     

       79
        
       

     

       80
        
         textures-editor = mkEditorProject rec {

     

       81
       -
           version = "1.5";

     

       82
        
           module = "TexturesLibraryEditor";

     

       83
        
           pname = module;

     

       84
        
           description = "Easily create SH3T files and edit the properties of the texture images it contain";

     

       85
        
           license = lib.licenses.gpl2Plus;

     

       86
       -
           src = fetchcvs {

     

       87
       -
             cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";

     

       88
       -
             sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h";

     

       89
       -
             module = module;

     

       90
       -
             tag = "V_" + d2u version;

     

       91
        
           };

     

       92
        
           desktopName = "Sweet Home 3D - Textures Library Editor";

     

       93
        
         };

     

       94
        
       

     

       95
        
         furniture-editor = mkEditorProject rec {

     

       96
       -
           version = "1.19";

     

       97
        
           module = "FurnitureLibraryEditor";

     

       98
        
           pname = module;

     

       99
        
           description = "Quickly create SH3F files and edit the properties of the 3D models it contain";

     

       100
        
           license = lib.licenses.gpl2;

     

       101
       -
           src = fetchcvs {

     

       102
       -
             cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";

     

       103
       -
             sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs";

     

       104
       -
             module = module;

     

       105
       -
             tag = "V_" + d2u version;

     

       106
        
           };

     

       107
        
           desktopName = "Sweet Home 3D - Furniture Library Editor";

     

       108
        
         };

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
       +
       , fetchurl

     

       4
        
       , makeWrapper

     

       5
        
       , makeDesktopItem

     

       6
       +
       # sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later?

     

       0
        
       
     

       7
        
       , jdk8

     

       8
       +
       , jre8

     

       0
        
       
     

       9
        
       , ant

     

       10
        
       , gtk3

     

       11
        
       , gsettings-desktop-schemas

     

       12
       +
       , sweethome3dApp

     

       13
       +
       , unzip

     

       14
       +
       }:

     

       15
        
       

     

       16
        
       let

     

       17
        
       

     
···

       20
        
           + removeSuffix "libraryeditor" (toLower m)

     

       21
        
           + "-editor";

     

       22
        
       

     

       23
       +
         applicationSrc = stdenv.mkDerivation {

     

       24
       +
           name = "application-src";

     

       25
       +
           src = sweethome3dApp.src;

     

       26
       +
           nativeBuildInputs = [ unzip ];

     

       27
       +
           buildPhase = "";

     

       28
       +
           installPhase = "cp -r . $out";

     

       29
       +
         };

     

       30
       +
       

     

       31
        
         mkEditorProject =

     

       32
        
         { pname, module, version, src, license, description, desktopName }:

     

       33
        
       

     
···

       43
        
             categories = "Graphics;2DGraphics;3DGraphics;";

     

       44
        
           };

     

       45
        
       

     

       46
       +
           nativeBuildInputs = [ makeWrapper unzip ];

     

       47
       +
           buildInputs = [ ant jre8 jdk8 gtk3 gsettings-desktop-schemas ];

     

       48
        
       

     

       49
        
           postPatch = ''

     

       50
       +
             sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml

     

       51
        
             sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml

     

       52
        
           '';

     

       53
        
       

     

       54
        
           buildPhase = ''

     

       55
        
             runHook preBuild

     

       56
        
       

     

       57
       +
             ant -lib ${applicationSrc}/libtest -lib ${applicationSrc}/lib -lib ${jdk8}/lib

     

       58
        
       

     

       59
        
             runHook postBuild

     

       60
        
           '';

     
···

       64
        
             mkdir -p $out/share/{java,applications}

     

       65
        
             cp ${module}-${version}.jar $out/share/java/.

     

       66
        
             cp "${editorItem}/share/applications/"* $out/share/applications

     

       67
       +
             makeWrapper ${jre8}/bin/java $out/bin/$exec \

     

       68
        
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       69
        
               --add-flags "-jar $out/share/java/${module}-${version}.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"

     

       70
        
           '';

     
···

       86
        
       in {

     

       87
        
       

     

       88
        
         textures-editor = mkEditorProject rec {

     

       89
       +
           version = "1.7";

     

       90
        
           module = "TexturesLibraryEditor";

     

       91
        
           pname = module;

     

       92
        
           description = "Easily create SH3T files and edit the properties of the texture images it contain";

     

       93
        
           license = lib.licenses.gpl2Plus;

     

       94
       +
           src = fetchurl {

     

       95
       +
             url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";

     

       96
       +
             sha256 = "03vb9y645qzffxxdhgbjb0d98k3lafxckg2vh2s86j62b6357d0h";

     

       0
        
       
     

       0
        
       
     

       97
        
           };

     

       98
        
           desktopName = "Sweet Home 3D - Textures Library Editor";

     

       99
        
         };

     

       100
        
       

     

       101
        
         furniture-editor = mkEditorProject rec {

     

       102
       +
           version = "1.27";

     

       103
        
           module = "FurnitureLibraryEditor";

     

       104
        
           pname = module;

     

       105
        
           description = "Quickly create SH3F files and edit the properties of the 3D models it contain";

     

       106
        
           license = lib.licenses.gpl2;

     

       107
       +
           src = fetchurl {

     

       108
       +
             url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";

     

       109
       +
             sha256 = "1zxbcn9awgax8lalzkc05f5yfwbgnrayc17fkyv5i19j4qb3r2a0";

     

       0
        
       
     

       0
        
       
     

       110
        
           };

     

       111
        
           desktopName = "Sweet Home 3D - Furniture Library Editor";

     

       112
        
         };

+2 -2

pkgs/applications/networking/cluster/nixops/shell.nix

···

       1
       -
       { pkgs ? import <nixpkgs> {} }:

     

       2
        
       

     

       3
        
       pkgs.mkShell {

     

       4
       -
         buildInputs = [

     

       5
        
           pkgs.poetry2nix.cli

     

       6
        
           pkgs.pkg-config

     

       7
        
           pkgs.libvirt

···

       1
       +
       { pkgs ? import <nixpkgs> { } }:

     

       2
        
       

     

       3
        
       pkgs.mkShell {

     

       4
       +
         packages = [

     

       5
        
           pkgs.poetry2nix.cli

     

       6
        
           pkgs.pkg-config

     

       7
        
           pkgs.libvirt

+2 -2

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

···

       13
        
       

     

       14
        
       python3.pkgs.buildPythonApplication rec {

     

       15
        
         pname = "terminator";

     

       16
       -
         version = "2.1.0";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "gnome-terminator";

     

       20
        
           repo = "terminator";

     

       21
        
           rev = "v${version}";

     

       22
       -
           sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

···

       13
        
       

     

       14
        
       python3.pkgs.buildPythonApplication rec {

     

       15
        
         pname = "terminator";

     

       16
       +
         version = "2.1.1";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "gnome-terminator";

     

       20
        
           repo = "terminator";

     

       21
        
           rev = "v${version}";

     

       22
       +
           sha256 = "1pfrzna30xv9yri6dsny1j5k35417m4hsg97c455vssywyl9w4jr";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

+13 -1

pkgs/applications/virtualization/open-vm-tools/default.nix

···

       1
       -
       { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,

     

       2
        
         fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto,

     

       3
        
         libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       4
        
         pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which,

     
···

       22
        
         nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];

     

       23
        
         buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ]

     

       24
        
             ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
        
         postPatch = ''

     

       27
        
            # Build bugfix for 10.1.0, stolen from Arch PKGBUILD

···

       1
       +
       { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fetchpatch,

     

       2
        
         fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto,

     

       3
        
         libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       4
        
         pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which,

     
···

       22
        
         nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];

     

       23
        
         buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ]

     

       24
        
             ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];

     

       25
       +
       

     

       26
       +
         patches = [

     

       27
       +
           # Fix building with glib 2.68. Remove after next release.

     

       28
       +
           # We drop AUTHORS due to conflicts when applying.

     

       29
       +
           # https://github.com/vmware/open-vm-tools/pull/505

     

       30
       +
           (fetchpatch {

     

       31
       +
             url = "https://github.com/vmware/open-vm-tools/commit/82931a1bcb39d5132910c7fb2ddc086c51d06662.patch";

     

       32
       +
             stripLen = 1;

     

       33
       +
             excludes = [ "AUTHORS" ];

     

       34
       +
             sha256 = "0yz5hnngr5vd4416hvmh8734a9vxa18d2xd37kl7if0p9vik6zlg";

     

       35
       +
           })

     

       36
       +
         ];

     

       37
        
       

     

       38
        
         postPatch = ''

     

       39
        
            # Build bugfix for 10.1.0, stolen from Arch PKGBUILD

+5 -6

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

···

       6
        
       

     

       7
        
       mkDerivation rec {

     

       8
        
         pname = "virt-manager-qt";

     

       9
       -
         version = "0.71.95";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner  = "F1ash";

     

       13
        
           repo   = "qt-virt-manager";

     

       14
        
           rev    = version;

     

       15
       -
           sha256 = "1s8753bzsjyixpv1c2l9d1xjcn8i47k45qj7pr50prc64ldf5f47";

     

       16
        
         };

     

       17
        
       

     

       18
        
         cmakeFlags = [

     
···

       22
        
       

     

       23
        
         patches = [

     

       24
        
           (fetchpatch {

     

       25
       -
             # Maintainer note: Check whether this patch is still needed when a new version is released

     

       26
       -
             name = "krdc-variable-name-changes.patch";

     

       27
       -
             url = "https://github.com/fadenb/qt-virt-manager/commit/4640f5f64534ed7c8a1ecc6851f1c7503988de6d.patch";

     

       28
       -
             sha256 = "1chl58nra1mj96n8jmnjbsyr6vlwkhn38afhwqsbr0bgyg23781v";

     

       29
        
           })

     

       30
        
         ];

     

       31

···

       6
        
       

     

       7
        
       mkDerivation rec {

     

       8
        
         pname = "virt-manager-qt";

     

       9
       +
         version = "0.72.97";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner  = "F1ash";

     

       13
        
           repo   = "qt-virt-manager";

     

       14
        
           rev    = version;

     

       15
       +
           sha256 = "0b2bx7ah35glcsiv186sc9cqdrkhg1vs9jz036k9byk61np0cb1i";

     

       16
        
         };

     

       17
        
       

     

       18
        
         cmakeFlags = [

     
···

       22
        
       

     

       23
        
         patches = [

     

       24
        
           (fetchpatch {

     

       25
       +
             # drop with next update

     

       26
       +
             url = "https://github.com/F1ash/qt-virt-manager/commit/0d338b037ef58c376d468c1cd4521a34ea181edd.patch";

     

       27
       +
             sha256 = "1wjqyc5wsnxfwwjzgqjr9hcqhd867amwhjd712qyvpvz8x7p2s24";

     

       0
        
       
     

       28
        
           })

     

       29
        
         ];

     

       30

+1 -1

pkgs/build-support/agda/default.nix

···

       1
        
       # Builder for Agda packages.

     

       2
        
       

     

       3
       -
       { stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }:

     

       4
        
       

     

       5
        
       with lib.strings;

     

       6

···

       1
        
       # Builder for Agda packages.

     

       2
        
       

     

       3
       +
       { stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }:

     

       4
        
       

     

       5
        
       with lib.strings;

     

       6

+14 -10

pkgs/build-support/mkshell/default.nix

···

       3
        
       # A special kind of derivation that is only meant to be consumed by the

     

       4
        
       # nix-shell.

     

       5
        
       {

     

       6
       -
         inputsFrom ? [], # a list of derivations whose inputs will be made available to the environment

     

       7
       -
         buildInputs ? [],

     

       8
       -
         nativeBuildInputs ? [],

     

       9
       -
         propagatedBuildInputs ? [],

     

       10
       -
         propagatedNativeBuildInputs ? [],

     

       11
       -
         ...

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       }@attrs:

     

       13
        
       let

     

       14
        
         mergeInputs = name: lib.concatLists (lib.catAttrs name

     

       15
       -
           ([attrs] ++ inputsFrom));

     

       16
        
       

     

       17
        
         rest = builtins.removeAttrs attrs [

     

       0
        
       
     

       18
        
           "inputsFrom"

     

       19
        
           "buildInputs"

     

       20
        
           "nativeBuildInputs"

     
···

       26
        
       

     

       27
        
       stdenv.mkDerivation ({

     

       28
        
         name = "nix-shell";

     

       29
       -
         phases = ["nobuildPhase"];

     

       30
        
       

     

       31
        
         buildInputs = mergeInputs "buildInputs";

     

       32
       -
         nativeBuildInputs = mergeInputs "nativeBuildInputs";

     

       33
        
         propagatedBuildInputs = mergeInputs "propagatedBuildInputs";

     

       34
        
         propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs";

     

       35
        
       

     

       36
        
         shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook"

     

       37
       -
           (lib.reverseList inputsFrom ++ [attrs]));

     

       38
        
       

     

       39
        
         nobuildPhase = ''

     

       40
        
           echo

···

       3
        
       # A special kind of derivation that is only meant to be consumed by the

     

       4
        
       # nix-shell.

     

       5
        
       {

     

       6
       +
         # a list of packages to add to the shell environment

     

       7
       +
         packages ? [ ]

     

       8
       +
       , # propagate all the inputs from the given derivations

     

       9
       +
         inputsFrom ? [ ]

     

       10
       +
       , buildInputs ? [ ]

     

       11
       +
       , nativeBuildInputs ? [ ]

     

       12
       +
       , propagatedBuildInputs ? [ ]

     

       13
       +
       , propagatedNativeBuildInputs ? [ ]

     

       14
       +
       , ...

     

       15
        
       }@attrs:

     

       16
        
       let

     

       17
        
         mergeInputs = name: lib.concatLists (lib.catAttrs name

     

       18
       +
           ([ attrs ] ++ inputsFrom));

     

       19
        
       

     

       20
        
         rest = builtins.removeAttrs attrs [

     

       21
       +
           "packages"

     

       22
        
           "inputsFrom"

     

       23
        
           "buildInputs"

     

       24
        
           "nativeBuildInputs"

     
···

       30
        
       

     

       31
        
       stdenv.mkDerivation ({

     

       32
        
         name = "nix-shell";

     

       33
       +
         phases = [ "nobuildPhase" ];

     

       34
        
       

     

       35
        
         buildInputs = mergeInputs "buildInputs";

     

       36
       +
         nativeBuildInputs = packages ++ (mergeInputs "nativeBuildInputs");

     

       37
        
         propagatedBuildInputs = mergeInputs "propagatedBuildInputs";

     

       38
        
         propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs";

     

       39
        
       

     

       40
        
         shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook"

     

       41
       +
           (lib.reverseList inputsFrom ++ [ attrs ]));

     

       42
        
       

     

       43
        
         nobuildPhase = ''

     

       44
        
           echo

+10 -1

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

···

       1
       -
       { mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary

     

       2
        
       , bytestring, Cabal, cmark, containers, directory, elm-format

     

       3
        
       , fetchgit, filepath, free, HUnit, indents, json, mtl

     

       4
        
       , optparse-applicative, parsec, process, QuickCheck, quickcheck-io

     
···

       14
        
           rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e";

     

       15
        
           fetchSubmodules = true;

     

       16
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
         isLibrary = true;

     

       18
        
         isExecutable = true;

     

       19
        
         setupHaskellDepends = [ base Cabal directory filepath process ];

···

       1
       +
       { mkDerivation, fetchpatch, ansi-terminal, ansi-wl-pprint, base, binary

     

       2
        
       , bytestring, Cabal, cmark, containers, directory, elm-format

     

       3
        
       , fetchgit, filepath, free, HUnit, indents, json, mtl

     

       4
        
       , optparse-applicative, parsec, process, QuickCheck, quickcheck-io

     
···

       14
        
           rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e";

     

       15
        
           fetchSubmodules = true;

     

       16
        
         };

     

       17
       +
         patches = [

     

       18
       +
           # Update code after breaking change in optparse-applicative

     

       19
       +
           # https://github.com/zwilias/elm-instrument/pull/5

     

       20
       +
           (fetchpatch {

     

       21
       +
             name = "update-optparse-applicative.patch";

     

       22
       +
             url = "https://github.com/mdevlamynck/elm-instrument/commit/c548709d4818aeef315528e842eaf4c5b34b59b4.patch";

     

       23
       +
             sha256 = "0ln7ik09n3r3hk7jmwwm46kz660mvxfa71120rkbbaib2falfhsc";

     

       24
       +
           })

     

       25
       +
         ];

     

       26
        
         isLibrary = true;

     

       27
        
         isExecutable = true;

     

       28
        
         setupHaskellDepends = [ base Cabal directory filepath process ];

+1 -1

pkgs/development/mobile/androidenv/examples/shell.nix

···

       115
        
       in

     

       116
        
       pkgs.mkShell rec {

     

       117
        
         name = "androidenv-demo";

     

       118
       -
         buildInputs = [ androidSdk platformTools jdk pkgs.android-studio ];

     

       119
        
       

     

       120
        
         LANG = "C.UTF-8";

     

       121
        
         LC_ALL = "C.UTF-8";

···

       115
        
       in

     

       116
        
       pkgs.mkShell rec {

     

       117
        
         name = "androidenv-demo";

     

       118
       +
         packages = [ androidSdk platformTools jdk pkgs.android-studio ];

     

       119
        
       

     

       120
        
         LANG = "C.UTF-8";

     

       121
        
         LC_ALL = "C.UTF-8";

+21 -1

pkgs/development/node-packages/default.nix

···

       1
       -
       { pkgs, nodejs, stdenv }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         since = (version: pkgs.lib.versionAtLeast nodejs.version version);

     
···

       208
        
               ]}

     

       209
        
             '';

     

       210
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       211
        
       

     

       212
        
           ssb-server = super.ssb-server.override {

     

       213
        
             buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ];

···

       1
       +
       { pkgs, nodejs, stdenv, fetchFromGitHub }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         since = (version: pkgs.lib.versionAtLeast nodejs.version version);

     
···

       208
        
               ]}

     

       209
        
             '';

     

       210
        
           };

     

       211
       +
       

     

       212
       +
           netlify-cli =

     

       213
       +
             let

     

       214
       +
               esbuild = pkgs.esbuild.overrideAttrs (old: rec {

     

       215
       +
                 version = "0.11.14";

     

       216
       +
       

     

       217
       +
                 src = fetchFromGitHub {

     

       218
       +
                   owner = "evanw";

     

       219
       +
                   repo = "esbuild";

     

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

     

       221
       +
                   sha256 = "sha256-N7WNam0zF1t++nLVhuxXSDGV/JaFtlFhufp+etinvmM=";

     

       222
       +
                 };

     

       223
       +
       

     

       224
       +
               });

     

       225
       +
             in

     

       226
       +
             super.netlify-cli.override {

     

       227
       +
               preRebuild = ''

     

       228
       +
                 export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild"

     

       229
       +
               '';

     

       230
       +
             };

     

       231
        
       

     

       232
        
           ssb-server = super.ssb-server.override {

     

       233
        
             buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ];

+6

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

···

       42
        
           pytest-mock

     

       43
        
         ];

     

       44
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
         meta = with lib; {

     

       46
        
           description = "CSV on the Web";

     

       47
        
           homepage = "https://github.com/cldf/csvw";

···

       42
        
           pytest-mock

     

       43
        
         ];

     

       44
        
       

     

       45
       +
         disabledTests = [

     

       46
       +
           # this test is flaky on darwin because it depends on the resolution of filesystem mtimes

     

       47
       +
           # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257

     

       48
       +
           "test_write_file_exists"

     

       49
       +
         ];

     

       50
       +
       

     

       51
        
         meta = with lib; {

     

       52
        
           description = "CSV on the Web";

     

       53
        
           homepage = "https://github.com/cldf/csvw";

+49

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

···

       1
       +
       { lib

     

       2
       +
       , buildPythonPackage

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , isPy3k

     

       5
       +
       , libGL

     

       6
       +
       , libX11

     

       7
       +
       , pytestCheckHook

     

       8
       +
       , psutil

     

       9
       +
       }:

     

       10
       +
       

     

       11
       +
       buildPythonPackage rec {

     

       12
       +
         pname = "glcontext";

     

       13
       +
         version = "2.3.3";

     

       14
       +
       

     

       15
       +
         src = fetchFromGitHub {

     

       16
       +
           owner = "moderngl";

     

       17
       +
           repo = pname;

     

       18
       +
           rev = version;

     

       19
       +
           sha256 = "16kwrfjijn9bnb48rk17wapmhxq6g9s59zczh65imyncb9k82wkc";

     

       20
       +
         };

     

       21
       +
       

     

       22
       +
         disabled = !isPy3k;

     

       23
       +
       

     

       24
       +
         buildInputs = [ libGL libX11 ];

     

       25
       +
       

     

       26
       +
         postPatch = ''

     

       27
       +
           substituteInPlace glcontext/x11.cpp \

     

       28
       +
             --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \

     

       29
       +
             --replace '"libX11.so"' '"${libX11}/lib/libX11.so"'

     

       30
       +
           substituteInPlace glcontext/egl.cpp \

     

       31
       +
             --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \

     

       32
       +
             --replace '"libEGL.so"' '"${libGL}/lib/libEGL.so"'

     

       33
       +
         '';

     

       34
       +
       

     

       35
       +
         # Tests fail because they try to open display. See

     

       36
       +
         # https://github.com/NixOS/nixpkgs/pull/121439

     

       37
       +
         # for details.

     

       38
       +
         doCheck = false;

     

       39
       +
       

     

       40
       +
         pythonImportsCheck = [ "glcontext" ];

     

       41
       +
       

     

       42
       +
         meta = with lib; {

     

       43
       +
           homepage = "https://github.com/moderngl/glcontext";

     

       44
       +
           description = "OpenGL implementation for ModernGL";

     

       45
       +
           license = licenses.mit;

     

       46
       +
           platforms = platforms.linux;

     

       47
       +
           maintainers = with maintainers; [ friedelino ];

     

       48
       +
         };

     

       49
       +
       }

+5

pkgs/development/python-modules/globus-sdk/default.nix

···

       28
        
           responses

     

       29
        
         ];

     

       30
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
         pythonImportsCheck = [ "globus_sdk" ];

     

       32
        
       

     

       33
        
         meta = with lib; {

···

       28
        
           responses

     

       29
        
         ];

     

       30
        
       

     

       31
       +
         postPatch = ''

     

       32
       +
           substituteInPlace setup.py \

     

       33
       +
           --replace "pyjwt[crypto]>=1.5.3,<2.0.0" "pyjwt[crypto] >=1.5.3, <3.0.0"

     

       34
       +
         '';

     

       35
       +
       

     

       36
        
         pythonImportsCheck = [ "globus_sdk" ];

     

       37
        
       

     

       38
        
         meta = with lib; {

+2 -2

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

···

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
        
         pname = "ipydatawidgets";

     

       16
       -
         version = "4.2.0";

     

       17
        
       

     

       18
        
         disabled = isPy27;

     

       19
        
       

     

       20
        
         src = fetchPypi {

     

       21
        
           inherit pname version;

     

       22
       -
           sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc";

     

       23
        
         };

     

       24
        
       

     

       25
        
         propagatedBuildInputs = [

···

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
        
         pname = "ipydatawidgets";

     

       16
       +
         version = "4.1.0";

     

       17
        
       

     

       18
        
         disabled = isPy27;

     

       19
        
       

     

       20
        
         src = fetchPypi {

     

       21
        
           inherit pname version;

     

       22
       +
           sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01";

     

       23
        
         };

     

       24
        
       

     

       25
        
         propagatedBuildInputs = [

+2 -1

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

···

       4
        
       , isPy3k

     

       5
        
       , libGL

     

       6
        
       , libX11

     

       0
        
       
     

       7
        
       }:

     

       8
        
       

     

       9
        
       buildPythonPackage rec {

     
···

       17
        
       

     

       18
        
         disabled = !isPy3k;

     

       19
        
       

     

       20
       -
         buildInputs = [ libGL libX11 ];

     

       21
        
       

     

       22
        
         # Tests need a display to run.

     

       23
        
         doCheck = false;

···

       4
        
       , isPy3k

     

       5
        
       , libGL

     

       6
        
       , libX11

     

       7
       +
       , glcontext

     

       8
        
       }:

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

     
···

       18
        
       

     

       19
        
         disabled = !isPy3k;

     

       20
        
       

     

       21
       +
         buildInputs = [ libGL libX11 glcontext ];

     

       22
        
       

     

       23
        
         # Tests need a display to run.

     

       24
        
         doCheck = false;

+2 -1

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

···

       7
        
       , pyglet

     

       8
        
       , pillow

     

       9
        
       , pyrr

     

       0
        
       
     

       10
        
       }:

     

       11
        
       

     

       12
        
       buildPythonPackage rec {

     
···

       20
        
           sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q";

     

       21
        
         };

     

       22
        
       

     

       23
       -
         propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ];

     

       24
        
       

     

       25
        
         disabled = !isPy3k;

     

       26

···

       7
        
       , pyglet

     

       8
        
       , pillow

     

       9
        
       , pyrr

     

       10
       +
       , glcontext

     

       11
        
       }:

     

       12
        
       

     

       13
        
       buildPythonPackage rec {

     
···

       21
        
           sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q";

     

       22
        
         };

     

       23
        
       

     

       24
       +
         propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ];

     

       25
        
       

     

       26
        
         disabled = !isPy3k;

     

       27

+6

pkgs/development/python-modules/pytorch-metric-learning/default.nix

···

       41
        
         disabledTests = [

     

       42
        
           # requires FAISS (not in Nixpkgs)

     

       43
        
           "test_accuracy_calculator_and_faiss"

     

       0
        
       
     

       0
        
       
     

       44
        
           # require network access:

     

       45
        
           "test_get_nearest_neighbors"

     

       46
        
           "test_tuplestoweights_sampler"

     

       47
        
           "test_untrained_indexer"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
         ];

     

       49
        
       

     

       50
        
         meta = {

···

       41
        
         disabledTests = [

     

       42
        
           # requires FAISS (not in Nixpkgs)

     

       43
        
           "test_accuracy_calculator_and_faiss"

     

       44
       +
           "test_global_embedding_space_tester"

     

       45
       +
           "test_with_same_parent_label_tester"

     

       46
        
           # require network access:

     

       47
        
           "test_get_nearest_neighbors"

     

       48
        
           "test_tuplestoweights_sampler"

     

       49
        
           "test_untrained_indexer"

     

       50
       +
           "test_metric_loss_only"

     

       51
       +
           "test_pca"

     

       52
       +
           # flaky

     

       53
       +
           "test_distributed_classifier_loss_and_miner"

     

       54
        
         ];

     

       55
        
       

     

       56
        
         meta = {

+6 -2

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

···

       37
        
         inherit doCheck;

     

       38
        
       

     

       39
        
         disabledTests = [

     

       40
       -
           "test_gunicorn" # No "examples" directory in pypi distribution.

     

       41
       -
           "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       42
        
         ];

     

       43
        
       

     

       44
        
         __darwinAllowLocalNetworking = true;

···

       37
        
         inherit doCheck;

     

       38
        
       

     

       39
        
         disabledTests = [

     

       40
       +
           # No "examples" directory in pypi distribution

     

       41
       +
           "test_gunicorn"

     

       42
       +
           "test_zero_downtime"

     

       43
       +
           # flaky

     

       44
       +
           "test_keep_alive_client_timeout"

     

       45
       +
           "test_reloader_live"

     

       46
        
         ];

     

       47
        
       

     

       48
        
         __darwinAllowLocalNetworking = true;

+7

pkgs/development/tools/rq/default.nix

···

       11
        
           sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";

     

       12
        
         };

     

       13
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
         cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67";

     

       15
        
       

     

       16
        
         buildInputs = [ llvmPackages.libclang v8 ]

···

       11
        
           sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         postPatch = ''

     

       15
       +
           # Remove #[deny(warnings)] which is equivalent to -Werror in C.

     

       16
       +
           # Prevents build failures when upgrading rustc, which may give more warnings.

     

       17
       +
           substituteInPlace src/lib.rs \

     

       18
       +
             --replace "#![deny(warnings)]" ""

     

       19
       +
         '';

     

       20
       +
       

     

       21
        
         cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67";

     

       22
        
       

     

       23
        
         buildInputs = [ llvmPackages.libclang v8 ]

+5 -6

pkgs/os-specific/linux/anbox/kmod.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
        
         pname = "anbox-modules";

     

       5
       -
         version = "2019-11-15-" + kernel.version;

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "anbox";

     

       9
        
           repo = "anbox-modules";

     

       10
       -
           rev = "e0a237e571989987806b32881044c539db25e3e1";

     

       11
       -
           sha256 = "1km1nslp4f5znwskh4bb1b61r1inw1dlbwiyyq3rrh0f0agf8d0v";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     
···

       34
        
         meta = with lib; {

     

       35
        
           description = "Anbox ashmem and binder drivers.";

     

       36
        
           homepage = "https://github.com/anbox/anbox-modules";

     

       37
       -
           license = licenses.gpl2;

     

       38
        
           platforms = platforms.linux;

     

       39
       -
           broken = (versionOlder kernel.version "4.4");

     

       40
        
           maintainers = with maintainers; [ edwtjo ];

     

       41
        
         };

     

       42
       -
       

     

       43
        
       }

···

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
        
         pname = "anbox-modules";

     

       5
       +
         version = "2020-06-14-${kernel.version}";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "anbox";

     

       9
        
           repo = "anbox-modules";

     

       10
       +
           rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086";

     

       11
       +
           sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     
···

       34
        
         meta = with lib; {

     

       35
        
           description = "Anbox ashmem and binder drivers.";

     

       36
        
           homepage = "https://github.com/anbox/anbox-modules";

     

       37
       +
           license = licenses.gpl2Only;

     

       38
        
           platforms = platforms.linux;

     

       39
       +
           broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5";

     

       40
        
           maintainers = with maintainers; [ edwtjo ];

     

       41
        
         };

     

       0
        
       
     

       42
        
       }

+9 -1

pkgs/os-specific/linux/batman-adv/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, kernel }:

     

       2
        
       

     

       3
        
       let cfg = import ./version.nix; in

     

       4
        
       

     
···

       10
        
           url = "http://downloads.open-mesh.org/batman/releases/${pname}-${cfg.version}/${pname}-${cfg.version}.tar.gz";

     

       11
        
           sha256 = cfg.sha256.${pname};

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     

       15

···

       1
       +
       { lib, stdenv, fetchurl, fetchpatch, kernel }:

     

       2
        
       

     

       3
        
       let cfg = import ./version.nix; in

     

       4
        
       

     
···

       10
        
           url = "http://downloads.open-mesh.org/batman/releases/${pname}-${cfg.version}/${pname}-${cfg.version}.tar.gz";

     

       11
        
           sha256 = cfg.sha256.${pname};

     

       12
        
         };

     

       13
       +
       

     

       14
       +
         patches = [

     

       15
       +
           (fetchpatch {

     

       16
       +
             # Fix build with Kernel>=5.12, remove for batman-adv>=2021.1

     

       17
       +
             url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d";

     

       18
       +
             sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg";

     

       19
       +
           })

     

       20
       +
         ];

     

       21
        
       

     

       22
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     

       23

+9 -9

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       13
        
           },

     

       14
        
           "5.10": {

     

       15
        
               "extra": "-hardened1",

     

       16
       -
               "name": "linux-hardened-5.10.35-hardened1.patch",

     

       17
       -
               "sha256": "133k9h187jpkyfqrd66v4k0z3l3gg6r0g4x8nsic9sarapdd62v7",

     

       18
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.35-hardened1/linux-hardened-5.10.35-hardened1.patch"

     

       19
        
           },

     

       20
        
           "5.11": {

     

       21
        
               "extra": "-hardened1",

     

       22
       -
               "name": "linux-hardened-5.11.19-hardened1.patch",

     

       23
       -
               "sha256": "16czmg41nijl7zaahb4ggi8z7hizc0qsqg3az8vzll5kvzzr313f",

     

       24
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.19-hardened1/linux-hardened-5.11.19-hardened1.patch"

     

       25
        
           },

     

       26
        
           "5.4": {

     

       27
        
               "extra": "-hardened1",

     

       28
       -
               "name": "linux-hardened-5.4.117-hardened1.patch",

     

       29
       -
               "sha256": "0b9mfw49yrdgsj9804nh0qxzj49z2xb1jvxhvdxpm9yjlnyw85bv",

     

       30
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.117-hardened1/linux-hardened-5.4.117-hardened1.patch"

     

       31
        
           }

     

       32
        
       }

···

       13
        
           },

     

       14
        
           "5.10": {

     

       15
        
               "extra": "-hardened1",

     

       16
       +
               "name": "linux-hardened-5.10.36-hardened1.patch",

     

       17
       +
               "sha256": "0pkci99h0lrxyx5p7ml3m4194bl359m2ihm9izw0b33n35alkvbc",

     

       18
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.36-hardened1/linux-hardened-5.10.36-hardened1.patch"

     

       19
        
           },

     

       20
        
           "5.11": {

     

       21
        
               "extra": "-hardened1",

     

       22
       +
               "name": "linux-hardened-5.11.20-hardened1.patch",

     

       23
       +
               "sha256": "06jf2r9xr8kzybia590x21p20mfags8j1flj0g4ci6r0fsfbmymf",

     

       24
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.20-hardened1/linux-hardened-5.11.20-hardened1.patch"

     

       25
        
           },

     

       26
        
           "5.4": {

     

       27
        
               "extra": "-hardened1",

     

       28
       +
               "name": "linux-hardened-5.4.118-hardened1.patch",

     

       29
       +
               "sha256": "1zkcdxqysgcidary6nl4c2hrn6r23gi4r8rqhjan22xa3l3lj43b",

     

       30
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.118-hardened1/linux-hardened-5.4.118-hardened1.patch"

     

       31
        
           }

     

       32
        
       }

+2 -1

pkgs/os-specific/linux/kernel/linux-4.4.nix

···

       1
       -
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
        
         version = "4.4.268";

     

       5
        
         extraMeta.branch = "4.4";

     

       0
        
       
     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

···

       1
       +
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
        
         version = "4.4.268";

     

       5
        
         extraMeta.branch = "4.4";

     

       6
       +
         extraMeta.broken = stdenv.isAarch64;

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

+2 -1

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
       -
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
        
         version = "4.9.268";

     

       5
        
         extraMeta.branch = "4.9";

     

       0
        
       
     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

···

       1
       +
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
        
         version = "4.9.268";

     

       5
        
         extraMeta.branch = "4.9";

     

       6
       +
         extraMeta.broken = stdenv.isAarch64;

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

+2 -2

pkgs/os-specific/linux/kernel/linux-5.10.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.10.35";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.10.36";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "0s5jw7y17hnl66iybw6f4pbc5j5rilphqbv3iql22wq053vyg749";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-5.11.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.11.19";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "0jrb8wbxj0dadyadggcn49hlxzxgz8mz8xr0ckgbnnvb8snikvjs";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.11.20";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "15q7pw1wvl6ndvb6154p6vjr4qa4fa6lpbqpxvwy2kywc2jyxykk";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-5.12.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.12.2";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "03gp5vq8vkwvksjsa1birds37rmrr73s9ik6m1wvgz8mdncvk64c";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.12.3";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "13c7jbizf254rh4arvlgzk87vx7sz6psba47jnax23lbgal18dqk";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.4.117";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "0w679qymqh8dlb1mh2vxr382m1pzxdjwlp3bqzjr4043fmbrp62f";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.4.118";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "06w2vhw6pdy49n3dcnq12bn50glbg9pwaqvs4nlzbljg4yf50w6r";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

+3 -3

pkgs/os-specific/linux/kernel/linux-rt-5.10.nix

···

       6
        
       , ... } @ args:

     

       7
        
       

     

       8
        
       let

     

       9
       -
         version = "5.10.30-rt38"; # updated by ./update-rt.sh

     

       10
        
         branch = lib.versions.majorMinor version;

     

       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
        
       in buildLinux (args // {

     
···

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       21
       -
           sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl";

     

       22
        
         };

     

       23
        
       

     

       24
        
         kernelPatches = let rt-patch = {

     

       25
        
           name = "rt";

     

       26
        
           patch = fetchurl {

     

       27
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       28
       -
             sha256 = "0f8wcs0y1qx3kqsan8g7bh1my2yc77k6d1g3q12nfxvbmlgs766n";

     

       29
        
           };

     

       30
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       31

···

       6
        
       , ... } @ args:

     

       7
        
       

     

       8
        
       let

     

       9
       +
         version = "5.10.35-rt39"; # updated by ./update-rt.sh

     

       10
        
         branch = lib.versions.majorMinor version;

     

       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
        
       in buildLinux (args // {

     
···

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       21
       +
           sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc";

     

       22
        
         };

     

       23
        
       

     

       24
        
         kernelPatches = let rt-patch = {

     

       25
        
           name = "rt";

     

       26
        
           patch = fetchurl {

     

       27
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       28
       +
             sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y";

     

       29
        
           };

     

       30
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       31

+3

pkgs/servers/unfs3/default.nix

···

       29
        
           license = lib.licenses.bsd3;

     

       30
        
           platforms = lib.platforms.unix;

     

       31
        
           maintainers = [ ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
         };

     

       33
        
       }

···

       29
        
           license = lib.licenses.bsd3;

     

       30
        
           platforms = lib.platforms.unix;

     

       31
        
           maintainers = [ ];

     

       32
       +
       

     

       33
       +
           # https://github.com/unfs3/unfs3/issues/13

     

       34
       +
           broken = true;

     

       35
        
         };

     

       36
        
       }

+2 -2

pkgs/tools/X11/opentabletdriver/shell.nix

···

       1
       -
       { pkgs ? import ../../../../. {} }:

     

       2
        
       

     

       3
        
       with pkgs;

     

       4
        
       

     

       5
        
       mkShell {

     

       6
       -
         buildInputs = [

     

       7
        
           common-updater-scripts

     

       8
        
           curl

     

       9
        
           dotnetCorePackages.sdk_5_0

···

       1
       +
       { pkgs ? import ../../../../. { } }:

     

       2
        
       

     

       3
        
       with pkgs;

     

       4
        
       

     

       5
        
       mkShell {

     

       6
       +
         packages = [

     

       7
        
           common-updater-scripts

     

       8
        
           curl

     

       9
        
           dotnetCorePackages.sdk_5_0

+3 -3

pkgs/tools/admin/google-cloud-sdk/default.nix

···

       21
        
         sources = name: system: {

     

       22
        
           x86_64-darwin = {

     

       23
        
             url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";

     

       24
       -
             sha256 = "1xb6s78q0fba45595d868vmbxdb41060jbygypfa5hvvcz8d8ayk";

     

       25
        
           };

     

       26
        
       

     

       27
        
           x86_64-linux = {

     

       28
        
             url = "${baseUrl}/${name}-linux-x86_64.tar.gz";

     

       29
       -
             sha256 = "19ywvp7nm91rc32r7dzb6yf3ss74m3s01fh2xqnmdg382jjlzdby";

     

       30
        
           };

     

       31
        
         }.${system};

     

       32
        
       

     

       33
        
       in stdenv.mkDerivation rec {

     

       34
        
         pname = "google-cloud-sdk";

     

       35
       -
         version = "339.0.0";

     

       36
        
       

     

       37
        
         src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

     

       38

···

       21
        
         sources = name: system: {

     

       22
        
           x86_64-darwin = {

     

       23
        
             url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";

     

       24
       +
             sha256 = "1ag8h8gj3cld2qxqdrrqdwrz3d9d5m4c2wkx7b78vjpimv76qx5d";

     

       25
        
           };

     

       26
        
       

     

       27
        
           x86_64-linux = {

     

       28
        
             url = "${baseUrl}/${name}-linux-x86_64.tar.gz";

     

       29
       +
             sha256 = "1mm9lvbgszr5d6gs1qqn63012mgxq94xxkcc400fgfx3apzpkbpj";

     

       30
        
           };

     

       31
        
         }.${system};

     

       32
        
       

     

       33
        
       in stdenv.mkDerivation rec {

     

       34
        
         pname = "google-cloud-sdk";

     

       35
       +
         version = "340.0.0";

     

       36
        
       

     

       37
        
         src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

     

       38

+10

pkgs/tools/typesetting/pdf2djvu/default.nix

···

       1
        
       { stdenv

     

       2
        
       , lib

     

       3
        
       , fetchFromGitHub

     

       0
        
       
     

       4
        
       , autoreconfHook

     

       5
        
       , gettext

     

       6
        
       , libtool

     
···

       24
        
           rev = version;

     

       25
        
           sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn";

     

       26
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
       

     

       28
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       29

···

       1
        
       { stdenv

     

       2
        
       , lib

     

       3
        
       , fetchFromGitHub

     

       4
       +
       , fetchpatch

     

       5
        
       , autoreconfHook

     

       6
        
       , gettext

     

       7
        
       , libtool

     
···

       25
        
           rev = version;

     

       26
        
           sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn";

     

       27
        
         };

     

       28
       +
       

     

       29
       +
         patches = [

     

       30
       +
           # Not included in 0.9.17.1, but will be in the next version.

     

       31
       +
           (fetchpatch {

     

       32
       +
             name = "no-poppler-splash.patch";

     

       33
       +
             url = "https://github.com/jwilk/pdf2djvu/commit/2ec7eee57a47bbfd296badaa03dc20bf71b50201.patch";

     

       34
       +
             sha256 = "03kap7k2j29r16qgl781cxpswzg3r2yn513cqycgl0vax2xj3gly";

     

       35
       +
           })

     

       36
       +
         ];

     

       37
        
       

     

       38
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       39

+2

pkgs/top-level/python-packages.nix

···

       2727
        
       

     

       2728
        
         glasgow = callPackage ../development/python-modules/glasgow { };

     

       2729
        
       

     

       0
        
       
     

       0
        
       
     

       2730
        
         glob2 = callPackage ../development/python-modules/glob2 { };

     

       2731
        
       

     

       2732
        
         globre = callPackage ../development/python-modules/globre { };

···

       2727
        
       

     

       2728
        
         glasgow = callPackage ../development/python-modules/glasgow { };

     

       2729
        
       

     

       2730
       +
         glcontext = callPackage ../development/python-modules/glcontext { };

     

       2731
       +
       

     

       2732
        
         glob2 = callPackage ../development/python-modules/glob2 { };

     

       2733
        
       

     

       2734
        
         globre = callPackage ../development/python-modules/globre { };