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: f952058df732
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: 6f7f6876e5d7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 15, 2018

  1. nixos: systemd.services.*.environment: fix type 

    (cherry picked from commit fb2a8d6)
    @oxij @LnL7
    oxij authored and LnL7 committed May 15, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8887925 View commit details

  2. discord: 0.0.4 -> 0.0.5 

    (cherry picked from commit d72b870)
    @lightdiscord
    lightdiscord authored and Cray Elliott committed May 15, 2018
    Copy the full SHA
    6f7f687 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 nixos/modules/system/boot/systemd-unit-options.nix
  2. +2 −2 pkgs/applications/networking/instant-messengers/discord/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/systemd-unit-options.nix
View file
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ in rec {

environment = mkOption {
default = {};
type = with types; attrsOf (nullOr (either str package));
type = with types; attrsOf (nullOr (either str (either path package)));
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
description = "Environment variables passed to the service's processes.";
};
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/discord/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {

pname = "discord";
version = "0.0.4";
version = "0.0.5";
name = "${pname}-${version}";

src = fetchurl {
url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb";
sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g";
};

nativeBuildInputs = [ makeWrapper ];