commit c1c85b9bade820ffb3cf1f49d26453ab0e27a65a · pyrox.dev/nixpkgs

+12 -13

nixos/modules/config/fonts/fontconfig.nix

···

       1
       1
        
       /*

     

       2
       2
        
       

     

       3
       3
       -
       Configuration files are linked to /etc/fonts/${pkgs.fontconfig.configVersion}/conf.d/

     

       3
       3
       +
       Configuration files are linked to /etc/fonts/conf.d/

     

       4
       4
        
       

     

       5
       5
        
       This module generates a package containing configuration files and link it in /etc/fonts.

     

       6
       6
        
       

     
···

       35
       35
        
           in

     

       36
       36
        
           pkgs.writeText "fc-00-nixos-cache.conf" ''

     

       37
       37
        
             <?xml version='1.0'?>

     

       38
       38
       -
             <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       38
       38
       +
             <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>

     

       39
       39
        
             <fontconfig>

     

       40
       40
        
               <!-- Font directories -->

     

       41
       41
        
               ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}

     
···

       53
       53
        
         # priority 10

     

       54
       54
        
         renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" ''

     

       55
       55
        
           <?xml version='1.0'?>

     

       56
       56
       -
           <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       56
       56
       +
           <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>

     

       57
       57
        
           <fontconfig>

     

       58
       58
        
       

     

       59
       59
        
             <!-- Default rendering settings -->

     
···

       110
       110
        
           in

     

       111
       111
        
           pkgs.writeText "fc-52-nixos-default-fonts.conf" ''

     

       112
       112
        
           <?xml version='1.0'?>

     

       113
       113
       -
           <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       113
       113
       +
           <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>

     

       114
       114
        
           <fontconfig>

     

       115
       115
        
       

     

       116
       116
        
             <!-- Default fonts -->

     
···

       129
       129
        
         # priority 53

     

       130
       130
        
         rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''

     

       131
       131
        
           <?xml version="1.0"?>

     

       132
       132
       -
           <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       132
       132
       +
           <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       133
       133
        
           <fontconfig>

     

       134
       134
        
       

     

       135
       135
        
           ${optionalString (!cfg.allowBitmaps) ''

     
···

       157
       157
        
         # priority 53

     

       158
       158
        
         rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''

     

       159
       159
        
           <?xml version="1.0"?>

     

       160
       160
       -
           <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       160
       160
       +
           <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       161
       161
        
           <fontconfig>

     

       162
       162
        
       

     

       163
       163
        
           <!-- Reject Type 1 fonts -->

     
···

       176
       176
        
         confPkg = pkgs.runCommand "fontconfig-conf" {

     

       177
       177
        
           preferLocalBuild = true;

     

       178
       178
        
         } ''

     

       179
       179
       -
           dst=$out/etc/fonts/${pkg.configVersion}/conf.d

     

       179
       179
       +
           dst=$out/etc/fonts/conf.d

     

       180
       180
        
           mkdir -p $dst

     

       181
       181
        
       

     

       182
       182
        
           # fonts.conf

     

       183
       183
        
           ln -s ${pkg.out}/etc/fonts/fonts.conf \

     

       184
       184
        
                 $dst/../fonts.conf

     

       185
       185
        
           # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged

     

       186
       186
       -
           ln -s /etc/fonts/${pkg.configVersion}/fonts.conf \

     

       187
       187
       -
                 $out/etc/fonts/fonts.conf

     

       186
       186
       +
           mkdir -p $out/etc/fonts/2.11

     

       187
       187
       +
           ln -s /etc/fonts/fonts.conf \

     

       188
       188
       +
                 $out/etc/fonts/2.11/fonts.conf

     

       188
       189
        
       

     

       189
       190
        
           # fontconfig default config files

     

       190
       191
        
           ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \

     
···

       197
       198
        
           ln -s ${renderConf}       $dst/10-nixos-rendering.conf

     

       198
       199
        
       

     

       199
       200
        
           # 50-user.conf

     

       200
       200
       -
           # Since latest fontconfig looks for default files inside the package,

     

       201
       201
       -
           # we had to move this one elsewhere to be able to exclude it here.

     

       202
       202
       -
           ${optionalString cfg.includeUserConf ''

     

       203
       203
       -
           ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf

     

       201
       201
       +
           ${optionalString (!cfg.includeUserConf) ''

     

       202
       202
       +
           rm $dst/50-user.conf

     

       204
       203
        
           ''}

     

       205
       204
        
       

     

       206
       205
        
           # local.conf (indirect priority 51)

+3 -5

nixos/modules/system/boot/stage-1.nix

···

       87
       87
        
         # copy what we need.  Instead of using statically linked binaries,

     

       88
       88
        
         # we just copy what we need from Glibc and use patchelf to make it

     

       89
       89
        
         # work.

     

       90
       90
       -
         extraUtils = let

     

       91
       91
       -
           # Use lvm2 without udev support, which is the same lvm2 we already have in the closure anyways

     

       92
       92
       -
           lvm2 = pkgs.lvm2.override { udev = null; }; in pkgs.runCommandCC "extra-utils"

     

       90
       90
       +
         extraUtils = pkgs.runCommandCC "extra-utils"

     

       93
       91
        
           { nativeBuildInputs = [pkgs.buildPackages.nukeReferences];

     

       94
       92
        
             allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd

     

       95
       93
        
           }

     
···

       113
       111
        
             copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid

     

       114
       112
        
       

     

       115
       113
        
             # Copy dmsetup and lvm.

     

       116
       116
       -
             copy_bin_and_libs ${getBin lvm2}/bin/dmsetup

     

       117
       117
       -
             copy_bin_and_libs ${getBin lvm2}/bin/lvm

     

       114
       114
       +
             copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup

     

       115
       115
       +
             copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm

     

       118
       116
        
       

     

       119
       117
        
             # Add RAID mdadm tool.

     

       120
       118
        
             copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm

+4 -5

nixos/tests/installer.nix

···

       317
       317
        
                   texinfo

     

       318
       318
        
                   unionfs-fuse

     

       319
       319
        
                   xorg.lndir

     

       320
       320
       -
                   (lvm2.override { udev = null; }) # for initrd (extra-utils)

     

       321
       320
        
       

     

       322
       321
        
                   # add curl so that rather than seeing the test attempt to download

     

       323
       322
        
                   # curl's tarball, we see what it's trying to download

     
···

       634
       633
        
                 + " mklabel msdos"

     

       635
       634
        
                 + " mkpart primary ext2 1M 100MB"  # /boot

     

       636
       635
        
                 + " mkpart extended 100M -1s"

     

       637
       637
       -
                 + " mkpart logical 102M 2102M"  # md0 (root), first device

     

       638
       638
       -
                 + " mkpart logical 2103M 4103M"  # md0 (root), second device

     

       639
       639
       -
                 + " mkpart logical 4104M 4360M"  # md1 (swap), first device

     

       640
       640
       -
                 + " mkpart logical 4361M 4617M",  # md1 (swap), second device

     

       636
       636
       +
                 + " mkpart logical 102M 3102M"  # md0 (root), first device

     

       637
       637
       +
                 + " mkpart logical 3103M 6103M"  # md0 (root), second device

     

       638
       638
       +
                 + " mkpart logical 6104M 6360M"  # md1 (swap), first device

     

       639
       639
       +
                 + " mkpart logical 6361M 6617M",  # md1 (swap), second device

     

       641
       640
        
                 "udevadm settle",

     

       642
       641
        
                 "ls -l /dev/vda* >&2",

     

       643
       642
        
                 "cat /proc/partitions >&2",

+2 -2

pkgs/applications/audio/mpg123/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "mpg123-1.26.2";

     

       6
       6
       +
         name = "mpg123-1.26.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/mpg123/${name}.tar.bz2";

     

       10
       10
       -
           sha256 = "1wrgds46wj6xsnqa6bi8kkh3wd29i2nxclbps34w5kjglrzbzxq0";

     

       10
       10
       +
           sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

+15 -15

pkgs/applications/editors/emacs/generic.nix

···

       11
       11
        
       , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux

     

       12
       12
        
       , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf

     

       13
       13
        
       , jansson, harfbuzz

     

       14
       14
       -
       , libgccjit, targetPlatform, binutils, binutils-unwrapped, makeWrapper # native-comp params

     

       14
       14
       +
       , libgccjit, targetPlatform, makeWrapper # native-comp params

     

       15
       15
        
       , systemd ? null

     

       16
       16
        
       , withX ? !stdenv.isDarwin

     

       17
       17
        
       , withNS ? stdenv.isDarwin

     
···

       67
       67
        
       

     

       68
       68
        
           # Make native compilation work both inside and outside of nix build

     

       69
       69
        
           (lib.optionalString nativeComp (let

     

       70
       70
       -
             libPath = lib.concatStringsSep ":" [

     

       71
       71
       -
               "${lib.getLib libgccjit}/lib/gcc/${targetPlatform.config}/${libgccjit.version}"

     

       72
       72
       -
               "${lib.getLib stdenv.cc.cc}/lib"

     

       73
       73
       -
               "${lib.getLib stdenv.glibc}/lib"

     

       74
       74
       -
             ];

     

       70
       70
       +
             backendPath = (lib.concatStringsSep " "

     

       71
       71
       +
               (builtins.map (x: ''\"-B${x}\"'') [

     

       72
       72
       +
                 # Paths necessary so the JIT compiler finds its libraries:

     

       73
       73
       +
                 "${lib.getLib libgccjit}/lib"

     

       74
       74
       +
                 "${lib.getLib libgccjit}/lib/gcc"

     

       75
       75
       +
                 "${lib.getLib stdenv.cc.libc}/lib"

     

       76
       76
       +
       

     

       77
       77
       +
                 # Executable paths necessary for compilation (ld, as):

     

       78
       78
       +
                 "${lib.getBin stdenv.cc.cc}"

     

       79
       79
       +
                 "${lib.getBin stdenv.cc.bintools}"

     

       80
       80
       +
                 "${lib.getBin stdenv.cc.bintools.bintools}"

     

       81
       81
       +
               ]));

     

       75
       82
        
           in ''

     

       76
       83
        
             substituteInPlace lisp/emacs-lisp/comp.el --replace \

     

       77
       77
       -
               "(defcustom comp-async-env-modifier-form nil" \

     

       78
       78
       -
               "(defcustom comp-async-env-modifier-form '((setenv \"LIBRARY_PATH\" (string-join (seq-filter (lambda (v) (null (eq v nil))) (list (getenv \"LIBRARY_PATH\") \"${libPath}\")) \":\")))"

     

       79
       79
       -
       

     

       84
       84
       +
               "(defcustom comp-native-driver-options nil" \

     

       85
       85
       +
               "(defcustom comp-native-driver-options '(${backendPath})"

     

       80
       86
        
           ''))

     

       81
       81
       -
       

     

       82
       87
        
           ""

     

       83
       88
        
         ];

     

       84
       89
        
       

     
···

       156
       161
        
               "$out/bin/emacs"

     

       157
       162
        
             patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"

     

       158
       163
        
           '')

     

       159
       159
       -
       

     

       160
       160
       -
           (lib.optionalString nativeComp ''

     

       161
       161
       -
             wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ binutils binutils-unwrapped ]}"

     

       162
       162
       -
           '')

     

       163
       163
       -
       

     

       164
       164
        
         ];

     

       165
       165
        
       

     

       166
       166
        
         passthru = {

+2 -2

pkgs/applications/editors/vim/common.nix

···

       1
       1
        
       { lib, fetchFromGitHub }:

     

       2
       2
        
       rec {

     

       3
       3
       -
         version = "8.2.1123";

     

       3
       3
       +
         version = "8.2.1522";

     

       4
       4
        
       

     

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "vim";

     

       7
       7
        
           repo = "vim";

     

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

     

       9
       9
       -
           sha256 = "01fgfm5pnmbq12z84d7g3x0iq5gj1irdyihx41c4r2bww55v5q0c";

     

       9
       9
       +
           sha256 = "0dah3392cq06pagik5y7kcq61mslqvfsh7vqldv3kvhr5ilqb8qy";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         enableParallelBuilding = true;

-2

pkgs/applications/gis/openorienteering-mapper/default.nix

···

       56
       56
        
           "-DLICENSING_PROVIDER:BOOL=OFF"

     

       57
       57
        
           "-DMapper_MANUAL_QTHELP:BOOL=OFF"

     

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

     

       59
       59
       -
           # Usually enabled on Darwin

     

       60
       60
       -
           "-DCMAKE_FIND_FRAMEWORK=never"

     

       61
       59
        
           # FindGDAL is broken and always finds /Library/Framework unless this is

     

       62
       60
        
           # specified

     

       63
       61
        
           "-DGDAL_INCLUDE_DIR=${gdal}/include"

+23

pkgs/applications/kde/default.nix

···

       92
       92
        
             kaddressbook = callPackage ./kaddressbook.nix {};

     

       93
       93
        
             kalarm = callPackage ./kalarm.nix {};

     

       94
       94
        
             kalarmcal = callPackage ./kalarmcal.nix {};

     

       95
       95
       +
             kalzium = callPackage ./kalzium.nix {};

     

       96
       96
       +
             kapman = callPackage ./kapman.nix {};

     

       95
       97
        
             kapptemplate = callPackage ./kapptemplate.nix { };

     

       96
       98
        
             kate = callPackage ./kate.nix {};

     

       99
       99
       +
             katomic = callPackage ./katomic.nix {};

     

       100
       100
       +
             kblackbox = callPackage ./kblackbox.nix {};

     

       101
       101
       +
             kblocks = callPackage ./kblocks.nix {};

     

       102
       102
       +
             kbounce = callPackage ./kbounce.nix {};

     

       97
       103
        
             kbreakout = callPackage ./kbreakout.nix {};

     

       98
       104
        
             kcachegrind = callPackage ./kcachegrind.nix {};

     

       99
       105
        
             kcalc = callPackage ./kcalc.nix {};

     
···

       110
       116
        
             kdepim-apps-libs = callPackage ./kdepim-apps-libs {};

     

       111
       117
        
             kdf = callPackage ./kdf.nix {};

     

       112
       118
        
             kdialog = callPackage ./kdialog.nix {};

     

       119
       119
       +
             kdiamond = callPackage ./kdiamond.nix {};

     

       113
       120
        
             keditbookmarks = callPackage ./keditbookmarks.nix {};

     

       114
       121
        
             kfind = callPackage ./kfind.nix {};

     

       115
       122
        
             kfloppy = callPackage ./kfloppy.nix {};

     
···

       119
       126
        
             khelpcenter = callPackage ./khelpcenter.nix {};

     

       120
       127
        
             kidentitymanagement = callPackage ./kidentitymanagement.nix {};

     

       121
       128
        
             kig = callPackage ./kig.nix {};

     

       129
       129
       +
             kigo = callPackage ./kigo.nix {};

     

       130
       130
       +
             killbots = callPackage ./killbots.nix {};

     

       122
       131
        
             kimap = callPackage ./kimap.nix {};

     

       123
       132
        
             kipi-plugins = callPackage ./kipi-plugins.nix {};

     

       124
       133
        
             kitinerary = callPackage ./kitinerary.nix {};

     

       125
       134
        
             kio-extras = callPackage ./kio-extras.nix {};

     

       126
       135
        
             kldap = callPackage ./kldap.nix {};

     

       127
       136
        
             kleopatra = callPackage ./kleopatra.nix {};

     

       137
       137
       +
             klettres = callPackage ./klettres.nix {};

     

       138
       138
       +
             klines = callPackage ./klines.nix {};

     

       139
       139
       +
             kmag = callPackage ./kmag.nix {};

     

       128
       140
        
             kmahjongg = callPackage ./kmahjongg.nix {};

     

       129
       141
        
             kmail = callPackage ./kmail.nix {};

     

       130
       142
        
             kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};

     

       131
       143
        
             kmailtransport = callPackage ./kmailtransport.nix {};

     

       132
       144
        
             kmbox = callPackage ./kmbox.nix {};

     

       133
       145
        
             kmime = callPackage ./kmime.nix {};

     

       146
       146
       +
             kmines = callPackage ./kmines.nix {};

     

       134
       147
        
             kmix = callPackage ./kmix.nix {};

     

       135
       148
        
             kmplot = callPackage ./kmplot.nix {};

     

       149
       149
       +
             knavalbattle = callPackage ./knavalbattle.nix {};

     

       150
       150
       +
             knetwalk = callPackage ./knetwalk.nix {};

     

       151
       151
       +
             knights = callPackage ./knights.nix {};

     

       136
       152
        
             knotes = callPackage ./knotes.nix {};

     

       137
       153
        
             kolf = callPackage ./kolf.nix {};

     

       154
       154
       +
             kollision = callPackage ./kollision.nix {};

     

       138
       155
        
             kolourpaint = callPackage ./kolourpaint.nix {};

     

       139
       156
        
             kompare = callPackage ./kompare.nix {};

     

       140
       157
        
             konsole = callPackage ./konsole.nix {};

     
···

       149
       166
        
             ksquares = callPackage ./ksquares.nix {};

     

       150
       167
        
             kqtquickcharts = callPackage ./kqtquickcharts.nix {};

     

       151
       168
        
             kpkpass = callPackage ./kpkpass.nix {};

     

       169
       169
       +
             kreversi = callPackage ./kreversi.nix {};

     

       152
       170
        
             krdc = callPackage ./krdc.nix {};

     

       153
       171
        
             krfb = callPackage ./krfb.nix {};

     

       154
       172
        
             kruler = callPackage ./kruler.nix {};

     

       173
       173
       +
             kshisen = callPackage ./kshisen.nix {};

     

       155
       174
        
             kspaceduel = callPackage ./kspaceduel.nix {};

     

       156
       175
        
             ksudoku = callPackage ./ksudoku.nix {};

     

       157
       176
        
             ksystemlog = callPackage ./ksystemlog.nix {};

     

       177
       177
       +
             kteatime = callPackage ./kteatime.nix {};

     

       178
       178
       +
             ktimer = callPackage ./ktimer.nix {};

     

       158
       179
        
             ktnef = callPackage ./ktnef.nix {};

     

       159
       180
        
             ktouch = callPackage ./ktouch.nix {};

     

       181
       181
       +
             kturtle = callPackage ./kturtle.nix {};

     

       160
       182
        
             kwalletmanager = callPackage ./kwalletmanager.nix {};

     

       183
       183
       +
             kwave = callPackage ./kwave.nix {};

     

       161
       184
        
             libgravatar = callPackage ./libgravatar.nix {};

     

       162
       185
        
             libkcddb = callPackage ./libkcddb.nix {};

     

       163
       186
        
             libkdcraw = callPackage ./libkdcraw.nix {};

+26

pkgs/applications/kde/kalzium.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kalzium";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium";

     

       7
       7
       +
           description = "Kalzium is a program that shows you the Periodic Table of Elements";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           qtscript

     

       17
       17
       +
           #avogadro

     

       18
       18
       +
           kdoctools

     

       19
       19
       +
           ki18n

     

       20
       20
       +
           kio

     

       21
       21
       +
           openbabel

     

       22
       22
       +
           kparts

     

       23
       23
       +
           kplotting

     

       24
       24
       +
           kunitconversion

     

       25
       25
       +
         ];

     

       26
       26
       +
       }

+21

pkgs/applications/kde/kapman.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kapman";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kapman";

     

       7
       7
       +
           description = "Kapman is a clone of the well known game Pac-Man";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+22

pkgs/applications/kde/katomic.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "katomic";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.katomic";

     

       7
       7
       +
           description = "KAtomic is a fun educational game built around molecular geometry";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           knewstuff

     

       17
       17
       +
           libkdegames

     

       18
       18
       +
           kdoctools

     

       19
       19
       +
           ki18n

     

       20
       20
       +
           kio

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+21

pkgs/applications/kde/kblackbox.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kblackbox";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kblackbox";

     

       7
       7
       +
           description = "KBlackbox is a game of hide and seek played on a grid of boxes";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+21

pkgs/applications/kde/kblocks.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kblocks";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kblocks";

     

       7
       7
       +
           description = "KBlocks is the classic falling blocks game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+22

pkgs/applications/kde/kbounce.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kbounce";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kbounce";

     

       7
       7
       +
           description = "KBounce is a single player arcade game with the elements of puzzle";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kconfig

     

       18
       18
       +
           kcrash

     

       19
       19
       +
           kio

     

       20
       20
       +
           ki18n

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+23

pkgs/applications/kde/kdiamond.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kdiamond";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kdiamond";

     

       7
       7
       +
           description = "KDiamond is a single player puzzle game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           knotifyconfig

     

       18
       18
       +
           kconfig

     

       19
       19
       +
           kdoctools

     

       20
       20
       +
           ki18n

     

       21
       21
       +
           kio

     

       22
       22
       +
         ];

     

       23
       23
       +
       }

+22

pkgs/applications/kde/kigo.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kigo";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kigo";

     

       7
       7
       +
           description = "An open-source implementation of the popular Go game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           knewstuff

     

       18
       18
       +
           kdoctools

     

       19
       19
       +
           ki18n

     

       20
       20
       +
           kio

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+21

pkgs/applications/kde/killbots.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "killbots";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.killbots";

     

       7
       7
       +
           description = "A game where you avoid robots";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+22

pkgs/applications/kde/klettres.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "klettres";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/utilities/org.kde.klettres";

     

       7
       7
       +
           description = "KLettres is an application specially designed to help the user to learn an alphabet";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           phonon

     

       17
       17
       +
           knewstuff

     

       18
       18
       +
           kdoctools

     

       19
       19
       +
           ki18n

     

       20
       20
       +
           kio

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+21

pkgs/applications/kde/klines.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "klines";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.klines";

     

       7
       7
       +
           description = "KLines is a simple but highly addictive one player game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+20

pkgs/applications/kde/kmag.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kmag";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/utilities/org.kde.kmag";

     

       7
       7
       +
           description = "KMag is a small utility for Linux to magnify a part of the screen";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kdoctools

     

       17
       17
       +
           ki18n

     

       18
       18
       +
           kio

     

       19
       19
       +
         ];

     

       20
       20
       +
       }

+23

pkgs/applications/kde/kmines.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kmines";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kmines";

     

       7
       7
       +
           description = "KMines is a classic Minesweeper game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kconfig

     

       18
       18
       +
           kcrash

     

       19
       19
       +
           kio

     

       20
       20
       +
           kdoctools

     

       21
       21
       +
           ki18n

     

       22
       22
       +
         ];

     

       23
       23
       +
       }

+22

pkgs/applications/kde/knavalbattle.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "knavalbattle";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle";

     

       7
       7
       +
           description = "Naval Battle is a ship sinking game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
           kdnssd

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+21

pkgs/applications/kde/knetwalk.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "knetwalk";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.knetwalk";

     

       7
       7
       +
           description = "KNetWalk is a single player logic game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+23

pkgs/applications/kde/knights.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "knights";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.knights";

     

       7
       7
       +
           description = "KNights is a chess game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           plasma-framework

     

       18
       18
       +
           kplotting

     

       19
       19
       +
           kdoctools

     

       20
       20
       +
           ki18n

     

       21
       21
       +
           kio

     

       22
       22
       +
         ];

     

       23
       23
       +
       }

+21

pkgs/applications/kde/kollision.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kollision";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kollision";

     

       7
       7
       +
           description = "Kollision is a casual game";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           kdoctools

     

       18
       18
       +
           ki18n

     

       19
       19
       +
           kio

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+19

pkgs/applications/kde/kreversi.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kreversi";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kreversi";

     

       7
       7
       +
           description = "KReversi is a simple one player strategy game played against the computer";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kdeclarative

     

       17
       17
       +
           libkdegames

     

       18
       18
       +
         ];

     

       19
       19
       +
       }

+22

pkgs/applications/kde/kshisen.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kshisen";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/games/org.kde.kshisen";

     

       7
       7
       +
           description = "KShisen is a solitaire-like game played using the standard set of Mahjong tiles";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libkdegames

     

       17
       17
       +
           libkmahjongg

     

       18
       18
       +
           kdoctools

     

       19
       19
       +
           ki18n

     

       20
       20
       +
           kio

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+23

pkgs/applications/kde/kteatime.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kteatime";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime";

     

       7
       7
       +
           description = "KTeaTime is a handy timer for steeping tea";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kdoctools

     

       17
       17
       +
           ki18n

     

       18
       18
       +
           kconfig

     

       19
       19
       +
           kcrash

     

       20
       20
       +
           kiconthemes

     

       21
       21
       +
           knotifyconfig

     

       22
       22
       +
         ];

     

       23
       23
       +
       }

+20

pkgs/applications/kde/ktimer.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "ktimer";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer";

     

       7
       7
       +
           description = "KTimer is a little tool to execute programs after some time";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kdoctools

     

       17
       17
       +
           ki18n

     

       18
       18
       +
           kio

     

       19
       19
       +
         ];

     

       20
       20
       +
       }

+21

pkgs/applications/kde/kturtle.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         name = "kturtle";

     

       5
       5
       +
         meta = with lib; {

     

       6
       6
       +
           homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle";

     

       7
       7
       +
           description = "KTurtle is an educational programming environment for learning how to program";

     

       8
       8
       +
           maintainers = with maintainers; [ freezeboy ];

     

       9
       9
       +
           license = licenses.gpl2Plus;

     

       10
       10
       +
           platforms = platforms.linux;

     

       11
       11
       +
         };

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           extra-cmake-modules

     

       14
       14
       +
         ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kdoctools

     

       17
       17
       +
           ki18n

     

       18
       18
       +
           kio

     

       19
       19
       +
           knewstuff

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+37

pkgs/applications/kde/kwave.nix

···

       1
       1
       +
       { mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate

     

       2
       2
       +
       , alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }:

     

       3
       3
       +
       

     

       4
       4
       +
       mkDerivation {

     

       5
       5
       +
         name = "kwave";

     

       6
       6
       +
         meta = with lib; {

     

       7
       7
       +
           homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";

     

       8
       8
       +
           description = "KWave is a simple media player";

     

       9
       9
       +
           maintainers = with maintainers; [ freezeboy ];

     

       10
       10
       +
           license = licenses.gpl2Plus;

     

       11
       11
       +
           platforms = platforms.linux;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [

     

       14
       14
       +
           extra-cmake-modules

     

       15
       15
       +
         ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           alsaLib

     

       18
       18
       +
           audiofile

     

       19
       19
       +
           kcrash

     

       20
       20
       +
           kdoctools

     

       21
       21
       +
           qtmultimedia

     

       22
       22
       +
           kcompletion

     

       23
       23
       +
           kconfig

     

       24
       24
       +
           kiconthemes

     

       25
       25
       +
           kio

     

       26
       26
       +
           libpulseaudio

     

       27
       27
       +
           libsamplerate

     

       28
       28
       +
           flac

     

       29
       29
       +
           fftw

     

       30
       30
       +
           id3lib

     

       31
       31
       +
           libogg

     

       32
       32
       +
           libmad

     

       33
       33
       +
           libopus

     

       34
       34
       +
           libvorbis

     

       35
       35
       +
           librsvg

     

       36
       36
       +
         ];

     

       37
       37
       +
       }

+1

pkgs/applications/misc/octoprint/default.nix

···

       30
       30
        
               (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")

     

       31
       31
        
               (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")

     

       32
       32
        
               (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")

     

       33
       33
       +
               (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")

     

       33
       34
        
       

     

       34
       35
        
               # Built-in dependency

     

       35
       36
        
               (

+1 -1

pkgs/applications/networking/irc/weechat/default.nix

···

       44
       44
        
               "-DENABLE_JAVASCRIPT=OFF"  # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360

     

       45
       45
        
               "-DENABLE_PHP=OFF"

     

       46
       46
        
             ]

     

       47
       47
       -
               ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]

     

       47
       47
       +
               ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"]

     

       48
       48
        
               ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins

     

       49
       49
        
               ;

     

       50
       50

-4

pkgs/applications/office/ledger/default.nix

···

       27
       27
        
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       28
       28
        
           "-DBUILD_DOCS:BOOL=ON"

     

       29
       29
        
           (lib.optionalString usePython "-DUSE_PYTHON=true")

     

       30
       30
       -
         ] ++ lib.optionals (usePython && stdenv.isDarwin) [

     

       31
       31
       -
           # Fix python lookup on Darwin. Not necessary after

     

       32
       32
       -
           # https://github.com/NixOS/nixpkgs/pull/94090 lands in master

     

       33
       33
       -
           "-DPython_ROOT_DIR=${python}"

     

       34
       30
        
         ];

     

       35
       31
        
       

     

       36
       32
        
         # by default, it will query the python interpreter for it's sitepackages location

+26 -13

pkgs/applications/version-management/fossil/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       -
       , libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which

     

       3
       3
       -
       , tcllib, withJson ? true

     

       2
       2
       +
       , installShellFiles

     

       3
       3
       +
       , tcl

     

       4
       4
       +
       , libiconv

     

       5
       5
       +
       , fetchurl

     

       6
       6
       +
       , zlib

     

       7
       7
       +
       , openssl

     

       8
       8
       +
       , readline

     

       9
       9
       +
       , sqlite

     

       10
       10
       +
       , ed

     

       11
       11
       +
       , which

     

       12
       12
       +
       , tcllib

     

       13
       13
       +
       , withJson ? true

     

       4
       14
        
       }:

     

       5
       15
        
       

     

       6
       16
        
       stdenv.mkDerivation rec {

     
···

       16
       26
        
           sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2";

     

       17
       27
        
         };

     

       18
       28
        
       

     

       29
       29
       +
         nativeBuildInputs = [ installShellFiles tcl ];

     

       30
       30
       +
       

     

       19
       31
        
         buildInputs = [ zlib openssl readline sqlite which ed ]

     

       20
       20
       -
                    ++ stdenv.lib.optional stdenv.isDarwin libiconv;

     

       21
       21
       -
         nativeBuildInputs = [ tcl ];

     

       32
       32
       +
           ++ stdenv.lib.optional stdenv.isDarwin libiconv;

     

       22
       33
        
       

     

       23
       34
        
         doCheck = stdenv.hostPlatform == stdenv.buildPlatform;

     

       35
       35
       +
       

     

       36
       36
       +
         configureFlags = [ "--disable-internal-sqlite" ]

     

       37
       37
       +
           ++ stdenv.lib.optional withJson "--json";

     

       38
       38
       +
       

     

       24
       39
        
         preCheck = ''

     

       25
       40
        
           export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"

     

       26
       41
        
         '';

     

       27
       27
       -
         configureFlags = stdenv.lib.optional withJson "--json";

     

       28
       42
        
       

     

       29
       29
       -
         preBuild=''

     

       43
       43
       +
         preBuild = ''

     

       30
       44
        
           export USER=nonexistent-but-specified-user

     

       31
       45
        
         '';

     

       32
       46
        
       

     

       33
       47
        
         installPhase = ''

     

       34
       48
        
           mkdir -p $out/bin

     

       35
       49
        
           INSTALLDIR=$out/bin make install

     

       50
       50
       +
       

     

       51
       51
       +
           installManPage fossil.1

     

       52
       52
       +
           installShellCompletion --name fossil.bash tools/fossil-autocomplete.bash

     

       36
       53
        
         '';

     

       37
       54
        
       

     

       38
       38
       -
         meta = {

     

       55
       55
       +
         meta = with stdenv.lib; {

     

       39
       56
        
           description = "Simple, high-reliability, distributed software configuration management";

     

       40
       57
        
           longDescription = ''

     

       41
       58
        
             Fossil is a software configuration management system.  Fossil is

     
···

       45
       62
        
             from the others by being extremely simple to setup and operate.

     

       46
       63
        
           '';

     

       47
       64
        
           homepage = "http://www.fossil-scm.org/";

     

       48
       48
       -
           license = stdenv.lib.licenses.bsd2;

     

       49
       49
       -
           platforms = with stdenv.lib.platforms; all;

     

       50
       50
       -
           maintainers = [ #Add your name here!

     

       51
       51
       -
             stdenv.lib.maintainers.maggesi

     

       52
       52
       -
             stdenv.lib.maintainers.viric

     

       53
       53
       -
           ];

     

       65
       65
       +
           license = licenses.bsd2;

     

       66
       66
       +
           maintainers = with maintainers; [ maggesi viric ];

     

       54
       67
        
         };

     

       55
       68
        
       }

+1 -1

pkgs/applications/video/lightworks/default.nix

···

       47
       47
        
             # This adds it to lightworks' search path while keeping the default

     

       48
       48
        
             # using the FONTCONFIG_FILE env variable

     

       49
       49
        
             echo "<?xml version='1.0'?>

     

       50
       50
       -
             <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       50
       50
       +
             <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>

     

       51
       51
        
             <fontconfig>

     

       52
       52
        
                 <dir>/usr/share/fonts/truetype</dir>

     

       53
       53
        
                 <include>/etc/fonts/fonts.conf</include>

+1 -1

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

···

       311
       311
        
       

     

       312
       312
        
             substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh

     

       313
       313
        
             substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh

     

       314
       314
       -
             substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       314
       314
       +
             substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       315
       315
        
           ''

     

       316
       316
        
       

     

       317
       317
        
           ##

+1 -1

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

···

       453
       453
        
       

     

       454
       454
        
             substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh

     

       455
       455
        
             substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh

     

       456
       456
       -
             substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       456
       456
       +
             substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       457
       457
        
           ''

     

       458
       458
        
       

     

       459
       459
        
           ##

+1 -1

pkgs/build-support/pkg-config-wrapper/default.nix

···

       107
       107
        
       

     

       108
       108
        
           + ''

     

       109
       109
        
             substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh

     

       110
       110
       -
             substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       110
       110
       +
             substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       111
       111
        
           ''

     

       112
       112
        
       

     

       113
       113
        
           ##

+3 -3

pkgs/build-support/wrapper-common/utils.bash

···

       69
       69
        
           # directory (including the build directory).

     

       70
       70
        
           test \

     

       71
       71
        
               "$p" != "/dev/null" -a \

     

       72
       72
       -
               "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \

     

       73
       73
       -
               "${p:0:4}" != "/tmp" -a \

     

       74
       74
       -
               "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"

     

       72
       72
       +
               "${p#${NIX_STORE}}" = "$p" -a \

     

       73
       73
       +
               "${p#${TMP:-/tmp}}" = "$p" -a \

     

       74
       74
       +
               "${p#${NIX_BUILD_TOP}}" = "$p"

     

       75
       75
        
       }

     

       76
       76
        
       

     

       77
       77
        
       expandResponseParams() {

+92

pkgs/build-support/wrapper-common/utils.bash.darwin

···

       1
       1
       +
       # Accumulate suffixes for taking in the right input parameters with the `mangle*`

     

       2
       2
       +
       # functions below. See setup-hook for details.

     

       3
       3
       +
       accumulateRoles() {

     

       4
       4
       +
           declare -ga role_suffixes=()

     

       5
       5
       +
           if [ "${NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@:-}" ]; then

     

       6
       6
       +
               role_suffixes+=('_FOR_BUILD')

     

       7
       7
       +
           fi

     

       8
       8
       +
           if [ "${NIX_@wrapperName@_TARGET_HOST_@suffixSalt@:-}" ]; then

     

       9
       9
       +
               role_suffixes+=('')

     

       10
       10
       +
           fi

     

       11
       11
       +
           if [ "${NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@:-}" ]; then

     

       12
       12
       +
               role_suffixes+=('_FOR_TARGET')

     

       13
       13
       +
           fi

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       mangleVarList() {

     

       17
       17
       +
           local var="$1"

     

       18
       18
       +
           shift

     

       19
       19
       +
           local -a role_suffixes=("$@")

     

       20
       20
       +
       

     

       21
       21
       +
           local outputVar="${var}_@suffixSalt@"

     

       22
       22
       +
           declare -gx ${outputVar}+=''

     

       23
       23
       +
           # For each role we serve, we accumulate the input parameters into our own

     

       24
       24
       +
           # cc-wrapper-derivation-specific environment variables.

     

       25
       25
       +
           for suffix in "${role_suffixes[@]}"; do

     

       26
       26
       +
               local inputVar="${var}${suffix}"

     

       27
       27
       +
               if [ -v "$inputVar" ]; then

     

       28
       28
       +
                   export ${outputVar}+="${!outputVar:+ }${!inputVar}"

     

       29
       29
       +
               fi

     

       30
       30
       +
           done

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       mangleVarBool() {

     

       34
       34
       +
           local var="$1"

     

       35
       35
       +
           shift

     

       36
       36
       +
           local -a role_suffixes=("$@")

     

       37
       37
       +
       

     

       38
       38
       +
           local outputVar="${var}_@suffixSalt@"

     

       39
       39
       +
           declare -gxi ${outputVar}+=0

     

       40
       40
       +
           for suffix in "${role_suffixes[@]}"; do

     

       41
       41
       +
               local inputVar="${var}${suffix}"

     

       42
       42
       +
               if [ -v "$inputVar" ]; then

     

       43
       43
       +
                   # "1" in the end makes `let` return success error code when

     

       44
       44
       +
                   # expression itself evaluates to zero.

     

       45
       45
       +
                   # We don't use `|| true` because that would silence actual

     

       46
       46
       +
                   # syntax errors from bad variable values.

     

       47
       47
       +
                   let "${outputVar} |= ${!inputVar:-0}" "1"

     

       48
       48
       +
               fi

     

       49
       49
       +
           done

     

       50
       50
       +
       }

     

       51
       51
       +
       

     

       52
       52
       +
       skip () {

     

       53
       53
       +
           if (( "${NIX_DEBUG:-0}" >= 1 )); then

     

       54
       54
       +
               echo "skipping impure path $1" >&2

     

       55
       55
       +
           fi

     

       56
       56
       +
       }

     

       57
       57
       +
       

     

       58
       58
       +
       

     

       59
       59
       +
       # Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but

     

       60
       60
       +
       # `/nix/store/.../lib/foo.so' isn't.

     

       61
       61
       +
       badPath() {

     

       62
       62
       +
           local p=$1

     

       63
       63
       +
       

     

       64
       64
       +
           # Relative paths are okay (since they're presumably relative to

     

       65
       65
       +
           # the temporary build directory).

     

       66
       66
       +
           if [ "${p:0:1}" != / ]; then return 1; fi

     

       67
       67
       +
       

     

       68
       68
       +
           # Otherwise, the path should refer to the store or some temporary

     

       69
       69
       +
           # directory (including the build directory).

     

       70
       70
       +
           test \

     

       71
       71
       +
               "$p" != "/dev/null" -a \

     

       72
       72
       +
               "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \

     

       73
       73
       +
               "${p:0:4}" != "/tmp" -a \

     

       74
       74
       +
               "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"

     

       75
       75
       +
       }

     

       76
       76
       +
       

     

       77
       77
       +
       expandResponseParams() {

     

       78
       78
       +
           declare -ga params=("$@")

     

       79
       79
       +
           local arg

     

       80
       80
       +
           for arg in "$@"; do

     

       81
       81
       +
               if [[ "$arg" == @* ]]; then

     

       82
       82
       +
                   # phase separation makes this look useless

     

       83
       83
       +
                   # shellcheck disable=SC2157

     

       84
       84
       +
                   if [ -x "@expandResponseParams@" ]; then

     

       85
       85
       +
                       # params is used by caller

     

       86
       86
       +
                       #shellcheck disable=SC2034

     

       87
       87
       +
                       readarray -d '' params < <("@expandResponseParams@" "$@")

     

       88
       88
       +
                       return 0

     

       89
       89
       +
                   fi

     

       90
       90
       +
               fi

     

       91
       91
       +
           done

     

       92
       92
       +
       }

+1 -1

pkgs/data/fonts/caladea/cambria-alias.conf

···

       1
       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       2
       -
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       2
       2
       +
       <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       3
       3
        
       <fontconfig>

     

       4
       4
        
         <!-- Configure Caladea as a metric-compatible alias for the

     

       5
       5
        
              Microsoft Cambria font family. -->

+1 -1

pkgs/data/fonts/carlito/calibri-alias.conf

···

       1
       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       2
       -
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       2
       2
       +
       <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       3
       3
        
       <fontconfig>

     

       4
       4
        
         <!-- Configure Carlito as a metric-compatible alias for the

     

       5
       5
        
              Microsoft Calibri font family. -->

+1 -1

pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf

···

       1
       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       2
       -
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       2
       2
       +
       <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       3
       3
        
       <fontconfig>

     

       4
       4
        
         <!-- Configure Comic Relief as a metric-compatible alias for the

     

       5
       5
        
              Microsoft Comic Sans font family. -->

+1 -1

pkgs/data/fonts/corefonts/no-op.conf

···

       1
       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       2
       -
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       2
       2
       +
       <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       3
       3
        
       <fontconfig>

     

       4
       4
        
         <!-- This configuation is intentionally left empty in order to

     

       5
       5
        
              override any other font package that may wish to set up an

+3 -2

pkgs/data/fonts/liberation-fonts/default.nix

···

       2
       2
        
       let

     

       3
       3
        
         inherit (python3.pkgs) fonttools;

     

       4
       4
        
       

     

       5
       5
       +
         commonNativeBuildInputs = [ fontforge python3 ];

     

       5
       6
        
         common =

     

       6
       7
        
           { version, repo, sha256, nativeBuildInputs, postPatch ? null }:

     

       7
       8
        
             stdenv.mkDerivation rec {

     
···

       50
       51
        
         liberation_ttf_v1 = common {

     

       51
       52
        
           repo = "liberation-1.7-fonts";

     

       52
       53
        
           version = "1.07.5";

     

       53
       53
       -
           nativeBuildInputs = [ fontforge ];

     

       54
       54
       +
           nativeBuildInputs = commonNativeBuildInputs ;

     

       54
       55
        
           sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";

     

       55
       56
        
         };

     

       56
       57
        
         liberation_ttf_v2 = common {

     

       57
       58
        
           repo = "liberation-fonts";

     

       58
       59
        
           version = "2.1.0";

     

       59
       59
       -
           nativeBuildInputs = [ fontforge fonttools ];

     

       60
       60
       +
           nativeBuildInputs = commonNativeBuildInputs ++ [ fonttools ];

     

       60
       61
        
           postPatch = ''

     

       61
       62
        
             substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \

     

       62
       63
        
               'font = ttLib.TTFont(fontfile)' \

+1 -1

pkgs/data/fonts/vista-fonts-chs/no-op.conf

···

       1
       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       2
       -
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       2
       2
       +
       <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       3
       3
        
       <fontconfig>

     

       4
       4
        
         <!-- This configuation is intentionally left empty in order to

     

       5
       5
        
              override any other font package that may wish to set up an

+1 -1

pkgs/data/fonts/vista-fonts/no-op.conf

···

       1
       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       2
       -
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       2
       2
       +
       <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

     

       3
       3
        
       <fontconfig>

     

       4
       4
        
         <!-- This configuation is intentionally left empty in order to

     

       5
       5
        
              override any other font package that may wish to set up an

+1 -1

pkgs/development/compilers/gcc/9/default.nix

···

       184
       184
        
       

     

       185
       185
        
         preConfigure = import ../common/pre-configure.nix {

     

       186
       186
        
           inherit (stdenv) lib;

     

       187
       187
       -
           inherit version hostPlatform gnatboot langAda langGo;

     

       187
       187
       +
           inherit version hostPlatform gnatboot langAda langGo langJit;

     

       188
       188
        
         };

     

       189
       189
        
       

     

       190
       190
        
         dontDisableStatic = true;

+1 -1

pkgs/development/compilers/gcc/builder.sh

···

       261
       261
        
           fi

     

       262
       262
        
       

     

       263
       263
        
           if type "install_name_tool"; then

     

       264
       264
       -
               for i in "${!outputLib}"/lib/*.*.dylib; do

     

       264
       264
       +
               for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do

     

       265
       265
        
                   install_name_tool -id "$i" "$i" || true

     

       266
       266
        
                   for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do

     

       267
       267
        
                     new_path=`echo "$old_path" | sed "s,$out,${!outputLib},"`

+9

pkgs/development/compilers/gcc/common/pre-configure.nix

···

       2
       2
        
       , gnatboot ? null

     

       3
       3
        
       , langAda ? false

     

       4
       4
        
       , langJava ? false

     

       5
       5
       +
       , langJit ? false

     

       5
       6
        
       , langGo }:

     

       6
       7
        
       

     

       7
       8
        
       assert langJava -> lib.versionOlder version "7";

     
···

       49
       50
        
       + lib.optionalString (hostPlatform.isDarwin) ''

     

       50
       51
        
         export ac_cv_func_aligned_alloc=no

     

       51
       52
        
       ''

     

       53
       53
       +
       

     

       54
       54
       +
       # In order to properly install libgccjit on macOS Catalina, strip(1)

     

       55
       55
       +
       # upon installation must not remove external symbols, otherwise the

     

       56
       56
       +
       # install step errors with "symbols referenced by indirect symbol

     

       57
       57
       +
       # table entries that can't be stripped".

     

       58
       58
       +
       + lib.optionalString (hostPlatform.isDarwin && langJit) ''

     

       59
       59
       +
         export STRIP='strip -x'

     

       60
       60
       +
       ''

+1 -1

pkgs/development/compilers/mozart/default.nix

···

       60
       60
        
           # gcc together as compilers and we need clang for the sources generation.

     

       61
       61
        
           # However, clang emits tons of warnings about gcc's atomic-base library.

     

       62
       62
        
           "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"

     

       63
       63
       -
         ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";

     

       63
       63
       +
         ];

     

       64
       64
        
       

     

       65
       65
        
         fixupPhase = ''

     

       66
       66
        
           wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs

+12 -12

pkgs/development/interpreters/perl/default.nix

···

       175
       175
        
             priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`

     

       176
       176
        
           };

     

       177
       177
        
         } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {

     

       178
       178
       -
           crossVersion = "1.3.4"; # Jun 2, 2020

     

       178
       178
       +
           crossVersion = "15ca5359f99698ef0a199bc307b7956c08907abc"; # Aug 27, 2020

     

       179
       179
        
       

     

       180
       180
        
           perl-cross-src = fetchurl {

     

       181
       181
        
             url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";

     

       182
       182
       -
             sha256 = "15wvlafhpsh9h66s3vazhx46hf8ik75473acrvf6722ijd1wpz45";

     

       182
       182
       +
             sha256 = "0pcwv2ac02i2l0fjc8drdw70q6gwbypj2c5a53x2449m919v37h9";

     

       183
       183
        
           };

     

       184
       184
        
       

     

       185
       185
        
           depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];

     
···

       195
       195
        
           setupHook = ./setup-hook-cross.sh;

     

       196
       196
        
         });

     

       197
       197
        
       in {

     

       198
       198
       -
         # Maint version

     

       199
       199
       -
         perl528 = common {

     

       200
       200
       -
           perl = pkgs.perl528;

     

       201
       201
       -
           buildPerl = buildPackages.perl528;

     

       202
       202
       -
           version = "5.28.3";

     

       203
       203
       -
           sha256 = "052if351m81yhaab429i1kv77v9b15qm0g48kr6y2yjrc7bc3jdg";

     

       204
       204
       -
         };

     

       205
       205
       -
       

     

       206
       198
        
         # Maint version

     

       207
       199
        
         perl530 = common {

     

       208
       200
        
           perl = pkgs.perl530;

     
···

       211
       203
        
           sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j";

     

       212
       204
        
         };

     

       213
       205
        
       

     

       206
       206
       +
         # Maint version

     

       207
       207
       +
         perl532 = common {

     

       208
       208
       +
           perl = pkgs.perl532;

     

       209
       209
       +
           buildPerl = buildPackages.perl532;

     

       210
       210
       +
           version = "5.32.0";

     

       211
       211
       +
           sha256 = "1d6001cjnpxfv79000bx00vmv2nvdz7wrnyas451j908y7hirszg";

     

       212
       212
       +
         };

     

       213
       213
       +
       

     

       214
       214
        
         # the latest Devel version

     

       215
       215
        
         perldevel = common {

     

       216
       216
        
           perl = pkgs.perldevel;

     

       217
       217
        
           buildPerl = buildPackages.perldevel;

     

       218
       218
       -
           version = "5.32.0-RC0";

     

       219
       219
       -
           sha256 = "02i6n1xa4j0ksp014yy8q0j7scjcy5mr0yd4iash2ryrrfv5yw5k";

     

       218
       218
       +
           version = "5.33.1";

     

       219
       219
       +
           sha256 = "1rlnqqqzyhal79ys5dv7fwm3mg81s43dwks28b74x2gcmsngjnw9";

     

       220
       220
        
         };

     

       221
       221
        
       }

+4 -4

pkgs/development/interpreters/python/default.nix

···

       68
       68
        
           sourceVersion = {

     

       69
       69
        
             major = "3";

     

       70
       70
        
             minor = "6";

     

       71
       71
       -
             patch = "11";

     

       71
       71
       +
             patch = "12";

     

       72
       72
        
             suffix = "";

     

       73
       73
        
           };

     

       74
       74
       -
           sha256 = "dB69y8Tjk3pf8jUX3UVev31UPqn+9vXPb0blddbE/aQ=";

     

       74
       74
       +
           sha256 = "cJU6m11okdkuZdGEw1EhJqFYFL7hXh7/LdzOBDNOmpk=";

     

       75
       75
        
           inherit (darwin) configd;

     

       76
       76
        
           inherit passthruFun;

     

       77
       77
        
         };

     
···

       81
       81
        
           sourceVersion = {

     

       82
       82
        
             major = "3";

     

       83
       83
        
             minor = "7";

     

       84
       84
       -
             patch = "8";

     

       84
       84
       +
             patch = "9";

     

       85
       85
        
             suffix = "";

     

       86
       86
        
           };

     

       87
       87
       -
           sha256 = "Q6VDQEs2PwA3+J34R48Z2y28DW8//uMQvCmX+nGFSmM=";

     

       87
       87
       +
           sha256 = "008v6g1jkrjrdmiqlgjlq6msbbj848bvkws6ppwva1ahn03k14li";

     

       88
       88
        
           inherit (darwin) configd;

     

       89
       89
        
           inherit passthruFun;

     

       90
       90
        
         };

+2 -2

pkgs/development/libraries/enchant/2.x.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "enchant";

     

       13
       13
       -
         version = "2.2.9";

     

       13
       13
       +
         version = "2.2.10";

     

       14
       14
        
       

     

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

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";

     

       19
       19
       -
           sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj";

     

       19
       19
       +
           sha256 = "1hxx5kb015a5rvjimrpcb5050xb3988dgc52fd5m5n270v238nva";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

-36

pkgs/development/libraries/fontconfig/config-compat.patch

···

       1
       1
       -
       From 2ff9b53ce755be183ef9274f7dd3f9ac537173f6 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>

     

       3
       3
       -
       Date: Tue, 4 Nov 2014 12:24:25 +0100

     

       4
       4
       -
       Subject: [PATCH] add check for /etc/fonts/@configVersion@/fonts.conf

     

       5
       5
       -
       

     

       6
       6
       -
       It's checked between FONTCONFIG_FILE and the in-package etc/fonts/fonts.conf.

     

       7
       7
       -
       The latter is used so that on non-NixOS distributions, fontconfig works at least

     

       8
       8
       -
       with upstream defaults, even when the global config is incompatible.

     

       9
       9
       -
       

     

       10
       10
       -
       Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>

     

       11
       11
       -
       ---

     

       12
       12
       -
        src/fccfg.c | 7 ++++++-

     

       13
       13
       -
        1 file changed, 6 insertions(+), 1 deletion(-)

     

       14
       14
       -
       

     

       15
       15
       -
       diff --git a/src/fccfg.c b/src/fccfg.c

     

       16
       16
       -
       index 342c996..98a1324 100644

     

       17
       17
       -
       --- a/src/fccfg.c

     

       18
       18
       -
       +++ b/src/fccfg.c

     

       19
       19
       -
       @@ -2391,8 +2391,13 @@ FcConfigGetFilename (FcConfig      *config,

     

       20
       20
       -
            if (!url || !*url)

     

       21
       21
       -
            {

     

       22
       22
       -
        	url = (FcChar8 *) getenv ("FONTCONFIG_FILE");

     

       23
       23
       -
       +	if (!url) {

     

       24
       24
       -
       +	    static const FcChar8 *cfPath = "/etc/fonts/@configVersion@/fonts.conf";

     

       25
       25
       -
       +	    if (access (cfPath, R_OK) == 0)

     

       26
       26
       -
       +		url = cfPath;

     

       27
       27
       -
       +	}

     

       28
       28
       -
        	if (!url)

     

       29
       29
       -
       -	    url = (FcChar8 *) FONTCONFIG_FILE;

     

       30
       30
       -
       +	    url = (FcChar8 *) FONTCONFIG_PATH "/" FONTCONFIG_FILE;

     

       31
       31
       -
            }

     

       32
       32
       -
            file = 0;

     

       33
       33
       -
        

     

       34
       34
       -
       -- 

     

       35
       35
       -
       2.26.2

     

       36
       36
       -

+14 -36

pkgs/development/libraries/fontconfig/default.nix

···

       11
       11
        
       , autoreconfHook

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       /** Font configuration scheme

     

       15
       15
       -
        - ./config-compat.patch makes fontconfig try the following root configs, in order:

     

       16
       16
       -
           $FONTCONFIG_FILE, /etc/fonts/${configVersion}/fonts.conf, ${fontconfig.out}/etc/fonts/fonts.conf

     

       17
       17
       -
           This is done not to override config of pre-2.11 versions (which just blow up)

     

       18
       18
       -
           and still use *global* font configuration at NixOS,

     

       19
       19
       -
           falling back to upstream defaults on non-NixOS.

     

       20
       20
       -
        - NixOS creates /etc/fonts/${configVersion}/fonts.conf link to $out/etc/fonts/fonts.conf,

     

       21
       21
       -
           and other modifications should go to /etc/fonts/${configVersion}/conf.d

     

       22
       22
       -
        - See ./make-fonts-conf.xsl for config details.

     

       23
       23
       -
       

     

       24
       24
       -
       */

     

       25
       25
       -
       

     

       26
       26
       -
       let

     

       27
       27
       -
         configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations

     

       28
       28
       -
       in

     

       29
       14
        
       stdenv.mkDerivation rec {

     

       30
       15
        
         pname = "fontconfig";

     

       31
       16
        
         version = "2.13.92";

     
···

       36
       21
        
         };

     

       37
       22
        
       

     

       38
       23
        
         patches = [

     

       39
       39
       -
           (substituteAll {

     

       40
       40
       -
             src = ./config-compat.patch;

     

       41
       41
       -
             inherit configVersion;

     

       42
       42
       -
           })

     

       43
       43
       -
       

     

       44
       24
        
           # Fix fonts not being loaded when missing included configs that have ignore_missing="yes".

     

       45
       25
        
           # https://bugzilla.redhat.com/show_bug.cgi?id=1744377

     

       46
       26
        
           (fetchpatch {

     
···

       73
       53
        
             url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/37c7c748740bf6f2468d59e67951902710240b34.patch";

     

       74
       54
        
             sha256 = "1rz5zrfwhpn9g49wrzzrmdglj78pbvpnw8ksgsw6bxq8l5d84jfr";

     

       75
       55
        
           })

     

       56
       56
       +
       

     

       57
       57
       +
           # Show warning instead of error when encountering unknown attribute in config.

     

       58
       58
       +
           # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/111

     

       59
       59
       +
           (fetchpatch {

     

       60
       60
       +
             url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/409b37c62780728755c908991c912a6b16f2389c.patch";

     

       61
       61
       +
             sha256 = "zJFh37QErSAINPGFkFVJyhYRP27BuIN7PIgoDl/PIwI=";

     

       62
       62
       +
           })

     

       76
       63
        
         ];

     

       77
       64
        
       

     

       78
       65
        
         outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

     
···

       93
       80
        
         ];

     

       94
       81
        
       

     

       95
       82
        
         configureFlags = [

     

       83
       83
       +
           "--sysconfdir=/etc"

     

       96
       84
        
           "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"

     

       97
       85
        
           "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/

     

       98
       86
        
           "--disable-docs"

     
···

       106
       94
        
       

     

       107
       95
        
         doCheck = true;

     

       108
       96
        
       

     

       109
       109
       -
         # Don't try to write to /var/cache/fontconfig at install time.

     

       110
       110
       -
         installFlags = [ "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ];

     

       97
       97
       +
         installFlags = [

     

       98
       98
       +
           # Don't try to write to /var/cache/fontconfig at install time.

     

       99
       99
       +
           "fc_cachedir=$(TMPDIR)/dummy"

     

       100
       100
       +
           "RUN_FC_CACHE_TEST=false"

     

       101
       101
       +
           "sysconfdir=${placeholder "out"}/etc"

     

       102
       102
       +
         ];

     

       111
       103
        
       

     

       112
       104
        
         postInstall = ''

     

       113
       105
        
           cd "$out/etc/fonts"

     

       114
       106
        
           xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \

     

       115
       115
       -
             --stringparam fontconfig "$out" \

     

       116
       116
       -
             --stringparam fontconfigConfigVersion "${configVersion}" \

     

       117
       107
        
             --path $out/share/xml/fontconfig \

     

       118
       108
        
             ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \

     

       119
       109
        
             > fonts.conf.tmp

     

       120
       110
        
           mv fonts.conf.tmp $out/etc/fonts/fonts.conf

     

       121
       121
       -
       

     

       122
       122
       -
           # Make it easier to remove user config in NixOS module.

     

       123
       123
       -
           mkdir -p $out/etc/fonts/conf.d.bak

     

       124
       124
       -
           mv $out/etc/fonts/conf.d/50-user.conf $out/etc/fonts/conf.d.bak

     

       125
       125
       -
       

     

       126
       126
       -
           # update latest 51-local.conf path to look at the latest local.conf

     

       127
       127
       -
           substituteInPlace $out/etc/fonts/conf.d/51-local.conf \

     

       128
       128
       -
             --replace local.conf /etc/fonts/${configVersion}/local.conf

     

       129
       111
        
         '';

     

       130
       130
       -
       

     

       131
       131
       -
         passthru = {

     

       132
       132
       -
           inherit configVersion;

     

       133
       133
       -
         };

     

       134
       112
        
       

     

       135
       113
        
         meta = with stdenv.lib; {

     

       136
       114
        
           description = "A library for font customization and configuration";

+1 -1

pkgs/development/libraries/fontconfig/make-fonts-cache.nix

···

       16
       16
        
       

     

       17
       17
        
           cat > fonts.conf << EOF

     

       18
       18
        
           <?xml version='1.0'?>

     

       19
       19
       -
           <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       19
       19
       +
           <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>

     

       20
       20
        
           <fontconfig>

     

       21
       21
        
             <include>${fontconfig.out}/etc/fonts/fonts.conf</include>

     

       22
       22
        
             <cachedir>$out</cachedir>

-2

pkgs/development/libraries/fontconfig/make-fonts-conf.nix

···

       9
       9
        
         }

     

       10
       10
        
         ''

     

       11
       11
        
           xsltproc --stringparam fontDirectories "$fontDirectories" \

     

       12
       12
       -
             --stringparam fontconfig "${fontconfig.out}" \

     

       13
       13
       -
             --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \

     

       14
       12
        
             --path ${fontconfig.out}/share/xml/fontconfig \

     

       15
       13
        
             ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \

     

       16
       14
        
             > $out

+3 -8

pkgs/development/libraries/fontconfig/make-fonts-conf.xsl

···

       12
       12
        
                       extension-element-prefixes="str"

     

       13
       13
        
                       >

     

       14
       14
        
       

     

       15
       15
       -
         <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />

     

       15
       15
       +
         <xsl:output method='xml' encoding="UTF-8" doctype-system="urn:fontconfig:fonts.dtd" />

     

       16
       16
        
       

     

       17
       17
        
         <xsl:param name="fontDirectories" />

     

       18
       18
       -
         <xsl:param name="fontconfig" />

     

       19
       19
       -
         <xsl:param name="fontconfigConfigVersion" />

     

       20
       18
        
       

     

       21
       19
        
         <xsl:template match="/fontconfig">

     

       22
       20
        
       

     
···

       28
       26
        
             <!-- /var/cache/fontconfig is useful for non-nixos systems -->

     

       29
       27
        
             <cachedir>/var/cache/fontconfig</cachedir>

     

       30
       28
        
       

     

       31
       31
       -
             <!-- versioned system-wide config -->

     

       32
       32
       -
             <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include>

     

       33
       33
       -
       

     

       34
       34
       -
             <!-- upstream config -->

     

       35
       35
       -
             <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>

     

       29
       29
       +
             <!-- system-wide config -->

     

       30
       30
       +
             <include ignore_missing="yes">/etc/fonts/conf.d</include>

     

       36
       31
        
       

     

       37
       32
        
             <dir prefix="xdg">fonts</dir>

     

       38
       33
        
             <xsl:for-each select="str:tokenize($fontDirectories)">

+2 -2

pkgs/development/libraries/glib/default.nix

···

       45
       45
        
       

     

       46
       46
        
       stdenv.mkDerivation rec {

     

       47
       47
        
         pname = "glib";

     

       48
       48
       -
         version = "2.64.4";

     

       48
       48
       +
         version = "2.64.5";

     

       49
       49
        
       

     

       50
       50
        
         src = fetchurl {

     

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

     

       52
       52
       -
           sha256 = "0l6fggcgdnjif9kzy4crq7520f43bbrgzxz0c821ya3jn8jv7q7p";

     

       52
       52
       +
           sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw";

     

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         patches = optionals stdenv.isDarwin [

+6 -1

pkgs/development/libraries/glibmm/default.nix

···

       11
       11
        
       

     

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

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkgconfig gnum4 ];

     

       14
       14
       +
         nativeBuildInputs = [

     

       15
       15
       +
           pkgconfig

     

       16
       16
       +
           gnum4

     

       17
       17
       +
           glib # for glib-compile-schemas

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       15
       20
        
         buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

     

       16
       21
        
           Cocoa

     

       17
       22
        
         ]);

+1 -1

pkgs/development/libraries/jbig2dec/default.nix

···

       13
       13
        
           patchShebangs test_jbig2dec.py

     

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ autoreconfHook ];

     

       16
       16
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       17
       17
        
       

     

       18
       18
        
         checkInputs = [ python3 ];

     

       19
       19
        
         doCheck = true;

+2 -2

pkgs/development/libraries/libmpc/default.nix

···

       8
       8
        
       # files.

     

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
       -
         version = "1.1.0";

     

       11
       11
       +
         version = "1.2.0";

     

       12
       12
        
       in

     

       13
       13
        
       stdenv.mkDerivation {

     

       14
       14
        
         pname = "libmpc";

     
···

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "mirror://gnu/mpc/mpc-${version}.tar.gz";

     

       19
       19
       -
           sha256 = "0biwnhjm3rx3hc0rfpvyniky4lpzsvdcwhmcn7f0h4iw2hwcb1b9";

     

       19
       19
       +
           sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ gmp mpfr ];

+2 -2

pkgs/development/libraries/libpfm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, enableShared ? true }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation (rec {

     

       4
       4
       -
         version = "4.10.1";

     

       4
       4
       +
         version = "4.11.0";

     

       5
       5
        
         pname = "libpfm";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766";

     

       9
       9
       +
           sha256 = "1k7yp6xfsglp2b6271r622sjinlbys0dk24n9iiv656y5f3zi9ax";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         makeFlags = [

+3 -2

pkgs/development/libraries/libseccomp/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }:

     

       1
       1
       +
       { stdenv, fetchurl, getopt, utillinux, gperf }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libseccomp";

     
···

       11
       11
        
       

     

       12
       12
        
         outputs = [ "out" "lib" "dev" "man" ];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ getopt makeWrapper gperf ];

     

       14
       14
       +
         nativeBuildInputs = [ gperf ];

     

       15
       15
       +
         buildInputs = [ getopt ];

     

       15
       16
        
       

     

       16
       17
        
         patchPhase = ''

     

       17
       18
        
           patchShebangs .

+1 -3

pkgs/development/libraries/libusb1/default.nix

···

       22
       22
        
           sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         outputs = [ "out" "dev" ]; # get rid of propagating systemd closure

     

       25
       25
       +
         outputs = [ "out" "dev" ];

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ pkgconfig autoreconfHook ];

     

       28
       28
        
         propagatedBuildInputs =

     
···

       30
       30
        
           stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];

     

       31
       31
        
       

     

       32
       32
        
         dontDisableStatic = withStatic;

     

       33
       33
       -
       

     

       34
       34
       -
         NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

     

       35
       33
        
       

     

       36
       34
        
         configureFlags = stdenv.lib.optional (!enableSystemd) "--disable-udev";

     

       37
       35

+2 -13

pkgs/development/libraries/mesa/default.nix

···

       4
       4
        
       , llvmPackages, libffi, libomxil-bellagio, libva-minimal

     

       5
       5
        
       , libelf, libvdpau, python3Packages

     

       6
       6
        
       , libglvnd

     

       7
       7
       -
       , patchelf, autoreconfHook, fetchFromGitHub

     

       8
       7
        
       , enableRadv ? true

     

       9
       8
        
       , galliumDrivers ? ["auto"]

     

       10
       9
        
       , driDrivers ? ["auto"]

     
···

       32
       31
        
       let

     

       33
       32
        
         # Release calendar: https://www.mesa3d.org/release-calendar.html

     

       34
       33
        
         # Release frequency: https://www.mesa3d.org/releasing.html#schedule

     

       35
       35
       -
         version = "20.1.6";

     

       34
       34
       +
         version = "20.1.7";

     

       36
       35
        
         branch  = versions.major version;

     

       37
       36
        
       in

     

       38
       37
        
       

     
···

       47
       46
        
             "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"

     

       48
       47
        
             "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"

     

       49
       48
        
           ];

     

       50
       50
       -
           sha256 = "0g59gxbgr884a9xvg0fls10zkllyhz675zjvr50dcfmh2h0x9gi3";

     

       49
       49
       +
           sha256 = "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad";

     

       51
       50
        
         };

     

       52
       51
        
       

     

       53
       52
        
         prePatch = "patchShebangs .";

     
···

       148
       147
        
         depsBuildBuild = [ pkgconfig ];

     

       149
       148
        
       

     

       150
       149
        
         nativeBuildInputs = [

     

       151
       151
       -
           (patchelf.overrideAttrs (pa: {

     

       152
       152
       -
             src = fetchFromGitHub {

     

       153
       153
       -
               owner = "NixOS";

     

       154
       154
       -
               repo = "patchelf";

     

       155
       155
       -
               rev = "61bc10176"; # current master; what matters is merge of #225

     

       156
       156
       -
               sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93";

     

       157
       157
       -
             };

     

       158
       158
       -
             nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ];

     

       159
       159
       -
           }))

     

       160
       160
       -
         ] ++ [

     

       161
       150
        
           pkgconfig meson ninja

     

       162
       151
        
           intltool bison flex file

     

       163
       152
        
           python3Packages.python python3Packages.Mako

+8 -9

pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch

···

       1
       1
       -
       From 00f3c6d1b771c11ecc08c3d8bd793a51d6e64166 Mon Sep 17 00:00:00 2001

     

       1
       1
       +
       From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001

     

       2
       2
        
       From: David McFarland <corngood@gmail.com>

     

       3
       3
        
       Date: Sun, 26 Jul 2020 17:29:49 -0300

     

       4
       4
        
       Subject: [PATCH] link radv with ld_args_build_id

     
···

       9
       9
        
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       10
       10
        
       

     

       11
       11
        
       diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build

     

       12
       12
       -
       index efcf2dd6c89..590f286b8cb 100644

     

       12
       12
       +
       index eec026e8f60..a07a0821938 100644

     

       13
       13
        
       --- a/src/amd/vulkan/meson.build

     

       14
       14
        
       +++ b/src/amd/vulkan/meson.build

     

       15
       15
       -
       @@ -173,7 +173,7 @@ libvulkan_radeon = shared_library(

     

       15
       15
       +
       @@ -183,7 +183,7 @@ libvulkan_radeon = shared_library(

     

       16
       16
        
          ],

     

       17
       17
        
          c_args : [c_vis_args, no_override_init_args, radv_flags],

     

       18
       18
        
          cpp_args : [cpp_vis_args, radv_flags],

     

       19
       19
       -
       -  link_args : [ld_args_bsymbolic, ld_args_gc_sections],

     

       20
       20
       -
       +  link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections],

     

       19
       19
       +
       -  link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],

     

       20
       20
       +
       +  link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],

     

       21
       21
       +
          link_depends : [libvulkan_radeon_link_depends,],

     

       21
       22
        
          install : true,

     

       22
       23
        
        )

     

       23
       23
       -
        

     

       24
       24
       -
       -- 

     

       25
       25
       -
       2.27.0

     

       26
       26
       -
       

     

       24
       24
       +
       --

     

       25
       25
       +
       2.28.0

+6 -1

pkgs/development/libraries/p11-kit/default.nix

···

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

     

       17
       17
        
         outputBin = "dev";

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ autoreconfHook pkgconfig which ];

     

       19
       19
       +
         # for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs

     

       20
       20
       +
         # provides the asn1Parser binary on the hostPlatform needed for building.

     

       21
       21
       +
         # at the same time, libtasn1 in buildInputs provides the libasn1 library

     

       22
       22
       +
         # to link against for the target platform.

     

       23
       23
       +
         # hence, libtasn1 is required in both native and build inputs.

     

       24
       24
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ];

     

       20
       25
        
         buildInputs = [ gettext libffi libiconv libtasn1 ];

     

       21
       26
        
       

     

       22
       27
        
         autoreconfPhase = ''

+9 -9

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, isPy3k, attrs, protobuf, zeroconf }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "aioesphomeapi";

     

       5
       5
       -
         version = "2.6.1";

     

       5
       5
       +
         version = "2.6.3";

     

       6
       6
        
       

     

       7
       7
        
         disabled = !isPy3k;

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "139d1d348fcfe2f34926a210a32dff069935d17167c4e1cb66e8b039cbb4d6c1";

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "esphome";

     

       11
       11
       +
           repo = pname;

     

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

     

       13
       13
       +
           sha256 = "1lbjxqdx63fc7qxx7xwq4b9dafmdafj7p1ggs48hyhbqfwkrv9p7";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       14
       16
        
         propagatedBuildInputs = [ attrs protobuf zeroconf ];

     

       15
       17
        
       

     

       16
       18
        
         # no tests implemented

     

       17
       19
        
         doCheck = false;

     

       20
       20
       +
       

     

       21
       21
       +
         pythonImportsCheck = [ "aioesphomeapi" ];

     

       18
       22
        
       

     

       19
       23
        
         meta = with lib; {

     

       20
       24
        
           description = "Python Client for ESPHome native API";

     

       21
       25
        
           homepage = "https://github.com/esphome/aioesphomeapi";

     

       22
       26
        
           license = licenses.mit;

     

       23
       27
        
           maintainers = with maintainers; [ dotlambda ];

     

       24
       24
       -
       

     

       25
       25
       -
           # Home Assistant should pin protobuf to the correct version. Can be tested using

     

       26
       26
       -
           #     nix-build -E "with import ./. {}; home-assistant.override { extraPackages = ps: [ ps.aioesphomeapi ]; }"

     

       27
       27
       -
           broken = !lib.hasPrefix "3.6.1" protobuf.version;

     

       28
       28
        
         };

     

       29
       29
        
       }

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "aioftp";

     

       14
       14
       -
         version = "0.17.1";

     

       14
       14
       +
         version = "0.17.2";

     

       15
       15
        
         disabled = isPy27;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "87869958fa98c4691acad0815840a94c1b50c6925d037d4dbb51331ddf4911f3";

     

       19
       19
       +
           sha256 = "8433ff21317e71ef1f4d8cb8f7fe58365c04b5174142d9643e22343cfb35da1b";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "asdf";

     

       18
       18
       -
         version = "2.7.0";

     

       18
       18
       +
         version = "2.7.1";

     

       19
       19
        
         disabled = isPy27;

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           sha256 = "687d741f19db663b769eb188458dafd4fe5cc10201640ffed3210c7f138f15d0";

     

       23
       23
       +
           sha256 = "4ba2e31cb24b974a10dfae3edee23db2e6bea2d00608604d062366aa3af6e81a";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/atlassian-python-api/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "atlassian-python-api";

     

       19
       19
       -
         version = "1.16.0";

     

       19
       19
       +
         version = "1.16.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y";

     

       23
       23
       +
           sha256 = "b672131be7cc5e239c465909454542623c0aeb0a4d3b05e6a25ee9459959c11d";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         checkInputs = [ pytestrunner pytest ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "awkward1";

     

       13
       13
       -
         version = "0.2.33";

     

       13
       13
       +
         version = "0.2.35";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "bf3de210d0a88fb14a97c296f54ed2d5b686a785bb5fd7a31277f22b8daa9513";

     

       17
       17
       +
           sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ cmake ];

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname =  "boto3";

     

       16
       16
       -
         version = "1.14.43"; # N.B: if you change this, change botocore too

     

       16
       16
       +
         version = "1.14.51"; # N.B: if you change this, change botocore too

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "a6c9a3d3abbad2ff2e5751af599492a9271633a7c9fef343482524464c53e451";

     

       20
       20
       +
           sha256 = "a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "botocore";

     

       15
       15
       -
         version = "1.17.43"; # N.B: if you change this, change boto3 and awscli to a matching version

     

       15
       15
       +
         version = "1.17.51"; # N.B: if you change this, change boto3 and awscli to a matching version

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "3fb144d2b5d705127f394f7483737ece6fa79577ca7c493e4f42047ac8636200";

     

       19
       19
       +
           sha256 = "198a62d387eb64b4c1dde33a9c41e96b07884c68c1442dd7c7d38123592aae7c";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+1 -1

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pythonOlder

     

       5
       5
       -
       , pytestCheckHook

     

       6
       5
        
       , importlib-metadata

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

+2 -2

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

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "cheroot";

     

       21
       21
       -
         version = "8.4.4";

     

       21
       21
       +
         version = "8.4.5";

     

       22
       22
        
       

     

       23
       23
        
         disabled = !isPy3k;

     

       24
       24
        
       

     

       25
       25
        
         src = fetchPypi {

     

       26
       26
        
           inherit pname version;

     

       27
       27
       -
           sha256 = "ca92669cc90fbd0920fda1ebcc431147e7d3ae6887216ce404f85f1b3133fa93";

     

       27
       27
       +
           sha256 = "b6c18caf5f79cdae668c35fc8309fc88ea4a964cce9e2ca8504fab13bcf57301";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];

+2

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , numpy

     

       5
       5
        
       , scipy

     

       6
       6
       +
       , sparse

     

       6
       7
        
       , numba

     

       7
       8
        
       , future

     

       8
       9
        
       , h5py

     
···

       23
       24
        
         propagatedBuildInputs = [

     

       24
       25
        
           numpy

     

       25
       26
        
           scipy

     

       27
       27
       +
           sparse

     

       26
       28
        
           numba

     

       27
       29
        
           future

     

       28
       30
        
           h5py

+2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , beautifulsoup4

     

       4
       5
        
       , requests

     

       5
       6
        
       , future

     

       6
       7
        
       , pyyaml

     
···

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         propagatedBuildInputs = [

     

       21
       21
       +
           beautifulsoup4

     

       20
       22
        
           requests

     

       21
       23
        
           future

     

       22
       24
        
           pyyaml

+2 -2

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

···

       6
       6
        
       }:

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "cmd2";

     

       9
       9
       -
         version = "1.3.3";

     

       9
       9
       +
         version = "1.3.8";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "38015008ff4639edfd66591063a0e9bb75a62dccb14ee3ec7bf3a6cb130de5cf";

     

       13
       13
       +
           sha256 = "b6f6254def8ba479088702f97bca1b999c12e0c38ac5d82dc50a44db93c7108c";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         LC_ALL="en_US.UTF-8";

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "codecov";

     

       5
       5
       -
         version = "2.1.8";

     

       5
       5
       +
         version = "2.1.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0be9cd6358cc6a3c01a1586134b0fb524dfa65ccbec3a40e9f28d5f976676ba2";

     

       9
       9
       +
           sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         checkInputs = [ unittest2 ]; # Tests only

+2 -2

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

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "cryptography";

     

       25
       25
       -
         version = "3.0"; # Also update the hash in vectors.nix

     

       25
       25
       +
         version = "3.1"; # Also update the hash in vectors.nix

     

       26
       26
        
       

     

       27
       27
        
         src = fetchPypi {

     

       28
       28
        
           inherit pname version;

     

       29
       29
       -
           sha256 = "0lr06a9317n2iwfqwz9mpalqm99acqwk1478arvyj1jj0ay4v4lf";

     

       29
       29
       +
           sha256 = "021yccbqr446zh1c9l8yj79h9bgbd1cwv0ppj168w9y67i3rlh16";

     

       30
       30
        
         };

     

       31
       31
        
       

     

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

+1 -1

pkgs/development/python-modules/cryptography/vectors.nix

···

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0fa26ggksyhknb43cja1g0jwp35qkdbavivdq6yynj1igd2z1vsj";

     

       10
       10
       +
           sha256 = "10hixzqf2ppw8j61f6p04rgnq8ra6pjml68330s5af8df8xbqq16";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         # No tests included

+2 -2

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

···

       30
       30
        
       

     

       31
       31
        
       buildPythonPackage rec {

     

       32
       32
        
         pname = "datashader";

     

       33
       33
       -
         version = "0.11.0";

     

       33
       33
       +
         version = "0.11.1";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchPypi {

     

       36
       36
        
           inherit pname version;

     

       37
       37
       -
           sha256 = "05p81aff7x70yj8llclclgz6klvfzqixwxfng6awn3y5scv18w40";

     

       37
       37
       +
           sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/django-dynamic-preferences/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "django-dynamic-preferences";

     

       7
       7
       -
         version = "1.10";

     

       7
       7
       +
         version = "1.10.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "2310291c7f40606be045938d65e117383549aa8a979c6c4b700464c6a6204a34";

     

       11
       11
       +
           sha256 = "e4b2bb7b2563c5064ba56dd76441c77e06b850ff1466a386a1cd308909a6c7de";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ six django persisting-theory ];

+2 -2

pkgs/development/python-modules/django/2_2.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "Django";

     

       9
       9
       -
         version = "2.2.14";

     

       9
       9
       +
         version = "2.2.15";

     

       10
       10
        
       

     

       11
       11
        
         disabled = !isPy3k;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d";

     

       15
       15
       +
           sha256 = "3e2f5d172215862abf2bac3138d8a04229d34dbd2d0dab42c6bf33876cc22323";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         patches = stdenv.lib.optional withGdal

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "django-nose";

     

       10
       10
       -
         version = "1.4.6";

     

       10
       10
       +
         version = "1.4.7";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "01wah0ci5xdpiikash68x6lprxlvnkxg72ly9kjrc9lklq34m4sq";

     

       14
       14
       +
           sha256 = "a4885cd002d65fd2de96e2bb2563ef477c3fbe207009360c015fca5c3b5561b7";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # vast dependency list

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "docker";

     

       14
       14
       -
         version = "4.3.0";

     

       14
       14
       +
         version = "4.3.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "431a268f2caf85aa30613f9642da274c62f6ee8bae7d70d968e01529f7d6af93";

     

       18
       18
       +
           sha256 = "bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = lib.optional isPy27 mock;

+11 -2

pkgs/development/python-modules/dogpile.cache/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest, pytestcov, mock, Mako, decorator, stevedore

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , pytest

     

       6
       6
       +
       , pytestcov

     

       7
       7
       +
       , mock

     

       8
       8
       +
       , Mako

     

       9
       9
       +
       , decorator

     

       10
       10
       +
       , stevedore

     

       3
       11
        
       }:

     

       4
       12
        
       

     

       5
       13
        
       buildPythonPackage rec {

     

       6
       14
        
         pname = "dogpile.cache";

     

       7
       15
        
         version = "1.0.2";

     

       16
       16
       +
         disabled = pythonOlder "3.6";

     

       8
       17
        
       

     

       9
       18
        
         src = fetchPypi {

     

       10
       19
        
           inherit pname version;

+2 -1

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "executor";

     

       5
       5
        
         version = "21.3";

     

       6
       6
       +
         disabled = isPy27;

     

       6
       7
        
       

     

       7
       8
        
         src = fetchFromGitHub {

     

       8
       9
        
           owner = "xolox";

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "Faker";

     

       20
       20
       -
         version = "4.1.1";

     

       20
       20
       +
         version = "4.1.2";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchPypi {

     

       23
       23
        
           inherit pname version;

     

       24
       24
       -
           sha256 = "c006b3664c270a2cfd4785c5e41ff263d48101c4e920b5961cf9c237131d8418";

     

       24
       24
       +
           sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ pytestrunner ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "flufl.bounce";

     

       5
       5
       -
         version = "3.0";

     

       5
       5
       +
         version = "3.0.1";

     

       6
       6
        
       

     

       7
       7
        
         buildInputs = [ nose2 ];

     

       8
       8
        
         propagatedBuildInputs = [ atpublic zope_interface ];

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2";

     

       12
       12
       +
           sha256 = "e432fa1ca25ddbf23e2716b177d4d1c6ab6c078e357df56b0106b92bc10a8f06";

     

       13
       13
        
         };

     

       14
       14
        
       }

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonApplication rec {

     

       11
       11
        
         pname = "gdown";

     

       12
       12
       -
         version = "3.12.0";

     

       12
       12
       +
         version = "3.12.2";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "bf5f001e3a7add296e5298240c64db88ba88e5c136bd1fe84fcbd542feb6fccd";

     

       16
       16
       +
           sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ filelock requests tqdm setuptools ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "globus-sdk";

     

       13
       13
       -
         version = "1.9.0";

     

       13
       13
       +
         version = "1.9.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2";

     

       17
       17
       +
           sha256 = "883a862ddd17b0f4868ec55d6697a64c13d91c41b9fa5103198d2140053abac2";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkPhase = ''

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "google-cloud-kms";

     

       13
       13
       -
         version = "2.0.0";

     

       13
       13
       +
         version = "2.0.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "5af43d30adbb19023f9fec9d481b1d2d35be690d2a8dcdf9d6abc2c1d302cc17";

     

       17
       17
       +
           sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest mock ];

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "howdoi";

     

       14
       14
       -
         version = "2.0.4";

     

       14
       14
       +
         version = "2.0.5";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "0hq5biy0mpycbji2mikfbflw4r39prylr47iqhlz234kvwdy0jsg";

     

       18
       18
       +
           sha256 = "8e4d048ae7ca6182d648f62a66d07360cca2504fe46649c32748b6ef2735f7f4";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

+2 -2

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

···

       10
       10
        
         # pytz fake_factory django numpy pytest

     

       11
       11
        
         # If you need these, you can just add them to your environment.

     

       12
       12
        
       

     

       13
       13
       -
         version = "5.11.0";

     

       13
       13
       +
         version = "5.30.0";

     

       14
       14
        
         pname = "hypothesis";

     

       15
       15
        
       

     

       16
       16
        
         # Use github tarballs that includes tests

     
···

       18
       18
        
           owner = "HypothesisWorks";

     

       19
       19
        
           repo = "hypothesis-python";

     

       20
       20
        
           rev = "hypothesis-python-${version}";

     

       21
       21
       -
           sha256 = "1ca2dwih65s4r8vazwqm963ywngdr3v854ldnfyny7bvx1v28m8k";

     

       21
       21
       +
           sha256 = "0fmc4jfaksr285fjhp18ibj2rr8cxmbd0pwx370r5wf8jnhm6jb3";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "identify";

     

       5
       5
       -
         version = "1.4.27";

     

       5
       5
       +
         version = "1.4.29";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "4c3646d765127b003d2bed8db1e125d68f5f83ad0cd85e21c908ef87a5e24be1";

     

       9
       9
       +
           sha256 = "9f5fcf22b665eaece583bd395b103c2769772a0f646ffabb5b1f155901b07de2";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # Tests not included in PyPI tarball

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "inflection";

     

       5
       5
       -
         version = "0.5.0";

     

       5
       5
       +
         version = "0.5.1";

     

       6
       6
        
         disabled = isPy27;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
          inherit pname version;

     

       10
       10
       -
          sha256 = "f576e85132d34f5bf7df5183c2c6f94cfb32e528f53065345cf71329ba0b8924";

     

       10
       10
       +
          sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         checkInputs = [ pytest ];

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "ipyvuetify";

     

       10
       10
       -
         version = "1.5.0";

     

       10
       10
       +
         version = "1.5.1";

     

       11
       11
        
       

     

       12
       12
        
         # GitHub version tries to run npm (Node JS)

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "5c311308d3ec9c92e48ab6ca021b5b51295e9e39de640f69827e30d5f03a244b";

     

       15
       15
       +
           sha256 = "593f5d6761e304cbb78bca967030485d8835e8d310ef7d83ac1b0e6a13e4911c";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ ipyvue ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "jq";

     

       5
       5
       -
         version = "0.1.6";

     

       5
       5
       +
         version = "0.1.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "34bdf9f9e49e522e1790afc03f3584c6b57329215ea0567fb2157867d6d6f602";

     

       9
       9
       +
           sha256 = "9b6bb376237133080185ab556ca2a724e8be5b31946eb2053d4a1f17ae9df9a8";

     

       10
       10
        
         };

     

       11
       11
        
         patches = [ ./jq-py-setup.patch ];

     

       12
       12

+2 -2

pkgs/development/python-modules/junos-eznc/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "junos-eznc";

     

       18
       18
       -
         version = "2.5.1";

     

       18
       18
       +
         version = "2.5.3";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "0e3a1e74b9254b4832a6cdbf8e6f26f9a269f574cb8cf2dd292dc131e0f4b245";

     

       22
       22
       +
           sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25

+2 -2

pkgs/development/python-modules/jupyter_client/5.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "jupyter_client";

     

       15
       15
       -
         version = "5.3.4";

     

       15
       15
       +
         version = "5.3.5";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910";

     

       19
       19
       +
           sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "jupyter_client";

     

       15
       15
       -
         version = "6.1.6";

     

       15
       15
       +
         version = "6.1.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "b360f8d4638bc577a4656e93f86298db755f915098dc763f6fc05da0c5d7a595";

     

       19
       19
       +
           sha256 = "49e390b36fe4b4226724704ea28d9fb903f1a3601b6882ce3105221cd09377a1";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+1 -1

pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix

···

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "12xby5j7wmi6qsbb2fjd5qbckkcg5fmdij8qpc9n7ci8vfxq303m";

     

       14
       14
       +
           sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # No tests implemented

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "jupyterlab";

     

       11
       11
       -
         version = "2.2.4";

     

       11
       11
       +
         version = "2.2.6";

     

       12
       12
        
         disabled = pythonOlder "3.5";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "e9d26c4c1cf4f7760dfa9ccd3fd5ea5027ae2767f22c7766dbb2fbb5e5dfcd4b";

     

       16
       16
       +
           sha256 = "6554b022d2cd120100e165ec537c6511d70de7f89e253b3c667ea28f2a9263ff";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ jupyterlab_server notebook ];

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "keyring";

     

       14
       14
       -
         version = "21.3.0";

     

       14
       14
       +
         version = "21.3.1";

     

       15
       15
        
         disabled = isPy27;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "22df6abfed49912fc560806030051067fba9f0069cffa79da72899aeea4ccbd5";

     

       19
       19
       +
           sha256 = "182f94fc0381546489e3e4d90384a8c1d43cc09ffe2eb4a826e7312df6e1be7c";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/libcloud/2.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "apache-libcloud";

     

       17
       17
       -
         version = "2.8.2";

     

       17
       17
       +
         version = "2.8.3";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "1wvm8vixhcapkfv5k6xaf8c8w647kx2rdifarg6j0s34r4jzblfg";

     

       21
       21
       +
           sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         checkInputs = [ mock pytest pytestrunner requests-mock ];

+2 -2

pkgs/development/python-modules/marionette-harness/mozhttpd.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "mozhttpd";

     

       9
       9
       -
         version = "0.7";

     

       9
       9
       +
         version = "0.7.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa";

     

       13
       13
       +
           sha256 = "3e2a9b4d6c007a1a9fb729d6e95b5404d138914727747e10155426492dced975";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ moznetwork ];

+2 -2

pkgs/development/python-modules/mutagen/1.43.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "mutagen";

     

       15
       15
       -
         version = "1.43.0";

     

       15
       15
       +
         version = "1.43.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "125m0pkiw5lsffc0236xdlxfhwpr8csvxpmg6855405qy4wjv61s";

     

       19
       19
       +
           sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ setuptools ];

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "nbclient";

     

       8
       8
       -
         version = "0.4.1";

     

       8
       8
       +
         version = "0.4.3";

     

       9
       9
        
         disabled = pythonOlder "3.6";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "31fdb4bd45ebcd98eeda01e2c38fb391eae8a8480bdddbebb6cfd088486948a7";

     

       13
       13
       +
           sha256 = "311e14e463a300239c558a95023f6d1007c3f69f589bd51a76b1b6b3f19a7f4b";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "netdisco";

     

       5
       5
       -
         version = "2.8.1";

     

       5
       5
       +
         version = "2.8.2";

     

       6
       6
        
       

     

       7
       7
        
         disabled = !isPy3k;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "05ca5a8a0be88aa1a919818b0c5208293aa1197518a561545c6947232ee22bc1";

     

       11
       11
       +
           sha256 = "dcaabf83b204282aacfb213b18799eb7af2d5a6defe529487bbd0548036392fe";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ requests zeroconf netifaces ];

+2 -2

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

···

       50
       50
        
       

     

       51
       51
        
       buildPythonPackage rec {

     

       52
       52
        
         pname = "nipype";

     

       53
       53
       -
         version = "1.5.0";

     

       53
       53
       +
         version = "1.5.1";

     

       54
       54
        
       

     

       55
       55
        
         src = fetchPypi {

     

       56
       56
        
           inherit pname version;

     

       57
       57
       -
           sha256 = "8c837eafdaa68e85d911aca20c8a2cd9210e4fffabbcbc5bd2eb6e26f8553da9";

     

       57
       57
       +
           sha256 = "3d6aa37186e1d2f90917dfdf1faf5aeff469912554990e5d182ffe8435f250d5";

     

       58
       58
        
         };

     

       59
       59
        
       

     

       60
       60
        
         postPatch = ''

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "nodeenv";

     

       5
       5
       -
         version = "1.3.3";

     

       5
       5
       +
         version = "1.3.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a";

     

       9
       9
       +
           sha256 = "7389d06a7ea50c80ca51eda1b185db7b9ec38af1304d12d8b8299d6218486e91";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/notebook/2.nix

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "notebook";

     

       28
       28
       -
         version = "5.7.8";

     

       28
       28
       +
         version = "5.7.10";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchPypi {

     

       31
       31
        
           inherit pname version;

     

       32
       32
       -
           sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8";

     

       32
       32
       +
           sha256 = "b10107e1438e7a564292aa32510e610c88844cae03c882fe5286b891792b5c11";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         LC_ALL = "en_US.utf8";

+2 -2

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

···

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
       -
         version = "0.51.0";

     

       16
       16
       +
         version = "0.51.1";

     

       17
       17
        
         pname = "numba";

     

       18
       18
        
         # uses f-strings

     

       19
       19
        
         disabled = pythonOlder "3.6";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           sha256 = "da57ef00bc814bf54446fb3f8c0374557a7476e40279ceabefd9f12b05cc3c0c";

     

       23
       23
       +
           sha256 = "1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

+5 -2

pkgs/development/python-modules/numpy/1.16.nix

···

       21
       21
        
             ${blas.implementation} = {

     

       22
       22
        
               include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";

     

       23
       23
        
               library_dirs = "${blas}/lib:${lapack}/lib";

     

       24
       24
       +
               runtime_library_dirs = "${blas}/lib:${lapack}/lib";

     

       24
       25
        
               libraries = "lapack,lapacke,blas,cblas";

     

       25
       26
        
             };

     

       26
       27
        
             lapack = {

     

       27
       28
        
               include_dirs = "${lib.getDev lapack}/include";

     

       28
       29
        
               library_dirs = "${lapack}/lib";

     

       30
       30
       +
               runtime_library_dirs = "${lapack}/lib";

     

       29
       31
        
             };

     

       30
       32
        
             blas = {

     

       31
       33
        
               include_dirs = "${lib.getDev blas}/include";

     

       32
       34
        
               library_dirs = "${blas}/lib";

     

       35
       35
       +
               runtime_library_dirs = "${blas}/lib";

     

       33
       36
        
             };

     

       34
       37
        
           });

     

       35
       38
        
         };

     

       36
       39
        
       in buildPythonPackage rec {

     

       37
       40
        
         pname = "numpy";

     

       38
       38
       -
         version = "1.16.5";

     

       41
       41
       +
         version = "1.16.6";

     

       39
       42
        
         format = "pyproject.toml";

     

       40
       43
        
       

     

       41
       44
        
         src = fetchPypi {

     

       42
       45
        
           inherit pname version;

     

       43
       46
        
           extension = "zip";

     

       44
       44
       -
           sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c";

     

       47
       47
       +
           sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff";

     

       45
       48
        
         };

     

       46
       49
        
       

     

       47
       50
        
         nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];

+3

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

···

       22
       22
        
             ${blas.implementation} = {

     

       23
       23
        
               include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";

     

       24
       24
        
               library_dirs = "${blas}/lib:${lapack}/lib";

     

       25
       25
       +
               runtime_library_dirs = "${blas}/lib:${lapack}/lib";

     

       25
       26
        
               libraries = "lapack,lapacke,blas,cblas";

     

       26
       27
        
             };

     

       27
       28
        
             lapack = {

     

       28
       29
        
               include_dirs = "${lib.getDev lapack}/include";

     

       29
       30
        
               library_dirs = "${lapack}/lib";

     

       31
       31
       +
               runtime_library_dirs = "${lapack}/lib";

     

       30
       32
        
             };

     

       31
       33
        
             blas = {

     

       32
       34
        
               include_dirs = "${lib.getDev blas}/include";

     

       33
       35
        
               library_dirs = "${blas}/lib";

     

       36
       36
       +
               runtime_library_dirs = "${blas}/lib";

     

       34
       37
        
             };

     

       35
       38
        
           });

     

       36
       39
        
         };

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
        buildPythonPackage rec {

     

       4
       4
        
         pname = "nunavut";

     

       5
       5
       -
         version = "0.3.4";

     

       5
       5
       +
         version = "0.3.6";

     

       6
       6
        
         disabled = pythonOlder "3.5"; # only python>=3.5 is supported

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "5455946d069ac8cfd86e93d3977c1bd31ee7d68d22accdf130addb038e73564a";

     

       10
       10
       +
           sha256 = "434edabdc431b9af719896e0de4bd0deead657777d1d8aa4e3cd0dcdff6298bc";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "openpyxl";

     

       13
       13
       -
         version = "3.0.4";

     

       13
       13
       +
         version = "3.0.5";

     

       14
       14
        
         disabled = isPy27; # 2.6.4 was final python2 release

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "d88dd1480668019684c66cfff3e52a5de4ed41e9df5dd52e008cbf27af0dbf87";

     

       18
       18
       +
           sha256 = "18e11f9a650128a12580a58e3daba14e00a11d9e907c554a17ea016bf1a2c71b";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [ pytest ];

+2 -2

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

···

       31
       31
        
       

     

       32
       32
        
       in buildPythonPackage rec {

     

       33
       33
        
         pname = "pandas";

     

       34
       34
       -
         version = "1.1.0";

     

       34
       34
       +
         version = "1.1.1";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchPypi {

     

       37
       37
        
           inherit pname version;

     

       38
       38
       -
           sha256 = "b39508562ad0bb3f384b0db24da7d68a2608b9ddc85b1d931ccaaa92d5e45273";

     

       38
       38
       +
           sha256 = "53328284a7bb046e2e885fd1b8c078bd896d7fc4575b915d4936f54984a2ba67";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         checkInputs = [ pytest glibcLocales moto hypothesis ];

+2 -2

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

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "papermill";

     

       28
       28
       -
         version = "2.1.2";

     

       28
       28
       +
         version = "2.1.3";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchPypi {

     

       31
       31
        
           inherit pname version;

     

       32
       32
       -
           sha256 = "aadc23f0ae2eaa75868e4359f1ea7d75ff46bc8cb1988651f3f3fd5d4ec44679";

     

       32
       32
       +
           sha256 = "ecd4cafa9179693b0eedc3b6f4560f9ee47826a6e366e42bfa3cc20f7931b3f8";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         propagatedBuildInputs = [

+9

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

···

       1
       1
        
       { pkgs

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       , cryptography

     

       5
       6
        
       , bcrypt

     

       6
       7
        
       , invoke

     
···

       20
       21
        
           sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           # fix RSA key loading with cryptography 3.1, remove >2.7.1

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             url = "https://github.com/paramiko/paramiko/commit/81064206bf3cec2ca4372257ff138481e1227b91.patch";

     

       28
       28
       +
             sha256 = "01b87ffgyvd6rilp1w1kf7lk29z706ch39nwl21ifklqpjhmazww";

     

       29
       29
       +
           })

     

       30
       30
       +
         ];

     

       23
       31
        
         checkInputs = [ invoke pytest mock pytest-relaxed ];

     

       24
       32
        
         propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ];

     

       25
       33
        
       

     
···

       27
       35
        
       

     

       28
       36
        
         # 2 sftp tests fail (skip for now)

     

       29
       37
        
         # test_config relies on artifacts to be to downloaded

     

       38
       38
       +
         # RSA tests don't have valid keys

     

       30
       39
        
         checkPhase = ''

     

       31
       40
        
           pytest tests \

     

       32
       41
        
             --ignore=tests/test_sftp.py \

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "parfive";

     

       16
       16
       -
         version = "1.1.0";

     

       16
       16
       +
         version = "1.1.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "faa60c34dfbd080f011c1af0587f932874dcdf602d0336227d540899dbc41b50";

     

       20
       20
       +
           sha256 = "5793fdf9859a9a9fc93f033db9dc067a89626910355a14bbe425feb3956df6db";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

+2

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

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , isPy27

     

       4
       5
        
       , pytest

     

       5
       6
        
       , pytestrunner

     

       6
       7
        
       , future

     
···

       9
       10
        
       buildPythonPackage rec {

     

       10
       11
        
         pname = "parsedatetime";

     

       11
       12
        
         version = "2.6";

     

       13
       13
       +
         disabled = isPy27; # no longer compatible with icu package

     

       12
       14
        
       

     

       13
       15
        
         src = fetchPypi {

     

       14
       16
        
           inherit pname version;

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pyTelegramBotAPI";

     

       5
       5
       -
         version = "3.7.2";

     

       5
       5
       +
         version = "3.7.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "1jbd2npa942f3bqwpvc6kb3b9jxk7ksczd4grrdimfb6w7binzv4";

     

       9
       9
       +
           sha256 = "ce42d84442ff2ce4918de6550cf377253f61e28e4fac2634495683d12df66d00";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ requests ];

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pyatv";

     

       18
       18
       -
         version = "0.7.1";

     

       18
       18
       +
         version = "0.7.2";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "17d4fb4fbdfe1c762e421ce2caa6beddab8ef9a6e0e5c7ab7eb54c8d8654c61c";

     

       22
       22
       +
           sha256 = "83d86fac517d33a1e3063a547ee2a520fde74c74a1b95cb5a6f20afccfd59843";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pytestrunner];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "PyChromecast";

     

       5
       5
       -
         version = "7.2.0";

     

       5
       5
       +
         version = "7.2.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "c522c5ecb554471ca8e5690c05530b1c237c301349061d3839c506984f8d3c2d";

     

       9
       9
       +
           sha256 = "9aad074d0361791af8ccb8fb7ea0f1646db3d89600fed85c5562b64c8b1aa899";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         disabled = !isPy3k;

+2 -2

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

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
        
         pname = "PyMuPDF";

     

       4
       4
       -
         version = "1.17.5";

     

       4
       4
       +
         version = "1.17.6";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchPypi {

     

       7
       7
        
           inherit pname version;

     

       8
       8
       -
           sha256 = "ddec02c4dd1c2e0ead4d61cd97b52e725d643602f1f7832b5016190f5c653add";

     

       8
       8
       +
           sha256 = "5eef4ff61698016a296932858625a5a0039b923ba692043e2c98ca02966f1da2";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         patchPhase = ''

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "pyopencl";

     

       19
       19
       -
         version = "2020.2";

     

       19
       19
       +
         version = "2020.2.1";

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [ pytest ];

     

       22
       22
        
         buildInputs = [ opencl-headers ocl-icd pybind11 ];

     
···

       25
       25
        
       

     

       26
       26
        
         src = fetchPypi {

     

       27
       27
        
           inherit pname version;

     

       28
       28
       -
           sha256 = "afd9f22547bcd879b9e54252fc885b45034ebfd1890e630827f1afb408a03d23";

     

       28
       28
       +
           sha256 = "deb6c50f37f8f88960a943b379eca8c0a9a80634cf60e09aee691a7453ae202e";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         # py.test is not needed during runtime, so remove it from `install_requires`

+2 -2

pkgs/development/python-modules/pytest/4.nix

···

       3
       3
        
       , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy

     

       4
       4
        
       }:

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
       -
         version = "4.6.9";

     

       6
       6
       +
         version = "4.6.11";

     

       7
       7
        
         pname = "pytest";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0fgkmpc31nzy97fxfrkqbzycigdwxwwmninx3qhkzp81migggs0r";

     

       11
       11
       +
           sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         checkInputs = [ hypothesis mock ];

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "python-rtmidi";

     

       7
       7
       -
         version = "1.4.3";

     

       7
       7
       +
         version = "1.4.5";

     

       8
       8
        
         disabled = isPy27;

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "7f4bbcd77431917503d6ae738093c8419ed67812d50883fa9cfefce1eb21eb3a";

     

       12
       12
       +
           sha256 = "3dd1909d0f44f03a4191131f1829cac2ee6a94f5a4be2a9606354748e594e704";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkg-config ];

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "pywbem";

     

       8
       8
       -
         version = "1.0.1";

     

       8
       8
       +
         version = "1.0.2";

     

       9
       9
        
       

     

       10
       10
        
         # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release

     

       11
       11
        
         disabled = isPy37;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "2e738c9eb92591307f4f4d674b1e073bf12192604904e3c4028fde1aa338138c";

     

       15
       15
       +
           sha256 = "66d8ec82d30f2b95d8b4bd51659429066c2879d3f46292561f5fdbc7fed10f3d";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [

+4 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       4
       5
        
       , cython

     

       5
       6
        
       , numpy

     

       6
       7
        
       , scipy

     
···

       11
       12
        
       

     

       12
       13
        
       buildPythonPackage rec {

     

       13
       14
        
         pname = "ripser";

     

       14
       14
       -
         version = "0.5.3";

     

       15
       15
       +
         version = "0.5.4";

     

       16
       16
       +
         disabled = pythonOlder "3.6";

     

       15
       17
        
       

     

       16
       18
        
         src = fetchPypi {

     

       17
       19
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "cb63a03205511cd3d2aae586cec9515dddfbec3ce269dd0560911b0a55d75632";

     

       20
       20
       +
           sha256 = "7a54750427e3f1bbb26c625075c831314760a9e5b5bcd3b797df668f020c9eb6";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       23
        
         checkInputs = [

+2 -2

pkgs/development/python-modules/robotframework-requests/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
       -
         version = "0.7.0";

     

       11
       11
       +
         version = "0.7.1";

     

       12
       12
        
         pname = "robotframework-requests";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "da7bf998f9cbf8261199db7c96b95be1bf29d1db7f59dfbc77c435761698dc75";

     

       16
       16
       +
           sha256 = "501a1c7415f839d6837eedd57f2b6ed20576aab318bf14e3878a77c9b106aa45";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ unittest2 ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonPackage rec {

     

       4
       4
        
         pname = "sabyenc3";

     

       5
       5
       -
         version = "4.0.0";

     

       5
       5
       +
         version = "4.0.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0zfj1k4zij8ph8jwkq4d6i6axym8cil16yijxshqla5163d1031z";

     

       9
       9
       +
           sha256 = "dfaa0bdd01752a9cfde0d349a8f4e178b04b1cf9c1bc018b287961192cd2bb90";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # tests are not included in pypi distribution

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "sarge";

     

       5
       5
       -
         version = "0.1.5.post0";

     

       5
       5
       +
         version = "0.1.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "da8cc90883f8e5ab4af0d746438f608662f5f2a35da2e858517927edefa134b0";

     

       9
       9
       +
           sha256 = "f48fb904e64f10ad6bef62422eaf4736acfd9b13ab64ba44822637a9dbb53265";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # No tests in PyPI tarball

+2 -1

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchFromGitHub, numpy, future, spglib, glibcLocales, pytest, scipy }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "seekpath";

     

       5
       5
        
         version = "2.0.1";

     

       6
       6
       +
         disabled = pythonOlder "3.5";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchFromGitHub {

     

       8
       9
        
           owner = "giovannipizzi";

+4 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       4
       5
        
       , boto

     

       5
       6
        
       , boto3

     

       6
       7
        
       , bz2file

     
···

       12
       13
        
       

     

       13
       14
        
       buildPythonPackage rec {

     

       14
       15
        
         pname = "smart_open";

     

       15
       15
       -
         version = "2.1.0";

     

       16
       16
       +
         version = "2.1.1";

     

       17
       17
       +
         disabled = pythonOlder "3.5";

     

       16
       18
        
       

     

       17
       19
        
         src = fetchPypi {

     

       18
       20
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "c8792d2e77f33b349fbaa62eb28ddc519e6b7e5d36407e9bdc00bececeaa776d";

     

       21
       21
       +
           sha256 = "51b05acd85ec007e1d4dcdbf2bbf917218a45026f37d559559401114bb5e5840";

     

       20
       22
        
         };

     

       21
       23
        
       

     

       22
       24
        
         # nixpkgs version of moto is >=1.2.0, remove version pin to fix build

+2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , isPy27

     

       4
       5
        
       , cffi

     

       5
       6
        
       , numpy

     

       6
       7
        
       , portaudio

     
···

       10
       11
        
       buildPythonPackage rec {

     

       11
       12
        
         pname = "sounddevice";

     

       12
       13
        
         version = "0.4.0";

     

       14
       14
       +
         disabled = isPy27;

     

       13
       15
        
       

     

       14
       16
        
         src = fetchPypi {

     

       15
       17
        
           inherit pname version;

+3 -1

pkgs/development/python-modules/sphinxcontrib-openapi/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , setuptools_scm

     

       5
       5
       +
       , m2r

     

       5
       6
        
       , pyyaml

     

       6
       7
        
       , jsonschema

     

       7
       8
        
       , sphinxcontrib_httpdomain

     
···

       16
       17
        
           sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       19
       -
         propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain];

     

       20
       20
       +
         nativeBuildInputs = [ setuptools_scm ];

     

       21
       21
       +
         propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ];

     

       20
       22
        
       

     

       21
       23
        
         doCheck = false;

     

       22
       24

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "SQLAlchemy";

     

       9
       9
       -
         version = "1.3.18";

     

       9
       9
       +
         version = "1.3.19";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7";

     

       13
       13
       +
           sha256 = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "supervisor";

     

       10
       10
       -
         version = "4.2.0";

     

       10
       10
       +
         version = "4.2.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "64082ebedf6d36ff409ab2878f1aad5c9035f916c5f15a9a1ec7dffc6dfbbed8";

     

       14
       14
       +
           sha256 = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         patches = [

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "svglib";

     

       15
       15
       -
         version = "1.0.0";

     

       15
       15
       +
         version = "1.0.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "b17d4a6352f6c25ca3718d2b66a2f1ecfcdf558b1f6646c37f5c191b655979f1";

     

       19
       19
       +
           sha256 = "ff01593e8c07ea462d3742e1f4141bfa261cbd4400ceb25dfb8fec3508ad0e50";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         disabled = !isPy3k;

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "tifffile";

     

       16
       16
       -
         version = "2020.8.13";

     

       16
       16
       +
         version = "2020.8.25";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "60043e50adab5a1b9f13c3fb1a23992b9af00e1ada13d7ffe48c1ad7e0062cb8";

     

       20
       20
       +
           sha256 = "b51e496bd9ee9c6875170a018bdb7b6f67e3946c4ab57afdb95b18b2c6937783";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         patches = lib.optional isPy27 ./python2-regex-compat.patch;

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "timelib";

     

       8
       8
       -
         version = "0.2.4";

     

       8
       8
       +
         version = "0.2.5";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
        
           extension = "zip";

     

       13
       13
       -
           sha256 = "49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb";

     

       13
       13
       +
           sha256 = "6ac9f79b09b63bbc07db88525c1f62de1f6d50b0fd9937a0cb05e3d38ce0af45";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         meta = with stdenv.lib; {

+2

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

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , isPy27

     

       4
       5
        
       , requests

     

       5
       6
        
       , cryptography

     

       6
       7
        
       , suds-jurko

     
···

       10
       11
        
       buildPythonPackage rec {

     

       11
       12
        
         pname = "transip-api";

     

       12
       13
        
         version = "2.0.0";

     

       14
       14
       +
         disabled = isPy27;

     

       13
       15
        
       

     

       14
       16
        
         src = fetchFromGitHub {

     

       15
       17
        
           owner = "benkonrath";

+2 -2

pkgs/development/python-modules/typing-extensions/default.nix

···

       4
       4
        
       

     

       5
       5
        
       in buildPythonPackage rec {

     

       6
       6
        
         pname = "typing_extensions";

     

       7
       7
       -
         version = "3.7.4.2";

     

       7
       7
       +
         version = "3.7.4.3";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae";

     

       11
       11
       +
           sha256 = "99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         checkInputs = lib.optional (pythonOlder "3.5") typing;

+2 -2

pkgs/development/python-modules/unittest-xml-reporting/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "unittest-xml-reporting";

     

       5
       5
       -
         version = "3.0.3";

     

       5
       5
       +
         version = "3.0.4";

     

       6
       6
        
         disabled = isPy27;

     

       7
       7
        
       

     

       8
       8
        
         propagatedBuildInputs = [six];

     
···

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "89ad3376cc63dc0f7227c1e39d03d5f6a20807fef989c57d8c623446b5f79575";

     

       15
       15
       +
           sha256 = "984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695";

     

       16
       16
        
         };

     

       17
       17
        
         meta = with lib; {

     

       18
       18
        
           homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/";

+1

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

···

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "validators";

     

       14
       14
        
         version = "0.17.1";

     

       15
       15
       +
         disabled = isPy27;

     

       15
       16
        
       

     

       16
       17
        
         src = fetchPypi {

     

       17
       18
        
           inherit pname version;

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "virtualenv";

     

       20
       20
       -
         version = "20.0.30";

     

       20
       20
       +
         version = "20.0.31";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchPypi {

     

       23
       23
        
           inherit pname version;

     

       24
       24
       -
           sha256 = "7b54fd606a1b85f83de49ad8d80dbec08e983a2d2f96685045b262ebc7481ee5";

     

       24
       24
       +
           sha256 = "43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+3 -1

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

···

       1
       1
        
       { lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address

     

       2
       2
       -
       , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint

     

       2
       2
       +
       , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2

     

       3
       3
        
       , stdenv

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [

     

       16
       16
        
           intervaltree

     

       17
       17
       +
           jinja2

     

       17
       18
        
           pyflakes

     

       19
       19
       +
           pyyaml

     

       18
       20
        
           requests

     

       19
       21
        
           lxml

     

       20
       22
        
           google-i18n-address

+2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       +
       , isPy27

     

       3
       4
        
       , fetchPypi

     

       4
       5
        
       , setuptools_scm

     

       5
       6
        
       , asciitree

     
···

       12
       13
        
       buildPythonPackage rec {

     

       13
       14
        
         pname = "zarr";

     

       14
       15
        
         version = "2.4.0";

     

       16
       16
       +
         disabled = isPy27;

     

       15
       17
        
       

     

       16
       18
        
         src = fetchPypi {

     

       17
       19
        
           inherit pname version;

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "zeroconf";

     

       13
       13
       -
         version = "0.28.0";

     

       13
       13
       +
         version = "0.28.2";

     

       14
       14
        
         disabled = isPy27;

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "881da2ed3d7c8e0ab59fb1cc8b02b53134351941c4d8d3f3553a96700f257a03";

     

       18
       18
       +
           sha256 = "447d6da0b6426c0c67d5c29339e51b2d75e2c1f129605ad35a0cb84a454f09bc";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ ifaddr ]

+1 -1

pkgs/development/tools/build-managers/cmake/setup-hook.sh

···

       48
       48
        
       

     

       49
       49
        
           # on macOS we want to prefer Unix-style headers to Frameworks

     

       50
       50
        
           # because we usually do not package the framework

     

       51
       51
       -
           cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags"

     

       51
       51
       +
           cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"

     

       52
       52
        
       

     

       53
       53
        
           # on macOS i686 was only relevant for 10.5 or earlier.

     

       54
       54
        
           cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"

+7 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, gettext, perlPackages }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "intltool";

     
···

       19
       19
        
           sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45";

     

       20
       20
        
         })];

     

       21
       21
        
       

     

       22
       22
       +
         nativeBuildInputs = with perlPackages; [ perl XMLParser ];

     

       22
       23
        
         propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]);

     

       23
       24
        
       

     

       25
       25
       +
         postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       26
       26
       +
           for f in $out/bin/*; do

     

       27
       27
       +
             substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}"

     

       28
       28
       +
           done

     

       29
       29
       +
         '';

     

       24
       30
        
         meta = with stdenv.lib; {

     

       25
       31
        
           description = "Translation helper tool";

     

       26
       32
        
           homepage = "https://launchpad.net/intltool/";

+4 -3

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

···

       6
       6
        
       # files.

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
       -
         name = "patchelf-0.11";

     

       9
       9
       +
         pname = "patchelf";

     

       10
       10
       +
         version = "0.12";

     

       10
       11
        
       

     

       11
       12
        
         src = fetchurl {

     

       12
       12
       -
           url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";

     

       13
       13
       -
           sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx";

     

       13
       13
       +
           url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";

     

       14
       14
       +
           sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       17
        
         setupHook = [ ./setup-hook.sh ];

+4

pkgs/development/tools/misc/texinfo/6.7.nix

···

       1
       1
       +
       import ./common.nix {

     

       2
       2
       +
         version = "6.7";

     

       3
       3
       +
         sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q";

     

       4
       4
       +
       }

+2 -3

pkgs/development/tools/misc/texinfo/common.nix

···

       12
       12
        
       # files.

     

       13
       13
        
       

     

       14
       14
        
       let

     

       15
       15
       -
         crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform;

     

       15
       15
       +
         crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;

     

       16
       16
        
       in

     

       17
       17
        
       

     

       18
       18
        
       with stdenv.lib;

     
···

       26
       26
        
           inherit sha256;

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         patches = optional (version == "6.5") ./perl.patch

     

       30
       30
       -
           ++ optional crossBuildTools ./cross-tools-flags.patch;

     

       29
       29
       +
         patches = optional crossBuildTools ./cross-tools-flags.patch;

     

       31
       30
        
       

     

       32
       31
        
         # ncurses is required to build `makedoc'

     

       33
       32
        
         # this feature is introduced by the ./cross-tools-flags.patch

-43

pkgs/development/tools/misc/texinfo/perl.patch

···

       1
       1
       -
       Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/

     

       2
       2
       -
       Author: gavin

     

       3
       3
       -
       --- trunk/tp/Texinfo/Parser.pm  2018-06-04 19:51:36 UTC (rev 8006)

     

       4
       4
       -
       +++ trunk/tp/Texinfo/Parser.pm  2018-07-13 15:31:28 UTC (rev 8007)

     

       5
       5
       -
       @@ -5531,11 +5531,11 @@

     

       6
       6
       -
            }

     

       7
       7
       -
          } elsif ($command eq 'clickstyle') {

     

       8
       8
       -
            # REMACRO

     

       9
       9
       -
       -    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {

     

       10
       10
       -
       +    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {

     

       11
       11
       -
              $args = ['@'.$1];

     

       12
       12
       -
              $self->{'clickstyle'} = $1;

     

       13
       13
       -
              $remaining = $line;

     

       14
       14
       -
       -      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;

     

       15
       15
       -
       +      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;

     

       16
       16
       -
              $has_comment = 1 if (defined($4));

     

       17
       17
       -
            } else {

     

       18
       18
       -
              $self->line_error (sprintf($self->__(

     

       19
       19
       -
       --- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2018-07-13 15:31:28 UTC (rev 8007)

     

       20
       20
       -
       +++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2018-07-13 15:39:29 UTC (rev 8008)

     

       21
       21
       -
       @@ -248,6 +248,11 @@

     

       22
       22
       -
        

     

       23
       23
       -
          dTHX;

     

       24
       24
       -
        

     

       25
       25
       -
       +#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)

     

       26
       26
       -
       +  /* needed due to thread-safe locale handling in newer perls */

     

       27
       27
       -
       +  switch_to_global_locale();

     

       28
       28
       -
       +#endif

     

       29
       29
       -
       +

     

       30
       30
       -
          if (setlocale (LC_CTYPE, "en_US.UTF-8")

     

       31
       31
       -
              || setlocale (LC_CTYPE, "en_US.utf8"))

     

       32
       32
       -
            goto success;

     

       33
       33
       -
       @@ -320,6 +325,10 @@

     

       34
       34
       -
            {

     

       35
       35
       -
        success: ;

     

       36
       36
       -
              free (utf8_locale);

     

       37
       37
       -
       +#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)

     

       38
       38
       -
       +      /* needed due to thread-safe locale handling in newer perls */

     

       39
       39
       -
       +      sync_locale();

     

       40
       40
       -
       +#endif

     

       41
       41
       -
              /*

     

       42
       42
       -
              fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");

     

       43
       43
       -
              fprintf (stderr, "character encoding is: %s\n",

+1 -1

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

···

       24
       24
        
           "--with-modulesdirs=${modulesDirs}"

     

       25
       25
        
         ] ++ lib.optional withStatic "--enable-static";

     

       26
       26
        
       

     

       27
       27
       -
         patches = [ ./module-dir.patch ]

     

       27
       27
       +
         patches = [ ./module-dir.patch ./no-name-field.patch ]

     

       28
       28
        
           ++ lib.optional stdenv.isDarwin ./darwin.patch

     

       29
       29
        
           ++ lib.optional withStatic ./enable-static.patch;

     

       30
       30

+24

pkgs/os-specific/linux/kmod/no-name-field.patch

···

       1
       1
       +
       

     

       2
       2
       +
       ---

     

       3
       3
       +
        tools/modinfo.c | 5 ++++-

     

       4
       4
       +
        1 file changed, 4 insertions(+), 1 deletion(-)

     

       5
       5
       +
       

     

       6
       6
       +
       diff --git a/tools/modinfo.c b/tools/modinfo.c

     

       7
       7
       +
       index 0231bb0..7b2259e 100644

     

       8
       8
       +
       --- a/tools/modinfo.c

     

       9
       9
       +
       +++ b/tools/modinfo.c

     

       10
       10
       +
       @@ -178,7 +178,10 @@ static int modinfo_do(struct kmod_module *mod)

     

       11
       11
       +
        	is_builtin = (filename == NULL);

     

       12
       12
       +
        

     

       13
       13
       +
        	if (is_builtin) {

     

       14
       14
       +
       -		printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator);

     

       15
       15
       +
       +		if (field == NULL || field != NULL && streq(field, "name")){

     

       16
       16
       +
       +			printf("%-16s%s%c", "name:",

     

       17
       17
       +
       +			       kmod_module_get_name(mod), separator);

     

       18
       18
       +
       +		}

     

       19
       19
       +
        		filename = "(builtin)";

     

       20
       20
       +
        	}

     

       21
       21
       +
        

     

       22
       22
       +
       -- 

     

       23
       23
       +
       2.28.0

     

       24
       24
       +

+4 -4

pkgs/servers/http/unit/default.nix

···

       3
       3
        
       , withPython3 ? true, python3, ncurses

     

       4
       4
        
       , withPHP73 ? false, php73

     

       5
       5
        
       , withPHP74 ? true, php74

     

       6
       6
       -
       , withPerl528 ? false, perl528

     

       7
       7
       -
       , withPerl530 ? true, perl530

     

       6
       6
       +
       , withPerl530 ? false, perl530

     

       7
       7
       +
       , withPerl532 ? true, perl532

     

       8
       8
        
       , withPerldevel ? false, perldevel

     

       9
       9
        
       , withRuby_2_5 ? false, ruby_2_5

     

       10
       10
        
       , withRuby_2_6 ? true, ruby_2_6

     
···

       47
       47
        
           ++ optionals withPython3 [ python3 ncurses ]

     

       48
       48
        
           ++ optional withPHP73 php73-unit

     

       49
       49
        
           ++ optional withPHP74 php74-unit

     

       50
       50
       -
           ++ optional withPerl528 perl528

     

       51
       50
        
           ++ optional withPerl530 perl530

     

       51
       51
       +
           ++ optional withPerl532 perl532

     

       52
       52
        
           ++ optional withPerldevel perldevel

     

       53
       53
        
           ++ optional withRuby_2_5 ruby_2_5

     

       54
       54
        
           ++ optional withRuby_2_6 ruby_2_6

     
···

       73
       73
        
           ${optionalString withPython3    "./configure python --module=python3  --config=python3-config  --lib-path=${python3}/lib"}

     

       74
       74
        
           ${optionalString withPHP73      "./configure php    --module=php73    --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"}

     

       75
       75
        
           ${optionalString withPHP74      "./configure php    --module=php74    --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}

     

       76
       76
       -
           ${optionalString withPerl528    "./configure perl   --module=perl528  --perl=${perl528}/bin/perl"}

     

       77
       76
        
           ${optionalString withPerl530    "./configure perl   --module=perl530  --perl=${perl530}/bin/perl"}

     

       77
       77
       +
           ${optionalString withPerl532    "./configure perl   --module=perl532  --perl=${perl532}/bin/perl"}

     

       78
       78
        
           ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}

     

       79
       79
        
           ${optionalString withRuby_2_5   "./configure ruby   --module=ruby25   --ruby=${ruby_2_5}/bin/ruby"}

     

       80
       80
        
           ${optionalString withRuby_2_6   "./configure ruby   --module=ruby26   --ruby=${ruby_2_6}/bin/ruby"}

+2 -2

pkgs/tools/admin/awscli/default.nix

···

       19
       19
        
       

     

       20
       20
        
       in with py.pkgs; buildPythonApplication rec {

     

       21
       21
        
         pname = "awscli";

     

       22
       22
       -
         version = "1.18.120"; # N.B: if you change this, change botocore to a matching version too

     

       22
       22
       +
         version = "1.18.128"; # N.B: if you change this, change botocore to a matching version too

     

       23
       23
        
       

     

       24
       24
        
         src = fetchPypi {

     

       25
       25
        
           inherit pname version;

     

       26
       26
       -
           sha256 = "3d21dcb0a17b8b623e7b7fd3528ede7d445c485fa4ca6cacfbaf4910a1d17944";

     

       26
       26
       +
           sha256 = "c146c1634edbedc32564c536afcaaaeedc3ecc5aa9db3cf64fe5870c1c1a2a32";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         postPatch = ''

-7

pkgs/tools/networking/unbound/default.nix

···

       9
       9
        
           sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         # https://github.com/NLnetLabs/unbound/pull/90

     

       13
       13
       -
         postPatch = ''

     

       14
       14
       -
           substituteInPlace validator/val_secalgo.c \

     

       15
       15
       -
             --replace '&nettle_secp_256r1' 'nettle_get_secp_256r1()' \

     

       16
       16
       -
             --replace '&nettle_secp_384r1' 'nettle_get_secp_384r1()'

     

       17
       17
       -
         '';

     

       18
       18
       -
       

     

       19
       12
        
         outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

     

       20
       13
        
       

     

       21
       14
        
         buildInputs = [ openssl nettle expat libevent ];

+2 -2

pkgs/tools/security/gnupg/22.nix

···

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "gnupg";

     

       18
       18
        
       

     

       19
       19
       -
         version = "2.2.21";

     

       19
       19
       +
         version = "2.2.23";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchurl {

     

       22
       22
        
           url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";

     

       23
       23
       -
           sha256 = "1v3nirp9m7yxjkkcdixibckl379pdyr3mdx8b1k379szzdw35s31";

     

       23
       23
       +
           sha256 = "0p6ss4f3vlkf91pmp27bmvfr5bdxxi0pb3dmxpqljglbsx4mxd8h";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

+45 -16

pkgs/top-level/all-packages.nix

···

       11553
       11553
        
         texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };

     

       11554
       11554
        
         texinfo4 = texinfo413;

     

       11555
       11555
        
         texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };

     

       11556
       11556
       -
         texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { };

     

       11557
       11557
       -
         texinfo = texinfo6;

     

       11556
       11556
       +
         texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { };

     

       11557
       11557
       +
         texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { };

     

       11558
       11558
       +
         # Temporarily use older version on Darwin until it works.

     

       11559
       11559
       +
         texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6;

     

       11558
       11560
        
         texinfoInteractive = appendToName "interactive" (

     

       11559
       11561
        
           texinfo.override { interactive = true; }

     

       11560
       11562
        
         );

     
···

       16044
       16046
        
         ### DEVELOPMENT / PERL MODULES

     

       16045
       16047
        
       

     

       16046
       16048
        
         perlInterpreters = callPackages ../development/interpreters/perl {};

     

       16047
       16047
       -
         inherit (perlInterpreters) perl528 perl530 perldevel;

     

       16049
       16049
       +
         inherit (perlInterpreters) perl530 perl532 perldevel;

     

       16048
       16050
        
       

     

       16049
       16049
       -
         perl528Packages = recurseIntoAttrs perl528.pkgs;

     

       16050
       16051
        
         perl530Packages = recurseIntoAttrs perl530.pkgs;

     

       16052
       16052
       +
         perl532Packages = recurseIntoAttrs perl532.pkgs;

     

       16051
       16053
        
         perldevelPackages = perldevel.pkgs;

     

       16052
       16054
        
       

     

       16053
       16053
       -
         perl = perl530;

     

       16054
       16054
       -
         perlPackages = perl530Packages;

     

       16055
       16055
       +
         perl = perl532;

     

       16056
       16056
       +
         perlPackages = perl532Packages;

     

       16055
       16057
        
       

     

       16056
       16058
        
         ack = perlPackages.ack;

     

       16057
       16059
        
       

     
···

       17235
       17237
        
       

     

       17236
       17238
        
         criu = callPackage ../os-specific/linux/criu { };

     

       17237
       17239
        
       

     

       17238
       17238
       -
         cryptsetup = callPackage ../os-specific/linux/cryptsetup {

     

       17239
       17239
       -
           # cryptsetup only really needs the devmapper component of cryptsetup

     

       17240
       17240
       -
           # but itself is used as a library in systemd (=udev)

     

       17241
       17241
       -
           lvm2 = lvm2.override { udev = null; };

     

       17242
       17242
       -
         };

     

       17240
       17240
       +
         cryptsetup = callPackage ../os-specific/linux/cryptsetup { };

     

       17243
       17241
        
       

     

       17244
       17242
        
         cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { };

     

       17245
       17243
        
       

     
···

       18021
       18019
        
       

     

       18022
       18020
        
         lsscsi = callPackage ../os-specific/linux/lsscsi { };

     

       18023
       18021
        
       

     

       18024
       18024
       -
         lvm2 = callPackage ../os-specific/linux/lvm2 { };

     

       18022
       18022
       +
         lvm2 = callPackage ../os-specific/linux/lvm2 {

     

       18023
       18023
       +
           # udev is the same package as systemd which depends on cryptsetup

     

       18024
       18024
       +
           # which depends on lvm2 again.  But we only need the libudev part

     

       18025
       18025
       +
           # which does not depend on cryptsetup.

     

       18026
       18026
       +
           udev = udev.override { cryptsetup = null; };

     

       18027
       18027
       +
         };

     

       18025
       18028
        
         lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 {

     

       18026
       18029
        
           enableDmeventd = true;

     

       18027
       18030
        
           enableCmdlib = true;

     
···

       21282
       21285
        
             recurseIntoAttrs (makeOverridable mkApplications attrs);

     

       21283
       21286
        
       

     

       21284
       21287
        
         inherit (kdeApplications)

     

       21285
       21285
       -
           akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b

     

       21286
       21286
       -
           kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog

     

       21287
       21287
       -
           keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake

     

       21288
       21288
       -
           kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;

     

       21288
       21288
       +
           akonadi akregator ark

     

       21289
       21289
       +
           bomber bovo

     

       21290
       21290
       +
           dolphin dragon

     

       21291
       21291
       +
           elisa

     

       21292
       21292
       +
           ffmpegthumbs filelight

     

       21293
       21293
       +
           granatier gwenview

     

       21294
       21294
       +
           k3b

     

       21295
       21295
       +
           kaddressbook kalzium kapptemplate kapman kate katomic

     

       21296
       21296
       +
           kblackbox kblocks kbounce

     

       21297
       21297
       +
           kcachegrind kcalc kcharselect kcolorchooser

     

       21298
       21298
       +
           kdenlive kdf kdialog kdiamond

     

       21299
       21299
       +
           keditbookmarks

     

       21300
       21300
       +
           kfind kfloppy

     

       21301
       21301
       +
           kget kgpg

     

       21302
       21302
       +
           khelpcenter

     

       21303
       21303
       +
           kig kigo killbots kitinerary

     

       21304
       21304
       +
           kleopatra klettres klines

     

       21305
       21305
       +
           kmag kmail kmines kmix kmplot

     

       21306
       21306
       +
           knavalbattle knetwalk knights

     

       21307
       21307
       +
           kollision kolourpaint kompare konsole kontact korganizer

     

       21308
       21308
       +
           kpkpass

     

       21309
       21309
       +
           krdc kreversi krfb

     

       21310
       21310
       +
           kshisen ksquares ksystemlog

     

       21311
       21311
       +
           kteatime ktimer ktouch kturtle

     

       21312
       21312
       +
           kwalletmanager kwave

     

       21313
       21313
       +
           marble minuet

     

       21314
       21314
       +
           okular

     

       21315
       21315
       +
           picmi

     

       21316
       21316
       +
           spectacle

     

       21317
       21317
       +
           yakuake;

     

       21289
       21318
        
       

     

       21290
       21319
        
         okteta = libsForQt5.callPackage ../applications/editors/okteta { };

     

       21291
       21320

+2 -2

pkgs/top-level/perl-packages.nix

···

       11
       11
        
       , perl, overrides, buildPerl, shortenPerlShebang

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       # cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.3 or above

     

       15
       15
       -
       assert stdenv.lib.versionAtLeast perl.version "5.28.3";

     

       14
       14
       +
       # cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above

     

       15
       15
       +
       assert stdenv.lib.versionAtLeast perl.version "5.30.3";

     

       16
       16
        
       let

     

       17
       17
        
         inherit (stdenv.lib) maintainers;

     

       18
       18
        
         self = _self // (overrides pkgs);