Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf2425fb0624
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea13f90b5fd4
Choose a head ref
  • 16 commits
  • 18 files changed
  • 10 contributors

Commits on Jun 17, 2020

  1. pgbouncer: 1.13.0 -> 1.14.0

    r-ryantm committed Jun 17, 2020
    Copy the full SHA
    e505564 View commit details

Commits on Jun 19, 2020

  1. Copy the full SHA
    d0cdf0c View commit details

Commits on Jun 21, 2020

  1. Copy the full SHA
    dbad5e5 View commit details

Commits on Jun 22, 2020

  1. Copy the full SHA
    ebd7fab View commit details
  2. Copy the full SHA
    ac0e4d1 View commit details

Commits on Jun 23, 2020

  1. epubcheck: 4.2.2 -> 4.2.3

    eadwu committed Jun 23, 2020
    Copy the full SHA
    c61b5aa View commit details
  2. Copy the full SHA
    061cae0 View commit details
  3. Merge pull request #91130 from austinbutler/nomachine-6.11.2

    nomachine-client: 6.10.12 -> 6.11.2
    talyz authored Jun 23, 2020
    Copy the full SHA
    926afba View commit details
  4. Merge pull request #90664 from r-ryantm/auto-update/pgbouncer

    pgbouncer: 1.13.0 -> 1.14.0
    marsam authored Jun 23, 2020
    Copy the full SHA
    8c04239 View commit details
  5. Merge pull request #91325 from eadwu/epubcheck/4.2.3

    epubcheck: 4.2.2 -> 4.2.3
    marsam authored Jun 23, 2020
    Copy the full SHA
    d18c454 View commit details
  6. Merge pull request #91320 from nyanloutre/nginx_sso_0_25_0

    nginx-sso: 0.24.1 -> 0.25.0
    marsam authored Jun 23, 2020
    Copy the full SHA
    b54b5d7 View commit details
  7. Merge pull request #91246 from danieldk/resilio-sync-2.7.1

    resilio-sync: 2.7.0 -> 2.7.1
    marsam authored Jun 23, 2020
    Copy the full SHA
    801b645 View commit details
  8. Merge pull request #91334 from r-ryantm/auto-update/psi-plus

    psi-plus: 1.4.1231 -> 1.4.1407
    ryantm authored Jun 23, 2020
    Copy the full SHA
    b411fed View commit details
  9. bazel: 3.2.0 -> 3.3.0

    avdv authored and Profpatsch committed Jun 23, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    21a21a4 View commit details
  10. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    c1e8f5c View commit details
  11. Copy the full SHA
    ea13f90 View commit details
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

stdenv.mkDerivation rec {
pname = "psi-plus";
version = "1.4.1231";
version = "1.4.1407";

src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = version;
sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i";
sha256 = "0gp5rk7km2fzw109wil6s9x49x5q1qbw9mnkjs58dpzvxn74ylhw";
};

cmakeFlags = [
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.6.5",
"version": "1.6.6",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -48,17 +48,18 @@
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"matrix-js-sdk": "6.2.2",
"matrix-js-sdk": "7.0.0",
"mkdirp": "^1.0.3",
"needle": "^2.3.2",
"node-pre-gyp": "^0.14.0",
"needle": "^2.5.0",
"node-pre-gyp": "^0.15.0",
"npm": "^6.13.7",
"rimraf": "^3.0.2",
"semver": "^7.1.3",
"tar": "^6.0.1"
},
"hakDependencies": {
"matrix-seshat": "^1.3.3"
"matrix-seshat": "^1.3.3",
"keytar": "^5.6.0"
},
"build": {
"appId": "im.riot.app",
Original file line number Diff line number Diff line change
@@ -3154,11 +3154,11 @@
};
}
{
name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz";
name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz";
path = fetchurl {
name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz";
sha1 = "103d951f61945217b110962f55ae43996756f615";
name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0.tgz";
sha1 = "da2b24e57574379c3d8f7065eb68ea6c479d9806";
};
}
{
@@ -3273,6 +3273,14 @@
sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f";
};
}
{
name = "minimist___minimist_1.2.5.tgz";
path = fetchurl {
name = "minimist___minimist_1.2.5.tgz";
url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
};
}
{
name = "minipass___minipass_2.9.0.tgz";
path = fetchurl {
@@ -3321,6 +3329,14 @@
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
}
{
name = "mkdirp___mkdirp_0.5.5.tgz";
path = fetchurl {
name = "mkdirp___mkdirp_0.5.5.tgz";
url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
sha1 = "d91cefd62d1436ca0f41620e251288d420099def";
};
}
{
name = "mkdirp___mkdirp_1.0.3.tgz";
path = fetchurl {
@@ -3378,11 +3394,11 @@
};
}
{
name = "needle___needle_2.3.2.tgz";
name = "needle___needle_2.5.0.tgz";
path = fetchurl {
name = "needle___needle_2.3.2.tgz";
url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz";
sha1 = "3342dea100b7160960a450dc8c22160ac712a528";
name = "needle___needle_2.5.0.tgz";
url = "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz";
sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0";
};
}
{
@@ -3410,11 +3426,11 @@
};
}
{
name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz";
path = fetchurl {
name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83";
name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz";
url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz";
sha1 = "c2fc383276b74c7ffa842925241553e8b40f1087";
};
}
{
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "riot-desktop";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60";
sha256 = "0yrybi6cv3lj0fq4ab4rzjm9l4flfw97hkwzlp7zzixb3z9h09h8";
};
electron = electron_7;

Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.6.5";
version = "1.6.6";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5";
sha256 = "0j88wcha5rr6qaxik4m90v9mgfcj3r9nb4gpd2dzi7m1zf7kivkw";
};

installPhase = ''
6 changes: 3 additions & 3 deletions pkgs/applications/networking/resilio-sync/default.nix
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@ let

in stdenv.mkDerivation rec {
pname = "resilio-sync";
version = "2.7.0";
version = "2.7.1";

src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
x86_64-linux = "17vw4kyggmi8phm91jx1skkd7vrdhbahibv6d6zm14q87r01a56f";
i686-linux = "0yvy3lif2g4jchcp5q1r5b8ndj8009pcq5js7r0kl20bmmcmzklg";
x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm";
i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i";
}.${stdenv.hostPlatform.system};
};

2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/gvisor/default.nix
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';

sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v";
sha256 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq";
};

buildAttrs = {
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/dm-sonnet/default.nix
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ let
bazelTarget = ":install";

fetchAttrs = {
sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3";
sha256 = "1gag2xghik68zblhwbdd206hs8nxp2sclw182x2qi78jqgfnq5ci";
};

bazelFlags = [
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ let
bazelTarget = ":pip_pkg";

fetchAttrs = {
sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i";
sha256 = "1bh6lsi0732fzhrfs6p33qg2qfvq73r6qmijbpnv592aq8yiy1h5";
};

buildAttrs = {
2 changes: 1 addition & 1 deletion pkgs/development/tools/bazel-watcher/default.nix
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';

sha256 = "16zgjd6zww9skk34ggfx5l3kbsdyv98zxawrvmx1arv5gaj63pp9";
sha256 = "17vdqs3dpaqc4llmzh4rd8mkm19q192w5gp90jlry3dpwj6b4kdf";
};

buildAttrs = {
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';

sha256 = "0rfjyvw370yn4rp1f2772b2h3jbycymdw26zx38krzy5zq0iajyp";
sha256 = "04wbimzjxxmm8kh57q11zvyardb6ilyffc4nkdp6mb87p1l8fmww";
};

buildAttrs = {
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@
}:

let
version = "3.2.0";
version = "3.3.0";

src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "1ylbfdcb6rhnc3sr292c6shl754i0h0i050f4gr4bppn6sa15v24";
sha256 = "09p8xv8ni4g4wcyaapxsx8gjc3x3l3c6lxn575c7gm89vrh3k805";
};

# Update with `eval $(nix-build -A bazel.updater)`,
@@ -53,8 +53,8 @@ let
else srcs."java_tools_javac11_linux-v8.0.zip")
srcs."coverage_output_generator-v2.1.zip"
srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.16.0.tar.gz"
srcs."3.1.0.tar.gz"
srcs."android_tools_pkg-0.17.0.tar.gz"
srcs."bazel-toolchains-3.1.0.tar.gz"
srcs.rules_pkg
srcs.rules_cc
srcs.rules_java
90 changes: 63 additions & 27 deletions pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
Original file line number Diff line number Diff line change
@@ -7,6 +7,14 @@
"https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
]
},
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": {
"name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
"sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
]
},
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": {
"name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
"sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
@@ -15,14 +23,6 @@
"https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz"
]
},
"3.1.0.tar.gz": {
"name": "3.1.0.tar.gz",
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
"46993efdd33b73649796c5fc5c9efb193ae19d51.zip": {
"name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip",
"sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88",
@@ -65,14 +65,22 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz"
"sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f",
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz"
},
"android_tools_pkg-0.16.0.tar.gz": {
"name": "android_tools_pkg-0.16.0.tar.gz",
"sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
"android_tools_pkg-0.17.0.tar.gz": {
"name": "android_tools_pkg-0.17.0.tar.gz",
"sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f",
"urls": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz"
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz"
]
},
"bazel-toolchains-3.1.0.tar.gz": {
"name": "bazel-toolchains-3.1.0.tar.gz",
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
"bazel_j2objc": {
@@ -114,10 +122,19 @@
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"strip_prefix": "bazel-toolchains-3.1.0",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
"bazel_website": {
"build_file_content": "\nexports_files([\"_sass/style.scss\"])\n",
"name": "bazel_website",
"sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4",
"strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42",
"urls": [
"https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz"
]
},
"build_bazel_rules_nodejs": {
"name": "build_bazel_rules_nodejs",
"sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
@@ -126,14 +143,6 @@
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
]
},
"c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": {
"name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
]
},
"com_google_googletest": {
"name": "com_google_googletest",
"sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
@@ -201,11 +210,11 @@
},
"io_bazel_skydoc": {
"name": "io_bazel_skydoc",
"sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
"strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04",
"sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
"strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
"https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
]
},
"java_tools_javac11_darwin-v8.0.zip": {
@@ -337,6 +346,15 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"
]
},
"openjdk_linux_ppc64le_vanilla": {
"downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
"name": "openjdk_linux_ppc64le_vanilla",
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
"urls": [
"https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
]
},
"openjdk_linux_vanilla": {
"downloaded_file_path": "zulu-linux-vanilla.tar.gz",
"name": "openjdk_linux_vanilla",
@@ -589,6 +607,24 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
]
},
"remotejdk11_linux_ppc64le_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk11_linux_ppc64le_for_testing",
"patch_cmds": [
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
"echo >> BUILD.bazel",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
],
"patch_cmds_win": [
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
"strip_prefix": "jdk-11.0.7+10",
"urls": [
"https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
]
},
"remotejdk11_macos_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk11_macos_for_testing",
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ def list_source_repository(**kw): pass
def new_local_repository(**kw): pass
def local_repository(**kw): pass
DOC_VERSIONS = []
def stardoc_repositories(**kw): pass
def skydoc_repositories(**kw): pass
def rules_sass_dependencies(**kw): pass
def node_repositories(**kw): pass
10 changes: 7 additions & 3 deletions pkgs/servers/nginx-sso/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ buildGoPackage, fetchFromGitHub, stdenv }:
{ buildGoPackage, fetchFromGitHub, stdenv, nixosTests }:

buildGoPackage rec {
pname = "nginx-sso";
version = "0.24.1";
version = "0.25.0";
rev = "v${version}";

goPackagePath = "github.com/Luzifer/nginx-sso";
@@ -11,14 +11,18 @@ buildGoPackage rec {
inherit rev;
owner = "Luzifer";
repo = "nginx-sso";
sha256 = "1wij0a5ban2l6ahfra4n4dji7i5ndkqk1mgrblwm2ski7bl8yszx";
sha256 = "0z5h92rpr1rcfk11ggsb9w4ipg93fcb9byll7vl4c0mfcqkpm2dr";
};

postInstall = ''
mkdir -p $out/share
cp -R $src/frontend $out/share
'';

passthru.tests = {
inherit (nixosTests) nginx-sso;
};

meta = with stdenv.lib; {
description = "SSO authentication provider for the auth_request nginx module";
homepage = "https://github.com/Luzifer/nginx-sso";
4 changes: 2 additions & 2 deletions pkgs/servers/sql/pgbouncer/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "pgbouncer";
version = "1.13.0";
version = "1.14.0";

src = fetchurl {
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c";
sha256 = "1rzy06hqzhnijm32vah9icgrx95pmf9iglvyzwv7wmcg2h83vhd0";
};

nativeBuildInputs = [ pkg-config ];
8 changes: 4 additions & 4 deletions pkgs/tools/admin/nomachine-client/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
versionMajor = "6.10";
versionMinor = "12";
versionMajor = "6.11";
versionMinor = "2";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
@@ -17,15 +17,15 @@ in
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
];
sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01";
sha256 = "1b6r9bwkr8mhaljma19ikxpkmlx8iy5r1vf5hlv27bja2zz1r8xr";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
urls = [
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
];
sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg";
sha256 = "0dl138ry9n1qh651zh0zvp88qhgxrs2kvvnq329jw0py5v70b9pm";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
4 changes: 2 additions & 2 deletions pkgs/tools/text/epubcheck/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "epubcheck";
version = "4.2.2";
version = "4.2.3";

src = fetchzip {
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
sha256 = "0vz7k6i6y60ml20pbw2p9iqy6kxw4ziqszg6hbgz102x1jk8788d";
sha256 = "0pqvqjc7vzvygddl8x4y0nqiwca883rh8lfqx0ml1a9gdhq0r5k4";
};

nativeBuildInputs = [ makeWrapper ];