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: c19fa9be5efb
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: 0e2a4780df77
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on May 17, 2020

  1. adminer: 4.7.6 -> 4.7.7

    @r-ryantm
    r-ryantm committed May 17, 2020
    Copy the full SHA
    1fc8b73 View commit details

  2. nvi: mark as broken

    @Mic92
    Mic92 committed May 17, 2020
    Copy the full SHA
    b5742ab View commit details

  3. Merge pull request #87996 from r-ryantm/auto-update/adminer 

    adminer: 4.7.6 -> 4.7.7
    @ryantm
    ryantm authored May 17, 2020
    Copy the full SHA
    28c2c01 View commit details

  4. oh-my-zsh: 2020-05-11 -> 2020-05-16

    @NeQuissimus
    NeQuissimus committed May 17, 2020
    Copy the full SHA
    0e2a478 View commit details
Showing with 6 additions and 5 deletions.
  1. +1 −0 pkgs/applications/editors/nvi/default.nix
  2. +2 −2 pkgs/servers/adminer/default.nix
  3. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/editors/nvi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -51,5 +51,6 @@ stdenv.mkDerivation {
homepage = "http://www.bostic.com/vi/";
description = "The Berkeley Vi Editor";
license = stdenv.lib.licenses.free;
broken = true; # since 2020-02-08
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/adminer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, libbsd, fetchurl, phpPackages, php }:

stdenv.mkDerivation rec {
version = "4.7.6";
version = "4.7.7";
pname = "adminer";

# not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
src = fetchurl {
url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz";
sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi";
sha256 = "1rvvc7xml7ycpbpjgqbgkan8djplx67balrmfignk1b6h9cw3l4q";
};

nativeBuildInputs = with phpPackages; [ php composer ];
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 = "2020-05-11";
version = "2020-05-16";
pname = "oh-my-zsh";
rev = "fd786291bab7468c7cdd5066ac436218a1fba9e2";
rev = "cbd6fbe7a7c3ef260f497704092dc43f2e953c3f";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "197478z13m2ian2qfwn0bjz5nhv233w74vw4271a2r0kihbp6pp5";
sha256 = "1h7q68n9nbmv9rgvzcx5ciisw8gh5p3ka0bz0abhmk00xsinhy09";
};

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