| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
This is for the time being until either NixOS/nixpkgs#21671 has been
resolved or the next major version of Gajim has been released, because
the latter no longer uses pycrypto.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This already has started in e0abe1dbbda54c1f048b5d38df05e1a3289216a6
with @Profpatsch putting his packages into its own namespace, so let's
continue on that and move my crap into my own namespace as well.
The only difference in my approach is that I'm now also using a new
function called callPackageScope, which declutters pkgs/default.nix a
bit and moves the individual callPackage invocations into
aszlig/default.nix.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
A lot of crap has been accumulated there over the years, so I'm removing
at least the stuff that I have introduced.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Nix 1.12 already got rid of most of the Perl stuff so the Perl script
backing taalo-build doesn't work anymore because Nix/CopyClosure.pm is
no longer available.
One way to fix this properly is to part the backend to C++ and use the
new ssh-ng store backend. This would also have the advantage that we
don't need to hardcode protocol internals here anymore.
Unfortunately, Nix 1.12 isn't stable yet and we would break Nix 1.11 if
we use the new store API.
So that's why I'm pinning the backend to use Nix 1.11 instead and leave
that ugly Perl script until Nix 1.2 is stable.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously in d6848012b86088cbfd70666a0cfae95c567e7199 I've just rebased
the patch I had against 4.10 against kernel 4.11, but that didn't work
out so well.
So this is now a rebase against the new branch from Paolo Valente at:
https://github.com/linusw/linux-bfq/tree/bfq-v8
Hopefully this time it will compile ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
I'm fed up with fixing up Chromium beta and currently the included GN
doesn't bootstrap as well. So for now let's run with Chromium stable
until I'm masochistic enough to dig into Chromium again.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's basically only a very small change, because block/Makefile now
contains objects for block-MQ schedulers (one of these will also include
BFQ in possibly the next mainline kernel) and thus the patch no longer
applies.
Having that potch here in the source tree is a lot of crap lying around,
so we better get rid of it ASAP.
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>
|
|
|
|
|
|
|
|
| |
Most of these packages I don't need for daily work and thus only clutter
up the closure paths of those systems, so let's put them into
lazyPackages.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
We inject our own declarative config into Gajim by patching the source,
which unfortunately kills a few tests which assume the default
configuration, especially in terms of the GUI (for example the Vuizvui
config has a single window GUI).
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>
|
|
|
|
|
|
|
| |
Might be a good idea to have an actual application that can be used to
scan stuff (apart from Gimp and others with SANE support).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First of all, using .patch from the GitHub compare view is not going to
work because the concatenated diffs are in reverse order for use within
"git apply".
And the second thing why it's not working is that the patch has a hunk
that changes the version in Makefile to add an extra version -rc1-bfq,
which would only apply for kernel 4.10-rc1 but not for subsequent
release canidates.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This is mainly to distinguish the prompt color from my workstations so
it's clearly obvious that I'm working on meshuggah rather than say
mmrnmhrm.
We needed to add another option to the zsh module so that we can easily
override machine colors for other machines as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch is from https://github.com/linusw/linux-bfq/tree/bfq-v8.
It's a combined patch until the parent of the branch's head, because the
latest commit is a work-in-progress commit.
I have only tested evaluation and didn't test whether the patch actually
applies yet, because the machines currently using the BFQ patch are
broken because the old BFQ patch no longer applies for kernel 4.10.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently I just needed to support HP printers and scanners among all
the managed machines, so I thought it would be a good oportunity to
start a common profile for end user machines.
Right now there isn't that much factored out yet, but instead of copy &
pasting the printer/scanner config into all three machines I'm putting
it into the profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I need this on all my machines, so nix-env'ing it on every machine on
demand was getting tedious over time.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This one is annoying and it seems to be enabled by default in recent Vim
versions, so let's get rid of it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've been patching these machines up since ages and I'm tired now to do
both kernel configs *again* for the recent kernel versions.
Of course, in the long run I still want them to have their customized
kernel, but right now it's better to have a recent generic kernel rather
than have a fucked up custom kernel.
Also, this removes all that cruft for the Intel HDA pinning on dnyarri,
because the machine now has two X-Fi sound cards.
Both machines probably won't boot now, so we'll have to adjust a few
things very soon.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to properly separate attrsOf from the nested attrsOf because
otherwise the either type isn't able to distinguish between both types
during merging of the subtypes.
Now we have sub sections which is '[section "subsection"]' in Git's
config syntax and attrsOf (attrsOf ...) on our side and simple sections
like '[section]' which is just a plain attrsOf. This way we have an
additional type constraint in that we can't mix up subsections with
sections by the same name.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This reverts commit 1fb2981f660b2155331cdac1b28640ba7c6b4786.
Since NixOS/nixpkgs@c67a7ee73156796187894c63386b1a78e5902ea5, the
Chromium beta channel builds fine again, so let's go back to beta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This now should reflect "all things kernel" and thus could not only
contain patches but other things. If we have so many patches that it
makes sense to namespace them further, we can still use kernel/patches
for that purpose which is way better than "kpatches".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
The URL has changed, see brndnmtthws/conky#325 for the fix in upstream
conky.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Chromium's beta channel doesn't build for quite a while because the GYP
stuff is heavily broken in beta and dev and we need to move to GN
instead.
So until that's done I'm going with the stable channel for now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@da36847d925058fd86f027b64cc712c57be11ad8 we no
longer need so much cruft to specify kernel patches, so let's switch to
boot.kernelPatches instead of the hackery we had so far.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This reverts commit f0003b92674a1f4555dd14ffa271622a3889cd84.
Gajim 0.16.6 has been released last week and it includes a fix for GnuPG
2, so we no longer need this patch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I didn't use RXVT for years now, so it doesn't make sense to set options
for it here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I'm regularily using rsync and xhost sometimes, but the latter is a very
small package, so I don't mind having it in systemPackages.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
The "docdev" output has been removed in upstream nixpkgs at commit
NixOS/nixpkgs@e84a3524b5eaa03521bfbd5c67caec883ef76011.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I'v been regularily adding those packages to my user environment, so
let's add them to systemPackages so they are available all the time.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts the following commits:
4f4c778e424e72d51242dbfadde0a2a806efb68b
22fac6bad53e797ca84d7c7ac7e0fca3c0a912c8
We can now move Tomahawk back to the corresponding profiles/machines,
because the build has been fixed in f7e934e74595a0d7524159d6faa1b2bb5d.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Due to bandwidth constraints I'm not using Tomahawk at the moment and I
don't have time to investigate the current build failure.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Gah, yes, I'm still waking up and my eyes are not working already...
Accidentally copy & pasted tho wrong hash in there.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Nothing very scary here, just getting things up to date.
This also reflects on my choices of kernel options, most of them
probably are unnecessary but I'm going to rip apart the whole kernel
config very soon[TM] anyway.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
i3bar seems to close the FD for stderr, so conky will get a broken pipe
error when writing error messages to stderr.
Of course in the long run it's better to log these errors somewhere
where they can be inspected later.
But for now, it's better than terminating i3bar altogether, because
that's really annoying ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
While hacking on Hydra, this gets quite annoying, because all of these
template toolkit files don't get properly highlighted whenever I edit
them, so I always had to set the file type manually.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
HTML already is such a verbose markup language, so having 4 spaces just
makes it look even more shifted to the right than it's mostly is.
And in the past I've already set ts=2 sw=2 in HTML files every time I
edited them anyway.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is needed to run the OMEMO plugin:
https://github.com/omemo/gajim-omemo
I'm using drvAttrs directly here, so that we can pass
propagatedBuildInputs properly to the wrapper (without duplicating the
dependencies all over the place).
Ideally, this will be fixed in <nixpkgs> but in a much more fine-grained
way in that we are going to have Nix expressions for every single plugin
and its dependencies.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous attempts only fixed the KEY_CONSIDERED status line for a
few specific GnuPG functions, but after looking up the GnuPG source code
the status line can happen on virtually *any* function that looks up one
or more keys.
So this time, we're going to add handling of KEY_CONSIDERED to every
single status line handler.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
The previous patch didn't handle the KEY_CONSIDERED status at the
correct position, because the status will be returned during signing and
not during verification.
So this time, let's handle it during signing and actually test it (I did
and it worked).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
If the nix-instantiate step in taalo-build should fail, we want it to
fail altogether rather than just going on and bailing out very late
(with an exit status of 0) when the readlink call fails.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
GnuPG 2.1.13 has introduced a KEY_CONSIDERED status, which isn't really
picked up well by Gajim:
https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000390.html
There is also a new NOTATION_FLAGS status, but that shouldn't have an
effect on Gajim.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The default (light) package doesn't contain all the modules I need from
time to time, so having te replace the running pulseaudio daemon with
the full one is more of a hassle than worth keeping the light package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
After disabling allowUnfree a while ago, I also decided that I want my
machines to stay clear of proprietary stuff as much as possible.
And as I particularly don't use any of the Microsoft corefonts, I don't
shed a tear if they're gone :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The right name for it is "signingkey" instead of "signkey" and the
reason this has worked for so long was that if there is no signingkey
value set, Git falls back to using the users name and email address
instead, which is accepted by GnuPG as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression introduced by fba5c2469bd5e95857c4ffd9db3dd0529f2485f3.
The derivation paths returned by nix-instantiate are usually valid store
paths, except when used with --add-root. In case of the latter, we get
the root symlink back, so we need to do an additional readlink on it.
We also now pass -t to mktemp so that $TMPDIR or /tmp is used instead of
the current working directory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Time for a new GnuPG key, this time CCID-only :-)
This is the last commit you'll get using my old key (which will soon be
revoked as soon as I moved everything over to use the new key), so if
you're paranoid be sure to check the fingerprint against the signature
of this very commit.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This is needed to ensure that the .drv file doesn't get garbage
collected while we're transferring it to taalo.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|