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: 3d70d4ba0b6b
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: 62ef779f2a50
Choose a head ref
  • 5 commits
  • 4 files changed
  • 5 contributors

Commits on Dec 28, 2019

  1. linux-testing: 5.5-rc2 -> 5.5-rc3

    @clefru
    clefru committed Dec 28, 2019

    Partially verified

    This commit is signed with the committer’s verified signature.
    domenkozar’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    2af9828 View commit details

Commits on Dec 29, 2019

  1. Merge pull request #76623 from clefru/linux-bump 

    linux-testing: 5.5-rc2 -> 5.5-rc3
    @NeQuissimus
    NeQuissimus authored Dec 29, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    domenkozar Domen Kožar
    GPG key ID: C2FFBCAFD2C24246
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0332bc2 View commit details

  2. tokei: 10.1.0 -> 10.1.1 (#76630)

    @lilyball @veprbl
    lilyball authored and veprbl committed Dec 29, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    048243b View commit details

  3. oh-my-zsh: 2019-12-27 -> 2019-12-29

    @NeQuissimus
    NeQuissimus committed Dec 29, 2019
    Copy the full SHA
    124ec9c View commit details

  4. ponyc: 0.33.0 -> 0.33.1 (#76368)

    @r-ryantm @veprbl
    r-ryantm authored and veprbl committed Dec 29, 2019
    Copy the full SHA
    62ef779 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ponyc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation ( rec {
pname = "ponyc";
version = "0.33.0";
version = "0.33.1";

src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
sha256 = "0a0sw902nrayg0s1zrkhfpvrmdqw19nif67hsv0ijrckcq37bjcz";
sha256 = "0wqbnvxdzzwr9q4v9ha9r9jjymr6y8ba1rb2lkzrng4g9p6xqbxy";
};

buildInputs = [ llvm makeWrapper which libxml2 ];
6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/tokei/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "tokei";
version = "10.1.0";
version = "10.1.1";

src = fetchFromGitHub {
owner = "XAMPPRocky";
repo = pname;
rev = "v${version}";
sha256 = "0l7vqmdagfhi4hnp50ng253zy4g48qjhs5kmnk2xh5v3c59ys4zs";
sha256 = "0wndjb4rvj8548wz0svwgnk94qlg5w2fv75fn2jgriq6fh6v43yg";
};

cargoSha256 = "140nm0nswmgdp549gqp71dbn99rc5g7cagl9s5m5qirl9mbpys8x";
cargoSha256 = "1lpa4xfh3bcm51amwxvkzpvmi4b2c4q5qwxxigcbzw76l7rqp2w9";

buildInputs = stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.5-rc2";
version = "5.5-rc3";
extraMeta.branch = "5.5";

# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1fs432ld5k1j68hflqdxby9mxa6a7xnw1m6z5lfb9341gjw078xc";
sha256 = "1rf394d1d6c0mvf6006gq1bscq3jjcvj9xxmdwallfwpp9igs8id";
};

# Should the testing kernels ever be built on Hydra?
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2019-12-27";
version = "2019-12-29";
pname = "oh-my-zsh";
rev = "0c2f7514fc65d23fe86ad4c8eb6807ec7c18043f";
rev = "d56d6dc145e20dbea9c45f7aa1c09f8e2b5859a1";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "0ql0l4w72kid0dzyzvawaxkba8df2m3683gqflqqmvmzjxx3vcvf";
sha256 = "1plzmyk4j3zb4xxrys2w19r18nqhgp267pa3s0ipizr9bi1ijqdm";
};

pathsToLink = [ "/share/oh-my-zsh" ];