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: c9f216d5d585
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: 991bbef68351
Choose a head ref
10 contributors

Commits on Oct 18, 2019

  1. nixos/cadvisor: don't enable docker 

    cadvisor has usecases that don't involve docker, and it's entirely
unexpected for a monitoring service to enable docker.
    @tilpner
    tilpner committed Oct 18, 2019
    Copy the full SHA
    1ae39ff View commit details

Commits on Mar 9, 2020

  1. python27Packages.azure-mgmt-sql: 0.16.0 -> 0.17.0

    @r-ryantm
    r-ryantm committed Mar 9, 2020
    Copy the full SHA
    c7874f0 View commit details

Commits on Mar 13, 2020

  1. antibody: 4.2.0 -> 4.3.1

    @r-ryantm
    r-ryantm committed Mar 13, 2020
    Copy the full SHA
    fb08fa0 View commit details

  2. awsweeper: 0.4.1 -> 0.6.0

    @r-ryantm
    r-ryantm committed Mar 13, 2020
    Copy the full SHA
    ceee45c View commit details

  3. python37Packages.vtk: Fix build (#82336)

    @knedlsepp
    knedlsepp authored Mar 13, 2020
    Copy the full SHA
    de36c3b View commit details

  4. antibody: set version

    @marsam
    marsam committed Mar 13, 2020
    Copy the full SHA
    25b7ba9 View commit details

  5. virtualbox: 6.0.14 -> 6.1.4 

    Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see #74260, build
would fail for linux-5.5.5 to 5.5.9).
    @winterdeaf @alyssais
    winterdeaf authored and alyssais committed Mar 13, 2020
    Copy the full SHA
    2b99b29 View commit details

  6. thunderbird-bin: 68.5.0 -> 68.6.0

    @taku0 @alyssais
    taku0 authored and alyssais committed Mar 13, 2020
    Copy the full SHA
    8330317 View commit details

  7. thunderbird: 68.5.0 -> 68.6.0

    @taku0 @alyssais
    taku0 authored and alyssais committed Mar 13, 2020
    Copy the full SHA
    243cd9f View commit details

  8. maintainers: add sjfloat

    = authored and Jon committed Mar 13, 2020
    Copy the full SHA
    88ede5a View commit details

  9. ams: init at 2.1.2

    = authored and Jon committed Mar 13, 2020
    Copy the full SHA
    33746be View commit details

  10. lilypond: 2.18.2 -> 2.20.0

    @orivej
    orivej committed Mar 13, 2020
    Copy the full SHA
    2e099c7 View commit details

  11. Merge pull request #82492 from r-ryantm/auto-update/antibody 

    antibody: 4.2.0 -> 4.3.1
    @marsam
    marsam authored Mar 13, 2020
    Copy the full SHA
    324b177 View commit details

  12. Merge pull request #82494 from r-ryantm/auto-update/awsweeper 

    awsweeper: 0.4.1 -> 0.6.0
    @marsam
    marsam authored Mar 13, 2020
    Copy the full SHA
    e6e040d View commit details

Commits on Mar 14, 2020

  1. blender: 2.82 -> 2.82a (#82450)

    @r-ryantm
    r-ryantm authored Mar 14, 2020
    Copy the full SHA
    4d8cac3 View commit details

  2. Merge pull request #82123 from r-ryantm/auto-update/python2.7-azure-m… 

    …gmt-sql

python27Packages.azure-mgmt-sql: 0.16.0 -> 0.17.0
    @marsam
    marsam authored Mar 14, 2020
    Copy the full SHA
    c64f415 View commit details

  3. broot: 0.13.2 -> 0.13.4

    @marsam @alyssais
    marsam authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    1bb17b5 View commit details

  4. procs: 0.9.18 -> 0.9.20

    @marsam @alyssais
    marsam authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    d580dea View commit details

  5. refind: 0.11.5 -> 0.12

    @samueldr @alyssais
    samueldr authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    fb594b8 View commit details

  6. lean: 3.6.1 -> 3.7.0

    @marsam @alyssais
    marsam authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    c935567 View commit details

  7. Merge pull request #71329 from tilpner/cadvisor-no-docker 

    nixos/cadvisor: don't enable docker
    @marsam
    marsam authored Mar 14, 2020
    Copy the full SHA
    ee599f3 View commit details

  8. binaryen: 89 -> 91, emscripten: 1.38.28 -> 1.39.1

    @Ma27
    Ma27 committed Mar 14, 2020
    Copy the full SHA
    386a50f View commit details

  9. cadvisor: 0.35.0 -> 0.36.0

    @marsam @alyssais
    marsam authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    991bbef View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -6701,6 +6701,12 @@
githubId = 848812;
name = "Stephan Jau";
};
sjfloat = {
email = "steve+nixpkgs@jonescape.com";
github = "sjfloat";
githubId = 216167;
name = "Steve Jones";
};
sjmackenzie = {
email = "setori88@gmail.com";
github = "sjmackenzie";
1 change: 0 additions & 1 deletion nixos/modules/services/monitoring/cadvisor.nix
View file
Original file line number Diff line number Diff line change
@@ -135,7 +135,6 @@ in {

serviceConfig.TimeoutStartSec=300;
};
virtualisation.docker.enable = mkDefault true;
})
];
}
48 changes: 48 additions & 0 deletions pkgs/applications/audio/ams/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{ stdenv
, fetchgit
, automake
, alsaLib
, ladspaH
, libjack2
, fftw
, zita-alsa-pcmi
, qt5
, pkg-config
, autoreconfHook
}:

stdenv.mkDerivation rec {
name = "ams";
version = "unstable-2019-04-27";

src = fetchgit {
url = "https://git.code.sf.net/p/alsamodular/ams.git";
sha256 = "0qdyz5llpa94f3qx1xi1mz97vl5jyrj1mqff28p5g9i5rxbbk8z9";
rev = "3250bbcfea331c4fcb9845305eebded80054973d";
};

nativeBuildInputs = [
autoreconfHook
pkg-config
qt5.wrapQtAppsHook
];

buildInputs = [
alsaLib
ladspaH
libjack2
fftw
zita-alsa-pcmi
] ++ (with qt5; [
qtbase
qttools
]);

meta = with stdenv.lib; {
description = "Realtime modular synthesizer for ALSA";
homepage = "http://alsamodular.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ sjfloat ];
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/misc/blender/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@ let python = python3Packages.python; in

stdenv.mkDerivation rec {
pname = "blender";
version = "2.82";
version = "2.82a";

src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
sha256 = "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0";
sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d";
};

patches = lib.optional stdenv.isDarwin ./darwin.patch;
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "3D Creation/Animation/Publishing System";
homepage = https://www.blender.org;
homepage = "https://www.blender.org";
# They comment two licenses: GPLv2 and Blender License, but they
# say: "We've decided to cancel the BL offering for an indefinite period."
license = licenses.gpl2Plus;
Loading