Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2eddede86f5b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a4c4cbb613cc
Choose a head ref
  • 8 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 8, 2018

  1. oh-my-zsh: 2018-09-19 -> 2018-11-02 

    (cherry picked from commit 072b2b8)
    @NeQuissimus
    NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e2cf912 View commit details

  2. ammonite: 1.1.2 -> 1.2.0 

    (cherry picked from commit 08b8923)
    @NeQuissimus
    Oscar Vargas Torres authored and NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5ceebb View commit details

  3. ammonite: 1.2.0 -> 1.2.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ammonite/versions

(cherry picked from commit 8cf1f60)
    @r-ryantm @NeQuissimus
    r-ryantm authored and NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    199d87e View commit details

  4. ammonite: 1.2.1 -> 1.4.2 

    (cherry picked from commit dd46b1a)
    @NeQuissimus
    NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b20d58f View commit details

  5. kotlin: 1.2.61 -> 1.2.70 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions

(cherry picked from commit 4eb077b)
    @r-ryantm @NeQuissimus
    r-ryantm authored and NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd6e06b View commit details

  6. kotlin: 1.2.70 -> 1.2.71 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions

(cherry picked from commit 9d8e081)
    @r-ryantm @NeQuissimus
    r-ryantm authored and NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    27405f9 View commit details

  7. kotlin: 1.2.71 -> 1.3.0 

    (cherry picked from commit 619c39e)
    @NeQuissimus
    NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    be8258f View commit details

  8. gradle: 4.10 -> 4.10.2 

    (cherry picked from commit c1d9f57)
    @NeQuissimus
    NeQuissimus committed Nov 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a4c4cbb View commit details
4 changes: 2 additions & 2 deletions pkgs/development/compilers/kotlin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:

let
version = "1.2.61";
version = "1.3.0";
in stdenv.mkDerivation rec {
inherit version;
name = "kotlin-${version}";

src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy";
sha256 = "14i5qmni1dzfamab6y659b5nvgp99m1abx71i83zcbfi9nw1r1gz";
};

propagatedBuildInputs = [ jre ] ;
4 changes: 2 additions & 2 deletions pkgs/development/tools/ammonite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ammonite-${version}";
version = "1.1.2";
version = "1.4.2";
scalaVersion = "2.12";

src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc";
sha256 = "10m6nnvrwzkbyhiq77wlqgzvqfqmn16y4sp983dyihjljxalygax";
};

propagatedBuildInputs = [ jre ] ;
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/gradle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,12 +52,12 @@ rec {
};

gradle_latest = gradleGen rec {
name = "gradle-4.10";
name = "gradle-4.10.2";
nativeVersion = "0.14";

src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "064zyli00cj3clbn631kivg5izhkyyf31f6x65a2rqac229gv314";
sha256 = "0a9s2iisivgaapsz4vq1l8fa2w0wnlq0cj67yv5a0rybnahnv75l";
};
};

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 = "2018-09-14";
version = "2018-11-02";
name = "oh-my-zsh-${version}";

src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
rev = "489be2452a6410a2c7837910c4cd3c0ed47a7481";
sha256 = "05svfd2q4w4hnd9rsh57z7rsc50lavg3lqm3nmm6dqak1nnrkhbz";
rev = "05b617066ba5a37ef0c533385efd6e232a387b8f";
sha256 = "1pcb3ca5z3nywwnlhhjl4709k69lk4p0kd36l00q37j8p0vf6zr4";
};

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