commit 11ee0bf5d7e7632c74636eb4cde74c08713c20f4 · pyrox.dev/nixpkgs

+2 -1

nixos/modules/system/boot/stage-2-init.sh

···

       167
       167
        
       

     

       168
       168
        
       # Start systemd.

     

       169
       169
        
       echo "starting systemd..."

     

       170
       170
       +
       

     

       170
       171
        
       PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \

     

       171
       171
       -
           LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \

     

       172
       172
       +
           LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \

     

       172
       173
        
           exec @systemdExecutable@

+14 -1

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

···

       10
       10
        
           src = ./stage-2-init.sh;

     

       11
       11
        
           shellDebug = "${pkgs.bashInteractive}/bin/bash";

     

       12
       12
        
           shell = "${pkgs.bash}/bin/bash";

     

       13
       13
       -
           inherit (config.boot) systemdExecutable;

     

       13
       13
       +
           inherit (config.boot) systemdExecutable extraSystemdUnitPaths;

     

       14
       14
        
           isExecutable = true;

     

       15
       15
        
           inherit (config.nix) readOnlyStore;

     

       16
       16
        
           inherit useHostResolvConf;

     
···

       20
       20
        
             pkgs.util-linux

     

       21
       21
        
           ] ++ lib.optional useHostResolvConf pkgs.openresolv);

     

       22
       22
        
           fsPackagesPath = lib.makeBinPath config.system.fsPackages;

     

       23
       23
       +
           systemdUnitPathEnvVar = lib.optionalString (config.boot.extraSystemdUnitPaths != [])

     

       24
       24
       +
             ("SYSTEMD_UNIT_PATH="

     

       25
       25
       +
             + builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths

     

       26
       26
       +
             + ":"); # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable

     

       23
       27
        
           postBootCommands = pkgs.writeText "local-cmds"

     

       24
       28
        
             ''

     

       25
       29
        
               ${config.boot.postBootCommands}

     
···

       80
       84
        
                 The program to execute to start systemd. Typically

     

       81
       85
        
                 <literal>systemd</literal>, which will find systemd in the

     

       82
       86
        
                 PATH.

     

       87
       87
       +
               '';

     

       88
       88
       +
             };

     

       89
       89
       +
       

     

       90
       90
       +
             extraSystemdUnitPaths = mkOption {

     

       91
       91
       +
               default = [];

     

       92
       92
       +
               type = types.listOf types.str;

     

       93
       93
       +
               description = ''

     

       94
       94
       +
                 Additional paths that get appended to the SYSTEMD_UNIT_PATH environment variable

     

       95
       95
       +
                 that can contain mutable unit files.

     

       83
       96
        
               '';

     

       84
       97
        
             };

     

       85
       98
        
           };

nixos/tests/all-tests.nix

···

       393
       393
        
         systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};

     

       394
       394
        
         systemd-nspawn = handleTest ./systemd-nspawn.nix {};

     

       395
       395
        
         systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};

     

       396
       396
       +
         systemd-unit-path = handleTest ./systemd-unit-path.nix {};

     

       396
       397
        
         taskserver = handleTest ./taskserver.nix {};

     

       397
       398
        
         telegraf = handleTest ./telegraf.nix {};

     

       398
       399
        
         tiddlywiki = handleTest ./tiddlywiki.nix {};

+47

nixos/tests/systemd-unit-path.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         exampleScript = pkgs.writeTextFile {

     

       5
       5
       +
           name = "example.sh";

     

       6
       6
       +
           text = ''

     

       7
       7
       +
             #! ${pkgs.runtimeShell} -e

     

       8
       8
       +
       

     

       9
       9
       +
             while true; do

     

       10
       10
       +
                 echo "Example script running" >&2

     

       11
       11
       +
                 ${pkgs.coreutils}/bin/sleep 1

     

       12
       12
       +
             done

     

       13
       13
       +
           '';

     

       14
       14
       +
           executable = true;

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         unitFile = pkgs.writeTextFile {

     

       18
       18
       +
           name = "example.service";

     

       19
       19
       +
           text = ''

     

       20
       20
       +
             [Unit]

     

       21
       21
       +
             Description=Example systemd service unit file

     

       22
       22
       +
       

     

       23
       23
       +
             [Service]

     

       24
       24
       +
             ExecStart=${exampleScript}

     

       25
       25
       +
       

     

       26
       26
       +
             [Install]

     

       27
       27
       +
             WantedBy=multi-user.target

     

       28
       28
       +
           '';

     

       29
       29
       +
         };

     

       30
       30
       +
       in

     

       31
       31
       +
       {

     

       32
       32
       +
         name = "systemd-unit-path";

     

       33
       33
       +
       

     

       34
       34
       +
         machine = { pkgs, lib, ... }: {

     

       35
       35
       +
           boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ];

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       38
       38
       +
         testScript = ''

     

       39
       39
       +
           machine.wait_for_unit("multi-user.target")

     

       40
       40
       +
           machine.succeed("mkdir -p /etc/systemd-rw/system")

     

       41
       41
       +
           machine.succeed(

     

       42
       42
       +
               "cp ${unitFile} /etc/systemd-rw/system/example.service"

     

       43
       43
       +
           )

     

       44
       44
       +
           machine.succeed("systemctl start example.service")

     

       45
       45
       +
           machine.succeed("systemctl status example.service | grep 'Active: active'")

     

       46
       46
       +
         '';

     

       47
       47
       +
       })

+1 -1

pkgs/applications/graphics/rapid-photo-downloader/default.nix

···

       81
       81
        
         meta = with lib; {

     

       82
       82
        
           description = "Photo and video importer for cameras, phones, and memory cards";

     

       83
       83
        
           homepage = "https://www.damonlynch.net/rapid/";

     

       84
       84
       -
           license = licenses.gpl3;

     

       84
       84
       +
           license = licenses.gpl3Plus;

     

       85
       85
        
           platforms = platforms.linux;

     

       86
       86
        
           maintainers = with maintainers; [ jfrankenau ];

     

       87
       87
        
         };

+59

pkgs/applications/misc/moonlight-qt/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , wrapQtAppsHook

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , qmake

     

       7
       7
       +
       , qtquickcontrols2

     

       8
       8
       +
       , SDL2

     

       9
       9
       +
       , SDL2_ttf

     

       10
       10
       +
       , libva

     

       11
       11
       +
       , libvdpau

     

       12
       12
       +
       , libxkbcommon

     

       13
       13
       +
       , alsaLib

     

       14
       14
       +
       , libpulseaudio

     

       15
       15
       +
       , openssl

     

       16
       16
       +
       , libopus

     

       17
       17
       +
       , ffmpeg

     

       18
       18
       +
       }:

     

       19
       19
       +
       

     

       20
       20
       +
       stdenv.mkDerivation rec {

     

       21
       21
       +
         pname = "moonlight-qt";

     

       22
       22
       +
         version = "3.1.0";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchFromGitHub {

     

       25
       25
       +
           owner = "moonlight-stream";

     

       26
       26
       +
           repo = pname;

     

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

     

       28
       28
       +
           sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc=";

     

       29
       29
       +
           fetchSubmodules = true;

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         nativeBuildInputs = [

     

       33
       33
       +
           wrapQtAppsHook

     

       34
       34
       +
           pkg-config

     

       35
       35
       +
           qmake

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         buildInputs = [

     

       39
       39
       +
           qtquickcontrols2

     

       40
       40
       +
           SDL2

     

       41
       41
       +
           SDL2_ttf

     

       42
       42
       +
           libva

     

       43
       43
       +
           libvdpau

     

       44
       44
       +
           libxkbcommon

     

       45
       45
       +
           alsaLib

     

       46
       46
       +
           libpulseaudio

     

       47
       47
       +
           openssl

     

       48
       48
       +
           libopus

     

       49
       49
       +
           ffmpeg

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         meta = with lib; {

     

       53
       53
       +
           description = "Play your PC games on almost any device";

     

       54
       54
       +
           homepage = "https://moonlight-stream.org";

     

       55
       55
       +
           license = licenses.gpl3Plus;

     

       56
       56
       +
           maintainers = with maintainers; [ luc65r ];

     

       57
       57
       +
           platforms = platforms.all;

     

       58
       58
       +
         };

     

       59
       59
       +
       }

+1 -1

pkgs/applications/networking/cluster/velero/default.nix

···

       40
       40
        
             "https://github.com/vmware-tanzu/velero/releases/tag/v${version}";

     

       41
       41
        
           license = licenses.asl20;

     

       42
       42
        
           maintainers = [ maintainers.mbode maintainers.bryanasdev000 ];

     

       43
       43
       -
           platforms = platforms.linux;

     

       43
       43
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       44
       44
        
         };

     

       45
       45
        
       }

+4 -4

pkgs/applications/version-management/redmine/Gemfile

···

       3
       3
        
       ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'

     

       4
       4
        
       gem "bundler", ">= 1.5.0"

     

       5
       5
        
       

     

       6
       6
       -
       gem 'rails', '5.2.4.2'

     

       6
       6
       +
       gem 'rails', '5.2.4.5'

     

       7
       7
        
       gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'

     

       8
       8
        
       gem "rouge", "~> 3.12.0"

     

       9
       9
        
       gem "request_store", "~> 1.4.1"

     
···

       12
       12
        
       gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")

     

       13
       13
        
       gem "mimemagic"

     

       14
       14
        
       gem "mail", "~> 2.7.1"

     

       15
       15
       -
       gem "csv", "~> 3.1.1"

     

       16
       16
       -
       gem "nokogiri", "~> 1.10.0"

     

       15
       15
       +
       gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')

     

       16
       16
       +
       gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')

     

       17
       17
        
       gem "i18n", "~> 1.6.0"

     

       18
       18
        
       gem "rbpdf", "~> 1.20.0"

     

       19
       19
        
       

     
···

       38
       38
        
       

     

       39
       39
        
       # Optional Markdown support, not for JRuby

     

       40
       40
        
       group :markdown do

     

       41
       41
       -
         gem "redcarpet", "~> 3.5.0"

     

       41
       41
       +
         gem 'redcarpet', '~> 3.5.1'

     

       42
       42
        
       end

     

       43
       43
        
       

     

       44
       44
        
       # Include database gems for the database adapters NixOS supports

+74 -72

pkgs/applications/version-management/redmine/Gemfile.lock

···

       1
       1
        
       GEM

     

       2
       2
        
         remote: https://rubygems.org/

     

       3
       3
        
         specs:

     

       4
       4
       -
           actioncable (5.2.4.2)

     

       5
       5
       -
             actionpack (= 5.2.4.2)

     

       4
       4
       +
           actioncable (5.2.4.5)

     

       5
       5
       +
             actionpack (= 5.2.4.5)

     

       6
       6
        
             nio4r (~> 2.0)

     

       7
       7
        
             websocket-driver (>= 0.6.1)

     

       8
       8
       -
           actionmailer (5.2.4.2)

     

       9
       9
       -
             actionpack (= 5.2.4.2)

     

       10
       10
       -
             actionview (= 5.2.4.2)

     

       11
       11
       -
             activejob (= 5.2.4.2)

     

       8
       8
       +
           actionmailer (5.2.4.5)

     

       9
       9
       +
             actionpack (= 5.2.4.5)

     

       10
       10
       +
             actionview (= 5.2.4.5)

     

       11
       11
       +
             activejob (= 5.2.4.5)

     

       12
       12
        
             mail (~> 2.5, >= 2.5.4)

     

       13
       13
        
             rails-dom-testing (~> 2.0)

     

       14
       14
       -
           actionpack (5.2.4.2)

     

       15
       15
       -
             actionview (= 5.2.4.2)

     

       16
       16
       -
             activesupport (= 5.2.4.2)

     

       14
       14
       +
           actionpack (5.2.4.5)

     

       15
       15
       +
             actionview (= 5.2.4.5)

     

       16
       16
       +
             activesupport (= 5.2.4.5)

     

       17
       17
        
             rack (~> 2.0, >= 2.0.8)

     

       18
       18
        
             rack-test (>= 0.6.3)

     

       19
       19
        
             rails-dom-testing (~> 2.0)

     
···

       21
       21
        
           actionpack-xml_parser (2.0.1)

     

       22
       22
        
             actionpack (>= 5.0)

     

       23
       23
        
             railties (>= 5.0)

     

       24
       24
       -
           actionview (5.2.4.2)

     

       25
       25
       -
             activesupport (= 5.2.4.2)

     

       24
       24
       +
           actionview (5.2.4.5)

     

       25
       25
       +
             activesupport (= 5.2.4.5)

     

       26
       26
        
             builder (~> 3.1)

     

       27
       27
        
             erubi (~> 1.4)

     

       28
       28
        
             rails-dom-testing (~> 2.0)

     

       29
       29
        
             rails-html-sanitizer (~> 1.0, >= 1.0.3)

     

       30
       30
       -
           activejob (5.2.4.2)

     

       31
       31
       -
             activesupport (= 5.2.4.2)

     

       30
       30
       +
           activejob (5.2.4.5)

     

       31
       31
       +
             activesupport (= 5.2.4.5)

     

       32
       32
        
             globalid (>= 0.3.6)

     

       33
       33
       -
           activemodel (5.2.4.2)

     

       34
       34
       -
             activesupport (= 5.2.4.2)

     

       35
       35
       -
           activerecord (5.2.4.2)

     

       36
       36
       -
             activemodel (= 5.2.4.2)

     

       37
       37
       -
             activesupport (= 5.2.4.2)

     

       33
       33
       +
           activemodel (5.2.4.5)

     

       34
       34
       +
             activesupport (= 5.2.4.5)

     

       35
       35
       +
           activerecord (5.2.4.5)

     

       36
       36
       +
             activemodel (= 5.2.4.5)

     

       37
       37
       +
             activesupport (= 5.2.4.5)

     

       38
       38
        
             arel (>= 9.0)

     

       39
       39
       -
           activestorage (5.2.4.2)

     

       40
       40
       -
             actionpack (= 5.2.4.2)

     

       41
       41
       -
             activerecord (= 5.2.4.2)

     

       39
       39
       +
           activestorage (5.2.4.5)

     

       40
       40
       +
             actionpack (= 5.2.4.5)

     

       41
       41
       +
             activerecord (= 5.2.4.5)

     

       42
       42
        
             marcel (~> 0.3.1)

     

       43
       43
       -
           activesupport (5.2.4.2)

     

       43
       43
       +
           activesupport (5.2.4.5)

     

       44
       44
        
             concurrent-ruby (~> 1.0, >= 1.0.2)

     

       45
       45
        
             i18n (>= 0.7, < 2)

     

       46
       46
        
             minitest (~> 5.1)

     
···

       48
       48
        
           addressable (2.7.0)

     

       49
       49
        
             public_suffix (>= 2.0.2, < 5.0)

     

       50
       50
        
           arel (9.0.0)

     

       51
       51
       -
           ast (2.4.0)

     

       51
       51
       +
           ast (2.4.2)

     

       52
       52
        
           builder (3.2.4)

     

       53
       53
        
           capybara (3.25.0)

     

       54
       54
        
             addressable

     
···

       59
       59
        
             regexp_parser (~> 1.5)

     

       60
       60
        
             xpath (~> 3.2)

     

       61
       61
        
           childprocess (3.0.0)

     

       62
       62
       -
           concurrent-ruby (1.1.6)

     

       62
       62
       +
           concurrent-ruby (1.1.8)

     

       63
       63
        
           crass (1.0.6)

     

       64
       64
       -
           css_parser (1.7.1)

     

       64
       64
       +
           css_parser (1.9.0)

     

       65
       65
        
             addressable

     

       66
       66
       -
           csv (3.1.2)

     

       67
       67
       -
           docile (1.3.2)

     

       68
       68
       -
           erubi (1.9.0)

     

       66
       66
       +
           csv (3.1.9)

     

       67
       67
       +
           docile (1.3.5)

     

       68
       68
       +
           erubi (1.10.0)

     

       69
       69
        
           globalid (0.4.2)

     

       70
       70
        
             activesupport (>= 4.2.0)

     

       71
       71
        
           htmlentities (4.3.4)

     

       72
       72
        
           i18n (1.6.0)

     

       73
       73
        
             concurrent-ruby (~> 1.0)

     

       74
       74
        
           jaro_winkler (1.5.4)

     

       75
       75
       -
           json (2.3.0)

     

       76
       76
       -
           loofah (2.5.0)

     

       75
       75
       +
           json (2.5.1)

     

       76
       76
       +
           loofah (2.9.0)

     

       77
       77
        
             crass (~> 1.0.2)

     

       78
       78
        
             nokogiri (>= 1.5.9)

     

       79
       79
        
           mail (2.7.1)

     
···

       81
       81
        
           marcel (0.3.3)

     

       82
       82
        
             mimemagic (~> 0.3.2)

     

       83
       83
        
           method_source (1.0.0)

     

       84
       84
       -
           mimemagic (0.3.4)

     

       84
       84
       +
           mimemagic (0.3.5)

     

       85
       85
        
           mini_magick (4.9.5)

     

       86
       86
        
           mini_mime (1.0.2)

     

       87
       87
       -
           mini_portile2 (2.4.0)

     

       88
       88
       -
           minitest (5.14.0)

     

       89
       89
       -
           mocha (1.11.2)

     

       87
       87
       +
           mini_portile2 (2.5.0)

     

       88
       88
       +
           minitest (5.14.4)

     

       89
       89
       +
           mocha (1.12.0)

     

       90
       90
        
           mysql2 (0.5.3)

     

       91
       91
       -
           net-ldap (0.16.2)

     

       92
       92
       -
           nio4r (2.5.2)

     

       93
       93
       -
           nokogiri (1.10.9)

     

       94
       94
       -
             mini_portile2 (~> 2.4.0)

     

       95
       95
       -
           parallel (1.19.1)

     

       96
       96
       -
           parser (2.7.1.0)

     

       97
       97
       -
             ast (~> 2.4.0)

     

       91
       91
       +
           net-ldap (0.16.3)

     

       92
       92
       +
           nio4r (2.5.7)

     

       93
       93
       +
           nokogiri (1.11.2)

     

       94
       94
       +
             mini_portile2 (~> 2.5.0)

     

       95
       95
       +
             racc (~> 1.4)

     

       96
       96
       +
           parallel (1.20.1)

     

       97
       97
       +
           parser (3.0.0.0)

     

       98
       98
       +
             ast (~> 2.4.1)

     

       98
       99
        
           pg (1.1.4)

     

       99
       99
       -
           public_suffix (4.0.4)

     

       100
       100
       -
           puma (3.12.4)

     

       101
       101
       -
           rack (2.2.2)

     

       100
       100
       +
           public_suffix (4.0.6)

     

       101
       101
       +
           puma (3.12.6)

     

       102
       102
       +
           racc (1.5.2)

     

       103
       103
       +
           rack (2.2.3)

     

       102
       104
        
           rack-openid (1.4.2)

     

       103
       105
        
             rack (>= 1.1.0)

     

       104
       106
        
             ruby-openid (>= 2.1.8)

     

       105
       107
        
           rack-test (1.1.0)

     

       106
       108
        
             rack (>= 1.0, < 3)

     

       107
       107
       -
           rails (5.2.4.2)

     

       108
       108
       -
             actioncable (= 5.2.4.2)

     

       109
       109
       -
             actionmailer (= 5.2.4.2)

     

       110
       110
       -
             actionpack (= 5.2.4.2)

     

       111
       111
       -
             actionview (= 5.2.4.2)

     

       112
       112
       -
             activejob (= 5.2.4.2)

     

       113
       113
       -
             activemodel (= 5.2.4.2)

     

       114
       114
       -
             activerecord (= 5.2.4.2)

     

       115
       115
       -
             activestorage (= 5.2.4.2)

     

       116
       116
       -
             activesupport (= 5.2.4.2)

     

       109
       109
       +
           rails (5.2.4.5)

     

       110
       110
       +
             actioncable (= 5.2.4.5)

     

       111
       111
       +
             actionmailer (= 5.2.4.5)

     

       112
       112
       +
             actionpack (= 5.2.4.5)

     

       113
       113
       +
             actionview (= 5.2.4.5)

     

       114
       114
       +
             activejob (= 5.2.4.5)

     

       115
       115
       +
             activemodel (= 5.2.4.5)

     

       116
       116
       +
             activerecord (= 5.2.4.5)

     

       117
       117
       +
             activestorage (= 5.2.4.5)

     

       118
       118
       +
             activesupport (= 5.2.4.5)

     

       117
       119
        
             bundler (>= 1.3.0)

     

       118
       118
       -
             railties (= 5.2.4.2)

     

       120
       120
       +
             railties (= 5.2.4.5)

     

       119
       121
        
             sprockets-rails (>= 2.0.0)

     

       120
       122
        
           rails-dom-testing (2.0.3)

     

       121
       123
        
             activesupport (>= 4.2.0)

     

       122
       124
        
             nokogiri (>= 1.6)

     

       123
       125
        
           rails-html-sanitizer (1.3.0)

     

       124
       126
        
             loofah (~> 2.3)

     

       125
       125
       -
           railties (5.2.4.2)

     

       126
       126
       -
             actionpack (= 5.2.4.2)

     

       127
       127
       -
             activesupport (= 5.2.4.2)

     

       127
       127
       +
           railties (5.2.4.5)

     

       128
       128
       +
             actionpack (= 5.2.4.5)

     

       129
       129
       +
             activesupport (= 5.2.4.5)

     

       128
       130
        
             method_source

     

       129
       131
        
             rake (>= 0.8.7)

     

       130
       132
        
             thor (>= 0.19.0, < 2.0)

     

       131
       133
        
           rainbow (3.0.0)

     

       132
       132
       -
           rake (13.0.1)

     

       134
       134
       +
           rake (13.0.3)

     

       133
       135
        
           rbpdf (1.20.1)

     

       134
       136
        
             htmlentities

     

       135
       137
        
             rbpdf-font (~> 1.19.0)

     

       136
       138
        
           rbpdf-font (1.19.1)

     

       137
       137
       -
           redcarpet (3.5.0)

     

       138
       138
       -
           regexp_parser (1.7.0)

     

       139
       139
       +
           redcarpet (3.5.1)

     

       140
       140
       +
           regexp_parser (1.8.2)

     

       139
       141
        
           request_store (1.4.1)

     

       140
       142
        
             rack (>= 1.4)

     

       141
       143
        
           roadie (4.0.0)

     
···

       158
       160
        
             rack (>= 1.1)

     

       159
       161
        
             rubocop (>= 0.72.0)

     

       160
       162
        
           ruby-openid (2.9.2)

     

       161
       161
       -
           ruby-progressbar (1.10.1)

     

       163
       163
       +
           ruby-progressbar (1.11.0)

     

       162
       164
        
           rubyzip (2.3.0)

     

       163
       165
        
           selenium-webdriver (3.142.7)

     

       164
       166
        
             childprocess (>= 0.5, < 4.0)

     
···

       168
       170
        
             json (>= 1.8, < 3)

     

       169
       171
        
             simplecov-html (~> 0.10.0)

     

       170
       172
        
           simplecov-html (0.10.2)

     

       171
       171
       -
           sprockets (4.0.0)

     

       173
       173
       +
           sprockets (4.0.2)

     

       172
       174
        
             concurrent-ruby (~> 1.0)

     

       173
       175
        
             rack (> 1, < 3)

     

       174
       174
       -
           sprockets-rails (3.2.1)

     

       176
       176
       +
           sprockets-rails (3.2.2)

     

       175
       177
        
             actionpack (>= 4.0)

     

       176
       178
        
             activesupport (>= 4.0)

     

       177
       179
        
             sprockets (>= 3.0.0)

     

       178
       178
       -
           thor (1.0.1)

     

       180
       180
       +
           thor (1.1.0)

     

       179
       181
        
           thread_safe (0.3.6)

     

       180
       180
       -
           tzinfo (1.2.7)

     

       182
       182
       +
           tzinfo (1.2.9)

     

       181
       183
        
             thread_safe (~> 0.1)

     

       182
       184
        
           unicode-display_width (1.6.1)

     

       183
       183
       -
           websocket-driver (0.7.1)

     

       185
       185
       +
           websocket-driver (0.7.3)

     

       184
       186
        
             websocket-extensions (>= 0.1.0)

     

       185
       185
       -
           websocket-extensions (0.1.4)

     

       187
       187
       +
           websocket-extensions (0.1.5)

     

       186
       188
        
           xpath (3.2.0)

     

       187
       189
        
             nokogiri (~> 1.8)

     

       188
       188
       -
           yard (0.9.24)

     

       190
       190
       +
           yard (0.9.26)

     

       189
       191
        
       

     

       190
       192
        
       PLATFORMS

     

       191
       193
        
         ruby

     
···

       204
       206
        
         mocha (>= 1.4.0)

     

       205
       207
        
         mysql2 (~> 0.5.0)

     

       206
       208
        
         net-ldap (~> 0.16.0)

     

       207
       207
       -
         nokogiri (~> 1.10.0)

     

       209
       209
       +
         nokogiri (~> 1.11.1)

     

       208
       210
        
         pg (~> 1.1.4)

     

       209
       211
        
         puma (~> 3.7)

     

       210
       212
        
         rack-openid

     

       211
       211
       -
         rails (= 5.2.4.2)

     

       213
       213
       +
         rails (= 5.2.4.5)

     

       212
       214
        
         rails-dom-testing

     

       213
       215
        
         rbpdf (~> 1.20.0)

     

       214
       214
       -
         redcarpet (~> 3.5.0)

     

       216
       216
       +
         redcarpet (~> 3.5.1)

     

       215
       217
        
         request_store (~> 1.4.1)

     

       216
       218
        
         roadie-rails (~> 2.1.0)

     

       217
       219
        
         rouge (~> 3.12.0)

+2 -2

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

···

       1
       1
        
       { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "4.1.1";

     

       4
       4
       +
         version = "4.1.2";

     

       5
       5
        
         rubyEnv = bundlerEnv {

     

       6
       6
        
           name = "redmine-env-${version}";

     

       7
       7
        
       

     
···

       16
       16
        
       

     

       17
       17
        
           src = fetchurl {

     

       18
       18
        
             url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";

     

       19
       19
       -
             sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5";

     

       19
       19
       +
             sha256 = "13i2rlkpdwkdhidpdb5r2zxwxna00r71rh248kzfhgy5a5rkj8ky";

     

       20
       20
        
           };

     

       21
       21
        
       

     

       22
       22
        
           nativeBuildInputs = [ makeWrapper ];

+95 -85

pkgs/applications/version-management/redmine/gemset.nix

···

       5
       5
        
           platforms = [];

     

       6
       6
        
           source = {

     

       7
       7
        
             remotes = ["https://rubygems.org"];

     

       8
       8
       -
             sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v";

     

       8
       8
       +
             sha256 = "1rlx5597621jmdzpf8mhfm52d0fcz1izdj94k58l4sln4gw0x73j";

     

       9
       9
        
             type = "gem";

     

       10
       10
        
           };

     

       11
       11
       -
           version = "5.2.4.2";

     

       11
       11
       +
           version = "5.2.4.5";

     

       12
       12
        
         };

     

       13
       13
        
         actionmailer = {

     

       14
       14
        
           dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];

     
···

       16
       16
        
           platforms = [];

     

       17
       17
        
           source = {

     

       18
       18
        
             remotes = ["https://rubygems.org"];

     

       19
       19
       -
             sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z";

     

       19
       19
       +
             sha256 = "19y5y2dypqakk39smcmyslic8wnffzc0670d2zjadsrgsg850gyp";

     

       20
       20
        
             type = "gem";

     

       21
       21
        
           };

     

       22
       22
       -
           version = "5.2.4.2";

     

       22
       22
       +
           version = "5.2.4.5";

     

       23
       23
        
         };

     

       24
       24
        
         actionpack = {

     

       25
       25
        
           dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

     
···

       27
       27
        
           platforms = [];

     

       28
       28
        
           source = {

     

       29
       29
        
             remotes = ["https://rubygems.org"];

     

       30
       30
       -
             sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax";

     

       30
       30
       +
             sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq";

     

       31
       31
        
             type = "gem";

     

       32
       32
        
           };

     

       33
       33
       -
           version = "5.2.4.2";

     

       33
       33
       +
           version = "5.2.4.5";

     

       34
       34
        
         };

     

       35
       35
        
         actionpack-xml_parser = {

     

       36
       36
        
           dependencies = ["actionpack" "railties"];

     
···

       49
       49
        
           platforms = [];

     

       50
       50
        
           source = {

     

       51
       51
        
             remotes = ["https://rubygems.org"];

     

       52
       52
       -
             sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp";

     

       52
       52
       +
             sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c";

     

       53
       53
        
             type = "gem";

     

       54
       54
        
           };

     

       55
       55
       -
           version = "5.2.4.2";

     

       55
       55
       +
           version = "5.2.4.5";

     

       56
       56
        
         };

     

       57
       57
        
         activejob = {

     

       58
       58
        
           dependencies = ["activesupport" "globalid"];

     
···

       60
       60
        
           platforms = [];

     

       61
       61
        
           source = {

     

       62
       62
        
             remotes = ["https://rubygems.org"];

     

       63
       63
       -
             sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi";

     

       63
       63
       +
             sha256 = "1mb4s49vbrxyg3pba76z3llbzclm8d4zcjhalf4yrfq5y357kkya";

     

       64
       64
        
             type = "gem";

     

       65
       65
        
           };

     

       66
       66
       -
           version = "5.2.4.2";

     

       66
       66
       +
           version = "5.2.4.5";

     

       67
       67
        
         };

     

       68
       68
        
         activemodel = {

     

       69
       69
        
           dependencies = ["activesupport"];

     
···

       71
       71
        
           platforms = [];

     

       72
       72
        
           source = {

     

       73
       73
        
             remotes = ["https://rubygems.org"];

     

       74
       74
       -
             sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di";

     

       74
       74
       +
             sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m";

     

       75
       75
        
             type = "gem";

     

       76
       76
        
           };

     

       77
       77
       -
           version = "5.2.4.2";

     

       77
       77
       +
           version = "5.2.4.5";

     

       78
       78
        
         };

     

       79
       79
        
         activerecord = {

     

       80
       80
        
           dependencies = ["activemodel" "activesupport" "arel"];

     
···

       82
       82
        
           platforms = [];

     

       83
       83
        
           source = {

     

       84
       84
        
             remotes = ["https://rubygems.org"];

     

       85
       85
       -
             sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5";

     

       85
       85
       +
             sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg";

     

       86
       86
        
             type = "gem";

     

       87
       87
        
           };

     

       88
       88
       -
           version = "5.2.4.2";

     

       88
       88
       +
           version = "5.2.4.5";

     

       89
       89
        
         };

     

       90
       90
        
         activestorage = {

     

       91
       91
        
           dependencies = ["actionpack" "activerecord" "marcel"];

     
···

       93
       93
        
           platforms = [];

     

       94
       94
        
           source = {

     

       95
       95
        
             remotes = ["https://rubygems.org"];

     

       96
       96
       -
             sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9";

     

       96
       96
       +
             sha256 = "12i3an3vxg0fqjvr4mi0b3nnsb8jpcphkmz1717nb7lsy3wm4081";

     

       97
       97
        
             type = "gem";

     

       98
       98
        
           };

     

       99
       99
       -
           version = "5.2.4.2";

     

       99
       99
       +
           version = "5.2.4.5";

     

       100
       100
        
         };

     

       101
       101
        
         activesupport = {

     

       102
       102
        
           dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];

     
···

       104
       104
        
           platforms = [];

     

       105
       105
        
           source = {

     

       106
       106
        
             remotes = ["https://rubygems.org"];

     

       107
       107
       -
             sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc";

     

       107
       107
       +
             sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";

     

       108
       108
        
             type = "gem";

     

       109
       109
        
           };

     

       110
       110
       -
           version = "5.2.4.2";

     

       110
       110
       +
           version = "5.2.4.5";

     

       111
       111
        
         };

     

       112
       112
        
         addressable = {

     

       113
       113
        
           dependencies = ["public_suffix"];

     
···

       135
       135
        
           platforms = [];

     

       136
       136
        
           source = {

     

       137
       137
        
             remotes = ["https://rubygems.org"];

     

       138
       138
       -
             sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";

     

       138
       138
       +
             sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";

     

       139
       139
        
             type = "gem";

     

       140
       140
        
           };

     

       141
       141
       -
           version = "2.4.0";

     

       141
       141
       +
           version = "2.4.2";

     

       142
       142
        
         };

     

       143
       143
        
         builder = {

     

       144
       144
        
           groups = ["default"];

     
···

       176
       176
        
           platforms = [];

     

       177
       177
        
           source = {

     

       178
       178
        
             remotes = ["https://rubygems.org"];

     

       179
       179
       -
             sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";

     

       179
       179
       +
             sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";

     

       180
       180
        
             type = "gem";

     

       181
       181
        
           };

     

       182
       182
       -
           version = "1.1.6";

     

       182
       182
       +
           version = "1.1.8";

     

       183
       183
        
         };

     

       184
       184
        
         crass = {

     

       185
       185
        
           groups = ["default"];

     
···

       197
       197
        
           platforms = [];

     

       198
       198
        
           source = {

     

       199
       199
        
             remotes = ["https://rubygems.org"];

     

       200
       200
       -
             sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw";

     

       200
       200
       +
             sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751";

     

       201
       201
        
             type = "gem";

     

       202
       202
        
           };

     

       203
       203
       -
           version = "1.7.1";

     

       203
       203
       +
           version = "1.9.0";

     

       204
       204
        
         };

     

       205
       205
        
         csv = {

     

       206
       206
        
           groups = ["default"];

     

       207
       207
        
           platforms = [];

     

       208
       208
        
           source = {

     

       209
       209
        
             remotes = ["https://rubygems.org"];

     

       210
       210
       -
             sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5";

     

       210
       210
       +
             sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m";

     

       211
       211
        
             type = "gem";

     

       212
       212
        
           };

     

       213
       213
       -
           version = "3.1.2";

     

       213
       213
       +
           version = "3.1.9";

     

       214
       214
        
         };

     

       215
       215
        
         docile = {

     

       216
       216
        
           groups = ["default" "test"];

     

       217
       217
        
           platforms = [];

     

       218
       218
        
           source = {

     

       219
       219
        
             remotes = ["https://rubygems.org"];

     

       220
       220
       -
             sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";

     

       220
       220
       +
             sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z";

     

       221
       221
        
             type = "gem";

     

       222
       222
        
           };

     

       223
       223
       -
           version = "1.3.2";

     

       223
       223
       +
           version = "1.3.5";

     

       224
       224
        
         };

     

       225
       225
        
         erubi = {

     

       226
       226
        
           groups = ["default"];

     

       227
       227
        
           platforms = [];

     

       228
       228
        
           source = {

     

       229
       229
        
             remotes = ["https://rubygems.org"];

     

       230
       230
       -
             sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";

     

       230
       230
       +
             sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";

     

       231
       231
        
             type = "gem";

     

       232
       232
        
           };

     

       233
       233
       -
           version = "1.9.0";

     

       233
       233
       +
           version = "1.10.0";

     

       234
       234
        
         };

     

       235
       235
        
         globalid = {

     

       236
       236
        
           dependencies = ["activesupport"];

     
···

       279
       279
        
           platforms = [];

     

       280
       280
        
           source = {

     

       281
       281
        
             remotes = ["https://rubygems.org"];

     

       282
       282
       -
             sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";

     

       282
       282
       +
             sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";

     

       283
       283
        
             type = "gem";

     

       284
       284
        
           };

     

       285
       285
       -
           version = "2.3.0";

     

       285
       285
       +
           version = "2.5.1";

     

       286
       286
        
         };

     

       287
       287
        
         loofah = {

     

       288
       288
        
           dependencies = ["crass" "nokogiri"];

     
···

       290
       290
        
           platforms = [];

     

       291
       291
        
           source = {

     

       292
       292
        
             remotes = ["https://rubygems.org"];

     

       293
       293
       -
             sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";

     

       293
       293
       +
             sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";

     

       294
       294
        
             type = "gem";

     

       295
       295
        
           };

     

       296
       296
       -
           version = "2.5.0";

     

       296
       296
       +
           version = "2.9.0";

     

       297
       297
        
         };

     

       298
       298
        
         mail = {

     

       299
       299
        
           dependencies = ["mini_mime"];

     
···

       332
       332
        
           platforms = [];

     

       333
       333
        
           source = {

     

       334
       334
        
             remotes = ["https://rubygems.org"];

     

       335
       335
       -
             sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p";

     

       335
       335
       +
             sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf";

     

       336
       336
        
             type = "gem";

     

       337
       337
        
           };

     

       338
       338
       -
           version = "0.3.4";

     

       338
       338
       +
           version = "0.3.5";

     

       339
       339
        
         };

     

       340
       340
        
         mini_magick = {

     

       341
       341
        
           groups = ["minimagick"];

     
···

       362
       362
        
           platforms = [];

     

       363
       363
        
           source = {

     

       364
       364
        
             remotes = ["https://rubygems.org"];

     

       365
       365
       -
             sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";

     

       365
       365
       +
             sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";

     

       366
       366
        
             type = "gem";

     

       367
       367
        
           };

     

       368
       368
       -
           version = "2.4.0";

     

       368
       368
       +
           version = "2.5.0";

     

       369
       369
        
         };

     

       370
       370
        
         minitest = {

     

       371
       371
        
           groups = ["default" "test"];

     

       372
       372
        
           platforms = [];

     

       373
       373
        
           source = {

     

       374
       374
        
             remotes = ["https://rubygems.org"];

     

       375
       375
       -
             sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";

     

       375
       375
       +
             sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";

     

       376
       376
        
             type = "gem";

     

       377
       377
        
           };

     

       378
       378
       -
           version = "5.14.0";

     

       378
       378
       +
           version = "5.14.4";

     

       379
       379
        
         };

     

       380
       380
        
         mocha = {

     

       381
       381
        
           groups = ["test"];

     

       382
       382
        
           platforms = [];

     

       383
       383
        
           source = {

     

       384
       384
        
             remotes = ["https://rubygems.org"];

     

       385
       385
       -
             sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4";

     

       385
       385
       +
             sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a";

     

       386
       386
        
             type = "gem";

     

       387
       387
        
           };

     

       388
       388
       -
           version = "1.11.2";

     

       388
       388
       +
           version = "1.12.0";

     

       389
       389
        
         };

     

       390
       390
        
         mysql2 = {

     

       391
       391
        
           groups = ["default"];

     
···

       410
       410
        
           platforms = [];

     

       411
       411
        
           source = {

     

       412
       412
        
             remotes = ["https://rubygems.org"];

     

       413
       413
       -
             sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";

     

       413
       413
       +
             sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";

     

       414
       414
        
             type = "gem";

     

       415
       415
        
           };

     

       416
       416
       -
           version = "0.16.2";

     

       416
       416
       +
           version = "0.16.3";

     

       417
       417
        
         };

     

       418
       418
        
         nio4r = {

     

       419
       419
        
           groups = ["default"];

     

       420
       420
        
           platforms = [];

     

       421
       421
        
           source = {

     

       422
       422
        
             remotes = ["https://rubygems.org"];

     

       423
       423
       -
             sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";

     

       423
       423
       +
             sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";

     

       424
       424
        
             type = "gem";

     

       425
       425
        
           };

     

       426
       426
       -
           version = "2.5.2";

     

       426
       426
       +
           version = "2.5.7";

     

       427
       427
        
         };

     

       428
       428
        
         nokogiri = {

     

       429
       429
       -
           dependencies = ["mini_portile2"];

     

       429
       429
       +
           dependencies = ["mini_portile2" "racc"];

     

       430
       430
        
           groups = ["default" "test"];

     

       431
       431
        
           platforms = [];

     

       432
       432
        
           source = {

     

       433
       433
        
             remotes = ["https://rubygems.org"];

     

       434
       434
       -
             sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";

     

       434
       434
       +
             sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";

     

       435
       435
        
             type = "gem";

     

       436
       436
        
           };

     

       437
       437
       -
           version = "1.10.9";

     

       437
       437
       +
           version = "1.11.2";

     

       438
       438
        
         };

     

       439
       439
        
         parallel = {

     

       440
       440
        
           groups = ["default" "test"];

     

       441
       441
        
           platforms = [];

     

       442
       442
        
           source = {

     

       443
       443
        
             remotes = ["https://rubygems.org"];

     

       444
       444
       -
             sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";

     

       444
       444
       +
             sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";

     

       445
       445
        
             type = "gem";

     

       446
       446
        
           };

     

       447
       447
       -
           version = "1.19.1";

     

       447
       447
       +
           version = "1.20.1";

     

       448
       448
        
         };

     

       449
       449
        
         parser = {

     

       450
       450
        
           dependencies = ["ast"];

     
···

       452
       452
        
           platforms = [];

     

       453
       453
        
           source = {

     

       454
       454
        
             remotes = ["https://rubygems.org"];

     

       455
       455
       -
             sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7";

     

       455
       455
       +
             sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml";

     

       456
       456
        
             type = "gem";

     

       457
       457
        
           };

     

       458
       458
       -
           version = "2.7.1.0";

     

       458
       458
       +
           version = "3.0.0.0";

     

       459
       459
        
         };

     

       460
       460
        
         pg = {

     

       461
       461
        
           groups = ["default"];

     
···

       480
       480
        
           platforms = [];

     

       481
       481
        
           source = {

     

       482
       482
        
             remotes = ["https://rubygems.org"];

     

       483
       483
       -
             sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz";

     

       483
       483
       +
             sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";

     

       484
       484
        
             type = "gem";

     

       485
       485
        
           };

     

       486
       486
       -
           version = "4.0.4";

     

       486
       486
       +
           version = "4.0.6";

     

       487
       487
        
         };

     

       488
       488
        
         puma = {

     

       489
       489
        
           groups = ["test"];

     

       490
       490
        
           platforms = [];

     

       491
       491
        
           source = {

     

       492
       492
        
             remotes = ["https://rubygems.org"];

     

       493
       493
       -
             sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs";

     

       493
       493
       +
             sha256 = "1ypkyqhysb2vvdvkl4w923yvpmi228gld4kbargb1i2d4sa9s49a";

     

       494
       494
       +
             type = "gem";

     

       495
       495
       +
           };

     

       496
       496
       +
           version = "3.12.6";

     

       497
       497
       +
         };

     

       498
       498
       +
         racc = {

     

       499
       499
       +
           groups = ["default" "test"];

     

       500
       500
       +
           platforms = [];

     

       501
       501
       +
           source = {

     

       502
       502
       +
             remotes = ["https://rubygems.org"];

     

       503
       503
       +
             sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";

     

       494
       504
        
             type = "gem";

     

       495
       505
        
           };

     

       496
       496
       -
           version = "3.12.4";

     

       506
       506
       +
           version = "1.5.2";

     

       497
       507
        
         };

     

       498
       508
        
         rack = {

     

       499
       509
        
           groups = ["default" "openid" "test"];

     

       500
       510
        
           platforms = [];

     

       501
       511
        
           source = {

     

       502
       512
        
             remotes = ["https://rubygems.org"];

     

       503
       503
       -
             sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp";

     

       513
       513
       +
             sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";

     

       504
       514
        
             type = "gem";

     

       505
       515
        
           };

     

       506
       506
       -
           version = "2.2.2";

     

       516
       516
       +
           version = "2.2.3";

     

       507
       517
        
         };

     

       508
       518
        
         rack-openid = {

     

       509
       519
        
           dependencies = ["rack" "ruby-openid"];

     
···

       533
       543
        
           platforms = [];

     

       534
       544
        
           source = {

     

       535
       545
        
             remotes = ["https://rubygems.org"];

     

       536
       536
       -
             sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4";

     

       546
       546
       +
             sha256 = "1nzsm1fqqnhlvgcfrrpsmcv2znldfkyq5c9z7k08p2p54jrd8kfd";

     

       537
       547
        
             type = "gem";

     

       538
       548
        
           };

     

       539
       539
       -
           version = "5.2.4.2";

     

       549
       549
       +
           version = "5.2.4.5";

     

       540
       550
        
         };

     

       541
       551
        
         rails-dom-testing = {

     

       542
       552
        
           dependencies = ["activesupport" "nokogiri"];

     
···

       566
       576
        
           platforms = [];

     

       567
       577
        
           source = {

     

       568
       578
        
             remotes = ["https://rubygems.org"];

     

       569
       569
       -
             sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16";

     

       579
       579
       +
             sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd";

     

       570
       580
        
             type = "gem";

     

       571
       581
        
           };

     

       572
       572
       -
           version = "5.2.4.2";

     

       582
       582
       +
           version = "5.2.4.5";

     

       573
       583
        
         };

     

       574
       584
        
         rainbow = {

     

       575
       585
        
           groups = ["default" "test"];

     
···

       586
       596
        
           platforms = [];

     

       587
       597
        
           source = {

     

       588
       598
        
             remotes = ["https://rubygems.org"];

     

       589
       589
       -
             sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";

     

       599
       599
       +
             sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";

     

       590
       600
        
             type = "gem";

     

       591
       601
        
           };

     

       592
       592
       -
           version = "13.0.1";

     

       602
       602
       +
           version = "13.0.3";

     

       593
       603
        
         };

     

       594
       604
        
         rbpdf = {

     

       595
       605
        
           dependencies = ["htmlentities" "rbpdf-font"];

     
···

       617
       627
        
           platforms = [];

     

       618
       628
        
           source = {

     

       619
       629
        
             remotes = ["https://rubygems.org"];

     

       620
       620
       -
             sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";

     

       630
       630
       +
             sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";

     

       621
       631
        
             type = "gem";

     

       622
       632
        
           };

     

       623
       623
       -
           version = "3.5.0";

     

       633
       633
       +
           version = "3.5.1";

     

       624
       634
        
         };

     

       625
       635
        
         regexp_parser = {

     

       626
       636
        
           groups = ["default" "test"];

     

       627
       637
        
           platforms = [];

     

       628
       638
        
           source = {

     

       629
       639
        
             remotes = ["https://rubygems.org"];

     

       630
       630
       -
             sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2";

     

       640
       640
       +
             sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";

     

       631
       641
        
             type = "gem";

     

       632
       642
        
           };

     

       633
       633
       -
           version = "1.7.0";

     

       643
       643
       +
           version = "1.8.2";

     

       634
       644
        
         };

     

       635
       645
        
         request_store = {

     

       636
       646
        
           dependencies = ["rack"];

     
···

       723
       733
        
           platforms = [];

     

       724
       734
        
           source = {

     

       725
       735
        
             remotes = ["https://rubygems.org"];

     

       726
       726
       -
             sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";

     

       736
       736
       +
             sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";

     

       727
       737
        
             type = "gem";

     

       728
       738
        
           };

     

       729
       729
       -
           version = "1.10.1";

     

       739
       739
       +
           version = "1.11.0";

     

       730
       740
        
         };

     

       731
       741
        
         rubyzip = {

     

       732
       742
        
           groups = ["default" "test"];

     
···

       776
       786
        
           platforms = [];

     

       777
       787
        
           source = {

     

       778
       788
        
             remotes = ["https://rubygems.org"];

     

       779
       779
       -
             sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap";

     

       789
       789
       +
             sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38";

     

       780
       790
        
             type = "gem";

     

       781
       791
        
           };

     

       782
       782
       -
           version = "4.0.0";

     

       792
       792
       +
           version = "4.0.2";

     

       783
       793
        
         };

     

       784
       794
        
         sprockets-rails = {

     

       785
       795
        
           dependencies = ["actionpack" "activesupport" "sprockets"];

     
···

       787
       797
        
           platforms = [];

     

       788
       798
        
           source = {

     

       789
       799
        
             remotes = ["https://rubygems.org"];

     

       790
       790
       -
             sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";

     

       800
       800
       +
             sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";

     

       791
       801
        
             type = "gem";

     

       792
       802
        
           };

     

       793
       793
       -
           version = "3.2.1";

     

       803
       803
       +
           version = "3.2.2";

     

       794
       804
        
         };

     

       795
       805
        
         thor = {

     

       796
       806
        
           groups = ["default"];

     

       797
       807
        
           platforms = [];

     

       798
       808
        
           source = {

     

       799
       809
        
             remotes = ["https://rubygems.org"];

     

       800
       800
       -
             sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";

     

       810
       810
       +
             sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";

     

       801
       811
        
             type = "gem";

     

       802
       812
        
           };

     

       803
       803
       -
           version = "1.0.1";

     

       813
       813
       +
           version = "1.1.0";

     

       804
       814
        
         };

     

       805
       815
        
         thread_safe = {

     

       806
       816
        
           groups = ["default" "test"];

     
···

       818
       828
        
           platforms = [];

     

       819
       829
        
           source = {

     

       820
       830
        
             remotes = ["https://rubygems.org"];

     

       821
       821
       -
             sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";

     

       831
       831
       +
             sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";

     

       822
       832
        
             type = "gem";

     

       823
       833
        
           };

     

       824
       824
       -
           version = "1.2.7";

     

       834
       834
       +
           version = "1.2.9";

     

       825
       835
        
         };

     

       826
       836
        
         unicode-display_width = {

     

       827
       837
        
           groups = ["default" "test"];

     
···

       839
       849
        
           platforms = [];

     

       840
       850
        
           source = {

     

       841
       851
        
             remotes = ["https://rubygems.org"];

     

       842
       842
       -
             sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";

     

       852
       852
       +
             sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";

     

       843
       853
        
             type = "gem";

     

       844
       854
        
           };

     

       845
       845
       -
           version = "0.7.1";

     

       855
       855
       +
           version = "0.7.3";

     

       846
       856
        
         };

     

       847
       857
        
         websocket-extensions = {

     

       848
       858
        
           groups = ["default"];

     

       849
       859
        
           platforms = [];

     

       850
       860
        
           source = {

     

       851
       861
        
             remotes = ["https://rubygems.org"];

     

       852
       852
       -
             sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";

     

       862
       862
       +
             sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";

     

       853
       863
        
             type = "gem";

     

       854
       864
        
           };

     

       855
       855
       -
           version = "0.1.4";

     

       865
       865
       +
           version = "0.1.5";

     

       856
       866
        
         };

     

       857
       867
        
         xpath = {

     

       858
       868
        
           dependencies = ["nokogiri"];

     
···

       870
       880
        
           platforms = [];

     

       871
       881
        
           source = {

     

       872
       882
        
             remotes = ["https://rubygems.org"];

     

       873
       873
       -
             sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp";

     

       883
       883
       +
             sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";

     

       874
       884
        
             type = "gem";

     

       875
       885
        
           };

     

       876
       876
       -
           version = "0.9.24";

     

       886
       886
       +
           version = "0.9.26";

     

       877
       887
        
         };

     

       878
       888
        
       }

+3 -2

pkgs/development/compilers/openjdk/darwin/default.nix

···

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         jdk = stdenv.mkDerivation rec {

     

       10
       10
       -
           name = "zulu15.28.51-ca-jdk15.0.1";

     

       10
       10
       +
           pname = "zulu15.28.51-ca-jdk";

     

       11
       11
       +
           version = "15.0.1";

     

       11
       12
        
       

     

       12
       13
        
           src = fetchurl {

     

       13
       13
       -
             url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";

     

       14
       14
       +
             url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz";

     

       14
       15
        
             sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh";

     

       15
       16
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       16
       17
        
           };

pkgs/development/haskell-modules/configuration-common.nix

···

       1675
       1675
        
         # https://github.com/jgm/pandoc/issues/7163

     

       1676
       1676
        
         pandoc = dontCheck super.pandoc;

     

       1677
       1677
        
       

     

       1678
       1678
       +
         # Too strict version bounds on cryptonite.

     

       1679
       1679
       +
         # Issue reported upstream, no bug tracker url yet.

     

       1680
       1680
       +
         darcs = doJailbreak super.darcs;

     

       1681
       1681
       +
       

     

       1678
       1682
        
       } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

+2 -2

pkgs/development/libraries/liburcu/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, perl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.12.1";

     

       4
       4
       +
         version = "0.12.2";

     

       5
       5
        
         pname = "liburcu";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv";

     

       9
       9
       +
           sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         checkInputs = [ perl ];

+2 -2

pkgs/development/libraries/symengine/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "symengine";

     

       12
       12
       -
         version = "0.6.0";

     

       12
       12
       +
         version = "0.7.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "symengine";

     

       16
       16
        
           repo = "symengine";

     

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

     

       18
       18
       -
           sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1";

     

       18
       18
       +
           sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "colorlog";

     

       9
       9
       -
         version = "4.7.2";

     

       9
       9
       +
         version = "4.8.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q";

     

       13
       13
       +
           sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [ pytestCheckHook ];

+11 -1

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

···

       1
       1
       -
       { lib, fetchPypi, buildPythonPackage }:

     

       1
       1
       +
       { lib, fetchPypi, buildPythonPackage, tkinter }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "easygui";

     
···

       9
       9
        
           sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         postPatch = ''

     

       13
       13
       +
           substituteInPlace setup.py --replace README.md README.txt

     

       14
       14
       +
         '';

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           tkinter

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       12
       20
        
         doCheck = false; # No tests available

     

       21
       21
       +
       

     

       22
       22
       +
         pythonImportsCheck = [ "easygui" ];

     

       13
       23
        
       

     

       14
       24
        
         meta = with lib; {

     

       15
       25
        
           description = "Very simple, very easy GUI programming in Python";

+19 -8

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

···

       1
       1
        
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       2
        
       , aiohttp

     

       5
       3
        
       , asynctest

     

       6
       6
       -
       , stdiomask

     

       4
       4
       +
       , buildPythonPackage

     

       7
       5
        
       , cryptography

     

       8
       8
       -
       , pytestcov

     

       6
       6
       +
       , fetchFromGitHub

     

       9
       7
        
       , pytest-asyncio

     

       10
       8
        
       , pytestCheckHook

     

       9
       9
       +
       , pythonOlder

     

       10
       10
       +
       , stdiomask

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "subarulink";

     

       15
       15
       -
         version = "0.3.12";

     

       15
       15
       +
         version = "0.3.13";

     

       16
       16
       +
         disabled = pythonOlder "3.7";

     

       16
       17
        
       

     

       17
       18
        
         src = fetchFromGitHub {

     

       18
       19
        
           owner = "G-Two";

     

       19
       20
        
           repo = pname;

     

       20
       21
        
           rev = "subaru-v${version}";

     

       21
       21
       -
           sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6";

     

       22
       22
       +
           sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ aiohttp stdiomask ];

     

       25
       25
       +
         propagatedBuildInputs = [

     

       26
       26
       +
           aiohttp

     

       27
       27
       +
           stdiomask

     

       28
       28
       +
         ];

     

       25
       29
        
       

     

       26
       30
        
         checkInputs = [

     

       27
       31
        
           asynctest

     

       28
       32
        
           cryptography

     

       29
       33
        
           pytest-asyncio

     

       30
       30
       -
           pytestcov

     

       31
       34
        
           pytestCheckHook

     

       32
       35
        
         ];

     

       33
       36
        
       

     

       37
       37
       +
         postPatch = ''

     

       38
       38
       +
           substituteInPlace setup.cfg --replace "--cov=subarulink" ""

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       34
       41
        
         __darwinAllowLocalNetworking = true;

     

       42
       42
       +
       

     

       43
       43
       +
         preCheck = ''

     

       44
       44
       +
           export HOME=$(mktemp -d)

     

       45
       45
       +
         '';

     

       35
       46
        
       

     

       36
       47
        
         pythonImportsCheck = [ "subarulink" ];

     

       37
       48

+1 -2

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

···

       13
       13
        
       

     

       14
       14
        
         cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";

     

       15
       15
        
       

     

       16
       16
       -
         cargoBuildFlags = [ "--features=dist-client,dist-server" ];

     

       16
       16
       +
         cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkg-config ];

     

       19
       19
        
         buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

     
···

       27
       27
        
           homepage = "https://github.com/mozilla/sccache";

     

       28
       28
        
           maintainers = with maintainers; [ doronbehar ];

     

       29
       29
        
           license = licenses.asl20;

     

       30
       30
       -
           platforms = [ "x86_64-linux" ];

     

       31
       30
        
         };

     

       32
       31
        
       }

+2 -2

pkgs/games/unciv/default.nix

···

       25
       25
        
       in

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
        
         pname = "unciv";

     

       28
       28
       -
         version = "3.13.8";

     

       28
       28
       +
         version = "3.13.10";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";

     

       32
       32
       -
           sha256 = "sha256-upT0ZtVYzbrQolik0c/2URNwU2LDLgiMWyFEiOZFijc=";

     

       32
       32
       +
           sha256 = "sha256-5UT/STcU+/17wjc/guOXgkD6UCtn97EQkVRgnTliFjg=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         dontUnpack = true;

+45 -33

pkgs/misc/vim-plugins/generated.nix

···

       389
       389
        
       

     

       390
       390
        
         chadtree = buildVimPluginFrom2Nix {

     

       391
       391
        
           pname = "chadtree";

     

       392
       392
       -
           version = "2021-03-21";

     

       392
       392
       +
           version = "2021-03-22";

     

       393
       393
        
           src = fetchFromGitHub {

     

       394
       394
        
             owner = "ms-jpq";

     

       395
       395
        
             repo = "chadtree";

     

       396
       396
       -
             rev = "74e928c9a98c20f024f78703a7d54386cf6f4469";

     

       397
       397
       -
             sha256 = "0z52f4dq1jgzwy4qw278h6ig07rr09l9affhmfliz0m7mb9r7b71";

     

       396
       396
       +
             rev = "8f7238502c742fe098e0d681c3597452aa053b89";

     

       397
       397
       +
             sha256 = "1cppnzf1slzxf3kb24pg18r2izdpd6mylrhc49rla083mr7hqx15";

     

       398
       398
        
           };

     

       399
       399
        
           meta.homepage = "https://github.com/ms-jpq/chadtree/";

     

       400
       400
        
         };

     
···

       545
       545
        
       

     

       546
       546
        
         coc-nvim = buildVimPluginFrom2Nix {

     

       547
       547
        
           pname = "coc-nvim";

     

       548
       548
       -
           version = "2021-03-19";

     

       548
       548
       +
           version = "2021-03-22";

     

       549
       549
        
           src = fetchFromGitHub {

     

       550
       550
        
             owner = "neoclide";

     

       551
       551
        
             repo = "coc.nvim";

     

       552
       552
       -
             rev = "0f73118b752cf7be86c3be9923675df0aff30d64";

     

       553
       553
       -
             sha256 = "1q04kibi2vhw1ibxhzbr5yvyg8484yb07h103442bpc4a2pzcz7i";

     

       552
       552
       +
             rev = "3b3c5f88bcb25c3d68351f417fa5e8425a3a3142";

     

       553
       553
       +
             sha256 = "1fkgyb0a5wirndk99d9ajdvxaiipgnv3r0cmvzldvy6ps5ljxabm";

     

       554
       554
        
           };

     

       555
       555
        
           meta.homepage = "https://github.com/neoclide/coc.nvim/";

     

       556
       556
        
         };

     
···

       894
       894
        
       

     

       895
       895
        
         defx-nvim = buildVimPluginFrom2Nix {

     

       896
       896
        
           pname = "defx-nvim";

     

       897
       897
       -
           version = "2021-03-21";

     

       897
       897
       +
           version = "2021-03-22";

     

       898
       898
        
           src = fetchFromGitHub {

     

       899
       899
        
             owner = "Shougo";

     

       900
       900
        
             repo = "defx.nvim";

     

       901
       901
       -
             rev = "e47bba4e37c26908568ff137416d297b54459bd8";

     

       902
       902
       -
             sha256 = "1p5nl7iqcpc0vpmhng0yqm440kb79sdl6gaxzsjgp4j7wngm4kqa";

     

       901
       901
       +
             rev = "a07fdb14c2ae04f1dd4cd78ddeaba9ce1eda4070";

     

       902
       902
       +
             sha256 = "0z57vvw7jjh021qis4bywznwaywyznrh2zns6wl3ar65zys4dym7";

     

       903
       903
        
           };

     

       904
       904
        
           meta.homepage = "https://github.com/Shougo/defx.nvim/";

     

       905
       905
        
         };

     
···

       1366
       1366
        
       

     

       1367
       1367
        
         falcon = buildVimPluginFrom2Nix {

     

       1368
       1368
        
           pname = "falcon";

     

       1369
       1369
       -
           version = "2021-03-21";

     

       1369
       1369
       +
           version = "2021-03-22";

     

       1370
       1370
        
           src = fetchFromGitHub {

     

       1371
       1371
        
             owner = "fenetikm";

     

       1372
       1372
        
             repo = "falcon";

     

       1373
       1373
       -
             rev = "6cbabfc9e6829c6cda25fa1309cd7f9806990647";

     

       1374
       1374
       -
             sha256 = "1mbbl83mzlv4pv48j8r7kd1mb4w7b0qal3dmm7ngbm92833bfqyp";

     

       1373
       1373
       +
             rev = "2ba0036e19adbefaf0beffe545e349964a68cc0a";

     

       1374
       1374
       +
             sha256 = "0pg3i1dvbjv746szki36yszz6bd82pgzvfyr3ayxf7lih4pjbxmj";

     

       1375
       1375
        
           };

     

       1376
       1376
        
           meta.homepage = "https://github.com/fenetikm/falcon/";

     

       1377
       1377
        
         };

     
···

       2940
       2940
        
       

     

       2941
       2941
        
         nnn-vim = buildVimPluginFrom2Nix {

     

       2942
       2942
        
           pname = "nnn-vim";

     

       2943
       2943
       -
           version = "2021-02-28";

     

       2943
       2943
       +
           version = "2021-03-22";

     

       2944
       2944
        
           src = fetchFromGitHub {

     

       2945
       2945
        
             owner = "mcchrish";

     

       2946
       2946
        
             repo = "nnn.vim";

     

       2947
       2947
       -
             rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa";

     

       2948
       2948
       -
             sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f";

     

       2947
       2947
       +
             rev = "6408b859f9fac3880d82109d25874fb6656026d9";

     

       2948
       2948
       +
             sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72";

     

       2949
       2949
        
           };

     

       2950
       2950
        
           meta.homepage = "https://github.com/mcchrish/nnn.vim/";

     

       2951
       2951
        
         };

     
···

       3108
       3108
        
       

     

       3109
       3109
        
         nvim-hlslens = buildVimPluginFrom2Nix {

     

       3110
       3110
        
           pname = "nvim-hlslens";

     

       3111
       3111
       -
           version = "2021-03-18";

     

       3111
       3111
       +
           version = "2021-03-22";

     

       3112
       3112
        
           src = fetchFromGitHub {

     

       3113
       3113
        
             owner = "kevinhwang91";

     

       3114
       3114
        
             repo = "nvim-hlslens";

     

       3115
       3115
       -
             rev = "8724c4a0defb70c32c6bbfed37607b9d03a3272d";

     

       3116
       3116
       -
             sha256 = "1w4mszvckjmx0ajp8sxcf4f02x8nyhsdx6k2syrhzasj32pv1qmn";

     

       3115
       3115
       +
             rev = "fb6bf0c836b384f3afa66c43b24de112e2e05764";

     

       3116
       3116
       +
             sha256 = "1p887iysf2a2nhj3cih9a7mzlipqakglzgw6ll065ghrn4dmr28p";

     

       3117
       3117
        
           };

     

       3118
       3118
        
           meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";

     

       3119
       3119
        
         };

     
···

       3240
       3240
        
       

     

       3241
       3241
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       3242
       3242
        
           pname = "nvim-treesitter";

     

       3243
       3243
       -
           version = "2021-03-20";

     

       3243
       3243
       +
           version = "2021-03-22";

     

       3244
       3244
        
           src = fetchFromGitHub {

     

       3245
       3245
        
             owner = "nvim-treesitter";

     

       3246
       3246
        
             repo = "nvim-treesitter";

     

       3247
       3247
       -
             rev = "db67f5e517642eafe77be3714171880ea0372f80";

     

       3248
       3248
       -
             sha256 = "1x69adnhdbda4hharfdq4pzwliskmihfs0p6b6nsrd8i9g3iqwj7";

     

       3247
       3247
       +
             rev = "600509aad6c3e38c45a0f67802ede5d2204e0250";

     

       3248
       3248
       +
             sha256 = "0j92ayfrlapgh09mz9rxfjzxag2kjmljd2qkbv54jl5dzr6p0f3q";

     

       3249
       3249
        
           };

     

       3250
       3250
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       3251
       3251
        
         };

     
···

       3288
       3288
        
       

     

       3289
       3289
        
         nvim-ts-rainbow = buildVimPluginFrom2Nix {

     

       3290
       3290
        
           pname = "nvim-ts-rainbow";

     

       3291
       3291
       -
           version = "2021-03-21";

     

       3291
       3291
       +
           version = "2021-03-22";

     

       3292
       3292
        
           src = fetchFromGitHub {

     

       3293
       3293
        
             owner = "p00f";

     

       3294
       3294
        
             repo = "nvim-ts-rainbow";

     

       3295
       3295
       -
             rev = "280d324111b114f3649743179ccfc496663cdfec";

     

       3296
       3296
       -
             sha256 = "12y7jglbsl0lydx2a8syc9i02h21pzg3dcn4xspij41qblinv1g2";

     

       3295
       3295
       +
             rev = "4c9043e117bfa5ea8e4d5b04b60b2e29c0548e14";

     

       3296
       3296
       +
             sha256 = "1ada87qkka1bsjdy52xqcnj5rmd9fl8q2v0km1pml3lcjyi0zdf5";

     

       3297
       3297
        
           };

     

       3298
       3298
        
           meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

     

       3299
       3299
        
         };

     
···

       3731
       3731
        
           meta.homepage = "https://github.com/chrisbra/Recover.vim/";

     

       3732
       3732
        
         };

     

       3733
       3733
        
       

     

       3734
       3734
       +
         registers-nvim = buildVimPluginFrom2Nix {

     

       3735
       3735
       +
           pname = "registers-nvim";

     

       3736
       3736
       +
           version = "2021-03-21";

     

       3737
       3737
       +
           src = fetchFromGitHub {

     

       3738
       3738
       +
             owner = "tversteeg";

     

       3739
       3739
       +
             repo = "registers.nvim";

     

       3740
       3740
       +
             rev = "ba84c085ca868515520310073d922132fd811a24";

     

       3741
       3741
       +
             sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim";

     

       3742
       3742
       +
           };

     

       3743
       3743
       +
           meta.homepage = "https://github.com/tversteeg/registers.nvim/";

     

       3744
       3744
       +
         };

     

       3745
       3745
       +
       

     

       3734
       3746
        
         Rename = buildVimPluginFrom2Nix {

     

       3735
       3747
        
           pname = "Rename";

     

       3736
       3748
        
           version = "2011-08-31";

     
···

       4924
       4936
        
       

     

       4925
       4937
        
         vim-autoformat = buildVimPluginFrom2Nix {

     

       4926
       4938
        
           pname = "vim-autoformat";

     

       4927
       4927
       -
           version = "2021-02-10";

     

       4939
       4939
       +
           version = "2021-03-21";

     

       4928
       4940
        
           src = fetchFromGitHub {

     

       4929
       4941
        
             owner = "Chiel92";

     

       4930
       4942
        
             repo = "vim-autoformat";

     

       4931
       4931
       -
             rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b";

     

       4932
       4932
       -
             sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby";

     

       4943
       4943
       +
             rev = "e9104aeece94652b064a15ae220bd4926a715dbd";

     

       4944
       4944
       +
             sha256 = "1kvnmzs1wbqaiswsjra13f06m8dpdn62h8zqrnr9vv13rm8a2326";

     

       4933
       4945
        
           };

     

       4934
       4946
        
           meta.homepage = "https://github.com/Chiel92/vim-autoformat/";

     

       4935
       4947
        
         };

     
···

       7243
       7255
        
       

     

       7244
       7256
        
         vim-projectionist = buildVimPluginFrom2Nix {

     

       7245
       7257
        
           pname = "vim-projectionist";

     

       7246
       7246
       -
           version = "2021-01-22";

     

       7258
       7258
       +
           version = "2021-03-21";

     

       7247
       7259
        
           src = fetchFromGitHub {

     

       7248
       7260
        
             owner = "tpope";

     

       7249
       7261
        
             repo = "vim-projectionist";

     

       7250
       7250
       -
             rev = "348e070867d02bd471df486bfbe25e2e2ce13061";

     

       7251
       7251
       -
             sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr";

     

       7262
       7262
       +
             rev = "7d2853e7550e6ff6459096c211a4177303a2e5d2";

     

       7263
       7263
       +
             sha256 = "0qvsm0bd5nbd0dcgcrsa45vxmb4ccsm6yn4j3xiwd52gnyacp14s";

     

       7252
       7264
        
           };

     

       7253
       7265
        
           meta.homepage = "https://github.com/tpope/vim-projectionist/";

     

       7254
       7266
        
         };

     
···

       8529
       8541
        
       

     

       8530
       8542
        
         vimtex = buildVimPluginFrom2Nix {

     

       8531
       8543
        
           pname = "vimtex";

     

       8532
       8532
       -
           version = "2021-03-16";

     

       8544
       8544
       +
           version = "2021-03-21";

     

       8533
       8545
        
           src = fetchFromGitHub {

     

       8534
       8546
        
             owner = "lervag";

     

       8535
       8547
        
             repo = "vimtex";

     

       8536
       8536
       -
             rev = "96d716b98cf6ebd5056b6cd770d304a8c2007dac";

     

       8537
       8537
       -
             sha256 = "1fy9wg8iq3dd8qb36f1jn678kqd3hpgq1qk0yxfigha2w2rarh6b";

     

       8548
       8548
       +
             rev = "4b9e69dc5e817c3436843ee0cb431e59fa5705b0";

     

       8549
       8549
       +
             sha256 = "1s2h2bgd751jf7vj9dr1756g7gxdx3b7pwx49686273ibv1spnwf";

     

       8538
       8550
        
           };

     

       8539
       8551
        
           meta.homepage = "https://github.com/lervag/vimtex/";

     

       8540
       8552
        
         };

pkgs/misc/vim-plugins/vim-plugin-names

···

       635
       635
        
       tremor-rs/tremor-vim@main

     

       636
       636
        
       triglav/vim-visual-increment

     

       637
       637
        
       troydm/zoomwintab.vim

     

       638
       638
       +
       tversteeg/registers.nvim@main

     

       638
       639
        
       twerth/ir_black

     

       639
       640
        
       twinside/vim-haskellconceal

     

       640
       641
        
       Twinside/vim-hoogle

+1 -1

pkgs/misc/vscode-extensions/default.nix

···

       604
       604
        
               buildInputs = [ jdk ];

     

       605
       605
        
               meta = {

     

       606
       606
        
                 license = lib.licenses.epl20;

     

       607
       607
       -
                 broken = lib.versionAtLeast "11" jdk.version;

     

       607
       607
       +
                 broken = lib.versionAtLeast jdk.version "11";

     

       608
       608
        
               };

     

       609
       609
        
             };

     

       610
       610

+2 -1

pkgs/servers/home-assistant/default.nix

···

       36
       36
        
               src = fetchFromGitHub {

     

       37
       37
        
                 owner = "flz";

     

       38
       38
        
                 repo = "iaqualink-py";

     

       39
       39
       -
                 rev = version;

     

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

     

       40
       40
        
                 sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh";

     

       41
       41
        
               };

     

       42
       42
        
               checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ];

     
···

       299
       299
        
           "sql"

     

       300
       300
        
           "ssdp"

     

       301
       301
        
           "stream"

     

       302
       302
       +
           "subaru"

     

       302
       303
        
           "sun"

     

       303
       304
        
           "switch"

     

       304
       305
        
           "system_health"

+3 -3

pkgs/tools/admin/aws-vault/default.nix

···

       1
       1
        
       { buildGoModule, lib, fetchFromGitHub, installShellFiles }:

     

       2
       2
        
       buildGoModule rec {

     

       3
       3
        
         pname = "aws-vault";

     

       4
       4
       -
         version = "6.2.0";

     

       4
       4
       +
         version = "6.3.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "99designs";

     

       8
       8
        
           repo = pname;

     

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

     

       10
       10
       -
           sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j";

     

       10
       10
       +
           sha256 = "sha256-bmqmT/gkdgczrDfZdI+FySX5CuesJXWKS0JatzaubIw=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z";

     

       13
       13
       +
         vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw=";

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ installShellFiles ];

     

       16
       16

+2 -2

pkgs/tools/misc/bdf2psf/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "bdf2psf";

     

       5
       5
       -
         version = "1.201";

     

       5
       5
       +
         version = "1.202";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";

     

       9
       9
       -
           sha256 = "sha256-XVaROIxyNBBFoXf+K1mv4mW8wWozqMcs1cgaWj8L8Q0=";

     

       9
       9
       +
           sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ dpkg ];

+1 -1

pkgs/tools/misc/fdtools/default.nix

···

       76
       76
        
           homepage = "https://code.dogmap.org./fdtools/";

     

       77
       77
        
           description = "A set of utilities for working with file descriptors";

     

       78
       78
        
           license = lib.licenses.gpl2;

     

       79
       79
       -
           platforms = lib.platforms.all;

     

       79
       79
       +
           platforms = lib.platforms.linux;

     

       80
       80
        
           maintainers = [ lib.maintainers.Profpatsch ];

     

       81
       81
        
         };

     

       82
       82
        
       }

-30

pkgs/tools/security/steghide/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];

     

       5
       5
       -
         version = "0.5.1";

     

       6
       6
       -
         pname = "steghide";

     

       7
       7
       -
       

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;

     

       10
       10
       -
           sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         patches = [

     

       14
       14
       -
           ./patches/steghide-0.5.1-gcc34.patch

     

       15
       15
       -
           ./patches/steghide-0.5.1-gcc4.patch

     

       16
       16
       -
           ./patches/steghide-0.5.1-gcc43.patch

     

       17
       17
       -
         ];

     

       18
       18
       -
       

     

       19
       19
       -
         # AM_CXXFLAGS needed for automake

     

       20
       20
       -
         preConfigure = ''

     

       21
       21
       -
           export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"

     

       22
       22
       -
         '';

     

       23
       23
       -
       

     

       24
       24
       -
         meta = with lib; {

     

       25
       25
       -
           homepage = "http://steghide.sourceforge.net/";

     

       26
       26
       -
           description = "Steganography program that is able to hide data in various kinds of image- and audio-files";

     

       27
       27
       -
           license = licenses.gpl2;

     

       28
       28
       -
           platforms = platforms.linux;

     

       29
       29
       -
         };

     

       30
       30
       -
       }

-42

pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch

···

       1
       1
       -
       --- steghide-0.5.1.old/src/Makefile.am

     

       2
       2
       -
       +++ steghide-0.5.1.new/src/Makefile.am	2004-07-16 19:01:39.673947633 +0200

     

       3
       3
       -
       @@ -33,5 +33,5 @@

     

       4
       4
       -
        WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc

     

       5
       5
       -
        LIBS = @LIBINTL@ @LIBS@

     

       6
       6
       -
        localedir = $(datadir)/locale

     

       7
       7
       -
       -LIBTOOL = $(SHELL) libtool

     

       8
       8
       -
       +LIBTOOL = $(SHELL) libtool --tag=CXX

     

       9
       9
       -
        MAINTAINERCLEANFILES = Makefile.in

     

       10
       10
       -
       --- steghide-0.5.1.old/src/AuSampleValues.cc

     

       11
       11
       -
       +++ steghide-0.5.1.new/src/AuSampleValues.cc	2004-07-16 18:59:18.934578427 +0200

     

       12
       12
       -
       @@ -17,21 +17,21 @@

     

       13
       13
       -
         * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

     

       14
       14
       -
         *

     

       15
       15
       -
         */

     

       16
       16
       -
       -

     

       17
       17
       -
       +#include "common.h"

     

       18
       18
       -
        #include "AuSampleValues.h"

     

       19
       19
       -
        

     

       20
       20
       -
        // AuMuLawSampleValue

     

       21
       21
       -
       -const BYTE AuMuLawSampleValue::MinValue = 0 ;

     

       22
       22
       -
       -const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;

     

       23
       23
       -
       +template<> const BYTE  AuMuLawSampleValue::MinValue = 0 ;

     

       24
       24
       -
       +template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;

     

       25
       25
       -
        

     

       26
       26
       -
        // AuPCM8SampleValue

     

       27
       27
       -
       -const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;

     

       28
       28
       -
       -const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;

     

       29
       29
       -
       +template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;

     

       30
       30
       -
       +template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;

     

       31
       31
       -
        

     

       32
       32
       -
        // AuPCM16SampleValue

     

       33
       33
       -
       -const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;

     

       34
       34
       -
       -const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;

     

       35
       35
       -
       +template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;

     

       36
       36
       -
       +template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;

     

       37
       37
       -
        

     

       38
       38
       -
        // AuPCM32SampleValue

     

       39
       39
       -
       -const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;

     

       40
       40
       -
       -const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;

     

       41
       41
       -
       +template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;

     

       42
       42
       -
       +template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;

-46

pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch

···

       1
       1
       -
       diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h

     

       2
       2
       -
       --- steghide-0.5.1-orig/src/AuData.h	2003-09-28 09:30:29.000000000 -0600

     

       3
       3
       -
       +++ steghide-0.5.1/src/AuData.h	2007-05-11 22:04:56.000000000 -0600

     

       4
       4
       -
       @@ -26,22 +26,30 @@

     

       5
       5
       -
        

     

       6
       6
       -
        // AuMuLawAudioData

     

       7
       7
       -
        typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;

     

       8
       8
       -
       +template<>

     

       9
       9
       -
        inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }

     

       10
       10
       -
       +template<>

     

       11
       11
       -
        inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }

     

       12
       12
       -
        

     

       13
       13
       -
        // AuPCM8AudioData

     

       14
       14
       -
        typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;

     

       15
       15
       -
       +template<>

     

       16
       16
       -
        inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }

     

       17
       17
       -
       +template<>

     

       18
       18
       -
        inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }

     

       19
       19
       -
        

     

       20
       20
       -
        // AuPCM16AudioData

     

       21
       21
       -
        typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;

     

       22
       22
       -
       +template<>

     

       23
       23
       -
        inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }

     

       24
       24
       -
       +template<>

     

       25
       25
       -
        inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }

     

       26
       26
       -
        

     

       27
       27
       -
        // AuPCM32AudioData

     

       28
       28
       -
        typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;

     

       29
       29
       -
       +template<>

     

       30
       30
       -
        inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }

     

       31
       31
       -
       +template<>

     

       32
       32
       -
        inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }

     

       33
       33
       -
        

     

       34
       34
       -
        #endif // ndef SH_AUDATA_H

     

       35
       35
       -
       diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc

     

       36
       36
       -
       --- steghide-0.5.1-orig/src/MHashPP.cc	2003-10-05 04:17:50.000000000 -0600

     

       37
       37
       -
       +++ steghide-0.5.1/src/MHashPP.cc	2007-05-11 22:07:01.000000000 -0600

     

       38
       38
       -
       @@ -120,7 +120,7 @@

     

       39
       39
       -
        

     

       40
       40
       -
        std::string MHashPP::getAlgorithmName (hashid id)

     

       41
       41
       -
        {

     

       42
       42
       -
       -	char *name = mhash_get_hash_name (id) ;

     

       43
       43
       -
       +	char *name = (char *) mhash_get_hash_name (id) ;

     

       44
       44
       -
        	std::string retval ;

     

       45
       45
       -
        	if (name == NULL) {

     

       46
       46
       -
        		retval = std::string ("<algorithm not found>") ;

-349

pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch

···

       1
       1
       -
       --- steghide-0.5.1.old/configure.in	2003-10-15 09:48:52.000000000 +0200

     

       2
       2
       -
       +++ steghide-0.5.1.new/configure.in	2008-05-09 19:04:46.000000000 +0200

     

       3
       3
       -
       @@ -7,27 +7,26 @@

     

       4
       4
       -
        dnl checks for programs.

     

       5
       5
       -
        AC_PROG_CXX

     

       6
       6
       -
        AC_PROG_INSTALL

     

       7
       7
       -
        AC_PROG_AWK

     

       8
       8
       -
        AC_PROG_LN_S

     

       9
       9
       -
       +AC_CXX_COMPILE_STDCXX_0X

     

       10
       10
       -
        

     

       11
       11
       -
        dnl GNU gettext

     

       12
       12
       -
        AC_CHECK_FUNCS(strchr)

     

       13
       13
       -
        AM_GNU_GETTEXT

     

       14
       14
       -
        AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)

     

       15
       15
       -
        

     

       16
       16
       -
        dnl check if debugging support is requested

     

       17
       17
       -
       -AC_MSG_CHECKING([wether to enable debugging])

     

       18
       18
       -
       +AC_MSG_CHECKING([whether to enable debugging])

     

       19
       19
       -
        AC_ARG_ENABLE(debug,[  --enable-debug          enable debugging],

     

       20
       20
       -
        	if test "$enableval" = yes ;

     

       21
       21
       -
        	then

     

       22
       22
       -
        		AC_MSG_RESULT([yes])

     

       23
       23
       -
        		AC_DEFINE(DEBUG,1,[enable code used only for debugging])

     

       24
       24
       -
       -		CXXFLAGS="-O2 -Wall -g"

     

       25
       25
       -
        	else

     

       26
       26
       -
        		AC_MSG_RESULT([no])

     

       27
       27
       -
       -		CXXFLAGS="-O2 -Wall"

     

       28
       28
       -
        	fi

     

       29
       29
       -
        	,

     

       30
       30
       -
        	AC_MSG_RESULT([no])

     

       31
       31
       -
        	CXXFLAGS="-O2 -Wall"

     

       32
       32
       -
        )

     

       33
       33
       -
       @@ -213,7 +212,18 @@

     

       34
       34
       -
        	echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";

     

       35
       35
       -
        	echo "**********";

     

       36
       36
       -
        	AC_MSG_ERROR([[libmhash not found]])

     

       37
       37
       -
        fi

     

       38
       38
       -
        

     

       39
       39
       -
       +dnl Should we add std=c++0x?

     

       40
       40
       -
       +

     

       41
       41
       -
       +if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;

     

       42
       42
       -
       +then

     

       43
       43
       -
       +	CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"

     

       44
       44
       -
       +else

     

       45
       45
       -
       +	CXXFLAGS="${CXXFLAGS} -Wall -Wextra"

     

       46
       46
       -
       +fi

     

       47
       47
       -
       +

     

       48
       48
       -
       +AC_SUBST(CXXFLAGS)

     

       49
       49
       -
       +

     

       50
       50
       -
        dnl create Makefiles

     

       51
       51
       -
        AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])

     

       52
       52
       -
       --- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4	1970-01-01 01:00:00.000000000 +0100

     

       53
       53
       -
       +++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4	2008-05-09 19:04:46.000000000 +0200

     

       54
       54
       -
       @@ -0,0 +1,107 @@

     

       55
       55
       -
       +# ===========================================================================

     

       56
       56
       -
       +#        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html

     

       57
       57
       -
       +# ===========================================================================

     

       58
       58
       -
       +#

     

       59
       59
       -
       +# SYNOPSIS

     

       60
       60
       -
       +#

     

       61
       61
       -
       +#   AC_CXX_COMPILE_STDCXX_0X

     

       62
       62
       -
       +#

     

       63
       63
       -
       +# DESCRIPTION

     

       64
       64
       -
       +#

     

       65
       65
       -
       +#   Check for baseline language coverage in the compiler for the C++0x

     

       66
       66
       -
       +#   standard.

     

       67
       67
       -
       +#

     

       68
       68
       -
       +# LAST MODIFICATION

     

       69
       69
       -
       +#

     

       70
       70
       -
       +#   2008-04-17

     

       71
       71
       -
       +#

     

       72
       72
       -
       +# COPYLEFT

     

       73
       73
       -
       +#

     

       74
       74
       -
       +#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>

     

       75
       75
       -
       +#

     

       76
       76
       -
       +#   Copying and distribution of this file, with or without modification, are

     

       77
       77
       -
       +#   permitted in any medium without royalty provided the copyright notice

     

       78
       78
       -
       +#   and this notice are preserved.

     

       79
       79
       -
       +

     

       80
       80
       -
       +AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [

     

       81
       81
       -
       +  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,

     

       82
       82
       -
       +  ac_cv_cxx_compile_cxx0x_native,

     

       83
       83
       -
       +  [AC_LANG_SAVE

     

       84
       84
       -
       +  AC_LANG_CPLUSPLUS

     

       85
       85
       -
       +  AC_TRY_COMPILE([

     

       86
       86
       -
       +  template <typename T>

     

       87
       87
       -
       +    struct check

     

       88
       88
       -
       +    {

     

       89
       89
       -
       +      static_assert(sizeof(int) <= sizeof(T), "not big enough");

     

       90
       90
       -
       +    };

     

       91
       91
       -
       +

     

       92
       92
       -
       +    typedef check<check<bool>> right_angle_brackets;

     

       93
       93
       -
       +

     

       94
       94
       -
       +    int a;

     

       95
       95
       -
       +    decltype(a) b;

     

       96
       96
       -
       +

     

       97
       97
       -
       +    typedef check<int> check_type;

     

       98
       98
       -
       +    check_type c;

     

       99
       99
       -
       +    check_type&& cr = c;],,

     

       100
       100
       -
       +  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)

     

       101
       101
       -
       +  AC_LANG_RESTORE

     

       102
       102
       -
       +  ])

     

       103
       103
       -
       +

     

       104
       104
       -
       +  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,

     

       105
       105
       -
       +  ac_cv_cxx_compile_cxx0x_cxx,

     

       106
       106
       -
       +  [AC_LANG_SAVE

     

       107
       107
       -
       +  AC_LANG_CPLUSPLUS

     

       108
       108
       -
       +  ac_save_CXXFLAGS="$CXXFLAGS"

     

       109
       109
       -
       +  CXXFLAGS="$CXXFLAGS -std=c++0x"

     

       110
       110
       -
       +  AC_TRY_COMPILE([

     

       111
       111
       -
       +  template <typename T>

     

       112
       112
       -
       +    struct check

     

       113
       113
       -
       +    {

     

       114
       114
       -
       +      static_assert(sizeof(int) <= sizeof(T), "not big enough");

     

       115
       115
       -
       +    };

     

       116
       116
       -
       +

     

       117
       117
       -
       +    typedef check<check<bool>> right_angle_brackets;

     

       118
       118
       -
       +

     

       119
       119
       -
       +    int a;

     

       120
       120
       -
       +    decltype(a) b;

     

       121
       121
       -
       +

     

       122
       122
       -
       +    typedef check<int> check_type;

     

       123
       123
       -
       +    check_type c;

     

       124
       124
       -
       +    check_type&& cr = c;],,

     

       125
       125
       -
       +  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)

     

       126
       126
       -
       +  CXXFLAGS="$ac_save_CXXFLAGS"

     

       127
       127
       -
       +  AC_LANG_RESTORE

     

       128
       128
       -
       +  ])

     

       129
       129
       -
       +

     

       130
       130
       -
       +  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,

     

       131
       131
       -
       +  ac_cv_cxx_compile_cxx0x_gxx,

     

       132
       132
       -
       +  [AC_LANG_SAVE

     

       133
       133
       -
       +  AC_LANG_CPLUSPLUS

     

       134
       134
       -
       +  ac_save_CXXFLAGS="$CXXFLAGS"

     

       135
       135
       -
       +  CXXFLAGS="$CXXFLAGS -std=gnu++0x"

     

       136
       136
       -
       +  AC_TRY_COMPILE([

     

       137
       137
       -
       +  template <typename T>

     

       138
       138
       -
       +    struct check

     

       139
       139
       -
       +    {

     

       140
       140
       -
       +      static_assert(sizeof(int) <= sizeof(T), "not big enough");

     

       141
       141
       -
       +    };

     

       142
       142
       -
       +

     

       143
       143
       -
       +    typedef check<check<bool>> right_angle_brackets;

     

       144
       144
       -
       +

     

       145
       145
       -
       +    int a;

     

       146
       146
       -
       +    decltype(a) b;

     

       147
       147
       -
       +

     

       148
       148
       -
       +    typedef check<int> check_type;

     

       149
       149
       -
       +    check_type c;

     

       150
       150
       -
       +    check_type&& cr = c;],,

     

       151
       151
       -
       +  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)

     

       152
       152
       -
       +  CXXFLAGS="$ac_save_CXXFLAGS"

     

       153
       153
       -
       +  AC_LANG_RESTORE

     

       154
       154
       -
       +  ])

     

       155
       155
       -
       +

     

       156
       156
       -
       +  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||

     

       157
       157
       -
       +     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||

     

       158
       158
       -
       +     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then

     

       159
       159
       -
       +    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])

     

       160
       160
       -
       +  fi

     

       161
       161
       -
       +])

     

       162
       162
       -
       --- steghide-0.5.1.old/src/Arguments.cc	2003-10-11 23:25:04.000000000 +0200

     

       163
       163
       -
       +++ steghide-0.5.1.new/src/Arguments.cc	2008-05-09 19:04:44.000000000 +0200

     

       164
       164
       -
       @@ -26,10 +26,12 @@

     

       165
       165
       -
        #include "Terminal.h"

     

       166
       166
       -
        #include "common.h"

     

       167
       167
       -
        #include "error.h"

     

       168
       168
       -
        #include "msg.h"

     

       169
       169
       -
        

     

       170
       170
       -
       +float Arguments::Default_Goal = 100.0 ;

     

       171
       171
       -
       +

     

       172
       172
       -
        // the global Arguments object

     

       173
       173
       -
        Arguments Args ;

     

       174
       174
       -
        

     

       175
       175
       -
        Arguments::Arguments (int argc, char* argv[])

     

       176
       176
       -
        {

     

       177
       177
       -
       --- steghide-0.5.1.old/src/Arguments.h	2003-10-11 23:23:57.000000000 +0200

     

       178
       178
       -
       +++ steghide-0.5.1.new/src/Arguments.h	2008-05-09 19:04:44.000000000 +0200

     

       179
       179
       -
       @@ -98,11 +98,11 @@

     

       180
       180
       -
        	static const bool		Default_EmbedEmbFn = true ;

     

       181
       181
       -
        	static const bool		Default_Force = false ;

     

       182
       182
       -
        	static const VERBOSITY	Default_Verbosity = NORMAL ;

     

       183
       183
       -
        	static const unsigned long	Default_Radius = 0 ; // there is no default radius for all file formats

     

       184
       184
       -
        	static const unsigned int	Max_Algorithm = 3 ;

     

       185
       185
       -
       -	static const float		Default_Goal = 100.0 ;

     

       186
       186
       -
       +	static float			Default_Goal ;

     

       187
       187
       -
        	static const DEBUGCOMMAND	Default_DebugCommand = NONE ;

     

       188
       188
       -
        	static const bool		Default_Check = false ;

     

       189
       189
       -
        	static const unsigned int	Default_DebugLevel = 0 ;

     

       190
       190
       -
        	static const unsigned int	Default_GmlGraphRecDepth = 0 ;

     

       191
       191
       -
        	static const unsigned int	Default_GmlStartVertex = 0 ;

     

       192
       192
       -
       --- steghide-0.5.1.old/src/EncryptionMode.h	2003-09-28 17:30:30.000000000 +0200

     

       193
       193
       -
       +++ steghide-0.5.1.new/src/EncryptionMode.h	2008-05-09 19:04:46.000000000 +0200

     

       194
       194
       -
       @@ -69,11 +69,11 @@

     

       195
       195
       -
        	static const unsigned int NumValues = 8 ;

     

       196
       196
       -
        	IRep Value ;

     

       197
       197
       -
        

     

       198
       198
       -
        	typedef struct struct_Translation {

     

       199
       199
       -
        		IRep	irep ;

     

       200
       200
       -
       -		char*	srep ;

     

       201
       201
       -
       +		const char*	srep ;

     

       202
       202
       -
        	} Translation ;

     

       203
       203
       -
        	static const Translation Translations[] ;

     

       204
       204
       -
        } ;

     

       205
       205
       -
        

     

       206
       206
       -
        #endif // ndef SH_ENCMODE_H

     

       207
       207
       -
       --- steghide-0.5.1.old/src/Graph.cc	2003-10-11 23:54:26.000000000 +0200

     

       208
       208
       -
       +++ steghide-0.5.1.new/src/Graph.cc	2008-05-09 19:04:46.000000000 +0200

     

       209
       209
       -
       @@ -20,10 +20,12 @@

     

       210
       210
       -
        

     

       211
       211
       -
        #include <ctime>

     

       212
       212
       -
        #include <list>

     

       213
       213
       -
        #include <map>

     

       214
       214
       -
        #include <vector>

     

       215
       215
       -
       +#include <algorithm>

     

       216
       216
       -
       +#include <climits>

     

       217
       217
       -
        

     

       218
       218
       -
        #include "BitString.h"

     

       219
       219
       -
        #include "CvrStgFile.h"

     

       220
       220
       -
        #include "Edge.h"

     

       221
       221
       -
        #include "Graph.h"

     

       222
       222
       -
       --- steghide-0.5.1.old/src/Matching.cc	2003-10-11 23:54:30.000000000 +0200

     

       223
       223
       -
       +++ steghide-0.5.1.new/src/Matching.cc	2008-05-09 19:04:46.000000000 +0200

     

       224
       224
       -
       @@ -16,10 +16,11 @@

     

       225
       225
       -
         * along with this program; if not, write to the Free Software

     

       226
       226
       -
         * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

     

       227
       227
       -
         *

     

       228
       228
       -
         */

     

       229
       229
       -
        

     

       230
       230
       -
       +#include <algorithm>

     

       231
       231
       -
        #include "Edge.h"

     

       232
       232
       -
        #include "Graph.h"

     

       233
       233
       -
        #include "Matching.h"

     

       234
       234
       -
        #include "ProgressOutput.h"

     

       235
       235
       -
        #include "common.h"

     

       236
       236
       -
       --- steghide-0.5.1.old/src/ProgressOutput.cc	2003-10-11 11:20:51.000000000 +0200

     

       237
       237
       -
       +++ steghide-0.5.1.new/src/ProgressOutput.cc	2008-05-09 19:04:44.000000000 +0200

     

       238
       238
       -
       @@ -21,10 +21,12 @@

     

       239
       239
       -
        #include <cmath>

     

       240
       240
       -
        

     

       241
       241
       -
        #include "ProgressOutput.h"

     

       242
       242
       -
        #include "common.h"

     

       243
       243
       -
        

     

       244
       244
       -
       +float ProgressOutput::NoAvgWeight = 1.0 ;

     

       245
       245
       -
       +

     

       246
       246
       -
        ProgressOutput::ProgressOutput ()

     

       247
       247
       -
        	: Message("__nomessage__")

     

       248
       248
       -
        {

     

       249
       249
       -
        	LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time

     

       250
       250
       -
        }

     

       251
       251
       -
       --- steghide-0.5.1.old/src/ProgressOutput.h	2003-09-28 17:30:30.000000000 +0200

     

       252
       252
       -
       +++ steghide-0.5.1.new/src/ProgressOutput.h	2008-05-09 19:04:44.000000000 +0200

     

       253
       253
       -
       @@ -60,13 +60,13 @@

     

       254
       254
       -
        	/**

     

       255
       255
       -
        	 * update the output appending rate, [average edge weight], "done" and a newline

     

       256
       256
       -
        	 * \param rate the rate of matched vertices

     

       257
       257
       -
        	 * \param avgweight the average edge weight (is not printed if not given)

     

       258
       258
       -
        	 **/

     

       259
       259
       -
       -	void done (float rate, float avgweight = NoAvgWeight) const ;

     

       260
       260
       -
       +	void done (float rate, float avgweight = 1.0) const ;

     

       261
       261
       -
        

     

       262
       262
       -
       -	static const float NoAvgWeight = -1.0 ;

     

       263
       263
       -
       +	static float NoAvgWeight ;

     

       264
       264
       -
        

     

       265
       265
       -
        	protected:

     

       266
       266
       -
        	std::string vcompose (const char *msgfmt, va_list ap) const ;

     

       267
       267
       -
        

     

       268
       268
       -
        	private:

     

       269
       269
       -
       --- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc	2003-09-28 17:30:30.000000000 +0200

     

       270
       270
       -
       +++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc	2008-05-09 19:04:46.000000000 +0200

     

       271
       271
       -
       @@ -16,10 +16,12 @@

     

       272
       272
       -
         * along with this program; if not, write to the Free Software

     

       273
       273
       -
         * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

     

       274
       274
       -
         *

     

       275
       275
       -
         */

     

       276
       276
       -
        

     

       277
       277
       -
       +#include <algorithm>

     

       278
       278
       -
       +

     

       279
       279
       -
        #include "Edge.h"

     

       280
       280
       -
        #include "Graph.h"

     

       281
       281
       -
        #include "Matching.h"

     

       282
       282
       -
        #include "SMDConstructionHeuristic.h"

     

       283
       283
       -
        #include "Vertex.h"

     

       284
       284
       -
       --- steghide-0.5.1.old/src/WavFile.cc	2003-09-28 17:30:30.000000000 +0200

     

       285
       285
       -
       +++ steghide-0.5.1.new/src/WavFile.cc	2008-05-09 19:04:46.000000000 +0200

     

       286
       286
       -
       @@ -19,10 +19,11 @@

     

       287
       287
       -
         */

     

       288
       288
       -
        

     

       289
       289
       -
        #include <cstdio>

     

       290
       290
       -
        #include <cstdlib>

     

       291
       291
       -
        #include <cstring>

     

       292
       292
       -
       +#include <algorithm>

     

       293
       293
       -
        

     

       294
       294
       -
        #include "CvrStgFile.h"

     

       295
       295
       -
        #include "DFSAPHeuristic.h"

     

       296
       296
       -
        #include "SampleValueAdjacencyList.h"

     

       297
       297
       -
        #include "SMDConstructionHeuristic.h"

     

       298
       298
       -
       --- steghide-0.5.1.old/src/wrapper_hash_map.h	2003-09-28 17:30:30.000000000 +0200

     

       299
       299
       -
       +++ steghide-0.5.1.new/src/wrapper_hash_map.h	2008-05-09 19:04:46.000000000 +0200

     

       300
       300
       -
       @@ -25,17 +25,21 @@

     

       301
       301
       -
        

     

       302
       302
       -
        #ifdef __GNUC__

     

       303
       303
       -
        # if __GNUC__ < 3

     

       304
       304
       -
        #  include <hash_map.h>

     

       305
       305
       -
            namespace sgi { using ::hash ; using ::hash_map ; } ;

     

       306
       306
       -
       -# else

     

       307
       307
       -
       +# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )

     

       308
       308
       -
        #  include <ext/hash_map>

     

       309
       309
       -
       -#  if __GNUC_MINOR__ == 0

     

       310
       310
       -
       +#  if __GNUC__ == 3 &&  __GNUC_MINOR__ == 0

     

       311
       311
       -
            namespace sgi = std ;			// GCC 3.0

     

       312
       312
       -
        #  else

     

       313
       313
       -
            namespace sgi = __gnu_cxx ;	// GCC 3.1 and later

     

       314
       314
       -
        #  endif

     

       315
       315
       -
       +# else

     

       316
       316
       -
       +#  include <unordered_map>

     

       317
       317
       -
       +#  define hash_map unordered_map

     

       318
       318
       -
       +   namespace sgi = std ;

     

       319
       319
       -
        # endif

     

       320
       320
       -
        #else

     

       321
       321
       -
          namespace sgi = std ;

     

       322
       322
       -
        #endif

     

       323
       323
       -
        

     

       324
       324
       -
       --- steghide-0.5.1.old/src/wrapper_hash_set.h	2003-09-28 17:30:30.000000000 +0200

     

       325
       325
       -
       +++ steghide-0.5.1.new/src/wrapper_hash_set.h	2008-05-09 19:04:46.000000000 +0200

     

       326
       326
       -
       @@ -26,17 +26,21 @@

     

       327
       327
       -
        

     

       328
       328
       -
        #ifdef __GNUC__

     

       329
       329
       -
        # if __GNUC__ < 3

     

       330
       330
       -
        #  include <hash_set.h>

     

       331
       331
       -
            namespace sgi { using ::hash ; using ::hash_set ; } ;

     

       332
       332
       -
       -# else

     

       333
       333
       -
       +# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )

     

       334
       334
       -
        #  include <ext/hash_set>

     

       335
       335
       -
       -#  if __GNUC_MINOR__ == 0

     

       336
       336
       -
       +#  if __GNUC__ == 3 && __GNUC_MINOR__ == 0

     

       337
       337
       -
            namespace sgi = std ;			// GCC 3.0

     

       338
       338
       -
        #  else

     

       339
       339
       -
            namespace sgi = ::__gnu_cxx ;	// GCC 3.1 and later

     

       340
       340
       -
        #  endif

     

       341
       341
       -
       +# else

     

       342
       342
       -
       +#  include <unordered_set>

     

       343
       343
       -
       +#  define hash_set unordered_set

     

       344
       344
       -
       +   namespace sgi = std ;

     

       345
       345
       -
        # endif

     

       346
       346
       -
        #else

     

       347
       347
       -
          namespace sgi = std ;

     

       348
       348
       -
        #endif

     

       349
       349
       -

+2 -2

pkgs/top-level/all-packages.nix

···

       17232
       17232
        
       

     

       17233
       17233
        
         stlink = callPackage ../development/tools/misc/stlink { };

     

       17234
       17234
        
       

     

       17235
       17235
       -
         steghide = callPackage ../tools/security/steghide {};

     

       17236
       17236
       -
       

     

       17237
       17235
        
         stegseek = callPackage ../tools/security/stegseek {};

     

       17238
       17236
        
       

     

       17239
       17237
        
         stlport = callPackage ../development/libraries/stlport { };

     
···

       24081
       24079
        
         moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };

     

       24082
       24080
        
       

     

       24083
       24081
        
         moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };

     

       24082
       24082
       +
       

     

       24083
       24083
       +
         moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { };

     

       24084
       24084
        
       

     

       24085
       24085
        
         mooSpace = callPackage ../applications/audio/mooSpace { };

     

       24086
       24086