summary refs log tree commit diff
path: root/pkgs/lib
Commit message (Collapse)AuthorAge
* DohEelco Dolstra2013-07-03
|
* meta.license is a list of strings (not attribute sets)Eelco Dolstra2013-07-03
| | | | http://hydra.nixos.org/build/5453648
* Improve error message for option that is not defined and has now default value.Rob Vermaas2013-06-28
|
* maintainers: change my attrname to be uniformVladimír Čunát2013-06-27
|
* Merge branch 'master' into x-updatesVladimír Čunát2013-06-17
|\
| * Merge branch 'allow-imports-in-submodules' into upstream-masterShea Levy2013-06-17
| |\ | | | | | | | | | | | | | | | This allows submodules to use the full power of the module system. Signed-off-by: Shea Levy <shea@shealevy.com>
| | * When printing submodule keys, print just the file name if knownShea Levy2013-06-17
| | | | | | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
| | * Give unique keys to submodule componentsShea Levy2013-06-07
| | | | | | | | | | | | | | | | | | | | | | | | I'm not wed to the outPath values I chose, other options are probably valid there too. It would be nice if we could track which file each merged value came from as well. Signed-off-by: Shea Levy <shea@shealevy.com>
| | * Allow imports in submodulesShea Levy2013-06-06
| | | | | | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
| * | Add amdadl-sdk: amd display library sdk, usefull for ati gpu statisticsJaka Hudoklin2013-06-16
| | |
| * | Add amdapp-sdk: accelerated parallel processing sdk with OpenCL supportJaka Hudoklin2013-06-16
| | |
* | | Merge remote-tracking branch 'upstream/master' into x-updatesMichael Raskin2013-06-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix
| * | Merge pull request #606 from fignuts/masterMichael Raskin2013-06-13
| |\ \ | | | | | | | | Add keepass password manager and update mono DLLMap.
| | * | Added keepass password manager. Updated mono DLLMap to allow mono to run ↵Andrew Morsillo2013-06-09
| | |/ | | | | | | | | | WinForms applications (keepass).
| * / Add sup expressionJason "Don" O'Conal2013-06-13
| |/
* | Merge remote-tracking branch 'hydra/master' into x-updatesVladimír Čunát2013-06-08
|\| | | | | | | | | Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix
| * adding unfree-redistributable-firmwareDomen Kozar2013-06-05
| |
| * Merge submodule extraArgs and individualExtraArgsShea Levy2013-06-05
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | Merge branch 'master' into x-updatesVladimír Čunát2013-06-05
|\| | | | | | | | | Silently merged badly the firefox 20/21 things. I got that, hopefully there aren't more (my nixos-rebuild dry-run finds no more errors).
| * modules: Enable setting extraArgs for all submodules or by nameShea Levy2013-06-04
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
| * licenses: Add AGPLv3 and fix links to BSD licensesRicardo M. Correia2013-05-31
| |
* | ReRevert Merge x-updates into masterVladimír Čunát2013-05-29
|/ | | | | | | | | This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix
* Add offline <Jaka Hudoklin> as a maintainer, so i can latter add myself as ↵Jaka Hudoklin2013-05-26
| | | | maintainer to packages
* maintainers.nix: add myself (Bjørn Forsman)Bjørn Forsman2013-05-20
| | | | And keep the list sorted.
* Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all ↵Shea Levy2013-05-15
| | | | | | | | | | outputs"" This reverts commit 18df66f4666c0a2d5a3fa6d6660076e5af5f6af5. I will fix the breakage in upcoming commits. Signed-off-by: Shea Levy <shea@shealevy.com>
* Revert "Revert "Revert "Revert "overrideDerivation: Simplify""""Shea Levy2013-05-15
| | | | | | | | This reverts commit abf2d3677382bb93b989528cc6ed71ac6d5bd3b8. I will fix the breakage in upcoming commits. Signed-off-by: Shea Levy <shea@shealevy.com>
* Revert Merge x-updates into master due to mesa bloatVladimír Čunát2013-05-09
| | | | | | | | | | | See #490 discussion. This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
* add versionedDerivationMarc Weber2013-05-08
|
* experimental/multiple-versions-in-one-fileMarc Weber2013-05-08
| | | | | | | | | | | | | | | | | This patch introduces mergeAttrsByVersion to lib. In some cases it does make sense to keep "experimental" and "older" versions of the same package in one file because it follows the "do it once only" principle. Very often many versions share their build instructions - so even though I understand Eelcos opinion that different versions should be put into their own .nix files - its my feeling telling me that this is fastest for most cases. I agree with Eelco that if tweaks for individual versions become too much they should be split into individual files. See comments above mergeAttrsByVersion learn about its usage. Signed-off-by: Marc Weber <marco-oweber@gmx.de>
* Merge branch 'master' into x-updatesVladimír Čunát2013-05-08
|\ | | | | | | | | Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix
| * Revert "Revert "Revert "overrideDerivation: Simplify"""Eelco Dolstra2013-05-07
| | | | | | | | | | | | This reverts commit c2b1ca029663d1ad41bbffd3d09becada06c74cc. It still breaks VM builds: http://hydra.nixos.org/build/4858140
| * Revert "overrideDerivation: Re-attatch passthru and meta to all outputs"Eelco Dolstra2013-05-07
| | | | | | | | | | | | This reverts commit 6b0e94a516c5aa8d0e18e13028c7ccf541062c99. It still breaks VM builds: http://hydra.nixos.org/build/4858140
| * overrideDerivation: Re-attatch passthru and meta to all outputsShea Levy2013-05-03
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
| * Revert "Revert "overrideDerivation: Simplify""Shea Levy2013-05-03
| | | | | | | | | | | | | | | | Now that `drv.passthru' actually is meaningful, this works. This reverts commit d21bfddc57cdbc6c9a878dc364ffefbfc4455488. Signed-off-by: Shea Levy <shea@shealevy.com>
| * Revert "overrideDerivation: Simplify"Eelco Dolstra2013-05-03
| | | | | | | | | | | | | | | | | | This reverts commit 6640000cb7148ba39bbdcca8e0cd7f5c224bce57, which caused passthru attributes not to be passed correctly after calling overrideDerivation. E.g. in the evaluation of the Nix jobset: at `deb_ubuntu1004i386' [officialRelease = false, nix = ...]: attribute `fullName' missing
| * Revert "Add isPath to trivial.nix"Shea Levy2013-05-02
| | | | | | | | | | | | | | | | | | This breaks NixOS, and I don't actually need it, so someone who needs it can bring this back without breaking NixOS :) This reverts commit 2742087bdd092d77083dc99cdafb6e93444fba3e. Signed-off-by: Shea Levy <shea@shealevy.com>
| * Add isPath to trivial.nixShea Levy2013-05-02
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | Merge branch 'master' into x-updatesVladimír Čunát2013-05-01
|\|
| * Google killed my old emailEvgeny Egorochkin2013-04-24
| |
* | poppler: share most things between glib and qt4 versionsVladimír Čunát2013-04-21
| | | | | | | | | | | | | | | | | | | | Most of the stuff was duplicated (headers, the core library). The new solution makes the _qt4 package use the _glib one, because it depended on glib through cairo anyway (and _glib bindings themselves are just ~350kB). This also fixes a problem that mergeAttrsByFuncDefaultsClean didn't merge patches, which affected dbus.libs.
* | Merge branch 'master' into x-updatesVladimír Čunát2013-04-17
|\| | | | | | | | | | | Conflicts: pkgs/development/compilers/vala/default.nix (it's different version) pkgs/development/libraries/cairo/default.nix (trivial)
| * pythonPackages.buildout: update to 1.7.1 and also:Rok Garbas2013-04-17
| | | | | | | | | | | | | | - rename to zc_builout* while keeping alias back to buildout (opening ticket later to remove it) - meta: adding zpl licenses - meta: adding me maintainer
| * meta.license should be a (list of) string(s), not an attribute setEelco Dolstra2013-04-14
| | | | | | | | http://hydra.nixos.org/build/4744513
* | Merge branch 'master' into x-updatesVladimír Čunát2013-04-13
|\| | | | | | | | | Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix
| * Remove the "proprietary" licenseEelco Dolstra2013-04-12
| | | | | | | | We already had "unfree".
* | Merge branch 'master' into x-updatesVladimír Čunát2013-04-11
|\| | | | | | | Needed that to fix the tarball.
| * overrideDerivation: SimplifyShea Levy2013-04-11
| | | | | | | | | | | | | | | | | | | | Since we're just calling derivation again, drvAttrs is exactly what we want to pass, and we can get rid of the complicated "drop" logic. As a bonus, this actually makes it correct, since before "drop" removed the attribute named passthru but not actually the attributes added to the top-level attrset via passthru. Signed-off-by: Shea Levy <shea@shealevy.com>
* | dbus: minor update, reorganize and polish the expressionVladimír Čunát2013-04-11
| |
* | Merge branch 'master' into x-updatesVladimír Čunát2013-04-04
|\| | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix
| * Add myself (the-kenny) to the maintainer list.Moritz Ulrich2013-03-30
| | | | | | | | Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-04 15:52:01 +0000