colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-03 02:08:32 +00:00 committed by GitHub
commit 1fe3553272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/texstudio/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
sha256 = "sha256-MFCQwhdF+WCTqDt4q5qw431y/zqEy9vHudcUYb4BYNQ=";
sha256 = "0h5g1sirsy1f2xlq85c1ik1s52gycfipy9yx0flgaw8m4wmhz26v";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];

4
pkgs/applications/networking/cluster/nerdctl/default.nix
View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GPOrC9gL9lPv5SUldFxTS8ZT9YboPoDdqOAfwD0qGBQ=";
sha256 = "sha256-mBoqyDfGho2e4RuFwkiU2R+zb38LzByWtH4pOhguueY=";
};
vendorSha256 = "sha256-S3Gp7HkBIZNZ8rkp64XaUQUj1TggGwI9FMrVkyLCQWA=";

10
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,13 +1,13 @@
{
"version": "13.12.0",
"repo_hash": "060bmfvpqh6zdrwdh4lx4xr1nbg0f7hcp8zh6k9qplv48szhj8m9",
"version": "13.12.2",
"repo_hash": "1wzbjw21pan5cfiz1jd03c3w9sgyvmn35f6dm2sr2k54acsw034p",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.12.0-ee",
"rev": "v13.12.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.12.0",
"GITALY_SERVER_VERSION": "13.12.2",
"GITLAB_PAGES_VERSION": "1.39.0",
"GITLAB_SHELL_VERSION": "13.18.0",
"GITLAB_WORKHORSE_VERSION": "13.12.0"
"GITLAB_WORKHORSE_VERSION": "13.12.2"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -21,14 +21,14 @@ let
};
};
in buildGoModule rec {
version = "13.12.0";
version = "13.12.2";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-MGK0WjAeqApf2xUsbF1mtyzYMhJHC5LFtj8LSb0NQKI=";
sha256 = "sha256-jZg/OlecYlGjDxlxsayAuqzptil1OPtyPjOe1WYT0HY=";
};
vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "13.12.0";
version = "13.12.2";
src = fetchFromGitLab {
owner = data.owner;

2
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -139,7 +139,7 @@ GEM
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindata (2.4.8)
bindata (2.4.10)
binding_ninja (0.2.3)
bootsnap (1.4.6)
msgpack (~> 1.0)

4
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@ -557,10 +557,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr";
type = "gem";
};
version = "2.4.8";
version = "2.4.10";
};
binding_ninja = {
groups = ["default" "development" "test"];

22
pkgs/desktops/rox/rox-filer/default.nix
View File

@ -1,17 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk, libSM, shared-mime-info }:
{ lib
, stdenv
, fetchurl
, pkg-config
, wrapGAppsHook
, libxml2
, gtk
, libSM
, shared-mime-info
}:
let
stdenv.mkDerivation rec {
pname = "rox-filer";
version = "2.11";
name = "rox-filer-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/rox/rox-filer-${version}.tar.bz2";
sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
wrapGAppsHook
];
buildInputs = [ libxml2 gtk shared-mime-info libSM ];
NIX_LDFLAGS = "-ldl -lm";

4
pkgs/development/interpreters/erlang/R23.nix
View File

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "23.3.4.1";
sha256 = "vBGPCAq7410ykiWsxDo6PpgnInPMY35+RPx4gl/BW7k=";
version = "23.3.4.2";
sha256 = "QAIkiYBhYnUzyRg70SQ4BwjjYqclDA4uruqRNTgB2Sk=";
}

40
pkgs/games/factorio/versions.json
View File

@ -2,20 +2,20 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.33.tar.xz",
"name": "factorio_alpha_x64-1.1.34.tar.xz",
"needsAuth": true,
"sha256": "0qgr609w8pgjpmh8ycf0b846v0i019b393x71i790lb7vcygl2aa",
"sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.33/alpha/linux64",
"version": "1.1.33"
"url": "https://factorio.com/get-download/1.1.34/alpha/linux64",
"version": "1.1.34"
},
"stable": {
"name": "factorio_alpha_x64-1.1.32.tar.xz",
"name": "factorio_alpha_x64-1.1.34.tar.xz",
"needsAuth": true,
"sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490",
"sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.32/alpha/linux64",
"version": "1.1.32"
"url": "https://factorio.com/get-download/1.1.34/alpha/linux64",
"version": "1.1.34"
}
},
"demo": {
@ -28,30 +28,30 @@
"version": "1.1.30"
},
"stable": {
"name": "factorio_demo_x64-1.1.32.tar.xz",
"name": "factorio_demo_x64-1.1.34.tar.xz",
"needsAuth": false,
"sha256": "19zwl20hn8hh942avqri1kslf7dcqi9nim50vh4w5d0493srybfw",
"sha256": "1ld373lxfx1xbaqq394az8sxfxpjwkyqwwr77wbmg4sm2g9dinxm",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.32/demo/linux64",
"version": "1.1.32"
"url": "https://factorio.com/get-download/1.1.34/demo/linux64",
"version": "1.1.34"
}
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.33.tar.xz",
"name": "factorio_headless_x64-1.1.34.tar.xz",
"needsAuth": false,
"sha256": "0iv667l25aaij3g9v3mqxhkpphfbc6dhdghsg5qdw4l59vh6fpd4",
"sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.33/headless/linux64",
"version": "1.1.33"
"url": "https://factorio.com/get-download/1.1.34/headless/linux64",
"version": "1.1.34"
},
"stable": {
"name": "factorio_headless_x64-1.1.32.tar.xz",
"name": "factorio_headless_x64-1.1.34.tar.xz",
"needsAuth": false,
"sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz",
"sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.32/headless/linux64",
"version": "1.1.32"
"url": "https://factorio.com/get-download/1.1.34/headless/linux64",
"version": "1.1.34"
}
}
}

4
pkgs/servers/jackett/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.18.100";
version = "0.18.225";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-qgIC1PCCEMmt83xqedwmiUttA85zE/frn/Qxo5Y1yoM=";
sha256 = "sha256-EvFu+v1Ltot5zuDWcuG8Z00NHjWjZTrI0JKv+rgVB7U=";
};
nativeBuildInputs = [ makeWrapper ];

14
pkgs/servers/matrix-synapse/default.nix
View File

@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.34.0";
version = "1.35.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw=";
sha256 = "sha256-McgLJoOS8h8C7mcbLaF0hiMkfthpDRUKyB5Effzk2ds=";
};
patches = [
@ -27,12 +27,13 @@ buildPythonApplication rec {
buildInputs = [ openssl ];
propagatedBuildInputs = [
setuptools
authlib
bcrypt
bleach
canonicaljson
daemonize
frozendict
ijson
jinja2
jsonschema
lxml
@ -44,20 +45,20 @@ buildPythonApplication rec {
psutil
psycopg2
pyasn1
pyjwt
pymacaroons
pynacl
pyopenssl
pysaml2
pyyaml
requests
setuptools
signedjson
sortedcontainers
treq
twisted
unpaddedbase64
typing-extensions
authlib
pyjwt
unpaddedbase64
] ++ lib.optional enableSystemd systemd
++ lib.optional enableRedis hiredis;
@ -66,7 +67,6 @@ buildPythonApplication rec {
doCheck = !stdenv.isDarwin;
checkPhase = ''
${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"}
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';

4
pkgs/tools/misc/bdf2psf/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
version = "1.202";
version = "1.203";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c=";
sha256 = "sha256-jQJC3b+HsEeKYRKQUfI2w3xYDJHs9ajfN8lb6Upzgd8=";
};
nativeBuildInputs = [ dpkg ];

11
pkgs/tools/misc/yafetch/default.nix
View File

@ -2,22 +2,23 @@
stdenv.mkDerivation rec {
pname = "yafetch";
version = "unstable-2021-05-13";
version = "unstable-2021-06-01";
src = fetchFromGitLab {
owner = "cyberkitty";
repo = pname;
rev = "627465e6bf0192a9bc10f9c9385cde544766486f";
sha256 = "1r8jnzfyjs5ardq697crwysclfm3k8aiqvfbsyhsl251a08yls5c";
rev = "d9bbc1e4abca87028f898473c9a265161af3c287";
sha256 = "0hyb5k7drnm9li720z1fdvz7b15xgf7n6yajnz1j98day3k88bqk";
};
# Use the provided NixOS logo automatically
prePatch = ''
echo "#include \"ascii/nixos.h\"" > config.h
substituteInPlace ./config.h --replace \
"#include \"ascii/tux.h\"" "#include \"ascii/nixos.h\""
'';
# Fixes installation path
DESTDIR = placeholder "out";
PREFIX = placeholder "out";
meta = with lib; {
homepage = "https://gitlab.com/cyberkitty/yafetch";

6
pkgs/tools/text/mdbook/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook";
version = "0.4.8";
version = "0.4.9";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
sha256 = "sha256-MdkKDjyePlu6nDyHM9qdhn+kFeXZnyfin+cIZkE+PRE=";
sha256 = "sha256-wc3poiLnIHbbl0j2sWQkEbxccpohPnvjLPdNuKfsDSY=";
};
cargoSha256 = "sha256-MaN0Zz1cQQvwA6rPJRqzI4Q8gniHKAsROLsc0tBpYYU=";
cargoSha256 = "sha256-2DNfacPp9IMke2j8WYxpGmMxityaFGyXrc0jOyqPl3c=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];