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: c5668bd18356
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: 1d5b7a7d4204
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 29, 2018

  1. doc: Update section about imperative containers 

    Nix commands inside the container have been broken since 18.03,
and no fix is yet in sight.  Lets remove from the documentation
that this is a usecase that we support, as it doesn't seem
likely that this will be fixed before 18.09 either.

See #40355

(cherry picked from commit f309440)
    @arianvp @Mic92
    arianvp authored and Mic92 committed Sep 29, 2018
    Copy the full SHA
    b72abcf View commit details

  2. gitkraken: 4.0.2 -> 4.0.5 (#47512) 

    Fixes #47498. Note that the releases have moved to a new URL; I'm not sure they still host the earlier versions.

(cherry picked from commit 9d727e0)

backported because previous source url returns 404.
    @KiaraGrouwstra @xeji
    KiaraGrouwstra authored and xeji committed Sep 29, 2018
    Copy the full SHA
    1d5b7a7 View commit details
Showing with 14 additions and 14 deletions.
  1. +11 −11 nixos/doc/manual/administration/imperative-containers.xml
  2. +3 −3 pkgs/applications/version-management/gitkraken/default.nix
22 changes: 11 additions & 11 deletions nixos/doc/manual/administration/imperative-containers.xml
View file
Original file line number Diff line number Diff line change
@@ -73,8 +73,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
</para>

<para>
There are several ways to change the configuration of the container. First,
on the host, you can edit
To change the configuration of the container, you can edit
<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
and run
<screen>
@@ -87,7 +86,16 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
<xref linkend="opt-services.httpd.enable"/> = true;
<xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
<xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
'
'

<para>
Note that in previous versions of NixOS (17.09 and earlier) one could
also use all nix-related commands (like <command>nixos-rebuild switch</command>)
from inside the container. However, since the release of Nix 2.0 this
is not supported anymore. Supporting Nix commands inside the
container might be possible again in future versions. See
<link xlink:ref="https://github.com/NixOS/nixpkgs/issues/40355">the github issue</link> for tracking progress on this issue.
</para>

# curl http://$(nixos-container show-ip foo)/
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
@@ -96,14 +104,6 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
<filename>/etc/nixos/configuration.nix</filename>.
</para>

<para>
Alternatively, you can change the configuration from within the container
itself by running <command>nixos-rebuild switch</command> inside the
container. Note that the container by default does not have a copy of the
NixOS channel, so you should run <command>nix-channel --update</command>
first.
</para>

<para>
Containers can be stopped and started using <literal>nixos-container
stop</literal> and <literal>nixos-container start</literal>, respectively, or
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitkraken/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
version = "4.0.2";
version = "4.0.5";

src = fetchurl {
url = "https://release.gitkraken.com/linux/v${version}.deb";
sha256 = "0dnckd75fcgc9wa4ivbnw2djmk4phzzr891snhxpsvb1dhlc7rgx";
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
sha256 = "15wxcahlnz2k3331wqv30d5gq38fqh178hv87xky9b9vyh8qpcvz";
};

libPath = makeLibraryPath [