forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
11ee0bf5d7
|
|
@ -167,6 +167,7 @@ exec {logOutFd}>&- {logErrFd}>&-
|
|||
|
||||
# Start systemd.
|
||||
echo "starting systemd..."
|
||||
|
||||
PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
|
||||
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
|
||||
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \
|
||||
exec @systemdExecutable@
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
src = ./stage-2-init.sh;
|
||||
shellDebug = "${pkgs.bashInteractive}/bin/bash";
|
||||
shell = "${pkgs.bash}/bin/bash";
|
||||
inherit (config.boot) systemdExecutable;
|
||||
inherit (config.boot) systemdExecutable extraSystemdUnitPaths;
|
||||
isExecutable = true;
|
||||
inherit (config.nix) readOnlyStore;
|
||||
inherit useHostResolvConf;
|
||||
|
|
@ -20,6 +20,10 @@ let
|
|||
pkgs.util-linux
|
||||
] ++ lib.optional useHostResolvConf pkgs.openresolv);
|
||||
fsPackagesPath = lib.makeBinPath config.system.fsPackages;
|
||||
systemdUnitPathEnvVar = lib.optionalString (config.boot.extraSystemdUnitPaths != [])
|
||||
("SYSTEMD_UNIT_PATH="
|
||||
+ builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths
|
||||
+ ":"); # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable
|
||||
postBootCommands = pkgs.writeText "local-cmds"
|
||||
''
|
||||
${config.boot.postBootCommands}
|
||||
|
|
@ -82,6 +86,15 @@ in
|
|||
PATH.
|
||||
'';
|
||||
};
|
||||
|
||||
extraSystemdUnitPaths = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
Additional paths that get appended to the SYSTEMD_UNIT_PATH environment variable
|
||||
that can contain mutable unit files.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -393,6 +393,7 @@ in
|
|||
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
|
||||
systemd-nspawn = handleTest ./systemd-nspawn.nix {};
|
||||
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
|
||||
systemd-unit-path = handleTest ./systemd-unit-path.nix {};
|
||||
taskserver = handleTest ./taskserver.nix {};
|
||||
telegraf = handleTest ./telegraf.nix {};
|
||||
tiddlywiki = handleTest ./tiddlywiki.nix {};
|
||||
|
|
|
|||
47
nixos/tests/systemd-unit-path.nix
Normal file
47
nixos/tests/systemd-unit-path.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
exampleScript = pkgs.writeTextFile {
|
||||
name = "example.sh";
|
||||
text = ''
|
||||
#! ${pkgs.runtimeShell} -e
|
||||
|
||||
while true; do
|
||||
echo "Example script running" >&2
|
||||
${pkgs.coreutils}/bin/sleep 1
|
||||
done
|
||||
'';
|
||||
executable = true;
|
||||
};
|
||||
|
||||
unitFile = pkgs.writeTextFile {
|
||||
name = "example.service";
|
||||
text = ''
|
||||
[Unit]
|
||||
Description=Example systemd service unit file
|
||||
|
||||
[Service]
|
||||
ExecStart=${exampleScript}
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "systemd-unit-path";
|
||||
|
||||
machine = { pkgs, lib, ... }: {
|
||||
boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("mkdir -p /etc/systemd-rw/system")
|
||||
machine.succeed(
|
||||
"cp ${unitFile} /etc/systemd-rw/system/example.service"
|
||||
)
|
||||
machine.succeed("systemctl start example.service")
|
||||
machine.succeed("systemctl status example.service | grep 'Active: active'")
|
||||
'';
|
||||
})
|
||||
|
|
@ -81,7 +81,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Photo and video importer for cameras, phones, and memory cards";
|
||||
homepage = "https://www.damonlynch.net/rapid/";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
|
|
|
|||
59
pkgs/applications/misc/moonlight-qt/default.nix
Normal file
59
pkgs/applications/misc/moonlight-qt/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qtquickcontrols2
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, libva
|
||||
, libvdpau
|
||||
, libxkbcommon
|
||||
, alsaLib
|
||||
, libpulseaudio
|
||||
, openssl
|
||||
, libopus
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-qt";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
pkg-config
|
||||
qmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtquickcontrols2
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
libva
|
||||
libvdpau
|
||||
libxkbcommon
|
||||
alsaLib
|
||||
libpulseaudio
|
||||
openssl
|
||||
libopus
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Play your PC games on almost any device";
|
||||
homepage = "https://moonlight-stream.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -40,6 +40,6 @@ buildGoModule rec {
|
|||
"https://github.com/vmware-tanzu/velero/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.mbode maintainers.bryanasdev000 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
|||
ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
|
||||
gem "bundler", ">= 1.5.0"
|
||||
|
||||
gem 'rails', '5.2.4.2'
|
||||
gem 'rails', '5.2.4.5'
|
||||
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
|
||||
gem "rouge", "~> 3.12.0"
|
||||
gem "request_store", "~> 1.4.1"
|
||||
|
|
@ -12,8 +12,8 @@ gem "actionpack-xml_parser"
|
|||
gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
|
||||
gem "mimemagic"
|
||||
gem "mail", "~> 2.7.1"
|
||||
gem "csv", "~> 3.1.1"
|
||||
gem "nokogiri", "~> 1.10.0"
|
||||
gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
|
||||
gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
|
||||
gem "i18n", "~> 1.6.0"
|
||||
gem "rbpdf", "~> 1.20.0"
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ end
|
|||
|
||||
# Optional Markdown support, not for JRuby
|
||||
group :markdown do
|
||||
gem "redcarpet", "~> 3.5.0"
|
||||
gem 'redcarpet', '~> 3.5.1'
|
||||
end
|
||||
|
||||
# Include database gems for the database adapters NixOS supports
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (5.2.4.2)
|
||||
actionpack (= 5.2.4.2)
|
||||
actioncable (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailer (5.2.4.2)
|
||||
actionpack (= 5.2.4.2)
|
||||
actionview (= 5.2.4.2)
|
||||
activejob (= 5.2.4.2)
|
||||
actionmailer (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
actionview (= 5.2.4.5)
|
||||
activejob (= 5.2.4.5)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (5.2.4.2)
|
||||
actionview (= 5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
actionpack (5.2.4.5)
|
||||
actionview (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
rack (~> 2.0, >= 2.0.8)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
|
|
@ -21,26 +21,26 @@ GEM
|
|||
actionpack-xml_parser (2.0.1)
|
||||
actionpack (>= 5.0)
|
||||
railties (>= 5.0)
|
||||
actionview (5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
actionview (5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
activejob (5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
activerecord (5.2.4.2)
|
||||
activemodel (= 5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
activemodel (5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
activerecord (5.2.4.5)
|
||||
activemodel (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
arel (>= 9.0)
|
||||
activestorage (5.2.4.2)
|
||||
actionpack (= 5.2.4.2)
|
||||
activerecord (= 5.2.4.2)
|
||||
activestorage (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
activerecord (= 5.2.4.5)
|
||||
marcel (~> 0.3.1)
|
||||
activesupport (5.2.4.2)
|
||||
activesupport (5.2.4.5)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -48,7 +48,7 @@ GEM
|
|||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
arel (9.0.0)
|
||||
ast (2.4.0)
|
||||
ast (2.4.2)
|
||||
builder (3.2.4)
|
||||
capybara (3.25.0)
|
||||
addressable
|
||||
|
|
@ -59,21 +59,21 @@ GEM
|
|||
regexp_parser (~> 1.5)
|
||||
xpath (~> 3.2)
|
||||
childprocess (3.0.0)
|
||||
concurrent-ruby (1.1.6)
|
||||
concurrent-ruby (1.1.8)
|
||||
crass (1.0.6)
|
||||
css_parser (1.7.1)
|
||||
css_parser (1.9.0)
|
||||
addressable
|
||||
csv (3.1.2)
|
||||
docile (1.3.2)
|
||||
erubi (1.9.0)
|
||||
csv (3.1.9)
|
||||
docile (1.3.5)
|
||||
erubi (1.10.0)
|
||||
globalid (0.4.2)
|
||||
activesupport (>= 4.2.0)
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.6.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jaro_winkler (1.5.4)
|
||||
json (2.3.0)
|
||||
loofah (2.5.0)
|
||||
json (2.5.1)
|
||||
loofah (2.9.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
|
|
@ -81,61 +81,63 @@ GEM
|
|||
marcel (0.3.3)
|
||||
mimemagic (~> 0.3.2)
|
||||
method_source (1.0.0)
|
||||
mimemagic (0.3.4)
|
||||
mimemagic (0.3.5)
|
||||
mini_magick (4.9.5)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.0)
|
||||
mocha (1.11.2)
|
||||
mini_portile2 (2.5.0)
|
||||
minitest (5.14.4)
|
||||
mocha (1.12.0)
|
||||
mysql2 (0.5.3)
|
||||
net-ldap (0.16.2)
|
||||
nio4r (2.5.2)
|
||||
nokogiri (1.10.9)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
parallel (1.19.1)
|
||||
parser (2.7.1.0)
|
||||
ast (~> 2.4.0)
|
||||
net-ldap (0.16.3)
|
||||
nio4r (2.5.7)
|
||||
nokogiri (1.11.2)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
parallel (1.20.1)
|
||||
parser (3.0.0.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.1.4)
|
||||
public_suffix (4.0.4)
|
||||
puma (3.12.4)
|
||||
rack (2.2.2)
|
||||
public_suffix (4.0.6)
|
||||
puma (3.12.6)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
rack-openid (1.4.2)
|
||||
rack (>= 1.1.0)
|
||||
ruby-openid (>= 2.1.8)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails (5.2.4.2)
|
||||
actioncable (= 5.2.4.2)
|
||||
actionmailer (= 5.2.4.2)
|
||||
actionpack (= 5.2.4.2)
|
||||
actionview (= 5.2.4.2)
|
||||
activejob (= 5.2.4.2)
|
||||
activemodel (= 5.2.4.2)
|
||||
activerecord (= 5.2.4.2)
|
||||
activestorage (= 5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
rails (5.2.4.5)
|
||||
actioncable (= 5.2.4.5)
|
||||
actionmailer (= 5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
actionview (= 5.2.4.5)
|
||||
activejob (= 5.2.4.5)
|
||||
activemodel (= 5.2.4.5)
|
||||
activerecord (= 5.2.4.5)
|
||||
activestorage (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
bundler (>= 1.3.0)
|
||||
railties (= 5.2.4.2)
|
||||
railties (= 5.2.4.5)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.4.2)
|
||||
actionpack (= 5.2.4.2)
|
||||
activesupport (= 5.2.4.2)
|
||||
railties (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
rainbow (3.0.0)
|
||||
rake (13.0.1)
|
||||
rake (13.0.3)
|
||||
rbpdf (1.20.1)
|
||||
htmlentities
|
||||
rbpdf-font (~> 1.19.0)
|
||||
rbpdf-font (1.19.1)
|
||||
redcarpet (3.5.0)
|
||||
regexp_parser (1.7.0)
|
||||
redcarpet (3.5.1)
|
||||
regexp_parser (1.8.2)
|
||||
request_store (1.4.1)
|
||||
rack (>= 1.4)
|
||||
roadie (4.0.0)
|
||||
|
|
@ -158,7 +160,7 @@ GEM
|
|||
rack (>= 1.1)
|
||||
rubocop (>= 0.72.0)
|
||||
ruby-openid (2.9.2)
|
||||
ruby-progressbar (1.10.1)
|
||||
ruby-progressbar (1.11.0)
|
||||
rubyzip (2.3.0)
|
||||
selenium-webdriver (3.142.7)
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
|
|
@ -168,24 +170,24 @@ GEM
|
|||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.2)
|
||||
sprockets (4.0.0)
|
||||
sprockets (4.0.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.2.1)
|
||||
sprockets-rails (3.2.2)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
thor (1.0.1)
|
||||
thor (1.1.0)
|
||||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.7)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (1.6.1)
|
||||
websocket-driver (0.7.1)
|
||||
websocket-driver (0.7.3)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.4)
|
||||
websocket-extensions (0.1.5)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
yard (0.9.24)
|
||||
yard (0.9.26)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -204,14 +206,14 @@ DEPENDENCIES
|
|||
mocha (>= 1.4.0)
|
||||
mysql2 (~> 0.5.0)
|
||||
net-ldap (~> 0.16.0)
|
||||
nokogiri (~> 1.10.0)
|
||||
nokogiri (~> 1.11.1)
|
||||
pg (~> 1.1.4)
|
||||
puma (~> 3.7)
|
||||
rack-openid
|
||||
rails (= 5.2.4.2)
|
||||
rails (= 5.2.4.5)
|
||||
rails-dom-testing
|
||||
rbpdf (~> 1.20.0)
|
||||
redcarpet (~> 3.5.0)
|
||||
redcarpet (~> 3.5.1)
|
||||
request_store (~> 1.4.1)
|
||||
roadie-rails (~> 2.1.0)
|
||||
rouge (~> 3.12.0)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5";
|
||||
sha256 = "13i2rlkpdwkdhidpdb5r2zxwxna00r71rh248kzfhgy5a5rkj8ky";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v";
|
||||
sha256 = "1rlx5597621jmdzpf8mhfm52d0fcz1izdj94k58l4sln4gw0x73j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z";
|
||||
sha256 = "19y5y2dypqakk39smcmyslic8wnffzc0670d2zjadsrgsg850gyp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax";
|
||||
sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
actionpack-xml_parser = {
|
||||
dependencies = ["actionpack" "railties"];
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp";
|
||||
sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
|
|
@ -60,10 +60,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi";
|
||||
sha256 = "1mb4s49vbrxyg3pba76z3llbzclm8d4zcjhalf4yrfq5y357kkya";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di";
|
||||
sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport" "arel"];
|
||||
|
|
@ -82,10 +82,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5";
|
||||
sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
activestorage = {
|
||||
dependencies = ["actionpack" "activerecord" "marcel"];
|
||||
|
|
@ -93,10 +93,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9";
|
||||
sha256 = "12i3an3vxg0fqjvr4mi0b3nnsb8jpcphkmz1717nb7lsy3wm4081";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc";
|
||||
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
|
|
@ -135,10 +135,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
|
||||
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.4.2";
|
||||
};
|
||||
builder = {
|
||||
groups = ["default"];
|
||||
|
|
@ -176,10 +176,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.6";
|
||||
version = "1.1.8";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
|
|
@ -197,40 +197,40 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw";
|
||||
sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.1";
|
||||
version = "1.9.0";
|
||||
};
|
||||
csv = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5";
|
||||
sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.2";
|
||||
version = "3.1.9";
|
||||
};
|
||||
docile = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
|
||||
sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.2";
|
||||
version = "1.3.5";
|
||||
};
|
||||
erubi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
|
||||
sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
};
|
||||
globalid = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -279,10 +279,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.5.1";
|
||||
};
|
||||
loofah = {
|
||||
dependencies = ["crass" "nokogiri"];
|
||||
|
|
@ -290,10 +290,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
|
||||
sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
version = "2.9.0";
|
||||
};
|
||||
mail = {
|
||||
dependencies = ["mini_mime"];
|
||||
|
|
@ -332,10 +332,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p";
|
||||
sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
};
|
||||
mini_magick = {
|
||||
groups = ["minimagick"];
|
||||
|
|
@ -362,30 +362,30 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
|
||||
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.0";
|
||||
version = "5.14.4";
|
||||
};
|
||||
mocha = {
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4";
|
||||
sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
};
|
||||
mysql2 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -410,41 +410,41 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";
|
||||
sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
};
|
||||
nio4r = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
|
||||
sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.2";
|
||||
version = "2.5.7";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
|
||||
sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.9";
|
||||
version = "1.11.2";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
|
||||
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.1";
|
||||
version = "1.20.1";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
|
|
@ -452,10 +452,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7";
|
||||
sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.1.0";
|
||||
version = "3.0.0.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
|
|
@ -480,30 +480,40 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz";
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.4";
|
||||
version = "4.0.6";
|
||||
};
|
||||
puma = {
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs";
|
||||
sha256 = "1ypkyqhysb2vvdvkl4w923yvpmi228gld4kbargb1i2d4sa9s49a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.12.4";
|
||||
version = "3.12.6";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default" "openid" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp";
|
||||
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
};
|
||||
rack-openid = {
|
||||
dependencies = ["rack" "ruby-openid"];
|
||||
|
|
@ -533,10 +543,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4";
|
||||
sha256 = "1nzsm1fqqnhlvgcfrrpsmcv2znldfkyq5c9z7k08p2p54jrd8kfd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
rails-dom-testing = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
|
|
@ -566,10 +576,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16";
|
||||
sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.2";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -586,10 +596,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
|
||||
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.0.1";
|
||||
version = "13.0.3";
|
||||
};
|
||||
rbpdf = {
|
||||
dependencies = ["htmlentities" "rbpdf-font"];
|
||||
|
|
@ -617,20 +627,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
|
||||
sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
};
|
||||
regexp_parser = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2";
|
||||
sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.0";
|
||||
version = "1.8.2";
|
||||
};
|
||||
request_store = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -723,10 +733,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
|
||||
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
};
|
||||
rubyzip = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -776,10 +786,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap";
|
||||
sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.0";
|
||||
version = "4.0.2";
|
||||
};
|
||||
sprockets-rails = {
|
||||
dependencies = ["actionpack" "activesupport" "sprockets"];
|
||||
|
|
@ -787,20 +797,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
|
||||
sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
|
||||
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
};
|
||||
thread_safe = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -818,10 +828,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
|
||||
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
version = "1.2.9";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -839,20 +849,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
|
||||
sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.1";
|
||||
version = "0.7.3";
|
||||
};
|
||||
websocket-extensions = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
|
||||
sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
};
|
||||
xpath = {
|
||||
dependencies = ["nokogiri"];
|
||||
|
|
@ -870,9 +880,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp";
|
||||
sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.24";
|
||||
version = "0.9.26";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,11 @@ let
|
|||
};
|
||||
|
||||
jdk = stdenv.mkDerivation rec {
|
||||
name = "zulu15.28.51-ca-jdk15.0.1";
|
||||
pname = "zulu15.28.51-ca-jdk";
|
||||
version = "15.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
|
||||
url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz";
|
||||
sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh";
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1675,4 +1675,8 @@ self: super: {
|
|||
# https://github.com/jgm/pandoc/issues/7163
|
||||
pandoc = dontCheck super.pandoc;
|
||||
|
||||
# Too strict version bounds on cryptonite.
|
||||
# Issue reported upstream, no bug tracker url yet.
|
||||
darcs = doJailbreak super.darcs;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
pname = "liburcu";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
|
||||
sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv";
|
||||
sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns=";
|
||||
};
|
||||
|
||||
checkInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "symengine";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symengine";
|
||||
repo = "symengine";
|
||||
rev = "v${version}";
|
||||
sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1";
|
||||
sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "colorlog";
|
||||
version = "4.7.2";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q";
|
||||
sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchPypi, buildPythonPackage }:
|
||||
{ lib, fetchPypi, buildPythonPackage, tkinter }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "easygui";
|
||||
|
|
@ -9,8 +9,18 @@ buildPythonPackage rec {
|
|||
sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace README.md README.txt
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tkinter
|
||||
];
|
||||
|
||||
doCheck = false; # No tests available
|
||||
|
||||
pythonImportsCheck = [ "easygui" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Very simple, very easy GUI programming in Python";
|
||||
homepage = "https://github.com/robertlugg/easygui";
|
||||
|
|
|
|||
|
|
@ -1,38 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, asynctest
|
||||
, stdiomask
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, pytestcov
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, stdiomask
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "subarulink";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "G-Two";
|
||||
repo = pname;
|
||||
rev = "subaru-v${version}";
|
||||
sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6";
|
||||
sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp stdiomask ];
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
stdiomask
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
cryptography
|
||||
pytest-asyncio
|
||||
pytestcov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "--cov=subarulink" ""
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "subarulink" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";
|
||||
|
||||
cargoBuildFlags = [ "--features=dist-client,dist-server" ];
|
||||
cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
|
@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/mozilla/sccache";
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "3.13.8";
|
||||
version = "3.13.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
sha256 = "sha256-upT0ZtVYzbrQolik0c/2URNwU2LDLgiMWyFEiOZFijc=";
|
||||
sha256 = "sha256-5UT/STcU+/17wjc/guOXgkD6UCtn97EQkVRgnTliFjg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -389,12 +389,12 @@ let
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-03-21";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "74e928c9a98c20f024f78703a7d54386cf6f4469";
|
||||
sha256 = "0z52f4dq1jgzwy4qw278h6ig07rr09l9affhmfliz0m7mb9r7b71";
|
||||
rev = "8f7238502c742fe098e0d681c3597452aa053b89";
|
||||
sha256 = "1cppnzf1slzxf3kb24pg18r2izdpd6mylrhc49rla083mr7hqx15";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -545,12 +545,12 @@ let
|
|||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc-nvim";
|
||||
version = "2021-03-19";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "0f73118b752cf7be86c3be9923675df0aff30d64";
|
||||
sha256 = "1q04kibi2vhw1ibxhzbr5yvyg8484yb07h103442bpc4a2pzcz7i";
|
||||
rev = "3b3c5f88bcb25c3d68351f417fa5e8425a3a3142";
|
||||
sha256 = "1fkgyb0a5wirndk99d9ajdvxaiipgnv3r0cmvzldvy6ps5ljxabm";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
|
|
@ -894,12 +894,12 @@ let
|
|||
|
||||
defx-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "defx-nvim";
|
||||
version = "2021-03-21";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "defx.nvim";
|
||||
rev = "e47bba4e37c26908568ff137416d297b54459bd8";
|
||||
sha256 = "1p5nl7iqcpc0vpmhng0yqm440kb79sdl6gaxzsjgp4j7wngm4kqa";
|
||||
rev = "a07fdb14c2ae04f1dd4cd78ddeaba9ce1eda4070";
|
||||
sha256 = "0z57vvw7jjh021qis4bywznwaywyznrh2zns6wl3ar65zys4dym7";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/defx.nvim/";
|
||||
};
|
||||
|
|
@ -1366,12 +1366,12 @@ let
|
|||
|
||||
falcon = buildVimPluginFrom2Nix {
|
||||
pname = "falcon";
|
||||
version = "2021-03-21";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenetikm";
|
||||
repo = "falcon";
|
||||
rev = "6cbabfc9e6829c6cda25fa1309cd7f9806990647";
|
||||
sha256 = "1mbbl83mzlv4pv48j8r7kd1mb4w7b0qal3dmm7ngbm92833bfqyp";
|
||||
rev = "2ba0036e19adbefaf0beffe545e349964a68cc0a";
|
||||
sha256 = "0pg3i1dvbjv746szki36yszz6bd82pgzvfyr3ayxf7lih4pjbxmj";
|
||||
};
|
||||
meta.homepage = "https://github.com/fenetikm/falcon/";
|
||||
};
|
||||
|
|
@ -2940,12 +2940,12 @@ let
|
|||
|
||||
nnn-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nnn-vim";
|
||||
version = "2021-02-28";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa";
|
||||
sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f";
|
||||
rev = "6408b859f9fac3880d82109d25874fb6656026d9";
|
||||
sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
|
|
@ -3108,12 +3108,12 @@ let
|
|||
|
||||
nvim-hlslens = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-hlslens";
|
||||
version = "2021-03-18";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "nvim-hlslens";
|
||||
rev = "8724c4a0defb70c32c6bbfed37607b9d03a3272d";
|
||||
sha256 = "1w4mszvckjmx0ajp8sxcf4f02x8nyhsdx6k2syrhzasj32pv1qmn";
|
||||
rev = "fb6bf0c836b384f3afa66c43b24de112e2e05764";
|
||||
sha256 = "1p887iysf2a2nhj3cih9a7mzlipqakglzgw6ll065ghrn4dmr28p";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
|
||||
};
|
||||
|
|
@ -3240,12 +3240,12 @@ let
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2021-03-20";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "db67f5e517642eafe77be3714171880ea0372f80";
|
||||
sha256 = "1x69adnhdbda4hharfdq4pzwliskmihfs0p6b6nsrd8i9g3iqwj7";
|
||||
rev = "600509aad6c3e38c45a0f67802ede5d2204e0250";
|
||||
sha256 = "0j92ayfrlapgh09mz9rxfjzxag2kjmljd2qkbv54jl5dzr6p0f3q";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -3288,12 +3288,12 @@ let
|
|||
|
||||
nvim-ts-rainbow = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow";
|
||||
version = "2021-03-21";
|
||||
version = "2021-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "p00f";
|
||||
repo = "nvim-ts-rainbow";
|
||||
rev = "280d324111b114f3649743179ccfc496663cdfec";
|
||||
sha256 = "12y7jglbsl0lydx2a8syc9i02h21pzg3dcn4xspij41qblinv1g2";
|
||||
rev = "4c9043e117bfa5ea8e4d5b04b60b2e29c0548e14";
|
||||
sha256 = "1ada87qkka1bsjdy52xqcnj5rmd9fl8q2v0km1pml3lcjyi0zdf5";
|
||||
};
|
||||
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
|
||||
};
|
||||
|
|
@ -3731,6 +3731,18 @@ let
|
|||
meta.homepage = "https://github.com/chrisbra/Recover.vim/";
|
||||
};
|
||||
|
||||
registers-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "registers-nvim";
|
||||
version = "2021-03-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tversteeg";
|
||||
repo = "registers.nvim";
|
||||
rev = "ba84c085ca868515520310073d922132fd811a24";
|
||||
sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim";
|
||||
};
|
||||
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
|
||||
};
|
||||
|
||||
Rename = buildVimPluginFrom2Nix {
|
||||
pname = "Rename";
|
||||
version = "2011-08-31";
|
||||
|
|
@ -4924,12 +4936,12 @@ let
|
|||
|
||||
vim-autoformat = buildVimPluginFrom2Nix {
|
||||
pname = "vim-autoformat";
|
||||
version = "2021-02-10";
|
||||
version = "2021-03-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chiel92";
|
||||
repo = "vim-autoformat";
|
||||
rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b";
|
||||
sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby";
|
||||
rev = "e9104aeece94652b064a15ae220bd4926a715dbd";
|
||||
sha256 = "1kvnmzs1wbqaiswsjra13f06m8dpdn62h8zqrnr9vv13rm8a2326";
|
||||
};
|
||||
meta.homepage = "https://github.com/Chiel92/vim-autoformat/";
|
||||
};
|
||||
|
|
@ -7243,12 +7255,12 @@ let
|
|||
|
||||
vim-projectionist = buildVimPluginFrom2Nix {
|
||||
pname = "vim-projectionist";
|
||||
version = "2021-01-22";
|
||||
version = "2021-03-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-projectionist";
|
||||
rev = "348e070867d02bd471df486bfbe25e2e2ce13061";
|
||||
sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr";
|
||||
rev = "7d2853e7550e6ff6459096c211a4177303a2e5d2";
|
||||
sha256 = "0qvsm0bd5nbd0dcgcrsa45vxmb4ccsm6yn4j3xiwd52gnyacp14s";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-projectionist/";
|
||||
};
|
||||
|
|
@ -8529,12 +8541,12 @@ let
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-03-16";
|
||||
version = "2021-03-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "96d716b98cf6ebd5056b6cd770d304a8c2007dac";
|
||||
sha256 = "1fy9wg8iq3dd8qb36f1jn678kqd3hpgq1qk0yxfigha2w2rarh6b";
|
||||
rev = "4b9e69dc5e817c3436843ee0cb431e59fa5705b0";
|
||||
sha256 = "1s2h2bgd751jf7vj9dr1756g7gxdx3b7pwx49686273ibv1spnwf";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -635,6 +635,7 @@ travitch/hasksyn
|
|||
tremor-rs/tremor-vim@main
|
||||
triglav/vim-visual-increment
|
||||
troydm/zoomwintab.vim
|
||||
tversteeg/registers.nvim@main
|
||||
twerth/ir_black
|
||||
twinside/vim-haskellconceal
|
||||
Twinside/vim-hoogle
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ let
|
|||
buildInputs = [ jdk ];
|
||||
meta = {
|
||||
license = lib.licenses.epl20;
|
||||
broken = lib.versionAtLeast "11" jdk.version;
|
||||
broken = lib.versionAtLeast jdk.version "11";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "flz";
|
||||
repo = "iaqualink-py";
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh";
|
||||
};
|
||||
checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ];
|
||||
|
|
@ -299,6 +299,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"sql"
|
||||
"ssdp"
|
||||
"stream"
|
||||
"subaru"
|
||||
"sun"
|
||||
"switch"
|
||||
"system_health"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ buildGoModule, lib, fetchFromGitHub, installShellFiles }:
|
||||
buildGoModule rec {
|
||||
pname = "aws-vault";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "99designs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j";
|
||||
sha256 = "sha256-bmqmT/gkdgczrDfZdI+FySX5CuesJXWKS0JatzaubIw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z";
|
||||
vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdf2psf";
|
||||
version = "1.201";
|
||||
version = "1.202";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "sha256-XVaROIxyNBBFoXf+K1mv4mW8wWozqMcs1cgaWj8L8Q0=";
|
||||
sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ in stdenv.mkDerivation {
|
|||
homepage = "https://code.dogmap.org./fdtools/";
|
||||
description = "A set of utilities for working with file descriptors";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.all;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.Profpatsch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
|
||||
version = "0.5.1";
|
||||
pname = "steghide";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
|
||||
sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/steghide-0.5.1-gcc34.patch
|
||||
./patches/steghide-0.5.1-gcc4.patch
|
||||
./patches/steghide-0.5.1-gcc43.patch
|
||||
];
|
||||
|
||||
# AM_CXXFLAGS needed for automake
|
||||
preConfigure = ''
|
||||
export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://steghide.sourceforge.net/";
|
||||
description = "Steganography program that is able to hide data in various kinds of image- and audio-files";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
--- steghide-0.5.1.old/src/Makefile.am
|
||||
+++ steghide-0.5.1.new/src/Makefile.am 2004-07-16 19:01:39.673947633 +0200
|
||||
@@ -33,5 +33,5 @@
|
||||
WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc
|
||||
LIBS = @LIBINTL@ @LIBS@
|
||||
localedir = $(datadir)/locale
|
||||
-LIBTOOL = $(SHELL) libtool
|
||||
+LIBTOOL = $(SHELL) libtool --tag=CXX
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
--- steghide-0.5.1.old/src/AuSampleValues.cc
|
||||
+++ steghide-0.5.1.new/src/AuSampleValues.cc 2004-07-16 18:59:18.934578427 +0200
|
||||
@@ -17,21 +17,21 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
-
|
||||
+#include "common.h"
|
||||
#include "AuSampleValues.h"
|
||||
|
||||
// AuMuLawSampleValue
|
||||
-const BYTE AuMuLawSampleValue::MinValue = 0 ;
|
||||
-const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
|
||||
+template<> const BYTE AuMuLawSampleValue::MinValue = 0 ;
|
||||
+template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
|
||||
|
||||
// AuPCM8SampleValue
|
||||
-const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
|
||||
-const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
|
||||
+template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
|
||||
+template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
|
||||
|
||||
// AuPCM16SampleValue
|
||||
-const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
|
||||
-const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
|
||||
+template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
|
||||
+template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
|
||||
|
||||
// AuPCM32SampleValue
|
||||
-const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
|
||||
-const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
|
||||
+template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
|
||||
+template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
|
||||
--- steghide-0.5.1-orig/src/AuData.h 2003-09-28 09:30:29.000000000 -0600
|
||||
+++ steghide-0.5.1/src/AuData.h 2007-05-11 22:04:56.000000000 -0600
|
||||
@@ -26,22 +26,30 @@
|
||||
|
||||
// AuMuLawAudioData
|
||||
typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
|
||||
+template<>
|
||||
inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
|
||||
+template<>
|
||||
inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
|
||||
|
||||
// AuPCM8AudioData
|
||||
typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
|
||||
+template<>
|
||||
inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
|
||||
+template<>
|
||||
inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
|
||||
|
||||
// AuPCM16AudioData
|
||||
typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
|
||||
+template<>
|
||||
inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
|
||||
+template<>
|
||||
inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
|
||||
|
||||
// AuPCM32AudioData
|
||||
typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
|
||||
+template<>
|
||||
inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
|
||||
+template<>
|
||||
inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
|
||||
|
||||
#endif // ndef SH_AUDATA_H
|
||||
diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc
|
||||
--- steghide-0.5.1-orig/src/MHashPP.cc 2003-10-05 04:17:50.000000000 -0600
|
||||
+++ steghide-0.5.1/src/MHashPP.cc 2007-05-11 22:07:01.000000000 -0600
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
std::string MHashPP::getAlgorithmName (hashid id)
|
||||
{
|
||||
- char *name = mhash_get_hash_name (id) ;
|
||||
+ char *name = (char *) mhash_get_hash_name (id) ;
|
||||
std::string retval ;
|
||||
if (name == NULL) {
|
||||
retval = std::string ("<algorithm not found>") ;
|
||||
|
|
@ -1,349 +0,0 @@
|
|||
--- steghide-0.5.1.old/configure.in 2003-10-15 09:48:52.000000000 +0200
|
||||
+++ steghide-0.5.1.new/configure.in 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -7,27 +7,26 @@
|
||||
dnl checks for programs.
|
||||
AC_PROG_CXX
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_AWK
|
||||
AC_PROG_LN_S
|
||||
+AC_CXX_COMPILE_STDCXX_0X
|
||||
|
||||
dnl GNU gettext
|
||||
AC_CHECK_FUNCS(strchr)
|
||||
AM_GNU_GETTEXT
|
||||
AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
|
||||
|
||||
dnl check if debugging support is requested
|
||||
-AC_MSG_CHECKING([wether to enable debugging])
|
||||
+AC_MSG_CHECKING([whether to enable debugging])
|
||||
AC_ARG_ENABLE(debug,[ --enable-debug enable debugging],
|
||||
if test "$enableval" = yes ;
|
||||
then
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(DEBUG,1,[enable code used only for debugging])
|
||||
- CXXFLAGS="-O2 -Wall -g"
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
- CXXFLAGS="-O2 -Wall"
|
||||
fi
|
||||
,
|
||||
AC_MSG_RESULT([no])
|
||||
CXXFLAGS="-O2 -Wall"
|
||||
)
|
||||
@@ -213,7 +212,18 @@
|
||||
echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
|
||||
echo "**********";
|
||||
AC_MSG_ERROR([[libmhash not found]])
|
||||
fi
|
||||
|
||||
+dnl Should we add std=c++0x?
|
||||
+
|
||||
+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;
|
||||
+then
|
||||
+ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"
|
||||
+else
|
||||
+ CXXFLAGS="${CXXFLAGS} -Wall -Wextra"
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(CXXFLAGS)
|
||||
+
|
||||
dnl create Makefiles
|
||||
AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
|
||||
--- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -0,0 +1,107 @@
|
||||
+# ===========================================================================
|
||||
+# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
|
||||
+# ===========================================================================
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AC_CXX_COMPILE_STDCXX_0X
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# Check for baseline language coverage in the compiler for the C++0x
|
||||
+# standard.
|
||||
+#
|
||||
+# LAST MODIFICATION
|
||||
+#
|
||||
+# 2008-04-17
|
||||
+#
|
||||
+# COPYLEFT
|
||||
+#
|
||||
+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
|
||||
+#
|
||||
+# Copying and distribution of this file, with or without modification, are
|
||||
+# permitted in any medium without royalty provided the copyright notice
|
||||
+# and this notice are preserved.
|
||||
+
|
||||
+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
|
||||
+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
|
||||
+ ac_cv_cxx_compile_cxx0x_native,
|
||||
+ [AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
+ AC_TRY_COMPILE([
|
||||
+ template <typename T>
|
||||
+ struct check
|
||||
+ {
|
||||
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
||||
+ };
|
||||
+
|
||||
+ typedef check<check<bool>> right_angle_brackets;
|
||||
+
|
||||
+ int a;
|
||||
+ decltype(a) b;
|
||||
+
|
||||
+ typedef check<int> check_type;
|
||||
+ check_type c;
|
||||
+ check_type&& cr = c;],,
|
||||
+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
+
|
||||
+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
|
||||
+ ac_cv_cxx_compile_cxx0x_cxx,
|
||||
+ [AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
+ ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
+ AC_TRY_COMPILE([
|
||||
+ template <typename T>
|
||||
+ struct check
|
||||
+ {
|
||||
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
||||
+ };
|
||||
+
|
||||
+ typedef check<check<bool>> right_angle_brackets;
|
||||
+
|
||||
+ int a;
|
||||
+ decltype(a) b;
|
||||
+
|
||||
+ typedef check<int> check_type;
|
||||
+ check_type c;
|
||||
+ check_type&& cr = c;],,
|
||||
+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
|
||||
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
+
|
||||
+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
|
||||
+ ac_cv_cxx_compile_cxx0x_gxx,
|
||||
+ [AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
+ ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
|
||||
+ AC_TRY_COMPILE([
|
||||
+ template <typename T>
|
||||
+ struct check
|
||||
+ {
|
||||
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
||||
+ };
|
||||
+
|
||||
+ typedef check<check<bool>> right_angle_brackets;
|
||||
+
|
||||
+ int a;
|
||||
+ decltype(a) b;
|
||||
+
|
||||
+ typedef check<int> check_type;
|
||||
+ check_type c;
|
||||
+ check_type&& cr = c;],,
|
||||
+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
|
||||
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
+
|
||||
+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
|
||||
+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
|
||||
+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
|
||||
+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
|
||||
+ fi
|
||||
+])
|
||||
--- steghide-0.5.1.old/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Arguments.cc 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -26,10 +26,12 @@
|
||||
#include "Terminal.h"
|
||||
#include "common.h"
|
||||
#include "error.h"
|
||||
#include "msg.h"
|
||||
|
||||
+float Arguments::Default_Goal = 100.0 ;
|
||||
+
|
||||
// the global Arguments object
|
||||
Arguments Args ;
|
||||
|
||||
Arguments::Arguments (int argc, char* argv[])
|
||||
{
|
||||
--- steghide-0.5.1.old/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Arguments.h 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -98,11 +98,11 @@
|
||||
static const bool Default_EmbedEmbFn = true ;
|
||||
static const bool Default_Force = false ;
|
||||
static const VERBOSITY Default_Verbosity = NORMAL ;
|
||||
static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats
|
||||
static const unsigned int Max_Algorithm = 3 ;
|
||||
- static const float Default_Goal = 100.0 ;
|
||||
+ static float Default_Goal ;
|
||||
static const DEBUGCOMMAND Default_DebugCommand = NONE ;
|
||||
static const bool Default_Check = false ;
|
||||
static const unsigned int Default_DebugLevel = 0 ;
|
||||
static const unsigned int Default_GmlGraphRecDepth = 0 ;
|
||||
static const unsigned int Default_GmlStartVertex = 0 ;
|
||||
--- steghide-0.5.1.old/src/EncryptionMode.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/EncryptionMode.h 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -69,11 +69,11 @@
|
||||
static const unsigned int NumValues = 8 ;
|
||||
IRep Value ;
|
||||
|
||||
typedef struct struct_Translation {
|
||||
IRep irep ;
|
||||
- char* srep ;
|
||||
+ const char* srep ;
|
||||
} Translation ;
|
||||
static const Translation Translations[] ;
|
||||
} ;
|
||||
|
||||
#endif // ndef SH_ENCMODE_H
|
||||
--- steghide-0.5.1.old/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Graph.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -20,10 +20,12 @@
|
||||
|
||||
#include <ctime>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
+#include <algorithm>
|
||||
+#include <climits>
|
||||
|
||||
#include "BitString.h"
|
||||
#include "CvrStgFile.h"
|
||||
#include "Edge.h"
|
||||
#include "Graph.h"
|
||||
--- steghide-0.5.1.old/src/Matching.cc 2003-10-11 23:54:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Matching.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -16,10 +16,11 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <algorithm>
|
||||
#include "Edge.h"
|
||||
#include "Graph.h"
|
||||
#include "Matching.h"
|
||||
#include "ProgressOutput.h"
|
||||
#include "common.h"
|
||||
--- steghide-0.5.1.old/src/ProgressOutput.cc 2003-10-11 11:20:51.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/ProgressOutput.cc 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -21,10 +21,12 @@
|
||||
#include <cmath>
|
||||
|
||||
#include "ProgressOutput.h"
|
||||
#include "common.h"
|
||||
|
||||
+float ProgressOutput::NoAvgWeight = 1.0 ;
|
||||
+
|
||||
ProgressOutput::ProgressOutput ()
|
||||
: Message("__nomessage__")
|
||||
{
|
||||
LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time
|
||||
}
|
||||
--- steghide-0.5.1.old/src/ProgressOutput.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/ProgressOutput.h 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -60,13 +60,13 @@
|
||||
/**
|
||||
* update the output appending rate, [average edge weight], "done" and a newline
|
||||
* \param rate the rate of matched vertices
|
||||
* \param avgweight the average edge weight (is not printed if not given)
|
||||
**/
|
||||
- void done (float rate, float avgweight = NoAvgWeight) const ;
|
||||
+ void done (float rate, float avgweight = 1.0) const ;
|
||||
|
||||
- static const float NoAvgWeight = -1.0 ;
|
||||
+ static float NoAvgWeight ;
|
||||
|
||||
protected:
|
||||
std::string vcompose (const char *msgfmt, va_list ap) const ;
|
||||
|
||||
private:
|
||||
--- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -16,10 +16,12 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <algorithm>
|
||||
+
|
||||
#include "Edge.h"
|
||||
#include "Graph.h"
|
||||
#include "Matching.h"
|
||||
#include "SMDConstructionHeuristic.h"
|
||||
#include "Vertex.h"
|
||||
--- steghide-0.5.1.old/src/WavFile.cc 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/WavFile.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -19,10 +19,11 @@
|
||||
*/
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
+#include <algorithm>
|
||||
|
||||
#include "CvrStgFile.h"
|
||||
#include "DFSAPHeuristic.h"
|
||||
#include "SampleValueAdjacencyList.h"
|
||||
#include "SMDConstructionHeuristic.h"
|
||||
--- steghide-0.5.1.old/src/wrapper_hash_map.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/wrapper_hash_map.h 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -25,17 +25,21 @@
|
||||
|
||||
#ifdef __GNUC__
|
||||
# if __GNUC__ < 3
|
||||
# include <hash_map.h>
|
||||
namespace sgi { using ::hash ; using ::hash_map ; } ;
|
||||
-# else
|
||||
+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
|
||||
# include <ext/hash_map>
|
||||
-# if __GNUC_MINOR__ == 0
|
||||
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
|
||||
namespace sgi = std ; // GCC 3.0
|
||||
# else
|
||||
namespace sgi = __gnu_cxx ; // GCC 3.1 and later
|
||||
# endif
|
||||
+# else
|
||||
+# include <unordered_map>
|
||||
+# define hash_map unordered_map
|
||||
+ namespace sgi = std ;
|
||||
# endif
|
||||
#else
|
||||
namespace sgi = std ;
|
||||
#endif
|
||||
|
||||
--- steghide-0.5.1.old/src/wrapper_hash_set.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/wrapper_hash_set.h 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -26,17 +26,21 @@
|
||||
|
||||
#ifdef __GNUC__
|
||||
# if __GNUC__ < 3
|
||||
# include <hash_set.h>
|
||||
namespace sgi { using ::hash ; using ::hash_set ; } ;
|
||||
-# else
|
||||
+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
|
||||
# include <ext/hash_set>
|
||||
-# if __GNUC_MINOR__ == 0
|
||||
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
|
||||
namespace sgi = std ; // GCC 3.0
|
||||
# else
|
||||
namespace sgi = ::__gnu_cxx ; // GCC 3.1 and later
|
||||
# endif
|
||||
+# else
|
||||
+# include <unordered_set>
|
||||
+# define hash_set unordered_set
|
||||
+ namespace sgi = std ;
|
||||
# endif
|
||||
#else
|
||||
namespace sgi = std ;
|
||||
#endif
|
||||
|
||||
|
|
@ -17232,8 +17232,6 @@ in
|
|||
|
||||
stlink = callPackage ../development/tools/misc/stlink { };
|
||||
|
||||
steghide = callPackage ../tools/security/steghide {};
|
||||
|
||||
stegseek = callPackage ../tools/security/stegseek {};
|
||||
|
||||
stlport = callPackage ../development/libraries/stlport { };
|
||||
|
|
@ -24082,6 +24080,8 @@ in
|
|||
|
||||
moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };
|
||||
|
||||
moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { };
|
||||
|
||||
mooSpace = callPackage ../applications/audio/mooSpace { };
|
||||
|
||||
mop = callPackage ../applications/misc/mop { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue