Skip to content

Commit

Permalink
Merge master into staging-next
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored May 22, 2022
2 parents deef19c + e04ca59 commit 86ec856
Show file tree
Hide file tree
Showing 47 changed files with 429 additions and 221 deletions.
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12168,6 +12168,12 @@
githubId = 12984845;
name = "Subhrajyoti Sen";
};
sudosubin = {
email = "[email protected]";
github = "sudosubin";
githubId = 32478597;
name = "Subin Kim";
};
suhr = {
email = "[email protected]";
github = "suhr";
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/services/mail/postfix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ in

systemd.services.postfix-setup =
{ description = "Setup for Postfix mail server";
serviceConfig.RemainAfterExit = true;
serviceConfig.Type = "oneshot";
script = ''
# Backwards compatibility
Expand Down
10 changes: 7 additions & 3 deletions nixos/modules/services/misc/gitlab.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@ let
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;

databaseConfig = {
production = {
databaseConfig = let
val = {
adapter = "postgresql";
database = cfg.databaseName;
host = cfg.databaseHost;
username = cfg.databaseUsername;
encoding = "utf8";
pool = cfg.databasePool;
} // cfg.extraDatabaseConfig;
in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then {
production.main = val;
} else {
production = val;
};

# We only want to create a database if we're actually going to connect to it.
Expand Down Expand Up @@ -1184,7 +1188,7 @@ in {
fi
jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
'.production.password = $ENV.db_password' \
'.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password' \
>'${cfg.statePath}/config/database.yml'
''
else ''
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/editors/neovim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, unibilium, gperf
, libvterm-neovim
, tree-sitter
, CoreServices
, glibcLocales ? null, procps ? null

# now defaults to false because some tests can be flaky (clipboard etc), see
Expand Down Expand Up @@ -60,7 +61,7 @@ in
neovimLuaEnv
tree-sitter
unibilium
] ++ optional stdenv.isDarwin libiconv
] ++ optionals stdenv.isDarwin [ libiconv CoreServices ]
++ optionals doCheck [ glibcLocales procps ]
;

Expand Down
12 changes: 6 additions & 6 deletions pkgs/applications/editors/vscode/vscode.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "1db5vwcwi3w11zm2b72cvddn5k9yav65rg7ii9wq4a0dym39f8ql";
x86_64-darwin = "1q5vjisdc0q5vigb1lwq8fkxbaar73jnk4ac0fqlhc4gqacz3cs3";
aarch64-linux = "01lcvjw9nfgp93ydl16bp91gbkivd23jn8pan220fjvdsgvcbg48";
aarch64-darwin = "06p6p2c9a3rav9c23pvfn8mmd77wc9z7pavpmkgm1f3wplx48q8q";
armv7l-linux = "0pzim9r2zzwyim3g6f8ixgqllgz4cijaiw76czi0wmz4dxxdljrw";
x86_64-linux = "0yahcv64jblmz5q0ylgg1sghcnyam4nq47var3y18ndjpaqyb1fl";
x86_64-darwin = "0zsizwrhc0na9dfics27i48q4x3kz0qq5m2vdjvrgi69y2iy5z4c";
aarch64-linux = "01wpi9pdf1fjxfx8w5g5da31q561qw7ykjm9spb3arvnivq20dp2";
aarch64-darwin = "0qk22jyn0vypsx8x4cmpab5wrmhqx6hdkm314k8k06mz5cg1v4r3";
armv7l-linux = "04r0x31flahzw8y0kkbzqnvcwllifaa0ysr163bb5b8kiyc189kk";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.67.1";
version = "1.67.2";
pname = "vscode";

executableName = "code" + lib.optionalString isInsiders "-insiders";
Expand Down
12 changes: 6 additions & 6 deletions pkgs/applications/editors/vscode/vscodium.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "0hsq3b8j58xjl8pkrd5x3qh0lsl9gwbd9wgvhzlnx2h94iasr1v5";
x86_64-darwin = "04fbl8kp3af7xcicx17ay2piwy4y3yiyn9723hlmmf7s359rr1wn";
aarch64-linux = "0jljsa61zr3symfdsjx9jj4s3y1kqslxh8gc1gqx45zlm5rzr7k8";
aarch64-darwin = "1swkc0qb1xif8hj6cjp3jq1iqdfqsa681hhp7mxvrpqg0i2zppk3";
armv7l-linux = "1ssbdc4b11xmd45m7bzhdh6szx331pzah2mjpqjg7cz3ray3xvwy";
x86_64-linux = "1ns4cpkihbrwgh8pvn1kjlnipssinjkxy28szidnz6q71zyvsjyw";
x86_64-darwin = "05v0gxal74igc29qjy0ficlyna17bzh1lpfqvyxdpg22is894h2l";
aarch64-linux = "1x6lhcvdly3a2n0shp2vlgk3s2pj9byxn9dc9pjg4k5ff24dql7l";
aarch64-darwin = "03knkj0y6n45lin0v6288zbq1nz5qh81ijyw1w3zrpd7pijn9j0x";
armv7l-linux = "0iwlr5q1qwq3jgldrhz4bbyl3xmdhd4ss690x1lqb4vxm2m7v5jw";
}.${system};

sourceRoot = if stdenv.isDarwin then "" else ".";
Expand All @@ -28,7 +28,7 @@ in

# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.67.1";
version = "1.67.2";
pname = "vscodium";

executableName = "codium";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/nomad/1.1.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

callPackage ./generic.nix {
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
version = "1.1.12";
sha256 = "19y52sn4qz0vx9s188nf7rkr7y2cbq6h33l98sr4w85kmainn86s";
vendorSha256 = "0p582y2q6zpyn7vmv1p8p8r2gbh786pqc6lpipgr7rpxbnxf5v4b";
version = "1.1.14";
sha256 = "0jzcmv6kw555lz7mrm673qgjfmzm4pznibbz9qn3w1jj4x9ddncy";
vendorSha256 = "04nyd37viz521qb3frcy39alha0bpx029cy3kswldhh7wbyp7284";
}
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/nomad/1.2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

callPackage ./generic.nix {
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
version = "1.2.7";
sha256 = "13whyjl0shr00mn46f361ybz90zwkiyab9ygcs0hrs75lgvkmfm9";
vendorSha256 = "177gv0h8bhxd5j78sf4is86zzq8xl9schg1hbyh0hmwg4whhqm8a";
version = "1.2.8";
sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8";
vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5";
}
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/nomad/1.3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

callPackage ./generic.nix {
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
version = "1.3.0";
sha256 = "098sg7jl257r6zfi2fsp9dwm0rrzi8m2k85bb097q14n3p4s3pna";
vendorSha256 = "037bdgnyv8gkm2hz7h727ss46adnkywg28j6i1canmdacpi3qv5c";
version = "1.3.1";
sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7";
vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh";
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Native dependencies
, python3, gtk3, gobject-introspection, gnome
, gtksourceview4
, glib-networking

# Test dependencies
Expand All @@ -21,15 +22,16 @@

python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.3.3";
version = "1.4.1";

src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "1337qkpcv7j0fgws9scnk82mn2l7s17060vmrbh3ihinmxmbxg6x";
sha256 = "sha256:0mbx7s1d2xgk7bkhwqcdss6ynshkqdiwh3qgv7d45frb4c3k33l2";
};

buildInputs = [
gobject-introspection gtk3 gnome.adwaita-icon-theme
gtksourceview4
glib-networking
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
++ lib.optional enableSecrets libsecret
Expand Down Expand Up @@ -74,7 +76,7 @@ python3.pkgs.buildPythonApplication rec {
checkPhase = ''
xvfb-run dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
${python3.interpreter} -m unittest discover -s test/unit -v
${python3.interpreter} -m unittest discover -s test/gtk -v
${python3.interpreter} -m unittest discover -s test/no_gui -v
'';

Expand Down
9 changes: 2 additions & 7 deletions pkgs/applications/networking/pjsip/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,17 @@

stdenv.mkDerivation rec {
pname = "pjsip";
version = "2.12";
version = "2.12.1";

src = fetchFromGitHub {
owner = pname;
repo = "pjproject";
rev = version;
sha256 = "sha256-snp9+PlffU9Ay8o42PM8SqyP60hu9nozp457HM+0bM8=";
sha256 = "sha256-HIDL4xzzTu3irzrIOf8qSNCAvHGOMpi8EDeqZb8mMnc=";
};

patches = [
./fix-aarch64.patch
(fetchpatch {
name = "CVE-2022-24764.patch";
url = "https://github.com/pjsip/pjproject/commit/560a1346f87aabe126509bb24930106dea292b00.patch";
sha256 = "1fy78v3clm0gby7qcq3ny6f7d7f4qnn01lkqq67bf2s85k2phisg";
})
];

buildInputs = [ openssl libsamplerate ]
Expand Down
16 changes: 8 additions & 8 deletions pkgs/applications/version-management/gitlab/data.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"version": "14.10.2",
"repo_hash": "0f7cfc1wrzz4m5yhd6jnp3dqpdy7vbj8bf826zjsi2ss48430bk0",
"yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc",
"version": "15.0.0",
"repo_hash": "sha256-+ZLHo35BhgWlopuwrVGiMvcWl8qUvHUV2kAEIXWazyY=",
"yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.10.2-ee",
"rev": "v15.0.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.10.2",
"GITLAB_PAGES_VERSION": "1.56.1",
"GITLAB_SHELL_VERSION": "13.25.1",
"GITLAB_WORKHORSE_VERSION": "14.10.2"
"GITALY_SERVER_VERSION": "15.0.0",
"GITLAB_PAGES_VERSION": "1.58.0",
"GITLAB_SHELL_VERSION": "14.3.0",
"GITLAB_WORKHORSE_VERSION": "15.0.0"
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ let
rm lib/tasks/yarn.rake
# The rake tasks won't run without a basic configuration in place
mv config/database.yml.env config/database.yml
mv config/database.yml.postgresql config/database.yml
mv config/gitlab.yml.example config/gitlab.yml
# Yarn and bundler wants a real home directory to write cache, config, etc to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ GEM
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
json (2.6.1)
json (2.5.1)
licensee (9.14.1)
dotenv (~> 2.0)
octokit (~> 4.17)
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ let
gemdir = ./.;
};

version = "14.10.2";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
version = "15.0.0";
package_version = "v14";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
in

buildGoModule {
Expand All @@ -23,10 +24,10 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-hLTzkW5GDq1AgTwe1pVj6Tiyd0JpJ76ATFu3Q+m9MVg=";
sha256 = "sha256-ib/gGkXo6W6LZ6j92oUMhJWdDYZRnA1p+tsOK6ewemk=";
};

vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0=";
vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw=";

passthru = {
inherit rubyEnv;
Expand All @@ -42,7 +43,7 @@ buildGoModule {
postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto} $ruby
mv $out/bin/gitaly-git2go-v${lib.versions.major version} $out/bin/gitaly-git2go-${version}
mv $out/bin/gitaly-git2go-${package_version} $out/bin/gitaly-git2go-${version}
'';

outputs = [ "out" "ruby" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/gemset.nix
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
version = "2.6.1";
version = "2.5.1";
};
licensee = {
dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

buildGoModule rec {
pname = "gitlab-shell";
version = "13.25.1";
version = "14.3.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-JItk6gfpBNxabI0vsIOHIBhK7L6E1ijPgrnzhQiKPYw=";
sha256 = "sha256-SFoNtWcY0iJREsA+vZRsVJHmNb2vNvOiBJnochxA/Us=";
};

buildInputs = [ ruby ];

patches = [ ./remove-hardcoded-locations.patch ];

vendorSha256 = "sha256-S7bVQxb+p6o0LPAdx7S6dlsHLecPwMS7myjQZwYhHcU=";
vendorSha256 = "sha256-eSzJon8o7ktV3rFuTE1A4tzdkBzWBZf1JxnrcMj5s00=";

postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";

version = "14.10.2";
version = "15.0.0";

src = fetchFromGitLab {
owner = data.owner;
Expand All @@ -16,7 +16,7 @@ buildGoModule rec {

sourceRoot = "source/workhorse";

vendorSha256 = "sha256-TNZtggUBMwIPO6ZZGk/EkRcilh7sztlAT7Hu4vhME0w=";
vendorSha256 = "sha256-7hNwBCDMdiiOliZa/lkYLo8gyAksAU0HanCSyaAMYLs=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
Expand Down
Loading

0 comments on commit 86ec856

Please sign in to comment.