commit 81387c2e783a783368162af085984811727be538 · pyrox.dev/nixpkgs

+2 -2

doc/configuration.xml

···

       378
       378
        
           myPackages = pkgs.buildEnv {

     

       379
       379
        
             name = "my-packages";

     

       380
       380
        
             paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ];

     

       381
       381
       -
             pathsToLink = [ "/share/man" "/share/doc" /bin" ];

     

       381
       381
       +
             pathsToLink = [ "/share/man" "/share/doc" "/bin" ];

     

       382
       382
        
             extraOutputsToInstall = [ "man" "doc" ];

     

       383
       383
        
           };

     

       384
       384
        
         };

     
···

       416
       416
        
               nox

     

       417
       417
        
               silver-searcher

     

       418
       418
        
             ];

     

       419
       419
       -
             pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ];

     

       419
       419
       +
             pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];

     

       420
       420
        
             extraOutputsToInstall = [ "man" "doc" ];

     

       421
       421
        
           };

     

       422
       422
        
         };

+1 -9

lib/systems/examples.nix

···

       47
       47
        
       

     

       48
       48
        
         ben-nanonote = rec {

     

       49
       49
        
           config = "mipsel-unknown-linux-uclibc";

     

       50
       50
       -
           platform = {

     

       51
       51
       -
             name = "ben_nanonote";

     

       52
       52
       -
             kernelMajor = "2.6";

     

       53
       53
       -
             kernelArch = "mips";

     

       54
       54
       -
             gcc = {

     

       55
       55
       -
               arch = "mips32";

     

       56
       56
       -
               float = "soft";

     

       57
       57
       -
             };

     

       58
       58
       -
           };

     

       50
       50
       +
           platform = platforms.ben_nanonote;

     

       59
       51
        
         };

     

       60
       52
        
       

     

       61
       53
        
         fuloongminipc = rec {

+5

lib/systems/parse.nix

···

       79
       79
        
           armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };

     

       80
       80
        
           armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };

     

       81
       81
        
           aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };

     

       82
       82
       +
       

     

       82
       83
        
           i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };

     

       83
       84
        
           x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };

     

       85
       85
       +
       

     

       84
       86
        
           mips     = { bits = 32; significantByte = bigEndian;    family = "mips"; };

     

       85
       87
        
           mipsel   = { bits = 32; significantByte = littleEndian; family = "mips"; };

     

       86
       88
        
           mips64   = { bits = 64; significantByte = bigEndian;    family = "mips"; };

     

       87
       89
        
           mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };

     

       90
       90
       +
       

     

       88
       91
        
           powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };

     

       92
       92
       +
       

     

       89
       93
        
           riscv32  = { bits = 32; significantByte = littleEndian; family = "riscv"; };

     

       90
       94
        
           riscv64  = { bits = 64; significantByte = littleEndian; family = "riscv"; };

     

       95
       95
       +
       

     

       91
       96
        
           wasm32   = { bits = 32; significantByte = littleEndian; family = "wasm"; };

     

       92
       97
        
           wasm64   = { bits = 64; significantByte = littleEndian; family = "wasm"; };

     

       93
       98
        
         };

+100 -78

lib/systems/platforms.nix

···

       20
       20
        
           kernelAutoModules = false;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       +
         ##

     

       24
       24
       +
         ## ARM

     

       25
       25
       +
         ##

     

       26
       26
       +
       

     

       23
       27
        
         pogoplug4 = {

     

       24
       28
        
           name = "pogoplug4";

     

       25
       29
        
       

     
···

       372
       376
        
           kernelBaseConfig = "guruplug_defconfig";

     

       373
       377
        
         };

     

       374
       378
        
       

     

       375
       375
       -
         fuloong2f_n32 = {

     

       376
       376
       -
           name = "fuloong2f_n32";

     

       377
       377
       -
           kernelMajor = "2.6";

     

       378
       378
       -
           kernelBaseConfig = "lemote2f_defconfig";

     

       379
       379
       -
           kernelArch = "mips";

     

       380
       380
       -
           kernelAutoModules = false;

     

       381
       381
       -
           kernelExtraConfig = ''

     

       382
       382
       -
             MIGRATION n

     

       383
       383
       -
             COMPACTION n

     

       384
       384
       -
       

     

       385
       385
       -
             # nixos mounts some cgroup

     

       386
       386
       -
             CGROUPS y

     

       387
       387
       -
       

     

       388
       388
       -
             BLK_DEV_RAM y

     

       389
       389
       -
             BLK_DEV_INITRD y

     

       390
       390
       -
             BLK_DEV_CRYPTOLOOP m

     

       391
       391
       -
             BLK_DEV_DM m

     

       392
       392
       -
             DM_CRYPT m

     

       393
       393
       -
             MD y

     

       394
       394
       -
             REISERFS_FS m

     

       395
       395
       -
             EXT4_FS m

     

       396
       396
       -
             USB_STORAGE_CYPRESS_ATACB m

     

       397
       397
       -
       

     

       398
       398
       -
             IP_PNP y

     

       399
       399
       -
             IP_PNP_DHCP y

     

       400
       400
       -
             IP_PNP_BOOTP y

     

       401
       401
       -
             NFS_FS y

     

       402
       402
       -
             ROOT_NFS y

     

       403
       403
       -
             TUN m

     

       404
       404
       -
             NFS_V4 y

     

       405
       405
       -
             NFS_V4_1 y

     

       406
       406
       -
             NFS_FSCACHE y

     

       407
       407
       -
             NFSD m

     

       408
       408
       -
             NFSD_V2_ACL y

     

       409
       409
       -
             NFSD_V3 y

     

       410
       410
       -
             NFSD_V3_ACL y

     

       411
       411
       -
             NFSD_V4 y

     

       412
       412
       -
       

     

       413
       413
       -
             # Fail to build

     

       414
       414
       -
             DRM n

     

       415
       415
       -
             SCSI_ADVANSYS n

     

       416
       416
       -
             USB_ISP1362_HCD n

     

       417
       417
       -
             SND_SOC n

     

       418
       418
       -
             SND_ALI5451 n

     

       419
       419
       -
             FB_SAVAGE n

     

       420
       420
       -
             SCSI_NSP32 n

     

       421
       421
       -
             ATA_SFF n

     

       422
       422
       -
             SUNGEM n

     

       423
       423
       -
             IRDA n

     

       424
       424
       -
             ATM_HE n

     

       425
       425
       -
             SCSI_ACARD n

     

       426
       426
       -
             BLK_DEV_CMD640_ENHANCED n

     

       427
       427
       -
       

     

       428
       428
       -
             FUSE_FS m

     

       429
       429
       -
       

     

       430
       430
       -
             # Needed for udev >= 150

     

       431
       431
       -
             SYSFS_DEPRECATED_V2 n

     

       432
       432
       -
       

     

       433
       433
       -
             VGA_CONSOLE n

     

       434
       434
       -
             VT_HW_CONSOLE_BINDING y

     

       435
       435
       -
             SERIAL_8250_CONSOLE y

     

       436
       436
       -
             FRAMEBUFFER_CONSOLE y

     

       437
       437
       -
             EXT2_FS y

     

       438
       438
       -
             EXT3_FS y

     

       439
       439
       -
             REISERFS_FS y

     

       440
       440
       -
             MAGIC_SYSRQ y

     

       441
       441
       -
       

     

       442
       442
       -
             # The kernel doesn't boot at all, with FTRACE

     

       443
       443
       -
             FTRACE n

     

       444
       444
       -
           '';

     

       445
       445
       -
           kernelTarget = "vmlinux";

     

       446
       446
       -
           gcc = {

     

       447
       447
       -
             arch = "loongson2f";

     

       448
       448
       -
             float = "hard";

     

       449
       449
       -
             abi = "n32";

     

       450
       450
       -
           };

     

       451
       451
       -
         };

     

       452
       452
       -
       

     

       453
       379
        
         beaglebone = armv7l-hf-multiplatform // {

     

       454
       380
        
           name = "beaglebone";

     

       455
       381
        
           kernelBaseConfig = "bb.org_defconfig";

     
···

       536
       462
        
             arch = "armv8-a";

     

       537
       463
        
           };

     

       538
       464
        
         };

     

       465
       465
       +
       

     

       466
       466
       +
         ##

     

       467
       467
       +
         ## MIPS

     

       468
       468
       +
         ##

     

       469
       469
       +
       

     

       470
       470
       +
         ben_nanonote = {

     

       471
       471
       +
           name = "ben_nanonote";

     

       472
       472
       +
           kernelMajor = "2.6";

     

       473
       473
       +
           kernelArch = "mips";

     

       474
       474
       +
           gcc = {

     

       475
       475
       +
             arch = "mips32";

     

       476
       476
       +
             float = "soft";

     

       477
       477
       +
           };

     

       478
       478
       +
         };

     

       479
       479
       +
       

     

       480
       480
       +
         fuloong2f_n32 = {

     

       481
       481
       +
           name = "fuloong2f_n32";

     

       482
       482
       +
           kernelMajor = "2.6";

     

       483
       483
       +
           kernelBaseConfig = "lemote2f_defconfig";

     

       484
       484
       +
           kernelArch = "mips";

     

       485
       485
       +
           kernelAutoModules = false;

     

       486
       486
       +
           kernelExtraConfig = ''

     

       487
       487
       +
             MIGRATION n

     

       488
       488
       +
             COMPACTION n

     

       489
       489
       +
       

     

       490
       490
       +
             # nixos mounts some cgroup

     

       491
       491
       +
             CGROUPS y

     

       492
       492
       +
       

     

       493
       493
       +
             BLK_DEV_RAM y

     

       494
       494
       +
             BLK_DEV_INITRD y

     

       495
       495
       +
             BLK_DEV_CRYPTOLOOP m

     

       496
       496
       +
             BLK_DEV_DM m

     

       497
       497
       +
             DM_CRYPT m

     

       498
       498
       +
             MD y

     

       499
       499
       +
             REISERFS_FS m

     

       500
       500
       +
             EXT4_FS m

     

       501
       501
       +
             USB_STORAGE_CYPRESS_ATACB m

     

       502
       502
       +
       

     

       503
       503
       +
             IP_PNP y

     

       504
       504
       +
             IP_PNP_DHCP y

     

       505
       505
       +
             IP_PNP_BOOTP y

     

       506
       506
       +
             NFS_FS y

     

       507
       507
       +
             ROOT_NFS y

     

       508
       508
       +
             TUN m

     

       509
       509
       +
             NFS_V4 y

     

       510
       510
       +
             NFS_V4_1 y

     

       511
       511
       +
             NFS_FSCACHE y

     

       512
       512
       +
             NFSD m

     

       513
       513
       +
             NFSD_V2_ACL y

     

       514
       514
       +
             NFSD_V3 y

     

       515
       515
       +
             NFSD_V3_ACL y

     

       516
       516
       +
             NFSD_V4 y

     

       517
       517
       +
       

     

       518
       518
       +
             # Fail to build

     

       519
       519
       +
             DRM n

     

       520
       520
       +
             SCSI_ADVANSYS n

     

       521
       521
       +
             USB_ISP1362_HCD n

     

       522
       522
       +
             SND_SOC n

     

       523
       523
       +
             SND_ALI5451 n

     

       524
       524
       +
             FB_SAVAGE n

     

       525
       525
       +
             SCSI_NSP32 n

     

       526
       526
       +
             ATA_SFF n

     

       527
       527
       +
             SUNGEM n

     

       528
       528
       +
             IRDA n

     

       529
       529
       +
             ATM_HE n

     

       530
       530
       +
             SCSI_ACARD n

     

       531
       531
       +
             BLK_DEV_CMD640_ENHANCED n

     

       532
       532
       +
       

     

       533
       533
       +
             FUSE_FS m

     

       534
       534
       +
       

     

       535
       535
       +
             # Needed for udev >= 150

     

       536
       536
       +
             SYSFS_DEPRECATED_V2 n

     

       537
       537
       +
       

     

       538
       538
       +
             VGA_CONSOLE n

     

       539
       539
       +
             VT_HW_CONSOLE_BINDING y

     

       540
       540
       +
             SERIAL_8250_CONSOLE y

     

       541
       541
       +
             FRAMEBUFFER_CONSOLE y

     

       542
       542
       +
             EXT2_FS y

     

       543
       543
       +
             EXT3_FS y

     

       544
       544
       +
             REISERFS_FS y

     

       545
       545
       +
             MAGIC_SYSRQ y

     

       546
       546
       +
       

     

       547
       547
       +
             # The kernel doesn't boot at all, with FTRACE

     

       548
       548
       +
             FTRACE n

     

       549
       549
       +
           '';

     

       550
       550
       +
           kernelTarget = "vmlinux";

     

       551
       551
       +
           gcc = {

     

       552
       552
       +
             arch = "loongson2f";

     

       553
       553
       +
             float = "hard";

     

       554
       554
       +
             abi = "n32";

     

       555
       555
       +
           };

     

       556
       556
       +
         };

     

       557
       557
       +
       

     

       558
       558
       +
         ##

     

       559
       559
       +
         ## Other

     

       560
       560
       +
         ##

     

       539
       561
        
       

     

       540
       562
        
         riscv-multiplatform = bits: {

     

       541
       563
        
           name = "riscv-multiplatform";

+3 -2

pkgs/applications/graphics/gimp/default.nix

···

       43
       43
        
         nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];

     

       44
       44
        
         propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc

     

       45
       45
        
         buildInputs = [

     

       46
       46
       -
           babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev

     

       46
       46
       +
           babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes

     

       47
       47
        
           freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr

     

       48
       48
        
           libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp

     

       49
       49
        
           python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes

     

       50
       50
       -
         ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];

     

       50
       50
       +
         ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]

     

       51
       51
       +
           ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];

     

       51
       52
        
       

     

       52
       53
        
         pythonPath = [ pygtk ];

     

       53
       54

+2 -2

pkgs/applications/misc/hstr/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name    = "hstr-${version}";

     

       5
       5
       -
         version = "1.24";

     

       5
       5
       +
         version = "1.25";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";

     

       9
       9
       -
           sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x";

     

       9
       9
       +
           sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ readline ncurses ];

+2 -2

pkgs/applications/misc/kitty/default.nix

···

       5
       5
        
       

     

       6
       6
        
       with python3Packages;

     

       7
       7
        
       buildPythonApplication rec {

     

       8
       8
       -
         version = "0.9.0";

     

       8
       8
       +
         version = "0.9.1";

     

       9
       9
        
         name = "kitty-${version}";

     

       10
       10
        
         format = "other";

     

       11
       11
        
       

     
···

       13
       13
        
           owner = "kovidgoyal";

     

       14
       14
        
           repo = "kitty";

     

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

     

       16
       16
       -
           sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8";

     

       16
       16
       +
           sha256 = "08j2k3852c64z4mgh1j0dgdj6c2alkckpav67lzg1lxsz3w2izh2";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

+3 -3

pkgs/development/libraries/openmpi/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
       -
         majorVersion = "3.0";

     

       12
       12
       -
         minorVersion = "1";

     

       11
       11
       +
         majorVersion = "3.1";

     

       12
       12
       +
         minorVersion = "0";

     

       13
       13
        
       

     

       14
       14
        
       in stdenv.mkDerivation rec {

     

       15
       15
        
         name = "openmpi-${majorVersion}.${minorVersion}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";

     

       19
       19
       -
           sha256 = "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36";

     

       19
       19
       +
           sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+27

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pythonOlder

     

       2
       2
       +
       , attrs

     

       3
       3
       +
       , pytest

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "outcome";

     

       8
       8
       +
         version = "0.1.0a0";

     

       9
       9
       +
         disabled = pythonOlder "3.4";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ pytest ];

     

       17
       17
       +
         propagatedBuildInputs = [ attrs ];

     

       18
       18
       +
         # Has a test dependency on trio, which depends on outcome.

     

       19
       19
       +
         doCheck = false;

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           description = "Capture the outcome of Python function calls.";

     

       23
       23
       +
           homepage = https://github.com/python-trio/outcome;

     

       24
       24
       +
           license = with lib.licenses; [ mit asl20 ];

     

       25
       25
       +
           maintainers = with lib.maintainers; [ catern ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+42

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pythonOlder

     

       2
       2
       +
       , attrs

     

       3
       3
       +
       , sortedcontainers

     

       4
       4
       +
       , async_generator

     

       5
       5
       +
       , idna

     

       6
       6
       +
       , outcome

     

       7
       7
       +
       , contextvars

     

       8
       8
       +
       , pytest

     

       9
       9
       +
       , pyopenssl

     

       10
       10
       +
       , trustme

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "trio";

     

       15
       15
       +
         version = "0.4.0";

     

       16
       16
       +
         disabled = pythonOlder "3.5";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchPypi {

     

       19
       19
       +
           inherit pname version;

     

       20
       20
       +
           sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         checkInputs = [ pytest pyopenssl trustme ];

     

       24
       24
       +
         # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.

     

       25
       25
       +
         checkPhase = ''

     

       26
       26
       +
           py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname'

     

       27
       27
       +
         '';

     

       28
       28
       +
         propagatedBuildInputs = [

     

       29
       29
       +
           attrs

     

       30
       30
       +
           sortedcontainers

     

       31
       31
       +
           async_generator

     

       32
       32
       +
           idna

     

       33
       33
       +
           outcome

     

       34
       34
       +
         ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];

     

       35
       35
       +
       

     

       36
       36
       +
         meta = {

     

       37
       37
       +
           description = "An async/await-native I/O library for humans and snake people";

     

       38
       38
       +
           homepage = https://github.com/python-trio/trio;

     

       39
       39
       +
           license = with lib.licenses; [ mit asl20 ];

     

       40
       40
       +
           maintainers = with lib.maintainers; [ catern ];

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+26

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, cryptography, pytest, pyopenssl, service-identity }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "trustme";

     

       5
       5
       +
         version = "0.4.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         checkInputs = [ pytest pyopenssl service-identity ];

     

       13
       13
       +
         checkPhase = ''

     

       14
       14
       +
           py.test

     

       15
       15
       +
         '';

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           cryptography

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = {

     

       21
       21
       +
           description = "#1 quality TLS certs while you wait, for the discerning tester";

     

       22
       22
       +
           homepage = https://github.com/python-trio/trustme;

     

       23
       23
       +
           license = with lib.licenses; [ mit asl20 ];

     

       24
       24
       +
           maintainers = with lib.maintainers; [ catern ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+5 -8

pkgs/os-specific/linux/fuse/common.nix

···

       1
       1
       -
       { version, sha256Hash, maintainers }:

     

       1
       1
       +
       { version, sha256Hash }:

     

       2
       2
        
       

     

       3
       3
        
       { stdenv, fetchFromGitHub, fetchpatch

     

       4
       4
        
       , fusePackages, utillinux, gettext

     
···

       28
       28
        
               url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";

     

       29
       29
        
               sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";

     

       30
       30
        
             })

     

       31
       31
       -
           ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch

     

       32
       32
       -
           # TODO: Only relevant for 3.2.2 (opened an upstream issue)

     

       33
       33
       -
           ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch;

     

       34
       34
       -
       

     

       31
       31
       +
           ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;

     

       35
       32
        
       

     

       36
       33
        
         nativeBuildInputs = if isFuse3

     

       37
       34
        
           then [ meson ninja pkgconfig ]

     
···

       76
       73
        
       

     

       77
       74
        
         enableParallelBuilding = true;

     

       78
       75
        
       

     

       79
       79
       -
         meta = {

     

       76
       76
       +
         meta = with stdenv.lib; {

     

       80
       77
        
           inherit (src.meta) homepage;

     

       81
       78
        
           description = "Kernel module and library that allows filesystems to be implemented in user space";

     

       82
       82
       -
           platforms = stdenv.lib.platforms.linux;

     

       83
       83
       -
           inherit maintainers;

     

       79
       79
       +
           platforms = platforms.linux;

     

       80
       80
       +
           maintainers = [ maintainers.primeos ];

     

       84
       81
        
         };

     

       85
       82
        
       }

+2 -5

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

···

       4
       4
        
         mkFuse = args: callPackage (import ./common.nix args) {

     

       5
       5
        
           inherit utillinux;

     

       6
       6
        
         };

     

       7
       7
       -
         maintainers = stdenv.lib.maintainers;

     

       8
       7
        
       in {

     

       9
       8
        
         fuse_2 = mkFuse {

     

       10
       9
        
           version = "2.9.7";

     

       11
       10
        
           sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";

     

       12
       12
       -
           maintainers = [ ];

     

       13
       11
        
         };

     

       14
       12
        
       

     

       15
       13
        
         fuse_3 = mkFuse {

     

       16
       16
       -
           version = "3.2.2";

     

       17
       17
       -
           sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh";

     

       18
       18
       -
           maintainers = [ maintainers.primeos ];

     

       14
       14
       +
           version = "3.2.3";

     

       15
       15
       +
           sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d";

     

       19
       16
        
         };

     

       20
       17
        
       }

-8

pkgs/os-specific/linux/fuse/fuse3-fix-version.patch

···

       1
       1
       -
       --- a/meson.build	2018-04-01 01:05:19.612723597 +0200

     

       2
       2
       -
       +++ b/meson.build	2018-04-01 01:40:58.171109615 +0200

     

       3
       3
       -
       @@ -1,4 +1,4 @@

     

       4
       4
       -
       -project('libfuse3', 'c', version: '3.2.1',

     

       5
       5
       -
       +project('libfuse3', 'c', version: '3.2.2',

     

       6
       6
       -
                meson_version: '>= 0.38',

     

       7
       7
       -
                default_options: [ 'buildtype=debugoptimized' ])

     

       8
       8
       -

+2 -2

pkgs/tools/misc/powerline-go/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "powerline-go";

     

       5
       5
       -
         version = "1.10.0";

     

       5
       5
       +
         version = "1.11.0";

     

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

     

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

     

       8
       8
        
       

     
···

       12
       12
        
           owner = "justjanne";

     

       13
       13
        
           repo = pname;

     

       14
       14
        
           inherit rev;

     

       15
       15
       -
           sha256 = "1bmgim61cx6i4m24a474nm3w4zqjflm0wnw3y24299n9dj14izs3";

     

       15
       15
       +
           sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         goDeps = ./deps.nix;

+8 -8

pkgs/tools/misc/powerline-go/deps.nix

···

       14
       14
        
           fetch = {

     

       15
       15
        
             type = "git";

     

       16
       16
        
             url = "https://github.com/shirou/gopsutil";

     

       17
       17
       -
             rev = "63047d776e07105e370af46ecbd0ae96850f5ef2";

     

       18
       18
       -
             sha256 = "0204f0gx3fd8ya6rb478a7a4gr2v4i3m71148iv3jrdfvr5q5aaw";

     

       17
       17
       +
             rev = "57f370e13068146efe1cb7129f79e5d51da8a242";

     

       18
       18
       +
             sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";

     

       19
       19
        
           };

     

       20
       20
        
         }

     

       21
       21
        
         {

     
···

       23
       23
        
           fetch = {

     

       24
       24
        
             type = "git";

     

       25
       25
        
             url = "https://go.googlesource.com/crypto";

     

       26
       26
       -
             rev = "2b6c08872f4b66da917bb4ce98df4f0307330f78";

     

       27
       27
       -
             sha256 = "07wgdhs7ac3qmx0lfr4zazg2l159jqbwmn7jx49rr9811vivl1yh";

     

       26
       26
       +
             rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226";

     

       27
       27
       +
             sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw";

     

       28
       28
        
           };

     

       29
       29
        
         }

     

       30
       30
        
         {

     
···

       32
       32
        
           fetch = {

     

       33
       33
        
             type = "git";

     

       34
       34
        
             url = "https://go.googlesource.com/sys";

     

       35
       35
       -
             rev = "79b0c6888797020a994db17c8510466c72fe75d9";

     

       36
       36
       -
             sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";

     

       35
       35
       +
             rev = "9950ad118b73f9207b991f01920a3509c68f7f2b";

     

       36
       36
       +
             sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja";

     

       37
       37
        
           };

     

       38
       38
        
         }

     

       39
       39
        
         {

     
···

       41
       41
        
           fetch = {

     

       42
       42
        
             type = "git";

     

       43
       43
        
             url = "https://go.googlesource.com/text";

     

       44
       44
       -
             rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";

     

       45
       45
       -
             sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";

     

       44
       44
       +
             rev = "7dd2c8130f5e924233f5543598300651c386d431";

     

       45
       45
       +
             sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg";

     

       46
       46
        
           };

     

       47
       47
        
         }

     

       48
       48
        
         {

+6

pkgs/top-level/python-packages.nix

···

       303
       303
        
       

     

       304
       304
        
         oauthenticator = callPackage ../development/python-modules/oauthenticator { };

     

       305
       305
        
       

     

       306
       306
       +
         outcome = callPackage ../development/python-modules/outcome {};

     

       307
       307
       +
       

     

       306
       308
        
         plantuml = callPackage ../tools/misc/plantuml { };

     

       307
       309
        
       

     

       308
       310
        
         Pmw = callPackage ../development/python-modules/Pmw { };

     
···

       435
       437
        
         tables = callPackage ../development/python-modules/tables {

     

       436
       438
        
           hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };

     

       437
       439
        
         };

     

       440
       440
       +
       

     

       441
       441
       +
         trustme = callPackage ../development/python-modules/trustme {};

     

       442
       442
       +
       

     

       443
       443
       +
         trio = callPackage ../development/python-modules/trio {};

     

       438
       444
        
       

     

       439
       445
        
         tokenserver = callPackage ../development/python-modules/tokenserver {};

     

       440
       446