commit e30742adc3e699ec40ccc73d2d44fef5a1c0fbaa · pyrox.dev/nixpkgs

+72 -6

nixos/lib/make-disk-image.nix

···

       15
        
       

     

       16
        
       , # size of the boot partition, is only used if partitionTableType is

     

       17
        
         # either "efi" or "hybrid"

     

       0
        
       
     

       0
        
       
     

       18
        
         bootSize ? "256M"

     

       19
        
       

     

       20
        
       , # The files and directories to be placed in the target file system.

     
···

       163
        
       

     

       164
        
         closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; };

     

       165
        
       

     

       0
        
       
     

       0
        
       
     

       166
        
         prepareImage = ''

     

       167
        
           export PATH=${binPath}

     

       168
        
       

     
···

       173
        
       

     

       174
        
           sectorsToBytes() {

     

       175
        
             echo $(( "$1" * 512  ))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       176
        
           }

     

       177
        
       

     

       178
        
           mkdir $out

     
···

       235
        
       

     

       236
        
           ${if diskSize == "auto" then ''

     

       237
        
             ${if partitionTableType == "efi" || partitionTableType == "hybrid" then ''

     

       238
       -
               additionalSpace=$(( ($(numfmt --from=iec '${additionalSpace}') + $(numfmt --from=iec '${bootSize}')) / 1000 ))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       239
        
             '' else ''

     

       240
       -
               additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') / 1000 ))

     

       241
        
             ''}

     

       242
       -
             diskSize=$(( $(set -- $(du -d0 $root); echo "$1") + $additionalSpace ))

     

       243
       -
             truncate -s "$diskSize"K $diskImage

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       244
        
           '' else ''

     

       245
        
             truncate -s ${toString diskSize}M $diskImage

     

       246
        
           ''}

     
···

       251
        
             # Get start & length of the root partition in sectors to $START and $SECTORS.

     

       252
        
             eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs)

     

       253
        
       

     

       254
       -
             mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K

     

       255
        
           '' else ''

     

       256
       -
             mkfs.${fsType} -F -L ${label} $diskImage

     

       257
        
           ''}

     

       258
        
       

     

       259
        
           echo "copying staging root to image..."

     
···

       283
        
             # Some tools assume these exist

     

       284
        
             ln -s vda /dev/xvda

     

       285
        
             ln -s vda /dev/sda

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       286
        
       

     

       287
        
             mountPoint=/mnt

     

       288
        
             mkdir $mountPoint

···

       15
        
       

     

       16
        
       , # size of the boot partition, is only used if partitionTableType is

     

       17
        
         # either "efi" or "hybrid"

     

       18
       +
         # This will be undersized slightly, as this is actually the offset of

     

       19
       +
         # the end of the partition. Generally it will be 1MiB smaller.

     

       20
        
         bootSize ? "256M"

     

       21
        
       

     

       22
        
       , # The files and directories to be placed in the target file system.

     
···

       165
        
       

     

       166
        
         closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; };

     

       167
        
       

     

       168
       +
         blockSize = toString (4 * 1024); # ext4fs block size (not block device sector size)

     

       169
       +
       

     

       170
        
         prepareImage = ''

     

       171
        
           export PATH=${binPath}

     

       172
        
       

     
···

       177
        
       

     

       178
        
           sectorsToBytes() {

     

       179
        
             echo $(( "$1" * 512  ))

     

       180
       +
           }

     

       181
       +
       

     

       182
       +
           # Given lines of numbers, adds them together

     

       183
       +
           sum_lines() {

     

       184
       +
             local acc=0

     

       185
       +
             while read -r number; do

     

       186
       +
               acc=$((acc+number))

     

       187
       +
             done

     

       188
       +
             echo "$acc"

     

       189
       +
           }

     

       190
       +
       

     

       191
       +
           mebibyte=$(( 1024 * 1024 ))

     

       192
       +
       

     

       193
       +
           # Approximative percentage of reserved space in an ext4 fs over 512MiB.

     

       194
       +
           # 0.05208587646484375

     

       195
       +
           #  × 1000, integer part: 52

     

       196
       +
           compute_fudge() {

     

       197
       +
             echo $(( $1 * 52 / 1000 ))

     

       198
        
           }

     

       199
        
       

     

       200
        
           mkdir $out

     
···

       257
        
       

     

       258
        
           ${if diskSize == "auto" then ''

     

       259
        
             ${if partitionTableType == "efi" || partitionTableType == "hybrid" then ''

     

       260
       +
               # Add the GPT at the end

     

       261
       +
               gptSpace=$(( 512 * 34 * 1 ))

     

       262
       +
               # Normally we'd need to account for alignment and things, if bootSize

     

       263
       +
               # represented the actual size of the boot partition. But it instead

     

       264
       +
               # represents the offset at which it ends.

     

       265
       +
               # So we know bootSize is the reserved space in front of the partition.

     

       266
       +
               reservedSpace=$(( gptSpace + $(numfmt --from=iec '${bootSize}') ))

     

       267
       +
             '' else if partitionTableType == "legacy+gpt" then ''

     

       268
       +
               # Add the GPT at the end

     

       269
       +
               gptSpace=$(( 512 * 34 * 1 ))

     

       270
       +
               # And include the bios_grub partition; the ext4 partition starts at 2MB exactly.

     

       271
       +
               reservedSpace=$(( gptSpace + 2 * mebibyte ))

     

       272
       +
             '' else if partitionTableType == "legacy" then ''

     

       273
       +
               # Add the 1MiB aligned reserved space (includes MBR)

     

       274
       +
               reservedSpace=$(( mebibyte ))

     

       275
        
             '' else ''

     

       276
       +
               reservedSpace=0

     

       277
        
             ''}

     

       278
       +
             additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace ))

     

       279
       +
       

     

       280
       +
             # Compute required space in filesystem blocks

     

       281
       +
             diskUsage=$(find . ! -type d -exec 'du' '--apparent-size' '--block-size' "${blockSize}" '{}' ';' | cut -f1 | sum_lines)

     

       282
       +
             # Each inode takes space!

     

       283
       +
             numInodes=$(find . | wc -l)

     

       284
       +
             # Convert to bytes, inodes take two blocks each!

     

       285
       +
             diskUsage=$(( (diskUsage + 2 * numInodes) * ${blockSize} ))

     

       286
       +
             # Then increase the required space to account for the reserved blocks.

     

       287
       +
             fudge=$(compute_fudge $diskUsage)

     

       288
       +
             requiredFilesystemSpace=$(( diskUsage + fudge ))

     

       289
       +
       

     

       290
       +
             diskSize=$(( requiredFilesystemSpace  + additionalSpace ))

     

       291
       +
       

     

       292
       +
             # Round up to the nearest mebibyte.

     

       293
       +
             # This ensures whole 512 bytes sector sizes in the disk image

     

       294
       +
             # and helps towards aligning partitions optimally.

     

       295
       +
             if (( diskSize % mebibyte )); then

     

       296
       +
               diskSize=$(( ( diskSize / mebibyte + 1) * mebibyte ))

     

       297
       +
             fi

     

       298
       +
       

     

       299
       +
             truncate -s "$diskSize" $diskImage

     

       300
       +
       

     

       301
       +
             printf "Automatic disk size...\n"

     

       302
       +
             printf "  Closure space use: %d bytes\n" $diskUsage

     

       303
       +
             printf "  fudge: %d bytes\n" $fudge

     

       304
       +
             printf "  Filesystem size needed: %d bytes\n" $requiredFilesystemSpace

     

       305
       +
             printf "  Additional space: %d bytes\n" $additionalSpace

     

       306
       +
             printf "  Disk image size: %d bytes\n" $diskSize

     

       307
        
           '' else ''

     

       308
        
             truncate -s ${toString diskSize}M $diskImage

     

       309
        
           ''}

     
···

       314
        
             # Get start & length of the root partition in sectors to $START and $SECTORS.

     

       315
        
             eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs)

     

       316
        
       

     

       317
       +
             mkfs.${fsType} -b ${blockSize} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K

     

       318
        
           '' else ''

     

       319
       +
             mkfs.${fsType} -b ${blockSize} -F -L ${label} $diskImage

     

       320
        
           ''}

     

       321
        
       

     

       322
        
           echo "copying staging root to image..."

     
···

       346
        
             # Some tools assume these exist

     

       347
        
             ln -s vda /dev/xvda

     

       348
        
             ln -s vda /dev/sda

     

       349
       +
             # make systemd-boot find ESP without udev

     

       350
       +
             mkdir /dev/block

     

       351
       +
             ln -s /dev/vda1 /dev/block/254:1

     

       352
        
       

     

       353
        
             mountPoint=/mnt

     

       354
        
             mkdir $mountPoint

-1

nixos/maintainers/scripts/cloudstack/cloudstack-image.nix

···

       10
        
       

     

       11
        
         system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {

     

       12
        
           inherit lib config pkgs;

     

       13
       -
           diskSize = 8192;

     

       14
        
           format = "qcow2";

     

       15
        
           configFile = pkgs.writeText "configuration.nix"

     

       16
        
             ''

···

       10
        
       

     

       11
        
         system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {

     

       12
        
           inherit lib config pkgs;

     

       0
        
       
     

       13
        
           format = "qcow2";

     

       14
        
           configFile = pkgs.writeText "configuration.nix"

     

       15
        
             ''

+3 -2

nixos/maintainers/scripts/ec2/amazon-image.nix

···

       40
        
           };

     

       41
        
       

     

       42
        
           sizeMB = mkOption {

     

       43
       -
             type = types.int;

     

       44
       -
             default = if config.ec2.hvm then 2048 else 8192;

     

       0
        
       
     

       45
        
             description = "The size in MB of the image";

     

       46
        
           };

     

       47

···

       40
        
           };

     

       41
        
       

     

       42
        
           sizeMB = mkOption {

     

       43
       +
             type = with types; either (enum [ "auto" ]) int;

     

       44
       +
             default = "auto";

     

       45
       +
             example = 8192;

     

       46
        
             description = "The size in MB of the image";

     

       47
        
           };

     

       48

+1 -1

nixos/maintainers/scripts/openstack/openstack-image.nix

···

       12
        
       

     

       13
        
         system.build.openstackImage = import ../../../lib/make-disk-image.nix {

     

       14
        
           inherit lib config;

     

       0
        
       
     

       15
        
           pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package

     

       16
       -
           diskSize = 8192;

     

       17
        
           format = "qcow2";

     

       18
        
           configFile = pkgs.writeText "configuration.nix"

     

       19
        
             ''

···

       12
        
       

     

       13
        
         system.build.openstackImage = import ../../../lib/make-disk-image.nix {

     

       14
        
           inherit lib config;

     

       15
       +
           additionalSpace = "1024M";

     

       16
        
           pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package

     

       0
        
       
     

       17
        
           format = "qcow2";

     

       18
        
           configFile = pkgs.writeText "configuration.nix"

     

       19
        
             ''

+3 -2

nixos/modules/virtualisation/azure-image.nix

···

       9
        
       

     

       10
        
         options = {

     

       11
        
           virtualisation.azureImage.diskSize = mkOption {

     

       12
       -
             type = with types; int;

     

       13
       -
             default = 2048;

     

       0
        
       
     

       14
        
             description = ''

     

       15
        
               Size of disk image. Unit is MB.

     

       16
        
             '';

···

       9
        
       

     

       10
        
         options = {

     

       11
        
           virtualisation.azureImage.diskSize = mkOption {

     

       12
       +
             type = with types; either (enum [ "auto" ]) int;

     

       13
       +
             default = "auto";

     

       14
       +
             example = 2048;

     

       15
        
             description = ''

     

       16
        
               Size of disk image. Unit is MB.

     

       17
        
             '';

+3 -2

nixos/modules/virtualisation/digital-ocean-image.nix

···

       10
        
       

     

       11
        
         options = {

     

       12
        
           virtualisation.digitalOceanImage.diskSize = mkOption {

     

       13
       -
             type = with types; int;

     

       14
       -
             default = 4096;

     

       0
        
       
     

       15
        
             description = ''

     

       16
        
               Size of disk image. Unit is MB.

     

       17
        
             '';

···

       10
        
       

     

       11
        
         options = {

     

       12
        
           virtualisation.digitalOceanImage.diskSize = mkOption {

     

       13
       +
             type = with types; either (enum [ "auto" ]) int;

     

       14
       +
             default = "auto";

     

       15
       +
             example = 4096;

     

       16
        
             description = ''

     

       17
        
               Size of disk image. Unit is MB.

     

       18
        
             '';

+3 -2

nixos/modules/virtualisation/google-compute-image.nix

···

       18
        
       

     

       19
        
         options = {

     

       20
        
           virtualisation.googleComputeImage.diskSize = mkOption {

     

       21
       -
             type = with types; int;

     

       22
       -
             default = 1536;

     

       0
        
       
     

       23
        
             description = ''

     

       24
        
               Size of disk image. Unit is MB.

     

       25
        
             '';

···

       18
        
       

     

       19
        
         options = {

     

       20
        
           virtualisation.googleComputeImage.diskSize = mkOption {

     

       21
       +
             type = with types; either (enum [ "auto" ]) int;

     

       22
       +
             default = "auto";

     

       23
       +
             example = 1536;

     

       24
        
             description = ''

     

       25
        
               Size of disk image. Unit is MB.

     

       26
        
             '';

+3 -2

nixos/modules/virtualisation/hyperv-image.nix

···

       9
        
         options = {

     

       10
        
           hyperv = {

     

       11
        
             baseImageSize = mkOption {

     

       12
       -
               type = types.int;

     

       13
       -
               default = 2048;

     

       0
        
       
     

       14
        
               description = ''

     

       15
        
                 The size of the hyper-v base image in MiB.

     

       16
        
               '';

···

       9
        
         options = {

     

       10
        
           hyperv = {

     

       11
        
             baseImageSize = mkOption {

     

       12
       +
               type = with types; either (enum [ "auto" ]) int;

     

       13
       +
               default = "auto";

     

       14
       +
               example = 2048;

     

       15
        
               description = ''

     

       16
        
                 The size of the hyper-v base image in MiB.

     

       17
        
               '';

+3 -2

nixos/modules/virtualisation/virtualbox-image.nix

···

       11
        
         options = {

     

       12
        
           virtualbox = {

     

       13
        
             baseImageSize = mkOption {

     

       14
       -
               type = types.int;

     

       15
       -
               default = 50 * 1024;

     

       0
        
       
     

       16
        
               description = ''

     

       17
        
                 The size of the VirtualBox base image in MiB.

     

       18
        
               '';

···

       11
        
         options = {

     

       12
        
           virtualbox = {

     

       13
        
             baseImageSize = mkOption {

     

       14
       +
               type = with types; either (enum [ "auto" ]) int;

     

       15
       +
               default = "auto";

     

       16
       +
               example = 50 * 1024;

     

       17
        
               description = ''

     

       18
        
                 The size of the VirtualBox base image in MiB.

     

       19
        
               '';

+3 -2

nixos/modules/virtualisation/vmware-image.nix

···

       18
        
         options = {

     

       19
        
           vmware = {

     

       20
        
             baseImageSize = mkOption {

     

       21
       -
               type = types.int;

     

       22
       -
               default = 2048;

     

       0
        
       
     

       23
        
               description = ''

     

       24
        
                 The size of the VMWare base image in MiB.

     

       25
        
               '';

···

       18
        
         options = {

     

       19
        
           vmware = {

     

       20
        
             baseImageSize = mkOption {

     

       21
       +
               type = with types; either (enum [ "auto" ]) int;

     

       22
       +
               default = "auto";

     

       23
       +
               example = 2048;

     

       24
        
               description = ''

     

       25
        
                 The size of the VMWare base image in MiB.

     

       26
        
               '';

+2 -2

pkgs/applications/audio/flacon/default.nix

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "flacon";

     

       7
       -
         version = "6.1.0";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "flacon";

     

       11
        
           repo = "flacon";

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "flacon";

     

       7
       +
         version = "7.0.1";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "flacon";

     

       11
        
           repo = "flacon";

     

       12
        
           rev = "v${version}";

     

       13
       +
           sha256 = "sha256-35tARJkyhC8EisIyDCwuT/UUruzLjJRUuZysuqeNssM=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

+69

pkgs/applications/audio/mousai/default.nix

···

       1
       +
       { lib

     

       2
       +
       , python3

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , appstream-glib

     

       5
       +
       , desktop-file-utils

     

       6
       +
       , gettext

     

       7
       +
       , glib

     

       8
       +
       , gobject-introspection

     

       9
       +
       , gst_all_1

     

       10
       +
       , gtk3

     

       11
       +
       , libhandy

     

       12
       +
       , librsvg

     

       13
       +
       , meson

     

       14
       +
       , ninja

     

       15
       +
       , pkg-config

     

       16
       +
       , wrapGAppsHook

     

       17
       +
       }:

     

       18
       +
       

     

       19
       +
       python3.pkgs.buildPythonApplication rec {

     

       20
       +
         pname = "mousai";

     

       21
       +
         version = "0.3.1";

     

       22
       +
       

     

       23
       +
         format = "other";

     

       24
       +
       

     

       25
       +
         src = fetchFromGitHub {

     

       26
       +
           owner = "SeaDve";

     

       27
       +
           repo = "Mousai";

     

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

     

       29
       +
           sha256 = "0x57dci0prhlj79h74yh79cazn48rn0bckz5j3z4njk4fwc3fvfx";

     

       30
       +
         };

     

       31
       +
       

     

       32
       +
         postPatch = ''

     

       33
       +
           patchShebangs build-aux/meson

     

       34
       +
         '';

     

       35
       +
       

     

       36
       +
         nativeBuildInputs = [

     

       37
       +
           appstream-glib

     

       38
       +
           desktop-file-utils

     

       39
       +
           gettext

     

       40
       +
           glib

     

       41
       +
           gtk3

     

       42
       +
           meson

     

       43
       +
           ninja

     

       44
       +
           pkg-config

     

       45
       +
           wrapGAppsHook

     

       46
       +
         ];

     

       47
       +
       

     

       48
       +
         buildInputs = [

     

       49
       +
           gobject-introspection

     

       50
       +
           gst_all_1.gstreamer

     

       51
       +
           gst_all_1.gst-plugins-base

     

       52
       +
           gst_all_1.gst-plugins-good

     

       53
       +
           gtk3

     

       54
       +
           libhandy

     

       55
       +
           librsvg

     

       56
       +
         ];

     

       57
       +
       

     

       58
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       59
       +
           pygobject3

     

       60
       +
           requests

     

       61
       +
         ];

     

       62
       +
       

     

       63
       +
         meta = with lib; {

     

       64
       +
           description = "Identify any songs in seconds";

     

       65
       +
           homepage = "https://github.com/SeaDve/Mousai";

     

       66
       +
           license = licenses.gpl3Plus;

     

       67
       +
           maintainers = with maintainers; [ dotlambda ];

     

       68
       +
         };

     

       69
       +
       }

+24 -24

pkgs/applications/editors/eclipse/default.nix

···

       12
        
       # find the downloads needed for new versions

     

       13
        
       #

     

       14
        
       # to test:

     

       15
       -
       # $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done

     

       16
        
       

     

       17
        
       let

     

       18
        
         platform_major = "4";

     

       19
       -
         platform_minor = "18";

     

       20
       -
         year = "2020";

     

       21
       -
         month = "12";

     

       22
       -
         timestamp = "${year}${month}021800";

     

       23
        
         gtk = gtk3;

     

       24
        
       in rec {

     

       25
        
       

     
···

       37
        
           src =

     

       38
        
             fetchurl {

     

       39
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       40
       -
               sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ==";

     

       41
        
             };

     

       42
        
         };

     

       43
        
       

     
···

       49
        
           src =

     

       50
        
             fetchurl {

     

       51
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       52
       -
               sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ==";

     

       53
        
             };

     

       54
        
         };

     

       55
        
       

     
···

       61
        
           src =

     

       62
        
             fetchurl {

     

       63
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";

     

       64
       -
               sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg==";

     

       65
        
             };

     

       66
        
         };

     

       67
        
       

     
···

       86
        
           src =

     

       87
        
             fetchurl {

     

       88
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";

     

       89
       -
               sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ==";

     

       90
        
             };

     

       91
        
         };

     

       92
        
       

     
···

       98
        
           src =

     

       99
        
             fetchurl {

     

       100
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       101
       -
               sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ==";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       102
        
             };

     

       103
        
         };

     

       104
        
       

     
···

       110
        
           src =

     

       111
        
             fetchurl {

     

       112
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       113
       -
               sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA==";

     

       114
        
             };

     

       115
        
         };

     

       116
        
       

     
···

       122
        
           src =

     

       123
        
             fetchurl {

     

       124
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       125
       -
               sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g==";

     

       126
       -
             };

     

       127
       -
         };

     

       128
       -
       

     

       129
       -
         ### Eclipse IDE for Rust Developers

     

       130
       -
       

     

       131
       -
         eclipse-rust = buildEclipse {

     

       132
       -
           name = "eclipse-rust-${platform_major}.${platform_minor}";

     

       133
       -
           description = "Eclipse IDE for Rust Developers";

     

       134
       -
           src =

     

       135
       -
             fetchurl {

     

       136
       -
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       137
       -
               sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw==";

     

       138
        
             };

     

       139
        
         };

     

       140

···

       12
        
       # find the downloads needed for new versions

     

       13
        
       #

     

       14
        
       # to test:

     

       15
       +
       # $ for e in cpp modeling platform sdk java jee committers rcp; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done

     

       16
        
       

     

       17
        
       let

     

       18
        
         platform_major = "4";

     

       19
       +
         platform_minor = "19";

     

       20
       +
         year = "2021";

     

       21
       +
         month = "03";

     

       22
       +
         timestamp = "${year}${month}031800";

     

       23
        
         gtk = gtk3;

     

       24
        
       in rec {

     

       25
        
       

     
···

       37
        
           src =

     

       38
        
             fetchurl {

     

       39
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       40
       +
               sha512 = "3j0lmll0glcr9p0hf49jiaq9xr8hadsy0y58wbbkdpldj3rclxr056dkswmiw2bkypfiwrjygbli5qxyp6mz380562hc2kjwijqq476";

     

       41
        
             };

     

       42
        
         };

     

       43
        
       

     
···

       49
        
           src =

     

       50
        
             fetchurl {

     

       51
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       52
       +
               sha512 = "0iqz9a3ixcbmaci6lnspdnzwd2h1fcygi54hmsl89pq3d1k5scyhcl123ixi24csi782w847bn0lq00n0zwras9akmnhsflra4mw5pz";

     

       53
        
             };

     

       54
        
         };

     

       55
        
       

     
···

       61
        
           src =

     

       62
        
             fetchurl {

     

       63
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";

     

       64
       +
               sha512 = "03v1ly7j9d9qnl3d9rl5a9kp483dz8i8v3cfnh55ksm9fk8iy2fzg6wq178ggnx2z5x9k88a4wk6n647yilh2hgc2l7926imkh2j1ly";

     

       65
        
             };

     

       66
        
         };

     

       67
        
       

     
···

       86
        
           src =

     

       87
        
             fetchurl {

     

       88
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";

     

       89
       +
               sha512 = "37m91my121pch12bwpwk5svfqkm7vl07wjx4fkhpy947v5kjf36hm6x0i45swdg7f0hk72y2qz5ka15ki5jv890qy5psj6z7ax9sys7";

     

       90
        
             };

     

       91
        
         };

     

       92
        
       

     
···

       98
        
           src =

     

       99
        
             fetchurl {

     

       100
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       101
       +
               sha512 = "3qrnj6krhrqc9rfwlim3v7kshwfhsi050pszw6xdfbj56mzr9whr7l76isbpxd5j0zipgfw3qrzrx379pdp899d35fv284ilvllzl4k";

     

       102
       +
             };

     

       103
       +
         };

     

       104
       +
       

     

       105
       +
         ### Eclipse Java EE

     

       106
       +
       

     

       107
       +
         eclipse-jee = buildEclipse {

     

       108
       +
           name = "eclipse-jee-${platform_major}.${platform_minor}";

     

       109
       +
           description = "Eclipse IDE for Enterprise Java and Web Developers";

     

       110
       +
           src =

     

       111
       +
             fetchurl {

     

       112
       +
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       113
       +
               sha512 = "04k4x9imabxddqlrgajn33ak8i58wcap40ll09xz23d1sxn9a8prh01s06ymgwg6ldg939srphvbz4112p8p0b1hl7m25a02qll91zv";

     

       114
        
             };

     

       115
        
         };

     

       116
        
       

     
···

       122
        
           src =

     

       123
        
             fetchurl {

     

       124
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       125
       +
               sha512 = "2yksl3w7yr1a3h4zdpa9zf394r5c185zqxhigdv858ldg46kmr9h0l2c7shbgb16kkybcnrk4x44dhjvh60x8xw6ma05klp4lp9v5va";

     

       126
        
             };

     

       127
        
         };

     

       128
        
       

     
···

       134
        
           src =

     

       135
        
             fetchurl {

     

       136
        
               url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";

     

       137
       +
               sha512 = "3fhrhwbyqcys56c93s1vl9rbvn269nn5y3cb9f3n1qwgw6i97mim2zy98jl3r8cksf97jwsmqmsqclsgz9v799wcckv81dj1l628382";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       138
        
             };

     

       139
        
         };

     

       140

+3 -21

pkgs/applications/editors/eclipse/plugins.nix

···

       248
        
         cdt = buildEclipseUpdateSite rec {

     

       249
        
           name = "cdt-${version}";

     

       250
        
           # find current version at https://www.eclipse.org/cdt/downloads.php

     

       251
       -
           version = "10.1.0";

     

       252
        
       

     

       253
        
           src = fetchzip {

     

       254
        
             stripRoot = false;

     

       255
       -
             url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip";

     

       256
       -
             sha256 = "1hbswcar3a5cw20mwrj82w9pvpkvvj6jrvqqf1lincva0r5sl7h8";

     

       257
        
           };

     

       258
        
       

     

       259
        
           meta = with lib; {

     
···

       469
        
           meta = with lib; {

     

       470
        
             description = "Adds support for JSON files to Eclipse";

     

       471
        
             homepage = "https://github.com/boothen/Json-Eclipse-Plugin";

     

       472
       -
             license = licenses.epl10;

     

       473
       -
             platforms = platforms.all;

     

       474
       -
           };

     

       475
       -
         };

     

       476
       -
       

     

       477
       -
         jdt = buildEclipseUpdateSite rec {

     

       478
       -
           name = "jdt-${version}";

     

       479
       -
           version = "4.18";

     

       480
       -
       

     

       481
       -
           src = fetchzip {

     

       482
       -
             stripRoot = false;

     

       483
       -
             url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip";

     

       484
       -
             sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk=";

     

       485
       -
           };

     

       486
       -
       

     

       487
       -
           meta = with lib; {

     

       488
       -
             homepage = "https://www.eclipse.org/jdt/";

     

       489
       -
             description = "Eclipse Java development tools";

     

       490
        
             license = licenses.epl10;

     

       491
        
             platforms = platforms.all;

     

       492
        
           };

···

       248
        
         cdt = buildEclipseUpdateSite rec {

     

       249
        
           name = "cdt-${version}";

     

       250
        
           # find current version at https://www.eclipse.org/cdt/downloads.php

     

       251
       +
           version = "10.2.0";

     

       252
        
       

     

       253
        
           src = fetchzip {

     

       254
        
             stripRoot = false;

     

       255
       +
             url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.2/${name}/${name}.zip";

     

       256
       +
             sha256 = "1r30cbpbzw3dfcsn54p6sqip86dqhydhsppjgaz60b6z138vzx49";

     

       257
        
           };

     

       258
        
       

     

       259
        
           meta = with lib; {

     
···

       469
        
           meta = with lib; {

     

       470
        
             description = "Adds support for JSON files to Eclipse";

     

       471
        
             homepage = "https://github.com/boothen/Json-Eclipse-Plugin";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       472
        
             license = licenses.epl10;

     

       473
        
             platforms = platforms.all;

     

       474
        
           };

+115

pkgs/applications/graphics/openboard/default.nix

···

       1
       +
       { mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake

     

       2
       +
       , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler

     

       3
       +
       , ffmpeg, libva, alsaLib, SDL, x264, libvpx, libvorbis, libtheora, libogg

     

       4
       +
       , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }:

     

       5
       +
       

     

       6
       +
       let

     

       7
       +
         importer = mkDerivation rec {

     

       8
       +
           pname = "openboard-importer";

     

       9
       +
           version = "unstable-2016-10-08";

     

       10
       +
       

     

       11
       +
           src = fetchFromGitHub {

     

       12
       +
             owner = "OpenBoard-org";

     

       13
       +
             repo = "OpenBoard-Importer";

     

       14
       +
             rev = "47927bda021b4f7f1540b794825fb0d601875e79";

     

       15
       +
             sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf";

     

       16
       +
           };

     

       17
       +
       

     

       18
       +
           nativeBuildInputs = [ qmake ];

     

       19
       +
       

     

       20
       +
           installPhase = ''

     

       21
       +
             install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter

     

       22
       +
           '';

     

       23
       +
         };

     

       24
       +
       in mkDerivation rec {

     

       25
       +
         pname = "openboard";

     

       26
       +
         version = "1.6.1";

     

       27
       +
       

     

       28
       +
         src = fetchFromGitHub {

     

       29
       +
           owner = "OpenBoard-org";

     

       30
       +
           repo = "OpenBoard";

     

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

     

       32
       +
           sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M=";

     

       33
       +
         };

     

       34
       +
       

     

       35
       +
         postPatch = ''

     

       36
       +
           substituteInPlace OpenBoard.pro \

     

       37
       +
             --replace '/usr/include/quazip' '${quazip}/include/quazip5' \

     

       38
       +
             --replace '/usr/include/poppler' '${poppler.dev}/include/poppler'

     

       39
       +
         '';

     

       40
       +
       

     

       41
       +
         nativeBuildInputs = [ qmake copyDesktopItems ];

     

       42
       +
       

     

       43
       +
         buildInputs = [

     

       44
       +
           qtbase

     

       45
       +
           qtxmlpatterns

     

       46
       +
           qttools

     

       47
       +
           qtwebkit

     

       48
       +
           libGL

     

       49
       +
           fontconfig

     

       50
       +
           openssl

     

       51
       +
           poppler

     

       52
       +
           ffmpeg

     

       53
       +
           libva

     

       54
       +
           alsaLib

     

       55
       +
           SDL

     

       56
       +
           x264

     

       57
       +
           libvpx

     

       58
       +
           libvorbis

     

       59
       +
           libtheora

     

       60
       +
           libogg

     

       61
       +
           libopus

     

       62
       +
           lame

     

       63
       +
           fdk_aac

     

       64
       +
           libass

     

       65
       +
           quazip

     

       66
       +
           libXext

     

       67
       +
           libXfixes

     

       68
       +
         ];

     

       69
       +
       

     

       70
       +
         propagatedBuildInputs = [ importer ];

     

       71
       +
       

     

       72
       +
         makeFlags = [ "release-install" ];

     

       73
       +
       

     

       74
       +
         desktopItems = [

     

       75
       +
           (makeDesktopItem {

     

       76
       +
             name = "OpenBoard";

     

       77
       +
             exec = "OpenBoard %f";

     

       78
       +
             icon = "OpenBoard";

     

       79
       +
             comment = "OpenBoard, an interactive white board application";

     

       80
       +
             desktopName = "OpenBoard";

     

       81
       +
             mimeType = "application/ubz";

     

       82
       +
             categories = "Education;";

     

       83
       +
             startupNotify = true;

     

       84
       +
           })

     

       85
       +
         ];

     

       86
       +
       

     

       87
       +
         installPhase = ''

     

       88
       +
           runHook preInstall

     

       89
       +
       

     

       90
       +
           lrelease OpenBoard.pro

     

       91
       +
       

     

       92
       +
           # Replicated release_scripts/linux/package.sh

     

       93
       +
           mkdir -p $out/opt/openboard/i18n

     

       94
       +
           cp -R resources/customizations build/linux/release/product/* $out/opt/openboard/

     

       95
       +
           cp resources/i18n/*.qm $out/opt/openboard/i18n/

     

       96
       +
           install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/

     

       97
       +
           install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png

     

       98
       +
       

     

       99
       +
           runHook postInstall

     

       100
       +
         '';

     

       101
       +
       

     

       102
       +
         dontWrapQtApps = true;

     

       103
       +
       

     

       104
       +
         postFixup = ''

     

       105
       +
           makeWrapper $out/opt/openboard/OpenBoard $out/bin/OpenBoard \

     

       106
       +
             "''${qtWrapperArgs[@]}"

     

       107
       +
         '';

     

       108
       +
       

     

       109
       +
         meta = with lib; {

     

       110
       +
           description = "Interactive whiteboard application";

     

       111
       +
           license = licenses.gpl3Plus;

     

       112
       +
           maintainers = with maintainers; [ fufexan ];

     

       113
       +
           platforms = platforms.linux;

     

       114
       +
         };

     

       115
       +
       }

+5 -5

pkgs/applications/radio/wsjtx/default.nix

···

       1
        
       { lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,

     

       2
        
         docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,

     

       3
       -
         qtmultimedia, qtserialport, qttools, texinfo, wrapQtAppsHook }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "wsjtx";

     

       7
       -
         version = "2.2.2";

     

       8
        
       

     

       9
        
         # This is a "superbuild" tarball containing both wsjtx and a hamlib fork

     

       10
        
         src = fetchurl {

     

       11
        
           url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";

     

       12
       -
           sha256 = "17agyrhclqyahgdwba8vi9sl7vq03sm00jlyrmjgv34a4czidg0w";

     

       13
        
         };

     

       14
        
       

     

       15
        
         # Hamlib builds with autotools, wsjtx builds with cmake

     
···

       18
        
           asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool

     

       19
        
           qttools texinfo wrapQtAppsHook

     

       20
        
         ];

     

       21
       -
         buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];

     

       22
        
       

     

       23
        
         # Remove Git dependency from superbuild since sources are included

     

       24
        
         patches = [ ./super.patch ];

     
···

       36
        
           # Older licenses are for the statically-linked hamlib

     

       37
        
           license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];

     

       38
        
           platforms = platforms.linux;

     

       39
       -
           maintainers = with maintainers; [ lasandell ];

     

       40
        
         };

     

       41
        
       }

···

       1
        
       { lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,

     

       2
        
         docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,

     

       3
       +
         qtmultimedia, qtserialport, qttools, boost, texinfo, wrapQtAppsHook }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "wsjtx";

     

       7
       +
         version = "2.3.1";

     

       8
        
       

     

       9
        
         # This is a "superbuild" tarball containing both wsjtx and a hamlib fork

     

       10
        
         src = fetchurl {

     

       11
        
           url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";

     

       12
       +
           sha256 = "11wzh4bxp9277kbqkyrc063akkk09czgxnkpk8k07vl4s3dan3hh";

     

       13
        
         };

     

       14
        
       

     

       15
        
         # Hamlib builds with autotools, wsjtx builds with cmake

     
···

       18
        
           asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool

     

       19
        
           qttools texinfo wrapQtAppsHook

     

       20
        
         ];

     

       21
       +
         buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport boost ];

     

       22
        
       

     

       23
        
         # Remove Git dependency from superbuild since sources are included

     

       24
        
         patches = [ ./super.patch ];

     
···

       36
        
           # Older licenses are for the statically-linked hamlib

     

       37
        
           license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];

     

       38
        
           platforms = platforms.linux;

     

       39
       +
           maintainers = with maintainers; [ lasandell numinit ];

     

       40
        
         };

     

       41
        
       }

+11 -6

pkgs/applications/science/logic/alt-ergo/default.nix

···

       1
       -
       { fetchurl, lib, which, ocamlPackages }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         pname = "alt-ergo";

     

       5
       -
         version = "2.3.3";

     

       6
        
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz";

     

       9
       -
           sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         useDune2 = true;

     
···

       19
        
         pname = "alt-ergo-lib";

     

       20
        
         inherit version src useDune2 nativeBuildInputs;

     

       21
        
         configureFlags = pname;

     

       0
        
       
     

       22
        
         propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ];

     

       23
        
       }; in

     

       24
        
       

     
···

       36
        
       

     

       37
        
         configureFlags = pname;

     

       38
        
       

     

       39
       -
         buildInputs = [ alt-ergo-parsers ocamlPackages.menhir ];

     

       0
        
       
     

       0
        
       
     

       40
        
       

     

       41
        
         meta = {

     

       42
        
           description = "High-performance theorem prover and SMT solver";

···

       1
       +
       { fetchFromGitHub, lib, which, ocamlPackages }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         pname = "alt-ergo";

     

       5
       +
         version = "2.4.0";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "OCamlPro";

     

       9
       +
           repo = pname;

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "1jm1yrvsg8iyfp9bb728zdx2i7yb6z7minjrfs27k5ncjqkjm65g";

     

       12
        
         };

     

       13
        
       

     

       14
        
         useDune2 = true;

     
···

       21
        
         pname = "alt-ergo-lib";

     

       22
        
         inherit version src useDune2 nativeBuildInputs;

     

       23
        
         configureFlags = pname;

     

       24
       +
         buildInputs = with ocamlPackages; [ dune-configurator ];

     

       25
        
         propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ];

     

       26
        
       }; in

     

       27
        
       

     
···

       39
        
       

     

       40
        
         configureFlags = pname;

     

       41
        
       

     

       42
       +
         buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [

     

       43
       +
           cmdliner menhir ])

     

       44
       +
         ;

     

       45
        
       

     

       46
        
         meta = {

     

       47
        
           description = "High-performance theorem prover and SMT solver";

+13 -10

pkgs/applications/video/streamlink/default.nix

···

       1
        
       { lib

     

       2
       -
       , pythonPackages

     

       3
        
       , fetchFromGitHub

     

       4
        
       , rtmpdump

     

       5
       -
       , ffmpeg_3

     

       6
        
       }:

     

       7
        
       

     

       8
       -
       pythonPackages.buildPythonApplication rec {

     

       9
        
         pname = "streamlink";

     

       10
       -
         version = "2.0.0";

     

       11
       -
         disabled = pythonPackages.pythonOlder "3.5.0";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "streamlink";

     

       15
        
           repo = "streamlink";

     

       16
        
           rev = version;

     

       17
       -
           sha256 = "+W9Nu5Ze08r7IlUZOkkVOz582E1Bbj0a3qIQHwxSmj8=";

     

       18
        
         };

     

       19
        
       

     

       20
       -
         checkInputs = with pythonPackages; [

     

       21
       -
           pytest

     

       22
        
           mock

     

       23
        
           requests-mock

     

       24
        
           freezegun

     

       25
        
         ];

     

       26
        
       

     

       27
       -
         propagatedBuildInputs = (with pythonPackages; [

     

       28
        
           pycryptodome

     

       29
        
           requests

     

       30
        
           iso-639

     
···

       33
        
           isodate

     

       34
        
         ]) ++ [

     

       35
        
           rtmpdump

     

       36
       -
           ffmpeg_3

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
         ];

     

       38
        
       

     

       39
        
         meta = with lib; {

···

       1
        
       { lib

     

       2
       +
       , python3

     

       3
        
       , fetchFromGitHub

     

       4
        
       , rtmpdump

     

       5
       +
       , ffmpeg

     

       6
        
       }:

     

       7
        
       

     

       8
       +
       python3.pkgs.buildPythonApplication rec {

     

       9
        
         pname = "streamlink";

     

       10
       +
         version = "2.1.1";

     

       0
        
       
     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "streamlink";

     

       14
        
           repo = "streamlink";

     

       15
        
           rev = version;

     

       16
       +
           sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         checkInputs = with python3.pkgs; [

     

       20
       +
           pytestCheckHook

     

       21
        
           mock

     

       22
        
           requests-mock

     

       23
        
           freezegun

     

       24
        
         ];

     

       25
        
       

     

       26
       +
         propagatedBuildInputs = (with python3.pkgs; [

     

       27
        
           pycryptodome

     

       28
        
           requests

     

       29
        
           iso-639

     
···

       32
        
           isodate

     

       33
        
         ]) ++ [

     

       34
        
           rtmpdump

     

       35
       +
           ffmpeg

     

       36
       +
         ];

     

       37
       +
       

     

       38
       +
         disabledTests = [

     

       39
       +
           "test_plugin_not_in_removed_list"

     

       40
        
         ];

     

       41
        
       

     

       42
        
         meta = with lib; {

+2 -2

pkgs/data/themes/qogir/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "qogir-theme";

     

       5
       -
         version = "2021-02-09";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "vinceliuice";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1pilq939bqzxysw4ixd279c49bp7l74bykpprrhgc5f2klpjg1zn";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ gdk-pixbuf librsvg ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "qogir-theme";

     

       5
       +
         version = "2021-04-20";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "vinceliuice";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "17ajrg5safnb6b1jbwvnysc4rvl6gkpnqdf89bammlrpkj6fr3ip";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ gdk-pixbuf librsvg ];

+2 -2

pkgs/development/libraries/ffmpegthumbnailer/default.nix

···

       1
       -
       { fetchFromGitHub, lib, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg

     

       2
        
       }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     
···

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       16
       -
         buildInputs = [ ffmpeg_3 libpng libjpeg ];

     

       17
        
         cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];

     

       18
        
       

     

       19
        
         meta = with lib;  {

···

       1
       +
       { fetchFromGitHub, lib, stdenv, ffmpeg, cmake, libpng, pkg-config, libjpeg

     

       2
        
       }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     
···

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       16
       +
         buildInputs = [ ffmpeg libpng libjpeg ];

     

       17
        
         cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];

     

       18
        
       

     

       19
        
         meta = with lib;  {

+59

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

···

       1
       +
       { buildDunePackage

     

       2
       +
       , lib

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , ocaml

     

       5
       +
       , hpack

     

       6
       +
       , angstrom

     

       7
       +
       , faraday

     

       8
       +
       , base64

     

       9
       +
       , psq

     

       10
       +
       , httpaf

     

       11
       +
       , alcotest

     

       12
       +
       , yojson

     

       13
       +
       , hex

     

       14
       +
       }:

     

       15
       +
       

     

       16
       +
       let

     

       17
       +
         http2-frame-test-case = fetchFromGitHub {

     

       18
       +
           owner = "http2jp";

     

       19
       +
           repo = "http2-frame-test-case";

     

       20
       +
           rev = "5c67db0d4d68e1fb7d3a241d6e01fc04d981f465";

     

       21
       +
           sha256 = "16yyb37f8mk9saw7ndjs5is67yq7qa6b6y7k0c75ibxi4n9aw1r3";

     

       22
       +
         };

     

       23
       +
       in

     

       24
       +
       

     

       25
       +
       buildDunePackage rec {

     

       26
       +
         pname = "h2";

     

       27
       +
       

     

       28
       +
         inherit (hpack)

     

       29
       +
           version

     

       30
       +
           src

     

       31
       +
           useDune2

     

       32
       +
           ;

     

       33
       +
       

     

       34
       +
         minimumOCamlVersion = "4.06";

     

       35
       +
       

     

       36
       +
         propagatedBuildInputs = [

     

       37
       +
           angstrom

     

       38
       +
           faraday

     

       39
       +
           base64

     

       40
       +
           psq

     

       41
       +
           hpack

     

       42
       +
           httpaf

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         # Tests fail with 4.06

     

       46
       +
         doCheck = lib.versionAtLeast ocaml.version "4.07";

     

       47
       +
         preCheck = ''

     

       48
       +
           ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case

     

       49
       +
         '';

     

       50
       +
         checkInputs = [

     

       51
       +
           alcotest

     

       52
       +
           yojson

     

       53
       +
           hex

     

       54
       +
         ];

     

       55
       +
       

     

       56
       +
         meta = hpack.meta // {

     

       57
       +
           description = "A high-performance, memory-efficient, and scalable HTTP/2 library for OCaml";

     

       58
       +
         };

     

       59
       +
       }

+37

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

···

       1
       +
       { buildDunePackage

     

       2
       +
       , lib

     

       3
       +
       , fetchurl

     

       4
       +
       , angstrom

     

       5
       +
       , faraday

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       buildDunePackage rec {

     

       9
       +
         pname = "hpack";

     

       10
       +
         version = "0.8.0";

     

       11
       +
       

     

       12
       +
         src = fetchurl {

     

       13
       +
           url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";

     

       14
       +
           sha256 = "0qcn3yvyz0h419fjg9nb20csfmwmh3ihz0zb0jfzdycf5w4mlry6";

     

       15
       +
         };

     

       16
       +
       

     

       17
       +
         useDune2 = true;

     

       18
       +
         minimumOCamlVersion = "4.04";

     

       19
       +
       

     

       20
       +
         propagatedBuildInputs = [

     

       21
       +
           angstrom

     

       22
       +
           faraday

     

       23
       +
         ];

     

       24
       +
       

     

       25
       +
         # circular dependency

     

       26
       +
         doCheck = false;

     

       27
       +
       

     

       28
       +
         meta = {

     

       29
       +
           license = lib.licenses.bsd3;

     

       30
       +
           description = "An HPACK (Header Compression for HTTP/2) implementation in OCaml";

     

       31
       +
           homepage = "https://github.com/anmonteiro/ocaml-h2";

     

       32
       +
           maintainers = with lib.maintainers; [

     

       33
       +
             sternenseemann

     

       34
       +
             anmonteiro

     

       35
       +
           ];

     

       36
       +
         };

     

       37
       +
       }

+2 -2

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

···

       1
        
       { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "5.11.15";

     

       5
        
         suffix = "lqx1";

     

       6
        
       in

     

       7
        
       

     
···

       14
        
           owner = "zen-kernel";

     

       15
        
           repo = "zen-kernel";

     

       16
        
           rev = "v${version}-${suffix}";

     

       17
       -
           sha256 = "1dwibknj4q8cd3mim679mrb4j8yi7p4q9qjcb4rwvw0yzgxmz3lv";

     

       18
        
         };

     

       19
        
       

     

       20
        
         extraMeta = {

···

       1
        
       { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "5.11.16";

     

       5
        
         suffix = "lqx1";

     

       6
        
       in

     

       7
        
       

     
···

       14
        
           owner = "zen-kernel";

     

       15
        
           repo = "zen-kernel";

     

       16
        
           rev = "v${version}-${suffix}";

     

       17
       +
           sha256 = "1j25r45arikjwyhbr72r1935pr7a8g2j6vshggywdiixvizvrx9b";

     

       18
        
         };

     

       19
        
       

     

       20
        
         extraMeta = {

+2 -2

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

···

       1
        
       { lib, fetchFromGitHub, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "5.11.15";

     

       5
        
         suffix = "zen1";

     

       6
        
       in

     

       7
        
       

     
···

       14
        
           owner = "zen-kernel";

     

       15
        
           repo = "zen-kernel";

     

       16
        
           rev = "v${version}-${suffix}";

     

       17
       -
           sha256 = "0n9wm0lpwkqd79112k03lxp4hc898nvs2jjw3hxzggn5wk4i2dz9";

     

       18
        
         };

     

       19
        
       

     

       20
        
         extraMeta = {

···

       1
        
       { lib, fetchFromGitHub, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "5.11.16";

     

       5
        
         suffix = "zen1";

     

       6
        
       in

     

       7
        
       

     
···

       14
        
           owner = "zen-kernel";

     

       15
        
           repo = "zen-kernel";

     

       16
        
           rev = "v${version}-${suffix}";

     

       17
       +
           sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv";

     

       18
        
         };

     

       19
        
       

     

       20
        
         extraMeta = {

+1 -1

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

···

       27
        
         meta = with lib; {

     

       28
        
           homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip";

     

       29
        
           description = "allows to pass USB device from server to client over the network";

     

       30
       -
           license = licenses.gpl2;

     

       31
        
           platforms = platforms.linux;

     

       32
        
           broken = kernelOlder "4.10";

     

       33
        
         };

···

       27
        
         meta = with lib; {

     

       28
        
           homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip";

     

       29
        
           description = "allows to pass USB device from server to client over the network";

     

       30
       +
           license = with licenses; [ gpl2Only gpl2Plus ];

     

       31
        
           platforms = platforms.linux;

     

       32
        
           broken = kernelOlder "4.10";

     

       33
        
         };

+29

pkgs/servers/simple-http-server/default.nix

···

       1
       +
       { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:

     

       2
       +
       

     

       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       +
         pname = "simple-http-server";

     

       5
       +
         version = "0.6.1";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "TheWaWaR";

     

       9
       +
           repo = pname;

     

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

     

       11
       +
           sha256 = "01a129i1ph3m8k6zkdcqnnkqbhlqpk7qvvdsz2i2kas54csbgsww";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         cargoSha256 = "050avk6wff8v1dlsfvxwvldmmgfakdxmhglv2bhvc2f3q8cf1d5d";

     

       15
       +
       

     

       16
       +
         nativeBuildInputs = [ pkg-config ];

     

       17
       +
       

     

       18
       +
         buildInputs = [ openssl ];

     

       19
       +
       

     

       20
       +
         # Currently no tests are implemented, so we avoid building the package twice

     

       21
       +
         doCheck = false;

     

       22
       +
       

     

       23
       +
         meta = with lib; {

     

       24
       +
           description = "Simple HTTP server in Rust";

     

       25
       +
           homepage = "https://github.com/TheWaWaR/simple-http-server";

     

       26
       +
           license = licenses.mit;

     

       27
       +
           maintainers = with maintainers; [ mephistophiles ];

     

       28
       +
         };

     

       29
       +
       }

pkgs/shells/fish/plugins/default.nix

···

       15
        
       

     

       16
        
         foreign-env = callPackage ./foreign-env { };

     

       17
        
       

     

       0
        
       
     

       0
        
       
     

       18
        
         fzf-fish = callPackage ./fzf-fish.nix { };

     

       19
        
       

     

       20
        
         pure = callPackage ./pure.nix { };

···

       15
        
       

     

       16
        
         foreign-env = callPackage ./foreign-env { };

     

       17
        
       

     

       18
       +
         forgit-fish = callPackage ./forgit.nix { };

     

       19
       +
       

     

       20
        
         fzf-fish = callPackage ./fzf-fish.nix { };

     

       21
        
       

     

       22
        
         pure = callPackage ./pure.nix { };

+22

pkgs/shells/fish/plugins/forgit.nix

···

       1
       +
       { lib, buildFishPlugin, fetchFromGitHub, git, fzf }:

     

       2
       +
       

     

       3
       +
       buildFishPlugin rec {

     

       4
       +
         pname = "forgit";

     

       5
       +
         version = "unstable-2021-04-09";

     

       6
       +
       

     

       7
       +
         buildInputs = [ git fzf ];

     

       8
       +
       

     

       9
       +
         src = fetchFromGitHub {

     

       10
       +
           owner = "wfxr";

     

       11
       +
           repo = "forgit";

     

       12
       +
           rev = "7806fc3ab37ac479c315eb54b164f67ba9ed17ea";

     

       13
       +
           sha256 = "sha256-a7wjuqXe3+y5zlgSLk5J31WoORbieFimvtr0FQHRY5M=";

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
         meta = with lib; {

     

       17
       +
           description = "A utility tool powered by fzf for using git interactively.";

     

       18
       +
           homepage = "https://github.com/wfxr/forgit";

     

       19
       +
           license = licenses.mit;

     

       20
       +
           maintainers = with maintainers; [ happysalada ];

     

       21
       +
         };

     

       22
       +
       }

+25

pkgs/tools/misc/castty/default.nix

···

       1
       +
       { stdenv, lib, fetchFromGitHub, libsoundio, lame }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation {

     

       4
       +
         pname = "castty";

     

       5
       +
         version = "unstable-2020-11-10";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "dhobsd";

     

       9
       +
           repo = "castty";

     

       10
       +
           rev = "333a2bafd96d56cd0bb91577ae5ba0f7d81b3d99";

     

       11
       +
           sha256 = "0p84ivwsp8ds4drn0hx2ax04gp0xyq6blj1iqfsmrs4slrajdmqs";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         buildInputs = [ libsoundio lame ];

     

       15
       +
       

     

       16
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       17
       +
       

     

       18
       +
         meta = with lib; {

     

       19
       +
           description = "CLI tool to record audio-enabled screencasts of your terminal, for the web";

     

       20
       +
           homepage = "https://github.com/dhobsd/castty";

     

       21
       +
           license = licenses.bsd3;

     

       22
       +
           maintainers = with maintainers; [ iblech ];

     

       23
       +
           platforms = platforms.unix;

     

       24
       +
         };

     

       25
       +
       }

+3 -3

pkgs/tools/security/grype/default.nix

···

       6
        
       

     

       7
        
       buildGoModule rec {

     

       8
        
         pname = "grype";

     

       9
       -
         version = "0.10.2";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "anchore";

     

       13
        
           repo = pname;

     

       14
        
           rev = "v${version}";

     

       15
       -
           sha256 = "sha256-kKzrV2TTO8NmB3x27ZStMZpSIRGwm5Ev+cPGwT50FEU=";

     

       16
        
         };

     

       17
        
       

     

       18
       -
         vendorSha256 = "sha256-PC2n6+gPDxpG8RTAmCfK4P40yfxqlleYI6Ex4FtPjk4=";

     

       19
        
       

     

       20
        
         propagatedBuildInputs = [ docker ];

     

       21

···

       6
        
       

     

       7
        
       buildGoModule rec {

     

       8
        
         pname = "grype";

     

       9
       +
         version = "0.11.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "anchore";

     

       13
        
           repo = pname;

     

       14
        
           rev = "v${version}";

     

       15
       +
           sha256 = "sha256-E1tJ9hEJ4GaL+S4dz6aGq3nJPpdtx0/Tfb1RzgJSe8M=";

     

       16
        
         };

     

       17
        
       

     

       18
       +
         vendorSha256 = "sha256-LUyrX/rm01tCPT6Ua6hphhf+4ycNn4tLONRyH3iTrZ4=";

     

       19
        
       

     

       20
        
         propagatedBuildInputs = [ docker ];

     

       21

+30

pkgs/tools/security/nsjail/001-fix-bison-link-error.patch

···

       1
       +
       From 8e309a0af0851ab54ca7c6d51b6f3d19ee42c8ee Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Evangelos Foutras <evangelos@foutrelis.com>

     

       3
       +
       Date: Wed, 17 Mar 2021 16:36:40 +0200

     

       4
       +
       Subject: [PATCH] Replace YYUSE call with void cast in src/parser.y

     

       5
       +
       

     

       6
       +
       The YYUSE macro was renamed to YY_USE in bison 3.7.5; we might as well

     

       7
       +
       avoid using it altogether and cast the unused variable to void instead.

     

       8
       +
       

     

       9
       +
       Fixes the following linker error:

     

       10
       +
       

     

       11
       +
       /usr/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror':

     

       12
       +
       arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE'

     

       13
       +
       ---

     

       14
       +
        src/parser.y | 2 +-

     

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

     

       16
       +
       

     

       17
       +
       diff --git a/src/parser.y b/src/parser.y

     

       18
       +
       index e0f109c..0e01373 100644

     

       19
       +
       --- a/kafel/src/parser.y

     

       20
       +
       +++ b/kafel/src/parser.y

     

       21
       +
       @@ -420,8 +420,8 @@ const_def

     

       22
       +
        

     

       23
       +
        void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner,

     

       24
       +
                     const char *msg) {

     

       25
       +
       +  (void)scanner; /* suppress unused-parameter warning */

     

       26
       +
          if (!ctxt->lexical_error) {

     

       27
       +
       -    YYUSE(scanner);

     

       28
       +
            if (loc->filename != NULL) {

     

       29
       +
              append_error(ctxt, "%s:%d:%d: %s", loc->filename, loc->first_line, loc->first_column, msg);

     

       30
       +
            } else {

+6 -1

pkgs/tools/security/nsjail/default.nix

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "nsjail";

     

       7
       -
         version = "3.0";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner           = "google";

     
···

       17
        
         nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ];

     

       18
        
         buildInputs = [ libnl protobuf protobufc ];

     

       19
        
         enableParallelBuilding = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
       

     

       21
        
         preBuild = ''

     

       22
        
           makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap')

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "nsjail";

     

       7
       +
         version = "3.0"; # Bumping? Remove the bison patch.

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner           = "google";

     
···

       17
        
         nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ];

     

       18
        
         buildInputs = [ libnl protobuf protobufc ];

     

       19
        
         enableParallelBuilding = true;

     

       20
       +
       

     

       21
       +
         patches = [

     

       22
       +
           # To remove after bumping 3.0

     

       23
       +
           ./001-fix-bison-link-error.patch

     

       24
       +
         ];

     

       25
        
       

     

       26
        
         preBuild = ''

     

       27
        
           makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap')

+9 -1

pkgs/top-level/all-packages.nix

···

       1235
        
       

     

       1236
        
         inherit (nodePackages) castnow;

     

       1237
        
       

     

       0
        
       
     

       0
        
       
     

       1238
        
         certigo = callPackage ../tools/admin/certigo { };

     

       1239
        
       

     

       1240
        
         catcli = python3Packages.callPackage ../tools/filesystems/catcli { };

     
···

       7165
        
       

     

       7166
        
         openbazaar = callPackage ../applications/networking/openbazaar { };

     

       7167
        
         openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { };

     

       0
        
       
     

       0
        
       
     

       7168
        
       

     

       7169
        
         opencc = callPackage ../tools/text/opencc { };

     

       7170
        
       

     
···

       17639
        
       

     

       17640
        
         stlport = callPackage ../development/libraries/stlport { };

     

       17641
        
       

     

       17642
       -
         streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; };

     

       17643
        
         streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};

     

       17644
        
       

     

       17645
        
         sub-batch = callPackage ../applications/video/sub-batch { };

     
···

       24667
        
       

     

       24668
        
         motif = callPackage ../development/libraries/motif { };

     

       24669
        
       

     

       0
        
       
     

       0
        
       
     

       24670
        
         mozjpeg = callPackage ../applications/graphics/mozjpeg { };

     

       24671
        
       

     

       24672
        
         easytag = callPackage ../applications/audio/easytag { };

     
···

       31022
        
         tt2020 = callPackage ../data/fonts/tt2020 { };

     

       31023
        
       

     

       31024
        
         simplehttp2server = callPackage ../servers/simplehttp2server { };

     

       0
        
       
     

       0
        
       
     

       31025
        
       

     

       31026
        
         diceware = with python3Packages; toPythonApplication diceware;

     

       31027

···

       1235
        
       

     

       1236
        
         inherit (nodePackages) castnow;

     

       1237
        
       

     

       1238
       +
         castty = callPackage ../tools/misc/castty { };

     

       1239
       +
       

     

       1240
        
         certigo = callPackage ../tools/admin/certigo { };

     

       1241
        
       

     

       1242
        
         catcli = python3Packages.callPackage ../tools/filesystems/catcli { };

     
···

       7167
        
       

     

       7168
        
         openbazaar = callPackage ../applications/networking/openbazaar { };

     

       7169
        
         openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { };

     

       7170
       +
       

     

       7171
       +
         openboard = libsForQt5.callPackage ../applications/graphics/openboard { };

     

       7172
        
       

     

       7173
        
         opencc = callPackage ../tools/text/opencc { };

     

       7174
        
       

     
···

       17643
        
       

     

       17644
        
         stlport = callPackage ../development/libraries/stlport { };

     

       17645
        
       

     

       17646
       +
         streamlink = callPackage ../applications/video/streamlink { };

     

       17647
        
         streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};

     

       17648
        
       

     

       17649
        
         sub-batch = callPackage ../applications/video/sub-batch { };

     
···

       24671
        
       

     

       24672
        
         motif = callPackage ../development/libraries/motif { };

     

       24673
        
       

     

       24674
       +
         mousai = callPackage ../applications/audio/mousai { };

     

       24675
       +
       

     

       24676
        
         mozjpeg = callPackage ../applications/graphics/mozjpeg { };

     

       24677
        
       

     

       24678
        
         easytag = callPackage ../applications/audio/easytag { };

     
···

       31028
        
         tt2020 = callPackage ../data/fonts/tt2020 { };

     

       31029
        
       

     

       31030
        
         simplehttp2server = callPackage ../servers/simplehttp2server { };

     

       31031
       +
       

     

       31032
       +
         simple-http-server = callPackage ../servers/simple-http-server { };

     

       31033
        
       

     

       31034
        
         diceware = with python3Packages; toPythonApplication diceware;

     

       31035

pkgs/top-level/ocaml-packages.nix

···

       400
        
             inherit (pkgs) gsl;

     

       401
        
           };

     

       402
        
       

     

       0
        
       
     

       0
        
       
     

       403
        
           hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };

     

       404
        
       

     

       405
        
           herelib = callPackage ../development/ocaml-modules/herelib { };

     
···

       411
        
           hkdf = callPackage ../development/ocaml-modules/hkdf { };

     

       412
        
       

     

       413
        
           hmap = callPackage ../development/ocaml-modules/hmap { };

     

       0
        
       
     

       0
        
       
     

       414
        
       

     

       415
        
           hxd = callPackage ../development/ocaml-modules/hxd { };

     

       416

···

       400
        
             inherit (pkgs) gsl;

     

       401
        
           };

     

       402
        
       

     

       403
       +
           h2 = callPackage ../development/ocaml-modules/h2 { };

     

       404
       +
       

     

       405
        
           hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };

     

       406
        
       

     

       407
        
           herelib = callPackage ../development/ocaml-modules/herelib { };

     
···

       413
        
           hkdf = callPackage ../development/ocaml-modules/hkdf { };

     

       414
        
       

     

       415
        
           hmap = callPackage ../development/ocaml-modules/hmap { };

     

       416
       +
       

     

       417
       +
           hpack = callPackage ../development/ocaml-modules/hpack { };

     

       418
        
       

     

       419
        
           hxd = callPackage ../development/ocaml-modules/hxd { };

     

       420