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: b943338ea582
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: 5b7c90019251
Choose a head ref
  • 9 commits
  • 8 files changed
  • 8 contributors

Commits on Oct 8, 2019

  1. unetbootin: 661 -> 675

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

Commits on Oct 9, 2019

  1. nixos/gitlab: Don't print sensitive data to log on startup

    gitlab:db:configure prints the root user's password to stdout on
    successful setup, which means it will be logged to the
    journal. Silence this informational output. Errors are printed to
    stderr and will thus still be let through.
    talyz committed Oct 9, 2019
    Copy the full SHA
    dc29a45 View commit details
  2. Copy the full SHA
    8e2c34c View commit details

Commits on Oct 11, 2019

  1. cawbird: 1.0.1 -> 1.0.2

    fixes some TLS connection issues
    schmittlauch committed Oct 11, 2019
    Copy the full SHA
    b4c6764 View commit details
  2. nixos/gitlab: Don't print sensitive data to log on startup (#70861)

    nixos/gitlab: Don't print sensitive data to log on startup
    flokli authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1aad3ac View commit details
  3. Merge pull request #70799 from r-ryantm/auto-update/unetbootin

    unetbootin: 661 -> 675
    c0bw3b authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c3549e8 View commit details
  4. Merge pull request #70935 from schmittlauch/cawbird-1.0.2

    cawbird: 1.0.1 -> 1.0.2
    worldofpeace authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    61817ae View commit details
  5. Merge pull request #70881 from xfix/virtualbox-update

    virtualbox: 6.0.10 -> 6.0.12
    flokli authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fb5f649 View commit details
  6. nixos/gdm: do not restart on reload switch (#70357)

    Not entirely sure how this works, but this does seem to fix reload switch
    killing the current graphical session.
    hedning authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5b7c900 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/gitlab.nix
Original file line number Diff line number Diff line change
@@ -851,7 +851,7 @@ in {
initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' > /dev/null
# We remove potentially broken links to old gitlab-shell versions
rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/display-managers/gdm.nix
Original file line number Diff line number Diff line change
@@ -165,12 +165,12 @@ in
"rc-local.service"
"systemd-machined.service"
"systemd-user-sessions.service"
"getty@tty1.service"
"getty@tty${gdm.initialVT}.service"
"plymouth-quit.service"
"plymouth-start.service"
];
systemd.services.display-manager.conflicts = [
"getty@tty1.service"
"getty@tty${gdm.initialVT}.service"
"plymouth-quit.service"
];
systemd.services.display-manager.onFailure = [
12 changes: 2 additions & 10 deletions pkgs/applications/networking/cawbird/default.nix
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
, glib-networking, python3, fetchpatch }:

stdenv.mkDerivation rec {
version = "1.0.1";
version = "1.0.2";
pname = "cawbird";

src = fetchFromGitHub {
owner = "IBBoard";
repo = "cawbird";
rev = "v${version}";
sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1";
sha256 = "sha256:0b79ngwilicqkgacva93cir4rmk15yzgsih56yb3a4n6bqjispay";
};

nativeBuildInputs = [
@@ -22,14 +22,6 @@ stdenv.mkDerivation rec {
glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);

patches = [
# Fix build with vala 0.46
(fetchpatch {
url = "https://github.com/IBBoard/cawbird/commit/7b88f8856d108b9555ba7b855c7daed7b9e745ca.patch";
sha256 = "10kfdy91yas4xyz0hd057q6nsqfrkljcj7pql81xgm43qaff31y0";
})
];

postPatch = ''
chmod +x data/meson_post_install.py # patchShebangs requires executable file
patchShebangs data/meson_post_install.py
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/default.nix
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ let
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
main = "1y6j73axjns8ng3m8zs31zwx71wmm91n6vrhdpxphx16jf518djj";
version = "6.0.10";
main = "1hxbvr78b0fddcn7npz72ki89lpmbgqj4b5qvxm1wik7v0d8v1y8";
version = "6.0.12";
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/extpack.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

with lib;

let version = "6.0.10";
let version = "6.0.12";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -11,7 +11,7 @@ fetchurl rec {
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let value = "e5a9eb240379a57c9bf03954a594a03431698e67aef551e27f62170bed9b16ea";
let value = "27a0956940654b0accf4d79692078bd496d9f062e4ed3da69e5421cba8d1e444";
in assert (builtins.stringLength value) == 64; value;

meta = {
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "098kibz8dkiqd8shm44n4h6iyszcbj0ikav1b4vsi75dqzw8d9n8";
sha256 = "0hflsbx70dli34mpx94vd33p55ycfs3ahzwcdzqxdiwiiskjpykq";
};

KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
4 changes: 3 additions & 1 deletion pkgs/desktops/gnome-3/core/gdm/default.nix
Original file line number Diff line number Diff line change
@@ -31,12 +31,14 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
'';

initialVT = "7";

configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-plymouth=yes"
"--enable-gdm-xsession"
# "--with-initial-vt=7"
"--with-initial-vt=${initialVT}"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev"
];
4 changes: 2 additions & 2 deletions pkgs/tools/cd-dvd/unetbootin/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "unetbootin";
version = "661";
version = "675";

src = fetchFromGitHub {
owner = "unetbootin";
repo = "unetbootin";
rev = version;
sha256 = "0jwmmym86x9hc6yr619dxdbxdawx8x0zwld0dfrhzwxvwbqbpav5";
sha256 = "0b7z2amsf6i7b56a5sfs5di1vh30h6ybcqg23d5gx5zgn3w38w4a";
};

setSourceRoot = ''