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: 3f81cb1b278f
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: 4569dd753b8d
Choose a head ref
  • 14 commits
  • 9 files changed
  • 7 contributors

Commits on Oct 3, 2018

  1. fswatch: 1.12.0 -> 1.13.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/fswatch/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    e7c2c57 View commit details
  2. disorderfs: 0.5.3 -> 0.5.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/disorderfs/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    f4c968e View commit details

Commits on Oct 4, 2018

  1. camomile: 0.8.7 -> 1.0.1

    magnetophon committed Oct 4, 2018
    Copy the full SHA
    3f97539 View commit details
  2. Copy the full SHA
    d10a84e View commit details
  3. khard: fixup zsh autocompletion

    I introduced an error in, install -D will create the folders until the last component excluded
    so I needed to add the filename for it to create _khard
    NixOS/nixpkgs#46515
    teto committed Oct 4, 2018
    Copy the full SHA
    e30a2b0 View commit details
  4. girara: 0.3.0 -> 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/girara/versions
    r-ryantm authored and garbas committed Oct 4, 2018
    Copy the full SHA
    0260116 View commit details
  5. haproxy: 1.8.13 -> 1.8.14

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/haproxy/versions
    r-ryantm authored and garbas committed Oct 4, 2018
    Copy the full SHA
    365dad8 View commit details
  6. bubblewrap: 0.3.0 -> 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/bubblewrap/versions
    r-ryantm authored and FRidh committed Oct 4, 2018
    Copy the full SHA
    06956fa View commit details
  7. Merge pull request #47854 from teto/khard_zsh

    khard: fixup zsh autocompletion
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    665da39 View commit details
  8. Merge pull request #47838 from peterhoeg/f/plasma

    kcheckpass: it is in kscreenlocker, not plasma-workspace
    peterhoeg authored Oct 4, 2018
    Copy the full SHA
    6b4d336 View commit details
  9. Merge pull request #47833 from magnetophon/camomile

    camomile: 0.8.7 -> 1.0.1
    srhb authored Oct 4, 2018
    Copy the full SHA
    07c24ee View commit details
  10. Merge pull request #47815 from r-ryantm/auto-update/disorderfs

    disorderfs: 0.5.3 -> 0.5.4
    pSub authored Oct 4, 2018
    Copy the full SHA
    ebcbef1 View commit details
  11. Merge pull request #47800 from r-ryantm/auto-update/fswatch

    fswatch: 1.12.0 -> 1.13.0
    pSub authored Oct 4, 2018
    Copy the full SHA
    3cb5b46 View commit details
  12. Copy the full SHA
    4569dd7 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ in
};

security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
kwin_wayland = {
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
4 changes: 2 additions & 2 deletions pkgs/applications/misc/girara/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "girara-${version}";
version = "0.3.0";
version = "0.3.1";

src = fetchurl {
url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp";
sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext ];
2 changes: 1 addition & 1 deletion pkgs/applications/misc/khard/default.nix
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ in with python.pkgs; buildPythonApplication rec {
];

postInstall = ''
install -D misc/zsh/_khard $out/share/zsh/site-functions/
install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard
'';

# Fails; but there are no tests anyway.
6 changes: 3 additions & 3 deletions pkgs/development/ocaml-modules/camomile/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, cppo }:

stdenv.mkDerivation rec {
version = "0.8.7";
version = "1.0.1";
name = "ocaml${ocaml.version}-camomile-${version}";

src = fetchFromGitHub {
owner = "yoriyuki";
repo = "camomile";
rev = "rel-${version}";
sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf";
rev = "${version}";
sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
};

buildInputs = [ ocaml findlib dune cppo ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/fswatch/default.nix
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
name = "fswatch-${version}";
version = "1.12.0";
version = "1.13.0";

src = fetchFromGitHub {
owner = "emcrisostomo";
repo = "fswatch";
rev = version;
sha256 = "16f3g6s79gs1sp2ra3cka4c5mf5b557cx697bwcdfgj6r19ni5j7";
sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij";
};

nativeBuildInputs = [ autoreconfHook ];
4 changes: 2 additions & 2 deletions pkgs/tools/admin/bubblewrap/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "bubblewrap-${version}";
version = "0.3.0";
version = "0.3.1";

src = fetchurl {
url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8";
sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny";
};

nativeBuildInputs = [ libcap libxslt docbook_xsl ];
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/disorderfs/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "disorderfs-${version}";
version = "0.5.3";
version = "0.5.4";

src = fetchurl {
url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq";
sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y";
};

nativeBuildInputs = [ pkgconfig asciidoc ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/haproxy/default.nix
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@ assert usePcre -> pcre != null;

stdenv.mkDerivation rec {
pname = "haproxy";
version = "1.8.13";
version = "1.8.14";
name = "${pname}-${version}";

src = fetchurl {
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
sha256 = "2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1";
sha256 = "1przpp8xp2ygcklz4ypnm6z56nb73ydwksm3yy5fb1dyg0jl0zmi";
};

buildInputs = [ openssl zlib ]
8 changes: 4 additions & 4 deletions pkgs/tools/networking/pykms/default.nix
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ let

in buildPythonApplication rec {
name = "pykms-${version}";
version = "20171224";
version = "20180208";

src = fetchFromGitHub {
owner = "ThunderEX";
repo = "py-kms";
rev = "885f67904f002042d7758e38f9c5426461c5cdc7";
sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha";
rev = "a1666a0ee5b404569a234afd05b164accc9a8845";
sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4";
};

propagatedBuildInputs = [ argparse pytz ];
@@ -61,8 +61,8 @@ in buildPythonApplication rec {
mv * $siteDir
for b in client server ; do
chmod 0755 $siteDir/$b.py
makeWrapper ${python.interpreter} $out/bin/$b.py \
--argv0 $b \
--add-flags $siteDir/$b.py
done