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: 20c332173071
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: 82b699861c27
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 1, 2019

  1. xorriso: 1.5.0 -> 1.5.2 

    (cherry picked from commit eb22845)
    @Ma27
    Ma27 committed Nov 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3118b2d View commit details

  2. cargo-xbuild: 0.5.15 -> 0.5.18 

    https://github.com/rust-osdev/cargo-xbuild/blob/master/CHANGELOG.md#v0518---2019-10-08
(cherry picked from commit d4e516c)
    @Ma27
    Ma27 committed Nov 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9708378 View commit details

  3. vapoursynth-editor: use qt's mkDerivation 

    (cherry picked from commit d183f71)
    @tadeokondrak @worldofpeace
    tadeokondrak authored and worldofpeace committed Nov 1, 2019
    Copy the full SHA
    82b6998 View commit details
Showing with 13 additions and 10 deletions.
  1. +7 −5 pkgs/development/libraries/vapoursynth/editor.nix
  2. +3 −3 pkgs/development/tools/rust/cargo-xbuild/default.nix
  3. +3 −2 pkgs/tools/cd-dvd/xorriso/default.nix
12 changes: 7 additions & 5 deletions pkgs/development/libraries/vapoursynth/editor.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv, fetchFromBitbucket, makeWrapper
{ stdenv, mkDerivation, fetchFromBitbucket
, python3, vapoursynth
, qmake, qtbase, qtwebsockets
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "vapoursynth-editor";
version = "R19";

@@ -14,18 +14,20 @@ stdenv.mkDerivation rec {
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
};

nativeBuildInputs = [ qmake makeWrapper ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase vapoursynth qtwebsockets ];

dontWrapQtApps = true;

preConfigure = "cd pro";

installPhase = ''
preFixup = ''
cd ../build/release*
mkdir -p $out/bin
for bin in vsedit{,-job-server{,-watcher}}; do
mv $bin $out/bin
wrapProgram $out/bin/$bin \
wrapQtApp $out/bin/$bin \
--prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \
--prefix LD_LIBRARY_PATH : ${vapoursynth}/lib
done
6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-xbuild/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-xbuild";
version = "0.5.15";
version = "0.5.18";

src = fetchFromGitHub {
owner = "rust-osdev";
repo = pname;
rev = "v${version}";
sha256 = "0ck3gwgxbg03z864bhqy8vwcpm7al17fm380zsb6ijb1q2sk2r2n";
sha256 = "1hcsdwwl1xc59f1ppwlxj1zyp1md07z70gfvg4zqvafc6dzx708j";
};

cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv";
cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";

meta = with stdenv.lib; {
description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
5 changes: 3 additions & 2 deletions pkgs/tools/cd-dvd/xorriso/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }:

stdenv.mkDerivation rec {
name = "xorriso-1.5.0";
name = "xorriso-${version}";
version = "1.5.2";

src = fetchurl {
url = "mirror://gnu/xorriso/${name}.tar.gz";
sha256 = "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9";
sha256 = "1rqpzj95f70jfwpn4lamasfgqpizjsipz12aprdhri777b4zas9v";
};

doCheck = true;