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: 6653328aefea
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: 2892a24695f1
Choose a head ref
  • 15 commits
  • 8 files changed
  • 7 contributors

Commits on May 24, 2020

  1. factorio-{,headless}-experimental: 17.79 -> 18.26

    also added myself as maintainer
    erictapen committed May 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    Copy the full SHA
    cdd519c View commit details
  2. jsonnet: 0.15.0 -> 0.16.0

    r-ryantm committed May 24, 2020
    Copy the full SHA
    302fff6 View commit details
  3. just: 0.5.10 -> 0.5.11

    r-ryantm committed May 24, 2020
    Copy the full SHA
    de9242b View commit details
  4. lean: 3.13.1 -> 3.14.0

    r-ryantm committed May 24, 2020
    Copy the full SHA
    7573e99 View commit details
  5. zoxide: 0.4.0 -> 0.4.1

    ajeetdsouza/zoxide@v0.4.0...v0.4.1
    
    NOTE: This release drops compatibility for old 0.2.x databases. If you
    have ever run any version between 0.3.0 and 0.4.0 (inclusive), your
    database has already been upgraded. If you haven't, you will need to run
    one of those versions before updating, or your database will not be
    found or in the correct format.
    cole-h committed May 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    Copy the full SHA
    20a8580 View commit details

Commits on May 25, 2020

  1. Copy the full SHA
    d201270 View commit details
  2. Merge pull request #88839 from 7c6f434c/fix-lazarus

    lazarus: fix linking by the IDE;
    7c6f434c authored May 25, 2020

    Verified

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

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    89998eb View commit details
  4. Merge pull request #84523 from erictapen/factorio-18.17

    factorio-{,headless}-experimental: 17.79 -> 18.26
    veprbl authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7a2307d View commit details
  5. Copy the full SHA
    b9a82df View commit details
  6. Merge pull request #88819 from r-ryantm/auto-update/jsonnet

    jsonnet: 0.15.0 -> 0.16.0
    marsam authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    06d6c42 View commit details
  7. Merge pull request #88824 from r-ryantm/auto-update/lean

    lean: 3.13.1 -> 3.14.0
    marsam authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bc44690 View commit details
  8. Merge pull request #88826 from cole-h/zoxide

    zoxide: 0.4.0 -> 0.4.1
    marsam authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9751b67 View commit details
  9. Merge pull request #88848 from r-ryantm/auto-update/sensu-go-agent

    sensu-go-agent: 5.20.0 -> 5.20.1
    marsam authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3c1273f View commit details
  10. Merge pull request #88820 from r-ryantm/auto-update/just

    just: 0.5.10 -> 0.5.11
    marsam authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2892a24 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/lean/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "lean";
version = "3.13.1";
version = "3.14.0";

src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
sha256 = "1ak5l40h5yjlbzz92l724l6bm5q341cg6k1yk13sbwn42l8szsar";
sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b";
};

nativeBuildInputs = [ cmake ];
9 changes: 7 additions & 2 deletions pkgs/development/compilers/fpc/lazarus.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, makeWrapper
, fpc, gtk2, glib, pango, atk, gdk-pixbuf
, libXi, xorgproto, libX11, libXext
, gdb, gnumake, binutils
}:
stdenv.mkDerivation rec {
pname = "lazarus";
@@ -34,8 +35,12 @@ stdenv.mkDerivation rec {
'';

postInstall = ''
wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \
--prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'"
wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' \
"$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \
--prefix NIX_${binutils.infixSalt}_LDFLAGS ' ' \
"$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \
--prefix LCL_PLATFORM ' ' "$LCL_PLATFORM" \
--prefix PATH ':' "${fpc}/bin:${gdb}/bin:${gnumake}/bin:${binutils}/bin"
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/compilers/jsonnet/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "jsonnet";
version = "0.15.0";
version = "0.16.0";

src = fetchFromGitHub {
rev = "v${version}";
owner = "google";
repo = "jsonnet";
sha256 = "06imnpbc5mn1dis051f54q6nq80dbm51nhxmba61rdyhf1131ml8";
sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724";
};

enableParallelBuilding = true;
6 changes: 3 additions & 3 deletions pkgs/development/tools/just/default.nix
Original file line number Diff line number Diff line change
@@ -3,16 +3,16 @@

rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.5.10";
version = "0.5.11";

src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1";
sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv";
};

cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l";
cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz";

nativeBuildInputs = [ installShellFiles ];

11 changes: 7 additions & 4 deletions pkgs/games/factorio/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper
, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL
, factorio-utils
, libSM, libICE, libXext, factorio-utils
, releaseType
, mods ? []
, username ? "", token ? "" # get/reset token at https://factorio.com/profile
@@ -53,11 +53,11 @@ let
x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
alpha = {
stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; };
experimental = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; };
experimental = bdist { sha256 = "1ypq9qxry2b9a74p2i20f1yl20yf37xr4kvflbg1cn5nb8vvznxq"; version = "0.18.26"; withAuth = true; };
};
headless = {
stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; };
experimental = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; };
experimental = bdist { sha256 = "1srlzncwp1gcdy6ih8cc1ml5ggvg6xkw5jc2q95qjb9gpjv29mnl"; version = "0.18.26"; };
};
demo = {
stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; };
@@ -166,7 +166,7 @@ let
'';
homepage = "https://www.factorio.com/";
license = stdenv.lib.licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ Baughn elitak ];
maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
};
@@ -186,6 +186,9 @@ let
libXrandr
libXi
libGL
libSM
libICE
libXext
];

installPhase = base.installPhase + ''
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/sensu-go/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ let
generic = { subPackages, pname, postInstall ? "" }:
buildGoModule rec {
inherit pname;
version = "5.20.0";
version = "5.20.1";
shortRev = "3a1ac58"; # for internal version info

goPackagePath = "github.com/sensu/sensu-go";
@@ -13,7 +13,7 @@ let
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "0hnsgd6ryrl1y2prkavm7psqjnppkkfd891xkzbdfzblxsafs8cw";
sha256 = "0wrcchz878sq7zhkb8p0s93k92xppihv5yyvkl363xs6519xzm7m";
};

inherit subPackages postInstall;
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2020-05-21";
version = "2020-05-24";
pname = "oh-my-zsh";
rev = "b721053c87b4662c65452117a8db35af0154a29d";
rev = "5ea25e6736430ab5b8439d11b2e9a837a803771b";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "02y6mhvsxamsvfx2bcdrfbbl7g8v1cq8qycjbffn4w3d6aprq5c6";
sha256 = "047vdx7c5fsli6yh35kmp25nxs2bgji21837iq5dwq8nvyq42a9i";
};

pathsToLink = [ "/share/oh-my-zsh" ];
6 changes: 3 additions & 3 deletions pkgs/tools/misc/zoxide/default.nix
Original file line number Diff line number Diff line change
@@ -6,20 +6,20 @@

rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.4.0";
version = "0.4.1";

src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
rev = "v${version}";
sha256 = "1qkvmjrkcivfzbm6swl5lgvpqz9av9jxcn9i8ms3wz4vfsibmlxv";
sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6";
};

buildInputs = [
fzf
];

cargoSha256 = "1w921f7b6kzc1mjzff1bcs3mg4cp9h48698w2zlv5jzjs7nwgb8n";
cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd";

meta = with lib; {
description = "A fast cd command that learns your habits";