Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ce7773fcf7
@ -67,6 +67,8 @@ rec {
|
||||
|
||||
LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
|
||||
'';
|
||||
|
||||
passthru = driver.passthru;
|
||||
};
|
||||
|
||||
|
||||
@ -76,6 +78,7 @@ rec {
|
||||
, name ? "unnamed"
|
||||
# Skip linting (mainly intended for faster dev cycles)
|
||||
, skipLint ? false
|
||||
, passthru ? {}
|
||||
, ...
|
||||
} @ t:
|
||||
let
|
||||
@ -137,7 +140,7 @@ rec {
|
||||
testScript = testScript';
|
||||
preferLocalBuild = true;
|
||||
testName = name;
|
||||
passthru = {
|
||||
passthru = passthru // {
|
||||
inherit nodes;
|
||||
};
|
||||
}
|
||||
|
||||
@ -49,7 +49,10 @@ in
|
||||
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
|
||||
cage = handleTest ./cage.nix {};
|
||||
cagebreak = handleTest ./cagebreak.nix {};
|
||||
cassandra = handleTest ./cassandra.nix {};
|
||||
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
|
||||
cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; };
|
||||
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
|
||||
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
|
||||
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
|
||||
ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};
|
||||
certmgr = handleTest ./certmgr.nix {};
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
import ./make-test-python.nix ({ pkgs, lib, testPackage ? pkgs.cassandra, ... }:
|
||||
let
|
||||
# Change this to test a different version of Cassandra:
|
||||
testPackage = pkgs.cassandra;
|
||||
clusterName = "NixOS Automated-Test Cluster";
|
||||
|
||||
testRemoteAuth = lib.versionAtLeast testPackage.version "3.11";
|
||||
@ -47,7 +45,7 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "cassandra";
|
||||
name = "cassandra-${testPackage.version}";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
};
|
||||
@ -128,4 +126,8 @@ in
|
||||
"nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass2'"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit testPackage;
|
||||
};
|
||||
})
|
||||
|
||||
@ -32,11 +32,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "saga";
|
||||
version = "7.8.1";
|
||||
version = "7.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
|
||||
sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM=";
|
||||
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
|
||||
sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qvge";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArsMasiuk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll";
|
||||
sha256 = "0qy73dngl1xm6mr2306ddzbbrzk6yszp3y15phs861bfxynzkqjz";
|
||||
};
|
||||
|
||||
prePatch = "cd src";
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (6.0.3.2)
|
||||
activesupport (6.1.0)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
zeitwerk (~> 2.2, >= 2.2.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.1.7)
|
||||
em-websocket (0.5.1)
|
||||
em-websocket (0.5.2)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
eventmachine (1.2.7)
|
||||
@ -24,21 +24,21 @@ GEM
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (1.8.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (4.1.1)
|
||||
jekyll (4.2.0)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
i18n (~> 1.0)
|
||||
jekyll-sass-converter (~> 2.0)
|
||||
jekyll-watch (~> 2.0)
|
||||
kramdown (~> 2.1)
|
||||
kramdown (~> 2.3)
|
||||
kramdown-parser-gfm (~> 1.0)
|
||||
liquid (~> 4.0)
|
||||
mercenary (~> 0.4.0)
|
||||
pathutil (~> 0.9)
|
||||
rouge (~> 3.0)
|
||||
safe_yaml (~> 1.0)
|
||||
terminal-table (~> 1.8)
|
||||
terminal-table (~> 2.0)
|
||||
jekyll-avatar (0.7.0)
|
||||
jekyll (>= 3.0, < 5.0)
|
||||
jekyll-mentions (1.6.0)
|
||||
@ -46,8 +46,8 @@ GEM
|
||||
jekyll (>= 3.7, < 5.0)
|
||||
jekyll-sass-converter (2.1.0)
|
||||
sassc (> 2.0.1, < 3.0)
|
||||
jekyll-seo-tag (2.6.1)
|
||||
jekyll (>= 3.3, < 5.0)
|
||||
jekyll-seo-tag (2.7.1)
|
||||
jekyll (>= 3.8, < 5.0)
|
||||
jekyll-sitemap (1.4.0)
|
||||
jekyll (>= 3.7, < 5.0)
|
||||
jekyll-watch (2.2.1)
|
||||
@ -61,32 +61,31 @@ GEM
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
liquid (4.0.3)
|
||||
listen (3.2.1)
|
||||
listen (3.3.3)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
mercenary (0.4.0)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.1)
|
||||
minitest (5.14.2)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
pathutil (0.16.2)
|
||||
forwardable-extended (~> 2.6)
|
||||
public_suffix (4.0.5)
|
||||
public_suffix (4.0.6)
|
||||
rb-fsevent (0.10.4)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rexml (3.2.4)
|
||||
rouge (3.22.0)
|
||||
rouge (3.26.0)
|
||||
safe_yaml (1.0.5)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
terminal-table (1.8.0)
|
||||
terminal-table (2.0.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.7)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (2.0.3)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (1.7.0)
|
||||
zeitwerk (2.4.0)
|
||||
zeitwerk (2.4.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
|
||||
sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.3.2";
|
||||
version = "6.1.0";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -47,10 +47,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
|
||||
sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
};
|
||||
eventmachine = {
|
||||
groups = ["default"];
|
||||
@ -130,10 +130,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r";
|
||||
sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
};
|
||||
jekyll-avatar = {
|
||||
dependencies = ["jekyll"];
|
||||
@ -174,10 +174,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
|
||||
sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.1";
|
||||
version = "2.7.1";
|
||||
};
|
||||
jekyll-sitemap = {
|
||||
dependencies = ["jekyll"];
|
||||
@ -250,10 +250,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
|
||||
sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.1";
|
||||
version = "3.3.3";
|
||||
};
|
||||
mercenary = {
|
||||
groups = ["default"];
|
||||
@ -280,10 +280,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
|
||||
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.1";
|
||||
version = "5.14.2";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
@ -312,10 +312,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.5";
|
||||
version = "4.0.6";
|
||||
};
|
||||
rb-fsevent = {
|
||||
groups = ["default"];
|
||||
@ -353,10 +353,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
|
||||
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.22.0";
|
||||
version = "3.26.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default"];
|
||||
@ -385,31 +385,21 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
|
||||
sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
};
|
||||
thread_safe = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.6";
|
||||
version = "2.0.0";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["thread_safe"];
|
||||
dependencies = ["concurrent-ruby"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
|
||||
sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
version = "2.0.3";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = ["default"];
|
||||
@ -426,9 +416,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
|
||||
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.4.2";
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (6.0.3.2)
|
||||
activesupport (6.1.0)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
zeitwerk (~> 2.2, >= 2.2.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
classifier-reborn (2.2.0)
|
||||
@ -18,13 +18,14 @@ GEM
|
||||
coffee-script-source (1.12.2)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.1.7)
|
||||
em-websocket (0.5.1)
|
||||
em-websocket (0.5.2)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
eventmachine (1.2.7)
|
||||
execjs (2.7.0)
|
||||
faraday (1.0.1)
|
||||
faraday (1.1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ruby2_keywords
|
||||
fast-stemmer (1.0.2)
|
||||
ffi (1.13.1)
|
||||
forwardable-extended (2.6.0)
|
||||
@ -35,27 +36,27 @@ GEM
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (1.8.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (4.1.1)
|
||||
jekyll (4.2.0)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
i18n (~> 1.0)
|
||||
jekyll-sass-converter (~> 2.0)
|
||||
jekyll-watch (~> 2.0)
|
||||
kramdown (~> 2.1)
|
||||
kramdown (~> 2.3)
|
||||
kramdown-parser-gfm (~> 1.0)
|
||||
liquid (~> 4.0)
|
||||
mercenary (~> 0.4.0)
|
||||
pathutil (~> 0.9)
|
||||
rouge (~> 3.0)
|
||||
safe_yaml (~> 1.0)
|
||||
terminal-table (~> 1.8)
|
||||
terminal-table (~> 2.0)
|
||||
jekyll-avatar (0.7.0)
|
||||
jekyll (>= 3.0, < 5.0)
|
||||
jekyll-coffeescript (2.0.0)
|
||||
coffee-script (~> 2.2)
|
||||
coffee-script-source (~> 1.12)
|
||||
jekyll-feed (0.15.0)
|
||||
jekyll-feed (0.15.1)
|
||||
jekyll (>= 3.7, < 5.0)
|
||||
jekyll-gist (1.5.0)
|
||||
octokit (~> 4.2)
|
||||
@ -67,8 +68,8 @@ GEM
|
||||
jekyll (>= 3.3, < 5.0)
|
||||
jekyll-sass-converter (2.1.0)
|
||||
sassc (> 2.0.1, < 3.0)
|
||||
jekyll-seo-tag (2.6.1)
|
||||
jekyll (>= 3.3, < 5.0)
|
||||
jekyll-seo-tag (2.7.1)
|
||||
jekyll (>= 3.8, < 5.0)
|
||||
jekyll-sitemap (1.4.0)
|
||||
jekyll (>= 3.7, < 5.0)
|
||||
jekyll-watch (2.2.1)
|
||||
@ -87,45 +88,45 @@ GEM
|
||||
liquid (4.0.3)
|
||||
liquid-c (4.0.0)
|
||||
liquid (>= 3.0.0)
|
||||
listen (3.2.1)
|
||||
listen (3.3.3)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
mercenary (0.4.0)
|
||||
mime-types (3.3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2020.0512)
|
||||
mime-types-data (3.2020.1104)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.1)
|
||||
minitest (5.14.2)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
octokit (4.18.0)
|
||||
octokit (4.19.0)
|
||||
faraday (>= 0.9)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
pathutil (0.16.2)
|
||||
forwardable-extended (~> 2.6)
|
||||
public_suffix (4.0.5)
|
||||
public_suffix (4.0.6)
|
||||
rb-fsevent (0.10.4)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rdoc (6.2.1)
|
||||
rexml (3.2.4)
|
||||
rouge (3.22.0)
|
||||
rouge (3.26.0)
|
||||
ruby2_keywords (0.0.2)
|
||||
safe_yaml (1.0.5)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
sawyer (0.8.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
terminal-table (1.8.0)
|
||||
terminal-table (2.0.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
thread_safe (0.3.6)
|
||||
tomlrb (1.3.0)
|
||||
tzinfo (1.2.7)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (2.0.3)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (1.7.0)
|
||||
yajl-ruby (1.4.1)
|
||||
zeitwerk (2.4.0)
|
||||
zeitwerk (2.4.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
|
||||
sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.3.2";
|
||||
version = "6.1.0";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -101,10 +101,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
|
||||
sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
};
|
||||
eventmachine = {
|
||||
groups = ["default"];
|
||||
@ -127,15 +127,15 @@
|
||||
version = "2.7.0";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["multipart-post"];
|
||||
dependencies = ["multipart-post" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
|
||||
sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
};
|
||||
fast-stemmer = {
|
||||
groups = ["default"];
|
||||
@ -227,10 +227,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r";
|
||||
sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
};
|
||||
jekyll-avatar = {
|
||||
dependencies = ["jekyll"];
|
||||
@ -260,10 +260,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mgc1ik2cq2g8g7z9ql2i6ydzy771m2i4qrd1q77x8cf2sprlb0z";
|
||||
sha256 = "1zxqkrnix0xiw98531h5ga6h69jhzlx2jh9qhvcl67p8nq3sgza9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
};
|
||||
jekyll-gist = {
|
||||
dependencies = ["octokit"];
|
||||
@ -325,10 +325,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
|
||||
sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.1";
|
||||
version = "2.7.1";
|
||||
};
|
||||
jekyll-sitemap = {
|
||||
dependencies = ["jekyll"];
|
||||
@ -447,10 +447,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
|
||||
sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.1";
|
||||
version = "3.3.3";
|
||||
};
|
||||
mercenary = {
|
||||
groups = ["default"];
|
||||
@ -478,10 +478,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
|
||||
sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2020.0512";
|
||||
version = "3.2020.1104";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
@ -498,10 +498,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
|
||||
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.1";
|
||||
version = "5.14.2";
|
||||
};
|
||||
multipart-post = {
|
||||
groups = ["default"];
|
||||
@ -530,10 +530,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6";
|
||||
sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.18.0";
|
||||
version = "4.19.0";
|
||||
};
|
||||
pathutil = {
|
||||
dependencies = ["forwardable-extended"];
|
||||
@ -551,10 +551,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.5";
|
||||
version = "4.0.6";
|
||||
};
|
||||
rb-fsevent = {
|
||||
groups = ["default"];
|
||||
@ -602,10 +602,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
|
||||
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.22.0";
|
||||
version = "3.26.0";
|
||||
};
|
||||
ruby2_keywords = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.2";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default"];
|
||||
@ -645,20 +655,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
|
||||
sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
};
|
||||
thread_safe = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.6";
|
||||
version = "2.0.0";
|
||||
};
|
||||
tomlrb = {
|
||||
groups = ["default"];
|
||||
@ -671,15 +671,15 @@
|
||||
version = "1.3.0";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["thread_safe"];
|
||||
dependencies = ["concurrent-ruby"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
|
||||
sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
version = "2.0.3";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = ["default"];
|
||||
@ -718,9 +718,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
|
||||
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.4.2";
|
||||
};
|
||||
}
|
||||
22
pkgs/applications/misc/mob/default.nix
Normal file
22
pkgs/applications/misc/mob/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "0.0.25";
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
sha256 = "1gs0mv4j66278srrck7llvi5gnfdqxz3a489qn5sx3mw46yx5q93";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for swift git handover";
|
||||
homepage = "https://github.com/remotemobprogramming/mob";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ericdallo ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
, withGeolocation ? true
|
||||
, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa
|
||||
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
|
||||
, withAppIndicator ? true, libappindicator
|
||||
, withAppIndicator ? true, libappindicator, libayatana-appindicator
|
||||
}:
|
||||
|
||||
let
|
||||
@ -41,6 +41,9 @@ let
|
||||
"--enable-drm=${if withDrm then "yes" else "no"}"
|
||||
"--enable-quartz=${if withQuartz then "yes" else "no"}"
|
||||
"--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
|
||||
] ++ stdenv.lib.optionals (pname == "gammastep") [
|
||||
"--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/"
|
||||
"--enable-apparmor"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -52,7 +55,9 @@ let
|
||||
++ stdenv.lib.optional withDrm libdrm
|
||||
++ stdenv.lib.optional withQuartz ApplicationServices
|
||||
++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
|
||||
++ stdenv.lib.optional withAppIndicator libappindicator
|
||||
++ stdenv.lib.optional withAppIndicator (if (pname != "gammastep")
|
||||
then libappindicator
|
||||
else libayatana-appindicator)
|
||||
;
|
||||
|
||||
pythonPath = [ pygobject3 pyxdg ];
|
||||
@ -127,13 +132,13 @@ rec {
|
||||
|
||||
gammastep = mkRedshift rec {
|
||||
pname = "gammastep";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "chinstrap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7";
|
||||
sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya";
|
||||
};
|
||||
|
||||
meta = redshift.meta // {
|
||||
|
||||
58
pkgs/applications/networking/browsers/vieb/default.nix
Normal file
58
pkgs/applications/networking/browsers/vieb/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "vieb";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10l36q75nmqv0azxhmwms6hjicbgyvpk8k6ljrh9d7zxryd3xwz0";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
yarnLock = ./yarn.lock;
|
||||
yarnNix = ./yarn.nix;
|
||||
yarnFlags = [ "--production" "--offline" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "vieb";
|
||||
exec = "vieb %U";
|
||||
icon = "vieb";
|
||||
desktopName = "Web Browser";
|
||||
genericName = "Web Browser";
|
||||
categories = "Network;WebBrowser;";
|
||||
mimeType = lib.concatStringsSep ";" [
|
||||
"text/html"
|
||||
"application/xhtml+xml"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
];
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop
|
||||
|
||||
pushd $out/libexec/vieb/node_modules/vieb/app/img/icons
|
||||
for file in *.png; do
|
||||
install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/vieb.png
|
||||
done
|
||||
popd
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/vieb \
|
||||
--add-flags $out/libexec/vieb/node_modules/vieb/app
|
||||
'';
|
||||
|
||||
distPhase = ":"; # disable useless $out/tarballs directory
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://vieb.dev/";
|
||||
description = "Vim Inspired Electron Browser";
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
45
pkgs/applications/networking/browsers/vieb/package.json
Normal file
45
pkgs/applications/networking/browsers/vieb/package.json
Normal file
@ -0,0 +1,45 @@
|
||||
{
|
||||
"name": "vieb",
|
||||
"productName": "Vieb",
|
||||
"version": "3.1.0",
|
||||
"description": "Vim Inspired Electron Browser",
|
||||
"main": "app/index.js",
|
||||
"babel": {
|
||||
"plugins": [
|
||||
"@babel/plugin-proposal-optional-chaining"
|
||||
]
|
||||
},
|
||||
"scripts": {
|
||||
"test": "jest -u && eslint .",
|
||||
"start": "electron app",
|
||||
"build": "node build.js",
|
||||
"buildall": "node build.js --linux --win --mac",
|
||||
"buildlinux": "node build.js --linux",
|
||||
"buildwin": "node build.js --win",
|
||||
"buildmac": "node build.js --mac"
|
||||
},
|
||||
"repository": "https://github.com/Jelmerro/Vieb",
|
||||
"homepage": "https://vieb.dev",
|
||||
"keywords": [
|
||||
"Electron",
|
||||
"Browser",
|
||||
"Internet"
|
||||
],
|
||||
"author": "Jelmer van Arnhem",
|
||||
"email": "Jelmerro@users.noreply.github.com",
|
||||
"license": "GPL-3.0+",
|
||||
"devDependencies": {
|
||||
"@babel/plugin-proposal-optional-chaining": "^7.12.7",
|
||||
"archiver": "^5.0.2",
|
||||
"electron": "^11.0.3",
|
||||
"electron-builder": "^22.9.1",
|
||||
"eslint": "^7.15.0",
|
||||
"jest": "^26.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@cliqz/adblocker-electron": "^1.18.8",
|
||||
"darkreader": "^4.9.26",
|
||||
"is-svg": "^4.2.1",
|
||||
"rimraf": "^3.0.2"
|
||||
}
|
||||
}
|
||||
5236
pkgs/applications/networking/browsers/vieb/yarn.lock
Normal file
5236
pkgs/applications/networking/browsers/vieb/yarn.lock
Normal file
File diff suppressed because it is too large
Load Diff
5653
pkgs/applications/networking/browsers/vieb/yarn.nix
Normal file
5653
pkgs/applications/networking/browsers/vieb/yarn.nix
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "delly";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dellytools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1af1y20hd8x2yvix0gjvx038w7chf4fiyr68ny5yvrx5b2gw0vbq";
|
||||
sha256 = "sha256-j9klZ8qq1GQS7+zZ+vHwAwLHBYMBrWfbwqeD8QJeCuk=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib htslib bzip2 lzma ncurses boost ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "bumpver";
|
||||
version = "2020.1107";
|
||||
version = "2020.1108";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "75704333a8d1699e2cadcf1fcd3027a2cab6837ae343af10a61c6eef4e0313d7";
|
||||
sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aenum";
|
||||
version = "2.2.4";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0r1812bjm72x73pl7y4yhffr4zbdjgxa08avsy4b3di0pqgqv0l1";
|
||||
sha256 = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae";
|
||||
};
|
||||
|
||||
# For Python 3, locale has to be set to en_US.UTF-8 for
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioprocessing";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
disabled = !(pythonAtLeast "3.4");
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1yq1gfsky2kjimwdmzqk893sp6387vbl4bw0sbha5hl6cm3jp5dn";
|
||||
sha256 = "4603c86ff3fea673d4c643ad3adc519988cd778771b75079bc3be9e5ed4c5b66";
|
||||
};
|
||||
|
||||
# Tests aren't included in pypi package
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "25";
|
||||
version = "26";
|
||||
|
||||
disabled = ! isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1777effcc4ec8683e53603437887c43fa650f09ef4d148904ce06e2aa11044b7";
|
||||
sha256 = "3dd0f9fc59edff5d87905ddef3eecc93f974c209d818d3a91061b05925da04af";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "alerta";
|
||||
version = "8.2.0";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a689b2551655ffeb1fa0af2b652653c9355e4f612a3cb8265fcb53c47f83f7c0";
|
||||
sha256 = "83c7d751bad0cb9bd7886700da4cd83c5451b2e8eb8d4cc697966e02d6a565f8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ];
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bandit";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d02dfe250f4aa2d166c127ad81d192579e2bfcdb8501717c0e2005e35a6bcf60";
|
||||
sha256 = "8a4c7415254d75df8ff3c3b15cfe9042ecee628a1e40b44c15a98890fbfc2608";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, urllib3
|
||||
, geojson
|
||||
, isPy3k
|
||||
, mock
|
||||
, sqlalchemy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
@ -20,12 +20,12 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
urllib3
|
||||
sqlalchemy
|
||||
geojson
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
sqlalchemy
|
||||
mock
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -22,24 +22,31 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cryptography";
|
||||
version = "2.9.2"; # Also update the hash in vectors.nix
|
||||
version = "3.3.1"; # Also update the hash in vectors-3.3.nix
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0";
|
||||
sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy";
|
||||
};
|
||||
|
||||
patches = [ ./CVE-2020-25659.patch ];
|
||||
patches = [ ./cryptography-py27-warning.patch ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
|
||||
cffi
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
six
|
||||
] ++ stdenv.lib.optional (!isPyPy) cffi
|
||||
++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ];
|
||||
] ++ stdenv.lib.optionals (!isPyPy) [
|
||||
cffi
|
||||
] ++ stdenv.lib.optionals isPy27 [
|
||||
ipaddress enum34
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
cryptography_vectors
|
||||
@ -1,76 +0,0 @@
|
||||
Backported of:
|
||||
|
||||
From 58494b41d6ecb0f56b7c5f05d5f5e3ca0320d494 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Gaynor <alex.gaynor@gmail.com>
|
||||
Date: Sun, 25 Oct 2020 21:16:42 -0400
|
||||
Subject: [PATCH] Attempt to mitigate Bleichenbacher attacks on RSA decryption
|
||||
(#5507)
|
||||
|
||||
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
|
||||
index 6e4675d..ce66c28 100644
|
||||
--- a/docs/spelling_wordlist.txt
|
||||
+++ b/docs/spelling_wordlist.txt
|
||||
@@ -6,6 +6,7 @@ backend
|
||||
Backends
|
||||
backends
|
||||
bcrypt
|
||||
+Bleichenbacher
|
||||
Blowfish
|
||||
boolean
|
||||
Botan
|
||||
diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py
|
||||
index 3e4c2fd..6303f95 100644
|
||||
--- a/src/cryptography/hazmat/backends/openssl/rsa.py
|
||||
+++ b/src/cryptography/hazmat/backends/openssl/rsa.py
|
||||
@@ -117,40 +117,19 @@ def _enc_dec_rsa_pkey_ctx(backend, key, data, padding_enum, padding):
|
||||
|
||||
outlen = backend._ffi.new("size_t *", buf_size)
|
||||
buf = backend._ffi.new("unsigned char[]", buf_size)
|
||||
+ # Everything from this line onwards is written with the goal of being as
|
||||
+ # constant-time as is practical given the constraints of Python and our
|
||||
+ # API. See Bleichenbacher's '98 attack on RSA, and its many many variants.
|
||||
+ # As such, you should not attempt to change this (particularly to "clean it
|
||||
+ # up") without understanding why it was written this way (see
|
||||
+ # Chesterton's Fence), and without measuring to verify you have not
|
||||
+ # introduced observable time differences.
|
||||
res = crypt(pkey_ctx, buf, outlen, data, len(data))
|
||||
+ resbuf = backend._ffi.buffer(buf)[: outlen[0]]
|
||||
+ backend._lib.ERR_clear_error()
|
||||
if res <= 0:
|
||||
- _handle_rsa_enc_dec_error(backend, key)
|
||||
-
|
||||
- return backend._ffi.buffer(buf)[:outlen[0]]
|
||||
-
|
||||
-
|
||||
-def _handle_rsa_enc_dec_error(backend, key):
|
||||
- errors = backend._consume_errors()
|
||||
- backend.openssl_assert(errors)
|
||||
- backend.openssl_assert(errors[0].lib == backend._lib.ERR_LIB_RSA)
|
||||
- if isinstance(key, _RSAPublicKey):
|
||||
- backend.openssl_assert(
|
||||
- errors[0].reason == backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE
|
||||
- )
|
||||
- raise ValueError(
|
||||
- "Data too long for key size. Encrypt less data or use a "
|
||||
- "larger key size."
|
||||
- )
|
||||
- else:
|
||||
- decoding_errors = [
|
||||
- backend._lib.RSA_R_BLOCK_TYPE_IS_NOT_01,
|
||||
- backend._lib.RSA_R_BLOCK_TYPE_IS_NOT_02,
|
||||
- backend._lib.RSA_R_OAEP_DECODING_ERROR,
|
||||
- # Though this error looks similar to the
|
||||
- # RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE, this occurs on decrypts,
|
||||
- # rather than on encrypts
|
||||
- backend._lib.RSA_R_DATA_TOO_LARGE_FOR_MODULUS,
|
||||
- ]
|
||||
- if backend._lib.Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR:
|
||||
- decoding_errors.append(backend._lib.RSA_R_PKCS_DECODING_ERROR)
|
||||
-
|
||||
- backend.openssl_assert(errors[0].reason in decoding_errors)
|
||||
- raise ValueError("Decryption failed.")
|
||||
+ raise ValueError("Encryption/decryption failed.")
|
||||
+ return resbuf
|
||||
|
||||
|
||||
def _rsa_sig_determine_padding(backend, key, padding, algorithm):
|
||||
@ -0,0 +1,14 @@
|
||||
Delete the warning that breaks tests of dependent projects.
|
||||
|
||||
--- a/src/cryptography/__init__.py
|
||||
+++ b/src/cryptography/__init__.py
|
||||
@@ -33,9 +32,0 @@ __all__ = [
|
||||
-
|
||||
-if sys.version_info[0] == 2:
|
||||
- warnings.warn(
|
||||
- "Python 2 is no longer supported by the Python core team. Support for "
|
||||
- "it is now deprecated in cryptography, and will be removed in the "
|
||||
- "next release.",
|
||||
- CryptographyDeprecationWarning,
|
||||
- stacklevel=2,
|
||||
- )
|
||||
@ -7,7 +7,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r";
|
||||
sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03";
|
||||
};
|
||||
|
||||
# No tests included
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "7.1.10";
|
||||
version = "7.3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bae28fab1e08b709553c8efbeefc5b0ee4f5540a13a04e61fb3d348814823e16";
|
||||
sha256 = "c720298b05648f5de8f17de03f93d60ffb30c2d55ce2750e63c17c341a8de5e4";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -9,11 +9,11 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dependency-injector";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "345bfa4185802a712e27903b5612d4748a1e2483c3d5da8d840d8a401aeb75ea";
|
||||
sha256 = "99e65335cb84d543ebb47e76edadc695d062e5c25cc474698f50ed5e2aaa9002";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage (rec {
|
||||
pname = "elasticsearch";
|
||||
version = "7.10.0";
|
||||
version = "7.10.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9053ca99bc9db84f5d80e124a79a32dfa0f7079b2112b546a03241c0dbeda36d";
|
||||
sha256 = "a725dd923d349ca0652cf95d6ce23d952e2153740cf4ab6daf4a2d804feeed48";
|
||||
};
|
||||
|
||||
# Check is disabled because running them destroy the content of the local cluster!
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imagecorruptions";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "011e7c84a01f3e41465e5ad1ee48291cd6fd8032f45c836c5ddaad6e09fe0ae2";
|
||||
sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -29,6 +29,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/vpelletier/python-libusb1";
|
||||
description = "Python ctype-based wrapper around libusb1";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
maintainers = with maintainers; [ prusnak rnhmjoj ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "livereload";
|
||||
version = "2.6.1";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lepture";
|
||||
repo = "python-livereload";
|
||||
rev = "v${version}";
|
||||
sha256 = "15v2a0af897ijnsfjh2r8f7l5zi5i2jdm6z0xzlyyvp9pxd6mpfm";
|
||||
rev = version;
|
||||
sha256 = "1alp83h3l3771l915jqa1ylyllad7wxnmblayan0z0zj37jkp9n7";
|
||||
};
|
||||
|
||||
buildInputs = [ django ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.8.3";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bnflaz0nkjvps3b87ig02d3pymnrgrwcd0p0s6qyzx9s08lcz5x";
|
||||
sha256 = "564ffe240fd9a29978959c7d7827610cf4d8ff02ed612c3fd8067e2fba2cba59";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -21,9 +21,6 @@ buildPythonPackage rec {
|
||||
"test_get_machine_id"
|
||||
];
|
||||
|
||||
# Python 2 pytest fails with INTERNALERROR due to a deprecation warning.
|
||||
doCheck = isPy3k;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://palletsprojects.com/p/werkzeug/";
|
||||
description = "A WSGI utility library for Python";
|
||||
|
||||
@ -238,7 +238,7 @@ in rec {
|
||||
package = lib.importJSON packageJSON;
|
||||
pname = package.name;
|
||||
safeName = reformatPackageName pname;
|
||||
version = package.version or attrs.version;
|
||||
version = attrs.version or package.version;
|
||||
baseName = unlessNull name "${safeName}-${version}";
|
||||
|
||||
workspaceDependenciesTransitive = lib.unique (
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{
|
||||
"4.14": {
|
||||
"name": "linux-hardened-4.14.210.a.patch",
|
||||
"sha256": "1dzcxbby15r8k2xm0f4k0rz4j4jxx6br2h5hzfg6j5r07533vavg",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.210.a/linux-hardened-4.14.210.a.patch"
|
||||
"name": "linux-hardened-4.14.212.a.patch",
|
||||
"sha256": "068grrkygd6klv4zx3jghk987bl0v7g5g5911a2irllpsjv55rna",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.212.a/linux-hardened-4.14.212.a.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"name": "linux-hardened-4.19.161.a.patch",
|
||||
"sha256": "0xb29ybmw1gj186hn4q6hq3dnw3pljgmv4yd3xjf462hhb35pwsv",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.161.a/linux-hardened-4.19.161.a.patch"
|
||||
"name": "linux-hardened-4.19.163.a.patch",
|
||||
"sha256": "0p8y9r1f3blsqrakxy4yp73sff0i0k43cwp5rg4ry3apnzfly1a4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.163.a/linux-hardened-4.19.163.a.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"name": "linux-hardened-5.4.81.a.patch",
|
||||
"sha256": "1dm2rb7wwwi9s4zx2dbldamn85g98zvxq4r1c6icljyzkjk49wjh",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.81.a/linux-hardened-5.4.81.a.patch"
|
||||
"name": "linux-hardened-5.4.83.a.patch",
|
||||
"sha256": "08srahgfzynv2bfd0ym6vgl1c0xjfqg6qvgzlq85y9pb7fain5yp",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.83.a/linux-hardened-5.4.83.a.patch"
|
||||
},
|
||||
"5.8": {
|
||||
"name": "linux-hardened-5.8.18.a.patch",
|
||||
@ -20,8 +20,8 @@
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
|
||||
},
|
||||
"5.9": {
|
||||
"name": "linux-hardened-5.9.12.a.patch",
|
||||
"sha256": "18w35spv6lxniidnj0zw8gp02knhm3af3qif46plxcplyjbys6bw",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.12.a/linux-hardened-5.9.12.a.patch"
|
||||
"name": "linux-hardened-5.9.14.a.patch",
|
||||
"sha256": "1rr61s9k7nmr27r4vkgpvvra7r8ksi6h6axf5kcbx7krbgdmwmfv",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.14.a/linux-hardened-5.9.14.a.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.8.18";
|
||||
version = "5.10";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0d2mm16mjyl2d734ak0lj8vd76h3r0san7l7g2zczd5pjkva7d2a";
|
||||
sha256 = "sha256-3N+Z5D6YMw2SUBaYW/vHuDxm02e3FLLeDLv8v4PYykM=";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.4.78-rt44"; # updated by ./update-rt.sh
|
||||
version = "5.4.82-rt45"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -14,14 +14,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226";
|
||||
sha256 = "1byx163v83aw0ixphwz20znml2s2n3cy1kp89vgwbdiqxbj5hi7v";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0cvvk647cz7nckhyxrsvdnsc6hzhy09y3c1155xzhydiv5gxc56h";
|
||||
sha256 = "0nh7d5b81br3cpljmn5n7lgn877h02aal95782hiflv7cmrb597r";
|
||||
};
|
||||
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
|
||||
|
||||
|
||||
@ -3,4 +3,5 @@
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "2.1.22";
|
||||
sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3";
|
||||
generation = "2_1";
|
||||
})
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "2.2.19";
|
||||
sha256 = "1f8axpxxpmzlb22k3lqsnw3096qjp6xd36brvq5xbdk698jw15jl";
|
||||
version = "2.2.14";
|
||||
sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q";
|
||||
generation = "2_2";
|
||||
})
|
||||
|
||||
@ -3,4 +3,5 @@
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "3.0.23";
|
||||
sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz";
|
||||
generation = "3_0";
|
||||
})
|
||||
|
||||
@ -3,4 +3,5 @@
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "3.11.9";
|
||||
sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c";
|
||||
generation = "3_11";
|
||||
})
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps
|
||||
, which, jre, version, sha256, coreutils, ...
|
||||
, which, jre, coreutils, nixosTests
|
||||
# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
|
||||
, generation
|
||||
, version, sha256
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
@ -83,11 +87,22 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests =
|
||||
let
|
||||
test = nixosTests."cassandra_${generation}";
|
||||
in {
|
||||
nixos =
|
||||
assert test.testPackage.version == version;
|
||||
test;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://cassandra.apache.org/";
|
||||
description = "A massively scalable open source NoSQL database";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
maintainers = [];
|
||||
maintainers = [ maintainers.roberth ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "android-file-transfer";
|
||||
version = "4.0";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whoozle";
|
||||
repo = "android-file-transfer-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf";
|
||||
sha256 = "0xmnwxr649wdzsa1vf3spl387hxs4pq0rldyrsr9hz43da4v081k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake readline pkgconfig ];
|
||||
|
||||
@ -7,25 +7,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lsd";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peltoche";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj";
|
||||
sha256 = "1iiczdsqw0i6cz492177z6lr8s7fikn151j8p76fmr77zk0bm6q2";
|
||||
};
|
||||
|
||||
cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q";
|
||||
cargoSha256 = "1r2mkpicsyihlrim3bnmscgg5rnaijpvgq8c846zqj7ly8v8qqvg";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}}
|
||||
'';
|
||||
|
||||
checkFlags = stdenv.lib.optionals stdenv.isDarwin [
|
||||
"--skip meta::filetype::test::test_socket_type"
|
||||
];
|
||||
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) lsd; };
|
||||
|
||||
|
||||
@ -5293,6 +5293,8 @@ in
|
||||
|
||||
mmv-go = callPackage ../tools/misc/mmv-go { };
|
||||
|
||||
mob = callPackage ../applications/misc/mob { };
|
||||
|
||||
most = callPackage ../tools/misc/most { };
|
||||
|
||||
motion = callPackage ../applications/video/motion { };
|
||||
@ -12498,7 +12500,7 @@ in
|
||||
|
||||
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
|
||||
|
||||
niv = haskellPackages.niv.bin;
|
||||
niv = haskell.lib.justStaticExecutables haskellPackages.niv;
|
||||
|
||||
ormolu = haskellPackages.ormolu.bin;
|
||||
|
||||
@ -18362,7 +18364,7 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix {
|
||||
linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
@ -18370,7 +18372,7 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix {
|
||||
linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
@ -18631,7 +18633,7 @@ in
|
||||
|
||||
# Update this when adding the newest kernel major version!
|
||||
# And update linux_latest_for_hardened below if the patches are already available
|
||||
linuxPackages_latest = linuxPackages_5_9;
|
||||
linuxPackages_latest = linuxPackages_5_10;
|
||||
linux_latest = linuxPackages_latest.kernel;
|
||||
|
||||
# Realtime kernel packages.
|
||||
@ -18654,8 +18656,8 @@ in
|
||||
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
|
||||
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
|
||||
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
|
||||
linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8);
|
||||
linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9);
|
||||
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
|
||||
|
||||
# When adding to the list above:
|
||||
# - Update linuxPackages_latest to the latest version
|
||||
@ -23269,6 +23271,10 @@ in
|
||||
|
||||
owamp = callPackage ../applications/networking/owamp { };
|
||||
|
||||
vieb = callPackage ../applications/networking/browsers/vieb {
|
||||
electron = electron_11;
|
||||
};
|
||||
|
||||
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
|
||||
|
||||
vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
|
||||
|
||||
@ -1389,12 +1389,12 @@ in {
|
||||
cryptacular = callPackage ../development/python-modules/cryptacular { };
|
||||
|
||||
cryptography = if isPy27 then
|
||||
callPackage ../development/python-modules/cryptography/2.9.nix { }
|
||||
callPackage ../development/python-modules/cryptography/3.3.nix { }
|
||||
else
|
||||
callPackage ../development/python-modules/cryptography { };
|
||||
|
||||
cryptography_vectors = if isPy27 then
|
||||
callPackage ../development/python-modules/cryptography/vectors-2.9.nix { }
|
||||
callPackage ../development/python-modules/cryptography/vectors-3.3.nix { }
|
||||
else
|
||||
callPackage ../development/python-modules/cryptography/vectors.nix { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user