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: 2af676054136
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: 0ddb9e04957e
Choose a head ref
  • 12 commits
  • 6 files changed
  • 5 contributors

Commits on Jul 15, 2019

  1. xcape: 1.2 -> 20180301 

    1.2 only allows running in the foreground if debug mode is enabled which
generates lots of noise for journald.

The changes from the most recent release is only a few minor fixes plus support
for running in the foreground with the `-f` flag.
    @peterhoeg
    peterhoeg committed Jul 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4384bac View commit details

  2. jgmenu: 3.0 -> 3.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/jgmenu/versions
    @r-ryantm
    r-ryantm committed Jul 15, 2019
    Copy the full SHA
    87dc2ee View commit details

  3. ipvsadm: 1.29 -> 1.30 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ipvsadm/versions
    @r-ryantm
    r-ryantm committed Jul 15, 2019
    Copy the full SHA
    1b61987 View commit details

  4. monit: 5.25.3 -> 5.26.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/monit/versions
    @r-ryantm
    r-ryantm committed Jul 15, 2019
    Copy the full SHA
    13158dd View commit details

Commits on Jul 16, 2019

  1. oil: 0.6.pre15 -> 0.6.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/oil/versions
    @r-ryantm
    r-ryantm committed Jul 16, 2019
    Copy the full SHA
    7c64e05 View commit details

  2. picolisp: 18.12 -> 19.6 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/picolisp/versions
    @r-ryantm
    r-ryantm committed Jul 16, 2019
    Copy the full SHA
    65a3135 View commit details

  3. Merge pull request #64824 from r-ryantm/auto-update/ipvsadm 

    ipvsadm: 1.29 -> 1.30
    @ryantm
    ryantm authored Jul 16, 2019
    Copy the full SHA
    e8a7302 View commit details

  4. Merge pull request #64816 from r-ryantm/auto-update/jgmenu 

    jgmenu: 3.0 -> 3.1
    @ryantm
    ryantm authored Jul 16, 2019
    Copy the full SHA
    af608b6 View commit details

  5. Merge pull request #64861 from r-ryantm/auto-update/picoLisp 

    picolisp: 18.12 -> 19.6
    @7c6f434c
    7c6f434c authored Jul 16, 2019
    Copy the full SHA
    9a1d795 View commit details

  6. Merge pull request #64805 from peterhoeg/u/xcape 

    xcape: 1.2 -> 20180301
    @7c6f434c
    7c6f434c authored Jul 16, 2019
    Copy the full SHA
    be03f0a View commit details

  7. Merge pull request #64844 from r-ryantm/auto-update/monit 

    monit: 5.25.3 -> 5.26.0
    @7c6f434c
    7c6f434c authored Jul 16, 2019
    Copy the full SHA
    ec76e12 View commit details

  8. Merge pull request #64853 from r-ryantm/auto-update/oil 

    oil: 0.6.pre15 -> 0.6.0
    @lheckemann
    lheckemann authored Jul 16, 2019
    Copy the full SHA
    0ddb9e0 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/jgmenu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "jgmenu";
version = "3.0";
version = "3.1";

src = fetchFromGitHub {
owner = "johanmalm";
repo = pname;
rev = "v${version}";
sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
sha256 = "03lk89d6wvqv234qciksd4zm0z4lkvrxfh6r9ff0d8yzg67m7rd0";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/picolisp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "picoLisp-${version}";
version = "18.12";
version = "19.6";
src = fetchurl {
url = "https://www.software-lab.de/${name}.tgz";
sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
};
buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
patchPhase = ''
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/ipvsadm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "ipvsadm-${version}";
version = "1.29";
version = "1.30";

src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz";
sha256 = "c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149";
sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm";
};

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/shells/oil/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl }:
let
version = "0.6.pre15";
version = "0.6.0";
in
stdenv.mkDerivation {
name = "oil-${version}";

src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "1azdmicv39rp30msl6fpw6921gi6ib8lxiyc8kanljqk5d7zg4p6";
sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl";
};

postPatch = ''
29 changes: 14 additions & 15 deletions pkgs/tools/X11/xcape/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto,
libXi }:

let
baseName = "xcape";
version = "1.2";
in

stdenv.mkDerivation rec {
name = "${baseName}-${version}";
pname = "xcape";
version = "unstable-20180301";

src = fetchFromGitHub {
owner = "alols";
repo = baseName;
rev = "v${version}";
sha256 = "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm";
repo = pname;
rev = "a34d6bae27bbd55506852f5ed3c27045a3c0bd9e";
sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8";
};

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ libX11 libXtst xorgproto libXi ];

makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ];
makeFlags = [
"PREFIX=$(out)"
"MANDIR=/share/man/man1"
];

postInstall = "install -D --target-directory $out/share/doc README.md";
postInstall = "install -Dm444 --target-directory $out/share/doc README.md";

meta = {
meta = with stdenv.lib; {
description = "Utility to configure modifier keys to act as other keys";
longDescription = ''
xcape allows you to use a modifier key as another key when
@@ -35,8 +34,8 @@ stdenv.mkDerivation rec {
released on its own.
'';
homepage = https://github.com/alols/xcape;
license = stdenv.lib.licenses.gpl3 ;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
license = licenses.gpl3 ;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/system/monit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@
}:

stdenv.mkDerivation rec {
name = "monit-5.25.3";
name = "monit-5.26.0";

src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1";
sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47";
};

nativeBuildInputs = [ bison flex ];