Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Apr 15, 2015
  1. @aszlig

    releaso-notes: Document changes from #7349.

    aszlig authored
    Thanks to @domenkozar for implicitly reminding me that documentation is
    probably our biggest issue. And I'm a dumbass for contributing to that
    situation, so let's do better than that and document it.
    The current changes are only preparation for a bigger change coming real
    soon[TM] in Hydra and release-tools, so right now it's still a bit
    tedious to create custom channels.
    Signed-off-by: aszlig <>
Commits on Apr 14, 2015
  1. @aszlig

    Merge pull request #7367 plus own fixes.

    aszlig authored
    This introduces beets 1.3.11, changes can be found at:
    Thanks to @pjones for the pull request, which also adds him to the
    My changes on the other hand are only of cosmetic nature and do not
    change anything in functionality.
  2. @aszlig

    beet: Remove unnecessary "LANG = null".

    aszlig authored
    We're passing glibcLocales to the tests directly, so we don't pollute
    the builder's environment anyway, so no reason to override anything
    Signed-off-by: aszlig <>
  3. @aszlig

    boots: Sort expression strings/attributes.

    aszlig authored
    I know, I know, this is me being ultra-nazi about those things, but
    beets is about OCDing your music collection, so why not apply this to
    the Nix expressions as well?
    Signed-off-by: aszlig <>
  4. @aszlig

    python-wrapper: Handle strings at the beginning.

    aszlig authored
    This should fix #7366 for now, but using the (IMHO) pragmatic approach
    of extending the sed expression to recognize strings.
    However, this approach is obviously not parsing the full AST, nor does
    it wrap Python itself (as pointed out by @spwhitt in #7366) but tries to
    match Python strings as best as possible without getting TOO unreadable.
    We also use a little bit of Nix to help generating the SED expression,
    because doing the whole quote matching block over and over again would
    be quite repetitious and error-prone to change. The reason why I'm using
    imap here is that we need to have unique labels to avoid jumping into
    the wrong branch.
    So the new expression is not only able to match continous regions of
    triple-quoted strings, but also regions with only one quote character
    (even with escaped inner quotes) and empty strings.
    However, what it doesn't correctly recognize is something like this:
    "string1" "string2" "multi
    Which is very unlikely that we'll find something like this in the wild.
    Of course, we could handle it as well, but it would mean that we need to
    substitute the current line into hold space until we're finished parsing
    the strings, branch off to another label where we match multiline
    strings of all sorts and swap hold/pattern space and finally print the
    result. So to summarize: The SED expression would be 3 to 4 times bigger
    than now and we gain very little from that.
    Signed-off-by: aszlig <>
Commits on Apr 13, 2015
  1. @aszlig

    nixos-rebuild: Conditionally update channels.

    aszlig authored
    This partially reverts commit 3a4fd0b.
    Addresses another concern by @edolstra that users might not want to
    update *all* channels. We're now reverting to the old behaviour but
    after updating the "nixos" channel, we just check whether the channel
    ships with a file called ".update-on-nixos-rebuild" and if it exists, we
    update that channel as well.
    Other channels than these are not touched anymore.
    Signed-off-by: aszlig <>
  2. @aszlig

    nixos: Put root's channels to the end of NIX_PATH.

    aszlig authored
    My original reason to put it at the beginning of NIX_PATH was to allow
    shipping a particular version <nixpkgs> with a channel. But in order to
    do that, we can still let the channel expression ship with a custom
    version of nixpkgs by something like <channel/nixpkgs> and the builder
    of the channel could also rewrite self-references.
    So the inconvenience is now shifted towards the maintainer of the
    channel rather than the user (which isn't nice, but better err on the
    side of the developer rather than on the user), because as @edolstra
    pointed out: Having the channels of root at the beginning of NIX_PATH
    could have unintended side-effects if there a channel called nixpkgs.
    Signed-off-by: aszlig <>
Commits on Apr 12, 2015
  1. @aszlig

    nixos-rebuild: Update all channels of user root.

    aszlig authored
    Should make it even easier to use custom channels, because whenever the
    user does a "nixos-rebuild --upgrade", it will also upgrade possibly
    used ("used" as in referenced in configuration.nix) channels besides
    "nixos". And if you also ship a channel tied to a particular version of
    nixpkgs or even remove the "nixos" channels, you won't run into
    unexpected situations where the system is not updating your custom
    Signed-off-by: aszlig <>
  2. @aszlig

    nixos: Add all of root's channels to NIX_PATH.

    aszlig authored
    This is very useful if you want to distribute channels (and thus
    expressions as well) in a similar fashion to Debians APT sources (or
    PPAs or whatnot).
    So, for example if you have a channel with some additional functions
    or packages, you simply add that channel with:
    sudo nix-channel --add foo
    And you can access that channel using <foo>, for example in your
      imports = [ <foo/modules/shiny-little-module> ];
      environment.systemPackages = with import <foo/pkgs> {}; [ bar blah ];
      services.udev.extraRules = import <foo/lib/udev/mkrule.nix> {
        kernel = "eth*";
        attr.address = "00:1D:60:B9:6D:4F";
        name = "my_fast_network_card";
    Within nixpkgs, we shouldn't have <nixos> used anywhere anymore, so we
    shouldn't get into conflicts.
    Signed-off-by: aszlig <>
  3. @aszlig

    python-mccabe: Fix build due to missing tests.

    aszlig authored
    Regression introduced by 56a6f22.
    I'm temporarily pulling in, as suggested by someone at
    flintwork/mccabe#31, which for now should fix the build (and the tests
    of course as well).
    Signed-off-by: aszlig <>
Commits on Apr 11, 2015
  1. @aszlig

    tomahawk: Update to new upstream version 0.8.3.

    aszlig authored
    Upstream changes since 0.8.2:
      * Performance improvements for collection browsing.
      * Improved memory footprint.
      * Show cloud collections above your friends in the sidebar.
      * Keep looking for alternative sources even when we found a perfect match.
      * Fixed crash in network code.
      * Fixed repeat one/all icons.
      * Be more lenient about accepting JSPF and M3U playlists.
      * Improved support for compilation albums.
      * (Windows) Fixed support for Windows XP.
      * (OS X) Fixed settings dialog appearance on Yosemite.
      * (OS X) Fixed SSL errors on Yosemite.
    Signed-off-by: aszlig <>
Commits on Apr 4, 2015
  1. @aszlig

    nixos/release: Test vbox on x86_64-linux only.

    aszlig authored
    The i686-linux test has never worked and I wrote the VM test only on
    x86_64-linux to verify whether hardening mode works. I don't know why it
    fails on i686-linux, but that might be because the inner VirtualBox VM
    we're starting during the VM test doesn't use hardware virtualization.
    Closes #5708.
    Signed-off-by: aszlig <>
  2. @aszlig

    virtualbox: Update to version 4.3.26.

    aszlig authored
    Upstream changelog:
     * GUI: in the snapshots pane, protect the age of snapshots against
            wrong host time
     * NAT Network: fixed a bug which prevented to propagate any DNS name
                    server / domain / search string information to the NAT
                    network (4.3.24 regression)
     * NAT Network: don't delay the shutdown of VBoxSVC on Windows hosts
     * Mouse support: the mouse could not be moved under rare conditions if
                      no Guest Additions are installed (4.3.24 regression)
     * Storage: if the guest ejects a virtual CD/DVD medium, make the change
     * VGA: made saving secondary screen sizes possible in X11 guests
     * SDK: fixed the VirtualBox.tlb file (4.3.20 regression)
     * rdesktop-vrdp: make it work with USB devices again (4.3.14
     * USB: fixed a possible BSOD on Windows hosts under rare conditions
     * iPXE: enable the HTTP download protocol on non-Linux hosts
     * Mac OS X hosts: don't panic on hosts with activated SMAP (Broadwell
                       and later)
     * Linux hosts: don't crash Linux 4.0 hosts
    The same with bug IDs can be found at:
    Tested on my machine using the virtualbox NixOS VM test.
    Signed-off-by: aszlig <>
  3. @aszlig

    virtualbox: Remove group check on /nix/store.

    aszlig authored
    This is espacially cruicial when it comes to Nix 1.9, where we even have
    a more restrictive /nix/store. In any event, VirtualBox in hardenend
    mode doesn't have to check the /nix/store path, because it's read-only
    on NixOS systems. So this check would not introduce more security but
    more hurdles, thus I'm removing it (of course _only_ for /nix/store).
    Signed-off-by: aszlig <>
  4. @aszlig

    nixos/tests/vbox: Make GUI startup more robust.

    aszlig authored
    Sometimes, keys aren't properly recognized the first time, so in order
    to make sure they get through, always resend the key again on retry.
    In this case the worst that could happen is that the VM is started over
    and over again, but never in parallel, so that's fine because we're
    checking for successful startup 10 seconds after the keypress.
    Signed-off-by: aszlig <>
Commits on Apr 2, 2015
  1. @aszlig

    slic3r: Remove meta.broken due to Perl update.

    aszlig authored
    The update happened in fac757a.
    So it was a looong time ago and the build is working right now.
    Signed-off-by: aszlig <>
  2. @aszlig

    tests/chromium: Work around popup close flakiness.

    aszlig authored
    It's not nice to send the escape key over and over again just to ensure
    the popup is closed, because even *if* it fails to close the popup 4
    times in a row it's just very unlikely that it will be closed. But in
    order to make really sure, we might need to do a screenshot and detect
    visual changes.
    Signed-off-by: aszlig <>
  3. @aszlig

    qt-5.4: Fix reference to MySQL library.

    aszlig authored
    The MySQL library has been split up from the main client/server binaries
    in 53f1d81.
    Signed-off-by: aszlig <>
Commits on Apr 1, 2015
  1. @aszlig

    nixos/hardware: Add option to enable KSM.

    aszlig authored
    This is essentially what's been done for the official NixOS build slaves
    and I'm using it as well for a few of my machines and my own Hydra
    Here's the same implementation from the Delft server configurations:
    Signed-off-by: aszlig <>
  2. @aszlig

    Revert "mdadm: 3.3 -> 3.3.2".

    aszlig authored
    This reverts commit 7719f7f, again!
    It prevents systems from booting, for two reasons:
      * The initrd size is going to explode, but I think this is not the
        REAL issue. We had that in 666cf99 already, which reverted this
        update already.
      * Another reason I don't yet know, which is the REAL issue. We need to
        investigate and fix that before attempting another update.
    Because of that I've also added a small comment before the src attribute
    to prevent further updates like this.
    Signed-off-by: aszlig <>
  3. @aszlig

    nixos: Re-add swraid installer tests to releases.

    aszlig authored
    It has been removed by 71a197b.
    I'm reintroducing the test mainly because it actually *is* useful,
    because right now, machines with mdraid will not boot. In order to
    prevent such things from happening in the future, we should *not* remove
    this VM test again.
    If it really goes back to failing randomly, we should really try to fix
    it instead of removing it again.
    Of course it fails right now because of the mdraid bump in 7719f7f.
    Also, if you want to have additional info about the reasons, have a look
    at the commit message of 666cf99.
    Signed-off-by: aszlig <>
  4. @aszlig

    nixos/tests/swraid: Increase boot partition size.

    aszlig authored
    I'm increasing it to 100MB to make sure, any bootloader will fit with
    all its stages. Of course, right now the reason why GRUB doesn't fit
    into the partition is because of mdadm 3.3.2 and thus the initrd taking
    all the space, but in order to avoid confusion on why the *boot* loader
    fails in the VM tests, I've increased the size.
    Signed-off-by: aszlig <>
Commits on Mar 31, 2015
  1. @aszlig

    qca2: Update to new upstream version 2.1.0.

    aszlig authored
    This also removes qca2_ossl, because it's now bundled with the main QCA
    package and we can now drop all those patches and build system fixes,
    because they have switched from autotools to cmake.
    Tested against a few builds like PSI and Tomahawk.
    Signed-off-by: aszlig <>
Commits on Mar 20, 2015
  1. @aszlig

    nixos/mpd: Fix creation of "mpd" group.

    aszlig authored
    The group is specified using a singleton list, so the loaOf merging is
    done by iterating through the list items with imap, so it enumerates
    every element and sets that as the default "name" attribute.
    From lib/types:143:
    name = or "unnamed-${toString defIdx}.${toString elemIdx}";
    So, people get groups like "unnamed-X.Y" instead of "mpd".
    Signed-off-by: aszlig <>
    Reported-by: devhell <"^">
    Tested-by: devhell <"^">
  2. @aszlig

    haxe: Add package for the hxcpp runtime library.

    aszlig authored
    I'm not adding this to pkgs/development/libraries because it somewhat is
    strongly tied to Haxe itself, because otherwise you can't compile to C++
    and in the event that someone is going to create something like
    "haxePackages" someday it is easier to notice when it's residing in the
    Haxe folder.
    In theory it would also work by using imperative haxelib, but you'll get
    precompiled libraries which need to be patched on NixOS systems. That's
    the main reason I was packaging this, among from the fact that even when
    patching the libraries, it still leads to occasional library hell and
    The package has two outputs: One with the library itself, needed for
    compile time ($out) and another one ($lib) which is needed at runtime,
    so after compiling, the $out path can be safely garbage collected.
    Right now, I've set meta.platforms to Linux only, because that's where
    I've tested it. In order to get it running on other platforms the
    targetArch attribute has to be set accordingly.
    We also build everything completely from scratch, even though there are
    binaries within the source ZIP file. The main reason is to make smaller
    library dependencies by avoiding bundled libraries and using the ones we
    already ship with nixpkgs.
    Signed-off-by: aszlig <>
  3. @aszlig

    haxe: Add setup-hook and patch to add haxlib path.

    aszlig authored
    Introduces a new environment variable called HAXELIB_PATH and the patch
    for haxelib is trying to search that environment variable for other
    libraries. If the haxelib path for a particular library isn't found, it
    reverts to the normal behaviour of searching the user's home directory
    for a file called .haxelib, which in turn points to a repsitory path and
    that in turn has .current/.dev files to point it to the right version
    This avoids workarounds like this when using Nix to build Haxe projects:
    configurePhase = ''
      export HOME="$(pwd)"
      echo "$(pwd)" > .haxelib
      mkdir dependency1
      echo dev > dependency1/.current
      echo "${dependency1}" > dependency1/.dev
      mkdir dependency2
      echo dev > dependency2/.current
      echo "${dependency2}" > dependency2/.dev
    Now every haxelib is expected to be in $out/lib/haxe/$name and whenever
    it is listed in buildInputs of another Haxe derivation, HAXELIB_PATH
    gets automatically set in the build environment.
    Signed-off-by: aszlig <>
Commits on Mar 12, 2015
  1. @aszlig

    youtube-dl: Update to version 2015.03.09.

    aszlig authored
    With the old version, not even YouTube videos are working anymore.
    Signed-off-by: aszlig <>
  2. @aszlig

    python-nbxmpp: Update to version 0.5.2.

    aszlig authored
    After the update to Gajim 0.16.1 in 2d7dd6c, it bails out on start up
    with a message requiring up-to-date nbxmpp.
    Signed-off-by: aszlig <>
Commits on Mar 11, 2015
  1. @aszlig

    xorg.mxfontscale: Fix segfault with some fonts.

    aszlig authored
    The update to version 1.1.2 in 9c22c1b introduces a segfault when
    mkfontscale is processing fonts where the family name is missing.
    Applies a patch from Stefan Dirsch <> to be found at:
    Signed-off-by: aszlig <>
Commits on Mar 9, 2015
  1. @aszlig

    kbd: Patch in support for the Neo keyboard layout.

    aszlig authored
    This adds support for the Neo keyboard layout (, a
    layout optimized for the German language) for the native Linux console.
    It also adds build dependencies on autotools and friends, because we
    need to recreate the automake config in order to include a new keyboard
    layout directory.
    Signed-off-by: aszlig <>
Commits on Mar 5, 2015
  1. @aszlig

    nixos: Add VM test for i3 window manager.

    aszlig authored
    Currently just makes sure that by default it's possible to open a
    And exactly this should be the main point that might confuse users of i3
    in NixOS, because i3 doesn't print a warning/error if it is unable to
    start the terminal emulator.
    Thanks to @waaaaargh for reporting this issue.
    Signed-off-by: aszlig <>
Commits on Mar 4, 2015
  1. @aszlig

    linux-testing: Update to version 4.0-rc2.

    aszlig authored
    Signed-off-by: aszlig <>
  2. @aszlig

    linux/kernel: Remove EXT2_FS_XIP for version 4.0.

    aszlig authored
    The option has been removed in torvalds/linux@6cd176a and thus we
    shouldn't try to set it for kernel version 4.
    Signed-off-by: aszlig <>
  3. @aszlig

    virtualbox: Update to new upstream version 4.3.24.

    aszlig authored
    New maintenance release, changes:
     * VMM: emulation fix for the ENTER instruction under certain
       conditions; fixes Solaris 10 guests (VT-x without unrestricted guest
     * VMM: fix for handling NMIs on Linux hosts with X2APIC enabled
     * NAT/NAT Network: fix connection drops when the host's DHCP lease was
       renewed (4.3.22 regression; Windows hosts only)
     * NAT: don't crash on an empty domain list when switching the DNS host
       configuration (4.3.22 regression; Mac OS X hosts only)
     * PXE: re-enable it on Windows hosts (4.3.22 regression; Windows hosts
     * Shared Folders: fixed a problem with Windows guests (4.3.22
     * Audio: improved record quality when using the DirectSound audio
     * VBoxManage: when executing the controlvm command take care that the
       corresponding VM runtime changes are saved permanently
     * Windows Installer: properly install the 32-bit version of VBoxRes.dll
       on 32-bit hosts
     * Linux hosts / guests: Linux 4.0 fixes
     * OS/2 Additions: fixed mouse integration (4.3.22 regression)
     * X11 Additions: fixed a sporadic failure to deactivate virtual screens
    Full changelog with bug IDs can be found at:
    Signed-off-by: aszlig <>
Commits on Feb 22, 2015
  1. @aszlig

    Re-re-revert "chromium: remove preferLocalBuild".

    aszlig authored
    This reverts commit 0696b0e.
    Okay, now finally, let's get this straight. We actually *want*
    preferLocalBuild, *because* we have improved the source splitup in
    The idea is to use local builds in order to prevent the source being
    pushed to a remote machine, splitted up there (and thus copied again)
    and then being copied *again* FROM the remote machine.
    "DOH!" - as @edolstra or @rbvermaa would call it... and good d^Hnight.
    Signed-off-by: aszlig <>
Something went wrong with that request. Please try again.