about summary refs log tree commit diff
path: root/pkgs
Commit message (Collapse)AuthorAgeFilesLines
* Handle all <nixpkgs> paths with nixpkgs-path.nix.aszlig2015-04-291-1/+1
| | | | | | | | | This file is just defaulting to <nixpkgs>, but we're going to substitue it by the channel generator. We also need to make sure that we don't have any other references to <nixpkgs>, but the latter can best be done on Hydra's side if we don't make <nixpkgs> available to vuizvui builds. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Fix passing attributes to mkChannel.aszlig2015-04-281-2/+2
| | | | | | | The problem here was that the attributes were added to the resulting derivation of mkDerivation instead of the input attribute set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Add patchPhase to phases.aszlig2015-04-281-1/+1
| | | | | | Should make it easier to patch the channel expressions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-04-211-2/+2
| | | | | | | | Yes, I know that it's only two more commits we don't really care about, but I needed my Hydra to evaluatio the jobset again in order to test channels. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Pass meta.isHydraChannel = true.aszlig2015-04-211-1/+5
| | | | | | | In the latest not-yet-public implementation of Hydra channel improvements, we now have a meta attribute to designate a channel. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Switch from product subtype to type.aszlig2015-04-211-1/+1
| | | | | | | This is because I've changed the the WIP implementation to use a product type instead of a subtype. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-04-181-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mkChannel: Remove channelName attribute.aszlig2015-04-151-7/+5
| | | | | | | The third argument in hydra-build-products is actually the base directory and not a name, Alzheimer's near! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add helper function for creating channels.aszlig2015-04-152-0/+31
| | | | | | | | | We're going to create several channels and we don't want to code duplicates across vuizvui. This essentially not only creates a channel but also ties it to constituents, which make sure that channels are only updated whenever all constituent builds are successful. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-04-111-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-04-091-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Add patch to fix circular lib reference.aszlig2015-04-041-0/+4
| | | | | | | Patch is from pull request NixOS/nixops#280 and can hopefully be dropped in favour of the latest master version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-04-031-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Update to latest upstream master.aszlig2015-04-021-2/+2
| | | | | | | Contains a bunch of fixes especially some related to the Hetzner backend. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Generalize Qt5 fixups.aszlig2015-03-311-23/+21
| | | | | | | | | | | | The generalization is done by symlinking include dirs and libraries to the corresponding suffixed versions *only* if there isn't a ...5 suffix already. We now no longer need to pass QUAZIP_INCLUDE_DIR and QUAZIP_LIBRARIES as cmakeFlags, because the Tomahawk cmake build is able to find it by itself. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Add include suffix for QuaZip.aszlig2015-03-311-4/+10
| | | | | | Same as with 9ea16e0 and d3bfedd. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Reference quazip library file directly.aszlig2015-03-311-1/+1
| | | | | | | | | | | | It's not a big issue, because due to Nix's stdenv it's going to be able to link anyway, but there still is a nasty warning, we're getting rid by this: WARNING: Target "tomahawklib" requests linking to directory "/nix/store/ybw942c8jw0dyjah0r0pcsgn8q0sv02h-quazip-0.7.1/lib". Targets may link only to libraries. CMake is dropping the item. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-03-311-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Patch in suffixed version of liblastfm.aszlig2015-03-311-5/+10
| | | | | | Just as with echonest vs. echonest5 we now have lastfm vs. lastfm5. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Link echonest includes to suffixed ones.aszlig2015-03-311-1/+3
| | | | | | | Tomahawk expects the echonest library to have a "5" suffix in its include dir, so let's simply symlink it to the unsuffixed version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Override QCA sources with Qt5 fork.aszlig2015-03-311-10/+14
| | | | | | | Thanks to @muesli for mentioning this, so we no longer need to patch Tomahawk's CMakeList.txt. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Set liblastfm/echonest include dirs.aszlig2015-03-311-0/+2
| | | | | | | | | The libraries are searched in $KDE4_INCLUDE_DIR or in some other paths but with a prefix. On Nix however we don't need a prefix and our dependencies are strictly separate so searching in KDE4_INCLUDE_DIR won't work either. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Pass QuaZip include/library paths.aszlig2015-03-311-1/+3
| | | | | | | | The upstream cmake script wasn't able to find it by itself, but haven't looked into it whether this is only a Nix specific problem or whether it applies generally. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Rename Qca-qt5 to Qca in CMakeLists.txt.aszlig2015-03-311-0/+4
| | | | | | | | | | The upstream Tomahawk CMakeLists.txt contains a distro-specific name, which doesn't work well when using the name from upstream Qca. So let's rename it accordingly. Cc: @muesli Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Add missing Qt5 dependencies.aszlig2015-03-311-2/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Add Qt5 tools to qtkeychain dependency.aszlig2015-03-311-3/+10
| | | | | | Building qtkeychain with Qt5 requires Qt5LinguistTools. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Remove dependency an qjson.aszlig2015-03-311-3/+3
| | | | | | | | It is included in Qt5 already and the separate one also won't build with newer Qt, so let's null it out for echonest and remove it from Tomahawk's buildInputs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Replace attica by the Qt 5 version.aszlig2015-03-311-8/+2
| | | | | | Using the attica version from the KDE frameworks attribute set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tumahawk: Switch to Qt5 by default.aszlig2015-03-311-10/+32
| | | | | | | This was changed in tomahawk-player/tomahawk@873c35a, so let's adapt accordingly and jump straight to Qt 5.4 instead of plain old 5.3. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* temahawk: Update to latest upstream master.aszlig2015-03-311-2/+2
| | | | | | We're feeling to old, don't we? ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Remove dependency on qca2_ossl.aszlig2015-03-311-11/+1
| | | | | | | As of NixOS/nixpkgs@ee7c9bd this is no longer needed, as the new upstream version of QCA2 includes the plugin already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Refactor overrides into my base profile.aszlig2015-03-181-1/+1
| | | | | | | | | | | | | | | | | 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>
* Merge labernix packages into vuizvui pkgs.aszlig2015-03-183-3/+397
| | | | | | | | | | | | It's currently only BeeHive, but our goal is to dissolve labernix step by step until nothing is left. Also, we're now no longer namespace the pkgs with vuizvui directly in the package list. Before it wasn't even namespaced correctly (except for inside pkgs/ directly) and we did override the packages using the dirty approach in overrides/. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Refactor own Vim version into its own module.aszlig2015-03-182-334/+0
| | | | | | | | | | 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>
* Refactor Gajim config + patches into a module.aszlig2015-03-181-80/+0
| | | | | | | | Now we no longer pollute the repository root with Gajim (for example in cfgfiles/) and it's also easier to enable/disable my personal Gajim config among my own machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add Tomahawk from Git master.aszlig2015-03-132-0/+60
| | | | | | | | | | I'm including the whole file here, because it's easier to move it to <nixpkgs> once version 0.9.0 is finally released. This finally gets rid of the damn phonon dependency which cased most of my playback issues so far. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Remove cruft for supporting kernel 3.15.aszlig2015-03-111-2/+1
| | | | | | | | | | | This was in since the initial commit (6c224e4) of the bfqsched Nix expression and I didn't notice it for all those upgrades. Basically, this is just a no-op, because nowadays the sed expression doesn't rewrite anything anymore, but it might be harmful if it should match something in a future version of the bfqsched patch set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update to version 3.19-v7r7.aszlig2015-03-111-4/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/nixops: Update to latest upstream master.aszlig2015-01-211-26/+10
| | | | | | | | | | | | We also now use fetchFromGitHub and no longer use "git rev-parse" in order to truncate the commit hash. Instead, we're just trimming down the revision we already have in the Nix expression to 7 characters (like per default if done by "git rev-parse --short"). This should also mitigate the evaluation problems with latest nixpkgs, where leaveDotGit changed so it results in a different hash. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update patch set to version 3.18-v7r7.aszlig2015-01-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Changes for v7r7: * BUGFIX: Prevent the OOM queue from being involved in the queue cooperation mechanism. In fact, since the requests temporarily redirected to the OOM queue could be redirected again to dedicated queues at any time, the state needed to correctly handle merging with the OOM queue would be quite complex and expensive to maintain. Besides, in such a critical condition as an out of memory, the benefits of queue merging may be little relevant, or even negligible. * IMPROVEMENT: Let the OOM queue be initialized only once. Previously, the OOM queue was reinitialized, at each request enqueue, with the parameters related to the process that issued that request. Depending on the parameters of the processes doing I/O, this could easily cause the OOM queue to be moved continuously across service trees, or even across groups. It also caused the parameters of the OOM queue to be continuously reset in any case. * CODE IMPROVEMENT. Performed some minor code cleanups, and added some BUG_ON()s that, if the weight of an entity becomes inconsistent, should better help understand why. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* vim: Update nixAddon and add vimAddonErrorFormats.aszlig2014-12-161-2/+9
| | | | | | | | The latter is a newly introduced (well... not exactly introduced but actually referenced, I think it was there before) dependency of nixAddon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* vim: Add dependencies for vim-haxe plugin.aszlig2014-12-091-0/+21
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Move from overrides into own package.aszlig2014-11-182-0/+64
| | | | | | | | We now no longer override the package included in <nixpkgs>, but build it completely from the upstream Git repository and do our patches right after the fetchgit. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add new aacolorize script to colorize ASCII.aszlig2014-11-053-0/+196
| | | | | | | Basically this is just an old script I wrote to separate and merge color information from the actual ASCII arts. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update patches to 3.17.0-v7r6.aszlig2014-11-042-44/+5
| | | | | | Although we're building for 3.18, the patch should still apply. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* vim: Use correct name for single vimscript files.aszlig2014-11-011-2/+7
| | | | | | | | | Just threw me out of zone, because I was terribly annoyed on why the hell Python indentation isn't done correctly anymore. If the file path is something like "indent/script4316.vim", Vim won't load it because it's searching for "indent/$ftname.vim". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/vim: Remove obsolete config.nix.aszlig2014-10-141-287/+0
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/vim: Add vim-addon-goto-thing-at-cursor.aszlig2014-10-131-0/+7
| | | | | | The plugins "vim-haxe" and "vim-addon-nix" need this dependency. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* vim: Move overrides and config into pkgs/vim.aszlig2014-10-133-0/+581
| | | | | | | | | | | The main reason for doing this is to avoid collisions with other vim variants in <nixpkgs> which are expecting an .override attribute. Moving it into pkgs/ entirely also has the advantage of being properly namespaced rather than "all over the place" and we also don't clash anymore with existing Vim packages. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim/config.patch: Fix against version 0.16.aszlig2014-10-091-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-06 12:24:56 +0000