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

Commits on Mar 2, 2019

  1. qstopmotion: 2.4.0 -> 2.4.1 

    (cherry picked from commit 4d64916)
    @leenaars @srhb
    leenaars authored and srhb committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    MylesBorins Myles Borins
    GPG key ID: 933B01F40B5CA946
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    209b5c0 View commit details

  2. racket{,-minimal}: add cacert to nativeBuildInputs, silence warnings 

    We don't actually perform any network access, but since Racket 7.0,
when certain modules are loaded, they emit an annoying warning.
While compiling the bundled packages, this happens over and over and
pollutes the logs.

Having a correct SSL configuration prevents the warnings.

(cherry picked from commit f0fbed5)
    @clacke @srhb
    clacke authored and srhb committed Mar 2, 2019
    Copy the full SHA
    7d6764b View commit details

  3. nixos-rebuild: add changelog/docs for edit subcommand 

    (cherry picked from commit ad0b82d)
    @LnL7 @srhb
    LnL7 authored and srhb committed Mar 2, 2019
    Copy the full SHA
    a7ffe9c View commit details

  4. multimc: unstable-2018-06-04 -> 0.6.4 

    Closes #55699.

(cherry picked from commit 21e2427)
    @leo60228 @srhb
    leo60228 authored and srhb committed Mar 2, 2019
    Copy the full SHA
    7b083c0 View commit details
13 changes: 13 additions & 0 deletions nixos/doc/manual/man-nixos-rebuild.xml
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,10 @@
<option>dry-activate</option>
</arg>

<arg choice='plain'>
<option>edit</option>
</arg>

<arg choice='plain'>
<option>build-vm</option>
</arg>
@@ -188,6 +192,15 @@ $ nix-build /path/to/nixpkgs/nixos -A system
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>edit</option>
</term>
<listitem>
<para>
Opens <filename>configuration.nix</filename> in the default editor.
</para>
</listitem>
<varlistentry>
<term>
<option>build-vm</option>
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-1903.xml
View file
Original file line number Diff line number Diff line change
@@ -659,6 +659,11 @@
An upgrade guide can be found <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
</para>
</listitem>
<listitem>
<para>
A new subcommand <command>nixos-rebuild edit</command> was added.
</para>
</listitem>
</itemizedlist>
</section>
</section>
6 changes: 3 additions & 3 deletions pkgs/applications/video/qstopmotion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@

stdenv.mkDerivation rec {
pname = "qstopmotion";
version = "2.4.0";
version = "2.4.1";
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz";
sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2";
url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz";
sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
};

buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
3 changes: 2 additions & 1 deletion pkgs/development/interpreters/racket/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, makeFontsConf, makeWrapper
, cacert
, cairo, coreutils, fontconfig, freefont_ttf
, glib, gmp
, gtk3
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
];

nativeBuildInputs = [ wrapGAppsHook ];
nativeBuildInputs = [ cacert wrapGAppsHook ];

buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
8 changes: 3 additions & 5 deletions pkgs/games/multimc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,12 @@ let
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
in stdenv.mkDerivation rec {
name = "multimc-${version}";
# Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see
# https://github.com/NixOS/nixpkgs/issues/42387
version = "unstable-2018-06-04";
version = "0.6.4";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071";
sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0";
rev = "0.6.4";
sha256 = "0z9mhvfsq9m2cmi0dbrjjc51642r6ppdbb8932236gar5j7w3bc2";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];