| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 224a63100f6233fda762c72818cad57173411802 and
85f3d5340e53e2624f65248740ed04cb1f5e94e9.
Since the last staging merge done in commit
NixOS/nixpkgs@740d76371e6c1c76bae4801fc5b736a796c1ebbe we have systemd
version 234, which already has the change this patch has addressed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
I don't use anything that's machine specific within my Vim
configuration (and even if, we can pass it via the callPackage
arguments) so it's kinda pointless that it's a module instead of a plain
package (override).
This makes it also easier to nix-build the package without the need to
go through the module system.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The upstream issue is systemd/systemd#3879 and this bug has annoyed me
for a while now. I've also opened a pull request (NixOS/systemd#12) to
the NixOS fork of systemd, but this is pending since almost a month now
and the bug is still annoying as fuck, so let's patch it in vuizvui.
I'm not yet porting this to other machines yet, because I want to test
whether this actually really solves my problem (even though it's exactly
what the upstream bug describes) or whether we need to patch something
else as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell (uses networkd as well)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are two other occasions where packageOverrides are still in use,
one of them is @sternenseemann's fliewatuet machine and another one is
@devhell's package profile.
I've replaced every other occurence of packageOverrides and replaced it
with overlays and checked the store path hash after evaluation.
The reason why I left @sternenseemann's fliewatuet alone was that for
I wasn't quite sure whether "bluez = pkgs.bluez5" is still needed or
intentional to pin it to version 5. Because if it's not the case the
packageOverrides can just be dropped because bluez is already bluez5 in
upstream <nixpkgs>.
For @devhell's package profile, I did the conversion, but the store path
turned out to be a different one than what it was prior to the change.
I did take a quick look at the requisites of the drv and found that sox
was one of the different paths that led to the change in the final store
path.
This obviously needs to be tested and/or investigated first.
Other than that, the main reason why I'm moving everything to overlays
is that it's the replacement for packageOverrides and also has a better
way to pass through chains of overrides than packageOverrides had.
My guess is that after NixOS 17.09, the old packageOverrides function
will be removed, so let's make sure we're ready for that.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell, @sternenseemann
|
|
|
|
|
|
|
| |
This option does no longer exist in current Nix 1.12 and has been
removed in NixOS/nix@0afeb7f51e3465c7c27bc5a83017e9ffde8c6725.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Nix 1.12 already contains "nix repl" and as I'm using Nix 1.12 on all of
my machines the nix-repl package is obsolete.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Compiling nix-repl with Nix 1.12pre5152_915f62fa will only work by
enabling support for ISO C++ 2014, because nix/util.hh uses includes
from <experimental/*>.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Since NixOS/nix@21948deed99a3295e4d5666e027a6ca42dc00b40
nix::Pid::wait() no longer takes a boolean argument and is now blocking
by default.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@7cf8daa every chroot*-option has been renamed to
refer to "sandbox", because the name fits better (it's not only chroot).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
The CPU microcode is already excempted from it and unrar is unfree but
redistributable, so let's use our new unfreePkgs module attribute for
that.
Apart from that I haven't found anything else on my machines, but let's
see what happens after Hydra evaluates the jobset.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I use FireFox occasionally for whenever I'm forced to run ugly Java
plugins (in particular Hetzner's Lara machines use it).
I hope IcedTea is capable of running the Lara plugin, but even when not,
it's not a big deal-breaker as I didn't have to use Lara consoles for a
whole while now. And if it's the case, I can still look for a "fix" :-)
So another step towards being free of proprietary software.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
I've disabled Flash support via chrome://plugins since quite a while and
I have to say that I'm quite happy without Flash, so let's finally get
rid of that proprietary blob for good :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Using overrideDerivation on fetchFromGitHub is going to only override
the attributes from fetchzip, because fetchFromGitHub isn't directly
overridable.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
As of edolstra/nix-repl@8a2f5f0, this won't build with current
nixUnstable (version 1.12pre4509_69f28eb) and it already has been fixed
upstream (edolstra/nix-repl#25 and edolstra/nix-repl@ff8d069).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Quite useful for paging logs so that I don't all the time need to either
scroll back the buffer (which is also limited so it's not very useful
for large builds) or use something like:
curl https://headcounter.org/hydra/log/$drvbasename | less
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This option has been there for a long time (since
NixOS/nixpkgs@e8dace2), so let's actually use it instead of putting it
into extraOptions to make sure we get an error should the option be
renamed or removed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This has been introduced in NixOS/nixpkgs@662ab05 and it's quite useful
for creating USB sticks for crappy audio players which are only able to
read crappy audio formats ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This reverts commit c4915296f064587b7ead2c8ddb7bf42aeca522dc.
We no longer need this because the nixUnstable version has been updated
in NixOS/nixpkgs@2de76b275366a700f7f79709bf30d67358f2838a.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Until now I had a ~/.nixpkgs/config.nix with content like this:
(import <vuizvui/machines> {}).aszlig.mmrnmhrm.build.config.nixpkgs.config
Unfortunately, this has side-effects on a lot of things, essentially
whenever I import <nixpkgs> without a config attribute, so I'd like to
disable this by just modifying NIX_PATH instead of either moving
~/.nixpkgs/config.nix out of place or replace all imports of nixpkgs
with an empty config attribute.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Setting nix.package uses nixUnstable for the deamon but not for packages
depending on Nix, so instead of setting nix.package, let's just override
the "nix" attribute directly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
I'm using nixUnstable and without fiddling around, updating the channel
or installing anything into a user environment is going to fail with a
request of the impure paths /usr/lib/libSystem.dylib and
/usr/lib/system.
This patch is from NixOS/nix#688 and I'll keep it until the Nix tests on
Hydra are succeeding and we can update nixUnstable in <nixpkgs>.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
So far I tried to keep logs as long as possible, but in practice it
turns out that I'm not really interested in logs that are a few years
old.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts the following commits:
* 3b50260bb166a70a661634b3496e920d21a3ae3d
* d6e723dec33951120d8b8299fbb9e49e55cc1d91
The patch is no longer needed since the upgrade in NixOS/nixpkgs@5fee5c6
because the patch was already from upstream.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We need to strip off one path component, because the patches generated
by Trac's diff viewer contain absolute paths.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
I could have added this to the upstream <nixpkgs>, but we only include
and support release versions. This fixes the following failed build for
VirtualBox:
https://headcounter.org/hydra/build/748430
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts the following commits:
b0a2a69: profiles/base: Temporarily disable hinotify tests.
fc35a3d: profiles/base: Properly disable hinotify tests.
These are no longer needed as it has been quickly fixed upstream at
NixOS/nixpkgs@e75e0d9, thanks to @peti.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Using nixpkgs.config.haskellPackageOverrides isn't going to work for
NixOS configurations, because the other packageOverrides will override
the haskellPackageOverrides with a new instantiation of <nixpkgs>.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Build failure is here:
https://headcounter.org/hydra/build/722122/nixlog/1/raw
I'm overriding this in the base profile for now to get my main
workstations up to date ASAP.
Cc: @peti
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The default font changed to Terminus in NixOS/nixpkgs@0b68b92.
I personally hate Terminus with a passion, so I simply don't want it to
cause eye cancer on any of my machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
No longer necessary since NixOS/nixpkgs@a2a3508. Now overriding with
`systemd = null` should be enough to disable support for systemd (which
we don't want anyway).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Just moving the overrides into the base profile isn't enough here,
as we wouldn't be able to refer to packages anymore, because the global
nixpkgs.config override is now gone.
Instead, we're now putting pkgs.vuizvui.* into the NixOS module system
by a new profiles/common.nix, which is used unconditionally for all
machines.
Of course, the result of this is that we now need to change all
references to vuizvui-related packages, which also is a good thing,
because we will no longer shadow existing packages from upstream
nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
I want to have a useful zsh configuration on all of my machines, so
let's not only enable it for the workstation profile.
Also, this removes a redundant zsh reference in the systemPackages of
the base profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Gets rid of my own crap in the vuizvui pkgs namespace and makes it
easier for other users to selectively use my Vim configuration.
It's still not as fleshed out as I wish it would be, but let's do that
later if needed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
Both files are specific to my machines only and need to be generalized
in order to be useful for anyone else.
Moving these files has a few other censequences, such that we now need
to automatically import the module-list.nix in callMachine.
Speaking of module-list.nix, the file is now alphabetically sorted.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|