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: a2d9f5843336
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: 257aff801079
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on Apr 17, 2020

  1. bazelisk: 1.3.0 -> 1.4.0 

    Changelog; https://github.com/bazelbuild/bazelisk/releases/tag/v1.4.0
    @marsam
    marsam committed Apr 17, 2020
    Copy the full SHA
    fa49078 View commit details

Commits on Apr 18, 2020

  1. spotifyd: add withMpris and withKeyring optionals

    @bbigras
    bbigras committed Apr 18, 2020
    Copy the full SHA
    11be0cd View commit details

  2. lean: 3.8.0 -> 3.9.0

    @marsam
    marsam committed Apr 18, 2020
    Copy the full SHA
    f37c922 View commit details

Commits on Apr 19, 2020

  1. Merge pull request #85471 from bbigras/spotifyd 

    spotifyd: add withMpris and withKeyring optionals
    @marsam
    marsam authored Apr 19, 2020
    Copy the full SHA
    ad4eebc View commit details

  2. Merge pull request #85473 from marsam/update-bazelisk 

    bazelisk: 1.3.0 -> 1.4.0
    @marsam
    marsam authored Apr 19, 2020

    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
    b2d8cf9 View commit details

  3. Merge pull request #85532 from marsam/update-lean

    @gebner
    gebner authored Apr 19, 2020
    Copy the full SHA
    257aff8 View commit details
Showing with 12 additions and 6 deletions.
  1. +6 −2 pkgs/applications/audio/spotifyd/default.nix
  2. +2 −2 pkgs/applications/science/logic/lean/default.nix
  3. +4 −2 pkgs/development/tools/bazelisk/default.nix
8 changes: 6 additions & 2 deletions pkgs/applications/audio/spotifyd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@
, withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
, withMpris ? false
, withKeyring ? false
, dbus ? null
}:

rustPlatform.buildRustPackage rec {
@@ -20,15 +23,16 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [
"--no-default-features"
"--features"
"${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}"
"${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}${stdenv.lib.optionalString withMpris "dbus_mpris,"}${stdenv.lib.optionalString withKeyring "dbus_keyring,"}"
];

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ openssl ]
++ stdenv.lib.optional withALSA alsaLib
++ stdenv.lib.optional withPulseAudio libpulseaudio
++ stdenv.lib.optional withPortAudio portaudio;
++ stdenv.lib.optional withPortAudio portaudio
++ stdenv.lib.optional (withMpris || withKeyring) dbus;

doCheck = false;

4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/lean/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "lean";
version = "3.8.0";
version = "3.9.0";

src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
sha256 = "0frs2vhxlzdliyydb462c1886dn585zd7yp7hdxzsri2v6gdh89g";
sha256 = "0sklw211cmqp4y0c6nycfavpdxdpfwhq9a4sbwdlqd5agyf85h1j";
};

nativeBuildInputs = [ cmake ];
6 changes: 4 additions & 2 deletions pkgs/development/tools/bazelisk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,17 +2,19 @@

buildGoModule rec {
pname = "bazelisk";
version = "1.3.0";
version = "1.4.0";

src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "15h4mbsfjwby4wq57rdj4dzsf595qjfgi3v5zw62yycn3m2w922p";
sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq";
};

modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz";

buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ];

meta = with stdenv.lib; {
description = "A user-friendly launcher for Bazel";
longDescription = ''