From d45bf41d7ae20f4007b8a878bfa86fa221f97d81 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 24 Mar 2021 04:20:00 +0000 Subject: [PATCH 1/5] rubocop: 1.11.0 -> 1.12.0 https://github.com/rubocop/rubocop/releases/tag/v1.12.0 --- pkgs/development/tools/rubocop/Gemfile.lock | 2 +- pkgs/development/tools/rubocop/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 2c5deffc2d1c..913009f6b2b7 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -8,7 +8,7 @@ GEM rainbow (3.0.0) regexp_parser (2.1.1) rexml (3.2.4) - rubocop (1.11.0) + rubocop (1.12.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 46d920bc657b..fc919235e2bc 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zrzsgx35mcr81c51gyx63s7yngcfgk33dbkx5j0npkaks4fcm7r"; + sha256 = "1i3y0h6awywx4rdmjdan908jmnyk589pndbjypxkfbkqvjx514fw"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; rubocop-ast = { dependencies = ["parser"]; From 2dbe099c0d32f535eb4b01ec89188f307678782d Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Wed, 24 Mar 2021 20:02:22 +0100 Subject: [PATCH 2/5] bumpver: 2020.1108 -> 2021.1110 --- pkgs/applications/version-management/bumpver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index ded8f7ba6993..756a031ae1e7 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "bumpver"; - version = "2020.1108"; + version = "2021.1110"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm"; + sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03"; }; prePatch = '' From ecc9070c1aaab0915ad417612cae5c271029cd87 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 24 Mar 2021 17:56:00 -0400 Subject: [PATCH 3/5] zziplib: fix missing links on darwin --- pkgs/development/libraries/zziplib/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 051af0bd43f7..90758db16edd 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , perl , pkg-config @@ -21,6 +22,22 @@ stdenv.mkDerivation rec { hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q="; }; + patches = [ + # apply https://github.com/gdraheim/zziplib/pull/113 + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff"; + sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y"; + }) + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff"; + sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny"; + }) + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; + sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; + }) + ]; + nativeBuildInputs = [ cmake perl From 219ee8d09178cc4f4d63f58ecad539f09b4f61e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 25 Mar 2021 01:28:41 +0100 Subject: [PATCH 4/5] release notes: typo fixes (#117539) --- nixos/doc/manual/release-notes/rl-2105.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 218bb3ae309d..b7947293c012 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -720,8 +720,8 @@ environment.systemPackages = [ - Aditionally to the much stricter runtime environmet the - /dev/urandom mount lines we previously had in the code (that would + Additionally to the much stricter runtime environment the + /dev/urandom mount lines we previously had in the code (that randomly failed during the stop-phase) have been removed as systemd will take care of those for us. @@ -809,7 +809,7 @@ environment.systemPackages = [ Platforms, like stdenv.hostPlatform, no longer have a platform attribute. - It has been (mostly) flattoned away: + It has been (mostly) flattened away: platform.gcc is now gcc From 1d671fd0dcbfd425ab218cc458bff48bc6c0b564 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Mar 2021 00:38:59 +0000 Subject: [PATCH 5/5] ajour: 0.7.2 -> 1.0.0 --- pkgs/tools/games/ajour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index b2cbe58ce96d..3bc87680c52f 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "0.7.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz"; + sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y="; }; - cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1"; + cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA="; nativeBuildInputs = [ autoPatchelfHook