Merge master into staging-next

Changed files
+39 -26
maintainers
scripts
pkgs
applications
audio
editors
vscode
networking
browsers
version-management
gitlab
gitaly
development
python-modules
haversine
policyuniverse
sqlmap
time-machine
tools
misc
luarocks
top-level
+1 -1
maintainers/scripts/pluginupdate.py
···
log.setLevel(LOG_LEVELS[args.debug])
log.info("Start updating plugins")
-
nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
update = editor.get_update(args.input_file, args.outfile, args.proc)
redirects = update()
···
autocommit = not args.no_commit
if autocommit:
+
nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile])
if redirects:
+5 -3
pkgs/applications/audio/cozy-audiobooks/default.nix pkgs/applications/audio/cozy/default.nix
···
, gst_all_1
, gobject-introspection
, libhandy
+
, libdazzle
, python3Packages
-
, file
, cairo
, gettext
, gnome
···
format = "other"; # no setup.py
pname = "cozy";
-
version = "1.0.3";
+
version = "1.1.2";
# Temporary fix
# See https://github.com/NixOS/nixpkgs/issues/57029
···
owner = "geigi";
repo = pname;
rev = version;
-
sha256 = "0m0xiqpb87pwr3fhy0a4qxg67yjhwchcxj3x2anyy0li4inryxag";
+
sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI=";
};
nativeBuildInputs = [
···
cairo
gettext
gnome.adwaita-icon-theme
+
libdazzle
libhandy
pantheon.granite
] ++ (with gst_all_1; [
···
gst-plugins-good
gst-plugins-ugly
gst-plugins-base
+
gst-plugins-bad
]);
propagatedBuildInputs = with python3Packages; [
+6 -6
pkgs/applications/editors/vscode/vscode.nix
···
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
-
x86_64-linux = "0i2pngrp2pcas99wkay7ahrcn3gl47gdjjaq7ladr879ypldh24v";
-
x86_64-darwin = "1pni2cd5s6m9jxwpja4ma9xlr1q3xl46w8pim3971dw3xi5r29pg";
-
aarch64-linux = "0j71ha2df99583w8r2l1hppn6wx8ll80flwcj5xzj7icv3mq8x7v";
-
aarch64-darwin = "0vhp1z890mvs8hnwf43bfv74a7y0pv5crjn53rbiy0il1ihs1498";
-
armv7l-linux = "07yb0ia1rnbav3gza2y53yd3bcxqmngddd4jz6p4y0m539znl817";
+
x86_64-linux = "0g49765pnimh107pw3q7dlgd6jcmr5gagsvxrdx8i93mbxb0xm0c";
+
x86_64-darwin = "1837fcpllblm970jxsal0ahxsnjmsgydy6g6qn51hp7f797gi7zb";
+
aarch64-linux = "1bpmgv6hjyb7jl9v8qyqiyr0brl4xq3wnls2v9hirja6ls1x14cx";
+
aarch64-darwin = "0qksfscbiyr2ynw3j86g8wm7myyabkjwx03ik3z6rrv7dffb5yii";
+
armv7l-linux = "063p2wy1wl57p43f3md0wp2d981nnb650hyqs9rgqm4mlk2s168g";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
-
version = "1.59.1";
+
version = "1.60.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
+3 -3
pkgs/applications/networking/browsers/chromium/upstream-info.json
···
}
},
"dev": {
-
"version": "95.0.4621.4",
-
"sha256": "06fgdyg3bychqhf31fikk7s4qp3rc7hmsvm6p2bj9ascd6kzjzx8",
-
"sha256bin64": "1bvkdrc7cznb9xrnld642qj3z7vbyin9xbq0pp6kqva4gck41cyn",
+
"version": "95.0.4628.3",
+
"sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3",
+
"sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96",
"deps": {
"gn": {
"version": "2021-08-11",
+8 -1
pkgs/applications/version-management/gitlab/gitaly/default.nix
···
copyGemFiles = true;
gemdir = ./.;
};
-
in buildGoModule rec {
version = "14.2.1";
+
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
+
in
+
+
buildGoModule {
pname = "gitaly";
+
inherit version;
src = fetchFromGitLab {
owner = "gitlab-org";
···
inherit rubyEnv;
};
+
ldflags = "-X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}";
+
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
···
postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
+
mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}
'';
outputs = [ "out" "ruby" ];
+2 -2
pkgs/development/python-modules/haversine/default.nix
···
buildPythonPackage rec {
pname = "haversine";
-
version = "2.4.0";
+
version = "2.5.1";
src = fetchFromGitHub {
owner = "mapado";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-Q38oeSy1ilXWc2r/GW8EWQHH2Ty+DyTxxrDX3OcOwKc=";
+
sha256 = "sha256-tHA1Ff/J1mfSnER2X/8e0QyQkuRz1mn8MeGlThVQaSg=";
};
checkInputs = [
+2 -2
pkgs/development/python-modules/policyuniverse/default.nix
···
buildPythonPackage rec {
pname = "policyuniverse";
-
version = "1.4.0.20210816";
+
version = "1.4.0.20210819";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
sha256 = "05fxn89f6rr5rrp117cnqsfzy1p3nbmq3izq2jqk6kackcr3cl8x";
+
sha256 = "sha256-RBRUR9Rzw3/yd2ZnteEBigDApJPBagpIk5lSGzeGqL4=";
};
# Tests are not shipped and there are no GitHub tags
+2 -2
pkgs/development/python-modules/sqlmap/default.nix
···
buildPythonPackage rec {
pname = "sqlmap";
-
version = "1.5.8";
+
version = "1.5.9";
src = fetchPypi {
inherit pname version;
-
sha256 = "01wyhmvg9yh5q86z7kahbvj2xnkjyvi1h2qj7clgz5yd76sh8ygn";
+
sha256 = "1714780f8835854c6f949f854fca936c3064b9a7e0da96989bb637a6ba5c119b";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/time-machine/default.nix
···
buildPythonPackage rec {
pname = "time-machine";
-
version = "2.3.1";
+
version = "2.4.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "adamchainz";
repo = pname;
rev = version;
-
sha256 = "1flim8xaa7qglh2b39cf57i8g0kg0707pw3mdkrgh0xjn27bv9bi";
+
sha256 = "sha256-1k8mGkgJw0MfydJ/Sm8qDvFNaIqoHR1fZkVrXxvc8Zk=";
};
propagatedBuildInputs = [
+7 -3
pkgs/development/tools/misc/luarocks/default.nix
···
, zip
# some packages need to be compiled with cmake
, cmake
+
, installShellFiles
}:
stdenv.mkDerivation rec {
···
fi
'';
-
buildInputs = [
-
lua curl makeWrapper which
-
];
+
nativeBuildInputs = [ makeWrapper installShellFiles ];
+
+
buildInputs = [ lua curl which ];
postInstall = ''
sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/*
···
--suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua"
}
done
+
+
installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash)
+
installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh)
'';
propagatedBuildInputs = [ zip unzip cmake ];
+1 -1
pkgs/top-level/all-packages.nix
···
inherit (darwin.apple_sdk.frameworks) PCSC;
};
-
cozy = callPackage ../applications/audio/cozy-audiobooks { };
+
cozy = callPackage ../applications/audio/cozy { };
cpuid = callPackage ../os-specific/linux/cpuid { };