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: 54a0a400f2d1
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: fe3a49fd9047
Choose a head ref
  • 6 commits
  • 4 files changed
  • 6 contributors

Commits on Sep 18, 2020

  1. enlightenment.evisum: init at 0.5.6

    @romildo
    romildo committed Sep 18, 2020
    Copy the full SHA
    c0064c3 View commit details

Commits on Sep 19, 2020

  1. gitolite: fix updating of gitweb access list and description

    @ju1m
    ju1m committed Sep 19, 2020
    Copy the full SHA
    a3461af View commit details

  2. nixos/doc: fix dead link

    @tnias
    tnias committed Sep 19, 2020
    Copy the full SHA
    eae103c View commit details

  3. Merge pull request #97997 from romildo/upd.evisum 

    enlightenment.evisum: init at 0.5.6
    @doronbehar
    doronbehar authored Sep 19, 2020
    Copy the full SHA
    d192f8a View commit details

  4. Merge pull request #98262 from ju1m/fix-gitolite 

    gitolite: fix updating of gitweb access list and description
    @Lassulus
    Lassulus authored Sep 19, 2020
    Copy the full SHA
    8779fd7 View commit details

  5. Merge pull request #98272 from tnias/nixos_doc_dev_test_link 

    nixos/doc: fix dead link
    @grahamc
    grahamc authored Sep 19, 2020
    Copy the full SHA
    fe3a49f View commit details
2 changes: 1 addition & 1 deletion nixos/doc/manual/development/writing-nixos-tests.xml
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">
console, whether device ownership is correctly maintained when switching
between consoles, and so on. On the other hand,
<filename
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix">nfs/simple.nix</filename>,
which tests NFS client and server functionality in the Linux kernel
(including whether locks are maintained across server crashes), requires
three machines: a server and two clients.
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitolite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

postFixup = ''
wrapProgram $out/bin/gitolite-shell \
--prefix PATH : "${git}/bin"
--prefix PATH : ${lib.makeBinPath [ git perl ]}
'';

installPhase = ''
1 change: 1 addition & 0 deletions pkgs/desktops/enlightenment/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@

#### APPLICATIONS
econnman = callPackage ./econnman { };
evisum = callPackage ./evisum { };
terminology = callPackage ./terminology { };
rage = callPackage ./rage { };
ephoto = callPackage ./ephoto { };
29 changes: 29 additions & 0 deletions pkgs/desktops/enlightenment/evisum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchurl, meson, ninja, pkg-config, efl }:

stdenv.mkDerivation rec {
pname = "evisum";
version = "0.5.6";

src = fetchurl {
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97";
};

nativeBuildInputs = [
meson
ninja
pkg-config
];

buildInputs = [
efl
];

meta = with stdenv.lib; {
description = "System and process monitor written with EFL";
homepage = "https://www.enlightenment.org";
license = with licenses; [ isc ];
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}