Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a51a7187cb2c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c3401b60534
Choose a head ref
  • 12 commits
  • 9 files changed
  • 7 contributors

Commits on Oct 20, 2019

  1. waon: init at 0.11

    puckipedia committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    Copy the full SHA
    591b5a9 View commit details

Commits on Oct 21, 2019

  1. bup: 0.29.3 -> 0.30

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

Commits on Oct 22, 2019

  1. intel-media-driver: 19.2 -> 19.3.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/intel-media-driver/versions
    r-ryantm committed Oct 22, 2019
    Copy the full SHA
    eec342d View commit details
  2. ktlint: 0.34.2 -> 0.35.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/ktlint/versions
    r-ryantm committed Oct 22, 2019
    Copy the full SHA
    0ab7cc7 View commit details
  3. racket: 7.3 -> 7.4

    flokli committed Oct 22, 2019
    Copy the full SHA
    0e6a91b View commit details
  4. Merge pull request #71462 from puckipedia/waon

    waon: init at 0.11
    edef1c authored Oct 22, 2019
    Copy the full SHA
    14803d8 View commit details
  5. nixos-rebuild: support sudo + --target-host

    This adds support for deploying to remote hosts without being root:
    
      sudo nixos-rebuild --target-host non-root@host
    
    Without this change, only root@host is able to deploy.
    
    The idea is that if the local command is run with sudo, so should the
    remote one, thus there is no need for adding any CLI options.
    bjornfor committed Oct 22, 2019
    Copy the full SHA
    263a81e View commit details
  6. gitRepo: 1.13.7 -> 1.13.7.1

    primeos committed Oct 22, 2019
    Copy the full SHA
    597881a View commit details
  7. Merge pull request #71626 from r-ryantm/auto-update/intel-media-driver

    intel-media-driver: 19.2 -> 19.3.0
    mmahut authored Oct 22, 2019
    Copy the full SHA
    0eb6dcf View commit details
  8. Merge pull request #71640 from r-ryantm/auto-update/ktlint

    ktlint: 0.34.2 -> 0.35.0
    mmahut authored Oct 22, 2019
    Copy the full SHA
    32e75c4 View commit details
  9. Merge pull request #71524 from r-ryantm/auto-update/bup

    bup: 0.29.3 -> 0.30
    mmahut authored Oct 22, 2019
    Copy the full SHA
    3017d32 View commit details
  10. Merge pull request #71650 from flokli/racket-7.4

    racket: 7.3 -> 7.4
    flokli authored Oct 22, 2019
    Copy the full SHA
    5c3401b View commit details
10 changes: 7 additions & 3 deletions nixos/modules/installer/tools/nixos-rebuild.sh
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ repair=
profile=/nix/var/nix/profiles/system
buildHost=
targetHost=
maybeSudo=

while [ "$#" -gt 0 ]; do
i="$1"; shift 1
@@ -96,6 +97,9 @@ while [ "$#" -gt 0 ]; do
esac
done

if [ -n "$SUDO_USER" ]; then
maybeSudo="sudo "
fi

if [ -z "$buildHost" -a -n "$targetHost" ]; then
buildHost="$targetHost"
@@ -111,17 +115,17 @@ buildHostCmd() {
if [ -z "$buildHost" ]; then
"$@"
elif [ -n "$remoteNix" ]; then
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$@"
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$maybeSudo$@"
else
ssh $SSHOPTS "$buildHost" "$@"
ssh $SSHOPTS "$buildHost" "$maybeSudo$@"
fi
}

targetHostCmd() {
if [ -z "$targetHost" ]; then
"$@"
else
ssh $SSHOPTS "$targetHost" "$@"
ssh $SSHOPTS "$targetHost" "$maybeSudo$@"
fi
}

30 changes: 30 additions & 0 deletions pkgs/applications/audio/waon/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate
, libsndfile, ncurses, pkgconfig
}:

stdenv.mkDerivation rec {
pname = "waon";
version = "0.11";

src = fetchFromGitHub {
owner = "kichiki";
repo = pname;
rev = "v${version}";
sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fftw gtk2 libao libsamplerate libsndfile ncurses ];

installPhase = ''
install -Dt $out/bin waon pv gwaon
'';

meta = with stdenv.lib; {
description = "A Wave-to-Notes transcriber";
homepage = https://kichiki.github.io/WaoN/;
license = licenses.gpl2;
maintainers = [ maintainers.puckipedia ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-repo/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "git-repo";
version = "1.13.7";
version = "1.13.7.1";

src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "019pnf0g2dzdrbmckd96xq9md1qh8r5bwfj02qjrdg228lc9hzv4";
sha256 = "0acsvrc45kdwpj5mi5i61mibr1fdx4g4835c3b8x0fdgrya4n37c";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/racket/default.nix
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ in

stdenv.mkDerivation rec {
pname = "racket";
version = "7.3"; # always change at once with ./minimal.nix
version = "7.4"; # always change at once with ./minimal.nix

src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl {
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
}
)) {
inherit ;name = "${pname}-${version}";
sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
};

FONTCONFIG_FILE = fontsConf;
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/racket/minimal.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj";
sha256 = "0ixha4hcxlrsqjszjlr7xv6nn3mc5pb6szlbn4cq0880avakmml7";
};

meta = oldAttrs.meta // {
4 changes: 2 additions & 2 deletions pkgs/development/libraries/intel-media-driver/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "19.2";
version = "19.3.0";

src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "118cg1grzm62lppaygvh7mgxn23bicjkwjwpxhbyqs9g6yhdj3p8";
sha256 = "1vzh11qr7dwmi3d10nq46k754h3q1yya71nk2jgicaj2mm0ylzx6";
};

cmakeFlags = [
4 changes: 2 additions & 2 deletions pkgs/development/tools/ktlint/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "ktlint";
version = "0.34.2";
version = "0.35.0";

src = fetchurl {
url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
sha256 = "1v1s4y8ads2s8hjsjacxni1j0dbmnhilhnfs0xabr3aljqs15wb2";
sha256 = "0zj18wcapnqny7k4wvwkyjfds6l2f4y22w6a84k06rzih2ghv0gm";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/tools/backup/bup/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

assert par2Support -> par2cmdline != null;

let version = "0.29.3"; in
let version = "0.30"; in

with stdenv.lib;

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
repo = "bup";
owner = "bup";
rev = version;
sha256 = "1b5ynljd9gs1vzbsa0kggw32s3r4zhbprc2clvjm5qmvnx23hxh8";
sha256 = "0kzi9mzgmx1kjv3aldawapz7bk73f02bysiwh8rngqnirmm0vxdp";
};

buildInputs = [
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -21438,6 +21438,8 @@ in

vym = qt5.callPackage ../applications/misc/vym { };

waon = callPackage ../applications/audio/waon { };

w3m = callPackage ../applications/networking/browsers/w3m { };

# Should always be the version with the most features