commit 0011f9065a1ad1da4db67bec8d535d91b0a78fba · pyrox.dev/nixpkgs

lib/meta.nix

···

       17
       17
        
           drv // { meta = (drv.meta or {}) // newAttrs; };

     

       18
       18
        
       

     

       19
       19
        
       

     

       20
       20
       +
         /* Disable Hydra builds of given derivation.

     

       21
       21
       +
         */

     

       22
       22
       +
         dontDistribute = drv: addMetaAttrs { hydraPlatforms = []; } drv;

     

       23
       23
       +
       

     

       24
       24
       +
       

     

       20
       25
        
         /* Change the symbolic name of a package for presentation purposes

     

       21
       26
        
            (i.e., so that nix-env users can tell them apart).

     

       22
       27
        
         */

+3 -2

pkgs/applications/audio/airwave/default.nix

···

       1
       1
        
       { stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper

     

       2
       2
       -
       , overrideCC, qt5, requireFile, unzip, wineStable

     

       2
       2
       +
       , overrideCC, qt5, requireFile, unzip, wine

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       26
       26
        
           installPhase = "cp -r . $out";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         wine-wow64 = wineStable.override {

     

       29
       29
       +
         wine-wow64 = wine.override {

     

       30
       30
       +
           wineRelease = "stable";

     

       30
       31
        
           wineBuild = "wineWow";

     

       31
       32
        
         };

     

       32
       33

+7 -3

pkgs/misc/emulators/wine/base.nix

···

       91
       91
        
                 ((map (links "share/wine/gecko") geckos)

     

       92
       92
        
               ++ (map (links "share/wine/mono")  monos))}

     

       93
       93
        
         '' + lib.optionalString supportFlags.gstreamerSupport ''

     

       94
       94
       -
           wrapProgram "$out/bin/wine" \

     

       95
       95
       -
             --argv0 "" \

     

       96
       96
       -
             --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"

     

       94
       94
       +
           for i in wine wine64; do

     

       95
       95
       +
             if [ -e "$out/bin/$i" ]; then

     

       96
       96
       +
               wrapProgram "$out/bin/$i" \

     

       97
       97
       +
                 --argv0 "" \

     

       98
       98
       +
                 --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"

     

       99
       99
       +
             fi

     

       100
       100
       +
           done

     

       97
       101
        
         '';

     

       98
       102
        
         

     

       99
       103
        
         enableParallelBuilding = true;

+18 -5

pkgs/top-level/aliases.nix

···

       5
       5
        
       let

     

       6
       6
        
         # Removing recurseForDerivation prevents derivations of aliased attribute

     

       7
       7
        
         # set to appear while listing all the packages available.

     

       8
       8
       -
         removeRecurseForDerivations = _n: alias: with lib;

     

       8
       8
       +
         removeRecurseForDerivations = alias: with lib;

     

       9
       9
        
           if alias.recurseForDerivations or false then

     

       10
       10
        
             removeAttrs alias ["recurseForDerivations"]

     

       11
       11
        
           else alias;

     

       12
       12
        
       

     

       13
       13
       -
         doNotDisplayTwice = aliases:

     

       14
       14
       -
           lib.mapAttrs removeRecurseForDerivations aliases;

     

       13
       13
       +
         # Disabling distribution prevents top-level aliases for non-recursed package

     

       14
       14
       +
         # sets from building on Hydra.

     

       15
       15
       +
         removeDistribute = alias: with lib;

     

       16
       16
       +
           if isDerivation alias then

     

       17
       17
       +
             dontDistribute alias

     

       18
       18
       +
           else alias;

     

       19
       19
       +
       

     

       20
       20
       +
         mapAliases = aliases:

     

       21
       21
       +
           lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases;

     

       15
       22
        
       in

     

       16
       23
        
       

     

       17
       24
        
         ### Deprecated aliases - for backward compatibility

     

       18
       25
        
       

     

       19
       19
       -
       doNotDisplayTwice rec {

     

       26
       26
       +
       mapAliases (rec {

     

       20
       27
        
         accounts-qt = libsForQt5.accounts-qt;  # added 2015-12-19

     

       21
       28
        
         adobeReader = adobe-reader;

     

       22
       29
        
         aircrackng = aircrack-ng; # added 2016-01-14

     
···

       141
       148
        
         xlibs = xorg; # added 2015-09

     

       142
       149
        
         youtubeDL = youtube-dl;  # added 2014-10-26

     

       143
       150
        
       

     

       151
       151
       +
         # added 2017-05-27

     

       152
       152
       +
         wineMinimal = winePackages.minimal;

     

       153
       153
       +
         wineFull = winePackages.full;

     

       154
       154
       +
         wineStable = winePackages.stable;

     

       155
       155
       +
         wineUnstable = winePackages.unstable;

     

       156
       156
       +
       

     

       144
       157
        
         inherit (ocaml-ng) # added 2016-09-14

     

       145
       158
        
           ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1

     

       146
       159
        
           ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02

     
···

       156
       169
        
         ocaml_4_02   = ocamlPackages_4_02.ocaml;

     

       157
       170
        
         ocaml_4_03   = ocamlPackages_4_03.ocaml;

     

       158
       171
        
         ocaml        = ocamlPackages.ocaml;

     

       159
       159
       -
       })

     

       172
       172
       +
       }))

+51 -41

pkgs/top-level/all-packages.nix

···

       18718
       18718
        
           pythonPackages = python3Packages;

     

       18719
       18719
        
         };

     

       18720
       18720
        
       

     

       18721
       18721
       -
         wineMinimal = callPackage ../misc/emulators/wine {

     

       18722
       18722
       -
           wineRelease = config.wine.release or "stable";

     

       18723
       18723
       -
           wineBuild = config.wine.build or "wine32";

     

       18721
       18721
       +
         winePackages = rec {

     

       18722
       18722
       +
           minimal = callPackage ../misc/emulators/wine {

     

       18723
       18723
       +
             wineRelease = config.wine.release or "stable";

     

       18724
       18724
       +
             wineBuild = config.wine.build or "wine32";

     

       18725
       18725
       +
           };

     

       18726
       18726
       +
       

     

       18727
       18727
       +
           base = minimal.override {

     

       18728
       18728
       +
             pngSupport = true;

     

       18729
       18729
       +
             jpegSupport = true;

     

       18730
       18730
       +
             tiffSupport = true;

     

       18731
       18731
       +
             gettextSupport = true;

     

       18732
       18732
       +
             fontconfigSupport = true;

     

       18733
       18733
       +
             alsaSupport = true;

     

       18734
       18734
       +
             openglSupport = true;

     

       18735
       18735
       +
             tlsSupport = true;

     

       18736
       18736
       +
             cupsSupport = true;

     

       18737
       18737
       +
             dbusSupport = true;

     

       18738
       18738
       +
             cairoSupport = true;

     

       18739
       18739
       +
             cursesSupport = true;

     

       18740
       18740
       +
             saneSupport = true;

     

       18741
       18741
       +
             pulseaudioSupport = config.pulseaudio or stdenv.isLinux;

     

       18742
       18742
       +
             udevSupport = true;

     

       18743
       18743
       +
             xineramaSupport = true;

     

       18744
       18744
       +
             xmlSupport = true;

     

       18745
       18745
       +
           };

     

       18746
       18746
       +
       

     

       18747
       18747
       +
           full = base.override {

     

       18748
       18748
       +
             gtkSupport = true;

     

       18749
       18749
       +
             gstreamerSupport = true;

     

       18750
       18750
       +
             colorManagementSupport = true;

     

       18751
       18751
       +
             mpg123Support = true;

     

       18752
       18752
       +
             openalSupport = true;

     

       18753
       18753
       +
             openclSupport = true;

     

       18754
       18754
       +
             odbcSupport = true;

     

       18755
       18755
       +
             netapiSupport = true;

     

       18756
       18756
       +
             vaSupport = true;

     

       18757
       18757
       +
             pcapSupport = true;

     

       18758
       18758
       +
             v4lSupport = true;

     

       18759
       18759
       +
             gsmSupport = true;

     

       18760
       18760
       +
             gphoto2Support = true;

     

       18761
       18761
       +
             ldapSupport = true;

     

       18762
       18762
       +
           };

     

       18763
       18763
       +
       

     

       18764
       18764
       +
           stable = base.override { wineRelease = "stable"; };

     

       18765
       18765
       +
           unstable = base.override { wineRelease = "unstable"; };

     

       18766
       18766
       +
           staging = base.override { wineRelease = "staging"; };

     

       18724
       18767
        
         };

     

       18725
       18725
       -
         wine = lowPrio (self.wineMinimal.override {

     

       18726
       18726
       -
           pngSupport = true;

     

       18727
       18727
       -
           jpegSupport = true;

     

       18728
       18728
       -
           tiffSupport = true;

     

       18729
       18729
       -
           gettextSupport = true;

     

       18730
       18730
       -
           fontconfigSupport = true;

     

       18731
       18731
       -
           alsaSupport = true;

     

       18732
       18732
       -
           openglSupport = true;

     

       18733
       18733
       -
           tlsSupport = true;

     

       18734
       18734
       -
           cupsSupport = true;

     

       18735
       18735
       -
           colorManagementSupport = true;

     

       18736
       18736
       -
           dbusSupport = true;

     

       18737
       18737
       -
           mpg123Support = true;

     

       18738
       18738
       -
           openalSupport = true;

     

       18739
       18739
       -
           cairoSupport = true;

     

       18740
       18740
       -
           cursesSupport = true;

     

       18741
       18741
       -
           pulseaudioSupport = config.pulseaudio or stdenv.isLinux;

     

       18742
       18742
       -
           xineramaSupport = true;

     

       18743
       18743
       -
           xmlSupport = true;

     

       18744
       18744
       -
         });

     

       18745
       18745
       -
         wineFull = lowPrio (self.wine.override {

     

       18746
       18746
       -
           gtkSupport = true;

     

       18747
       18747
       -
           gstreamerSupport = true;

     

       18748
       18748
       -
           openclSupport = true;

     

       18749
       18749
       -
           odbcSupport = true;

     

       18750
       18750
       -
           netapiSupport = true;

     

       18751
       18751
       -
           vaSupport = true;

     

       18752
       18752
       -
           pcapSupport = true;

     

       18753
       18753
       -
           v4lSupport = true;

     

       18754
       18754
       -
           saneSupport = true;

     

       18755
       18755
       -
           gsmSupport = true;

     

       18756
       18756
       -
           gphoto2Support = true;

     

       18757
       18757
       -
           ldapSupport = true;

     

       18758
       18758
       -
           pulseaudioSupport = true;

     

       18759
       18759
       -
           udevSupport = true;

     

       18768
       18768
       +
       

     

       18769
       18769
       +
         wine = winePackages.base;

     

       18770
       18770
       +
       

     

       18771
       18771
       +
         wineStaging = lowPrio (winePackages.full.override {

     

       18772
       18772
       +
           wineRelease = "staging";

     

       18760
       18773
        
         });

     

       18761
       18761
       -
         wineStable = self.wine.override { wineRelease = "stable"; };

     

       18762
       18762
       -
         wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });

     

       18763
       18763
       -
         wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; });

     

       18764
       18774
        
       

     

       18765
       18775
        
         winetricks = callPackage ../misc/emulators/wine/winetricks.nix {

     

       18766
       18776
        
           inherit (gnome2) zenity;