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: 4b0e7b1201c5
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: 1c5386fa1dee
Choose a head ref
  • 10 commits
  • 17 files changed
  • 7 contributors

Commits on May 24, 2020

  1. Copy the full SHA
    9efb29f View commit details
  2. Copy the full SHA
    fd3d93a View commit details

Commits on May 28, 2020

  1. tiled: 1.3.4 -> 1.3.5

    r-ryantm committed May 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2b96b0f View commit details

Commits on May 29, 2020

  1. oniguruma: switch to autotools

    zowoq committed May 29, 2020
    Copy the full SHA
    8609b21 View commit details
  2. Merge pull request #88041 from zowoq/imagemagick

    imagemagick: 6.9.10-71 -> 6.9.11-14, 7.0.9-0 -> 7.0.10-14
    marsam authored May 29, 2020
    Copy the full SHA
    b6b424b View commit details
  3. Merge pull request #89103 from r-ryantm/auto-update/tiled

    tiled: 1.3.4 -> 1.3.5
    dywedir authored May 29, 2020
    Copy the full SHA
    2c1a591 View commit details
  4. Merge #89141: oniguruma: switch to autotools

    This fixes pkgsi686Linux.jq tests, for unknown reasons.  See also:
    NixOS/nixpkgs#88040 (comment)
    vcunat committed May 29, 2020
    Copy the full SHA
    135073a View commit details
  5. ocamlPackages.core_kernel: remove at 112.24.00

    This is a legacy version for OCaml 4.02
    vbgl committed May 29, 2020
    Copy the full SHA
    1992d68 View commit details
  6. bazel_3: init at 3.1.0

    avdv authored and Profpatsch committed May 29, 2020
    Copy the full SHA
    c456288 View commit details
  7. bazel: Make bazel_3 the default version

    * drop bazel_2
    * update hashes of fetch derivations that use `buildBazelPackage`
    avdv authored and Profpatsch committed May 29, 2020
    Copy the full SHA
    1c5386f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/tiled/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

mkDerivation rec {
pname = "tiled";
version = "1.3.4";
version = "1.3.5";

src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
sha256 = "0q3x1v88szxm8177qcnynfiyc7w8sn07ig6c7fjd164q7w30y24m";
sha256 = "0d1bs909vga1k494xnggq1mcjfxjrwa4acc0mj5rv73xqkc9mb2s";
};

nativeBuildInputs = [ pkgconfig qmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/7.0.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "7.0.9-0";
sha256 = "1w7ci7v5qlayd7a5z69px94fz3fshvn1diqw7k1ymsyvz5888d39";
version = "7.0.10-14";
sha256 = "1qcsq5884iqis1adpfbx3cwki8v4q9wwh70fpcaqnwwmznmqfq4j";
patches = [];
};
in
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/default.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "6.9.10-71";
sha256 = "0c69xmr8k8c4dplgzxydm30s2dr8biq71x07hc15bw196nsx3srr";
version = "6.9.11-14";
sha256 = "0x51vf48g75cfp0mbwf3ckmlwa6v00592xx3gvrqzjzx7vlayjyg";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
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 = "0r11kbyp1ambgcj35gvjjmxrsrdg7b9jb9sq3kih4lik7zyljp25";
sha256 = "1nghj9gjdx2nfi1k98nsfsjnglbfmqrcbn73zvb8ii5j7hdm7392";
};

buildAttrs = {
4 changes: 2 additions & 2 deletions pkgs/development/libraries/oniguruma/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, autoreconfHook }:

stdenv.mkDerivation rec {
pname = "onig";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1sx683hbb58gbjvla69n5vxdzwqhjqisqbfkf9xi95wr7p9ycjhl";
};

nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ autoreconfHook ];

meta = with stdenv.lib; {
homepage = "https://github.com/kkos/oniguruma";
30 changes: 0 additions & 30 deletions pkgs/development/ocaml-modules/core_kernel/default.nix

This file was deleted.

18 changes: 0 additions & 18 deletions pkgs/development/ocaml-modules/janestreet/core_kernel.nix

This file was deleted.

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 = "0jlgmwcanfkhkwvh4vxibpi0zyyl6xkjzcz2xqn7raympqscq81a";
sha256 = "1v5wwlg5v95fz2qg96pdkxlnvw029fxcbsjl906lxdgdi3f8xmmz";
};

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

fetchAttrs = {
sha256 = "0nmk7sbgl1ag20333v9r7l5cka6wapbskikfhi3y5a8l9f6hxkl3";
sha256 = "1rnbxgfhrv4rq8kc0ryxn6i5aqwx51cys0vd5r2m7mqz53aypawk";
};

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

sha256 = "0ili0123xcl0mjcrn4r1r1q9d7a8a3bbh9r3zhlshl39awfm4r2d";
sha256 = "0qx641bxwpkg42sps67k1x1r68ql42qalpn7irf85vn634rw4r8v";
};

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 = "1hzb84zxav68ysdwkimaaz0b9rq95k3bgifw01m644v7idabrz50";
sha256 = "16rb9kgv1izqnv80lvfrd7dxrmgnjrlknv1396w6q2qanskh3cjv";
};

buildAttrs = {
Loading