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: f723ed8d693b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22409c800696
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 1, 2020

  1. mrsh: 2020-01-08 -> 2020-07-27 etc. 

    - `doCheck` is enabled now.
- It marked as broken on Darwin due to [build failures][macos-issue].

[macos-issue]: #101910 (comment)

Reference: https://github.com/emersion/mrsh/compare/ef21854fc9..0da902c0ee
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
    @omasanori
    omasanori committed Nov 1, 2020
    Copy the full SHA
    955926a View commit details

Commits on Nov 2, 2020

  1. Merge pull request #101910 from omasanori/mrsh/update-2020-07-27 

    mrsh: 2020-01-08 -> 2020-07-27 etc.
    @kevincox
    kevincox authored Nov 2, 2020
    Copy the full SHA
    22409c8 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/shells/mrsh/default.nix
9 changes: 6 additions & 3 deletions pkgs/shells/mrsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,23 +2,26 @@

stdenv.mkDerivation rec {
pname = "mrsh";
version = "2020-01-08";
version = "2020-07-27";

src = fetchFromGitHub {
owner = "emersion";
repo = "mrsh";
rev = "ef21854fc9ce172fb1f7f580b19a89d030d67c65";
sha256 = "1iyxmwl61p2x9v9b22416n4lnrlwjqyxybq35x8bcbjxkwypp943";
rev = "0da902c0ee6f443fe703498e60f266af7f12537e";
sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05";
};

nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ readline ];

doCheck = true;

meta = with stdenv.lib; {
description = "A minimal POSIX shell";
homepage = "https://mrsh.sh";
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}