ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity
27,919 Commits 96 Branches 102 Tags 4.5 GiB
d37795e572
Commit Graph

558 Commits

Author SHA1 Message Date
Shea Levy
6b0d6593e8 Create a mkEnableOption function for an extremely common NixOS idiom 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-18 15:13:42 -04:00
Eelco Dolstra
329a705005 nvidia-x11: Fix the library-only build 
Also, introduce a function ‘versionAtLeast’ which is probably more
natural than ‘versionOlder’.
 2013-07-17 11:14:26 +02:00
Shea Levy
8a66c8b8f8 imap previously mapped with 1-based indices 
Why????

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-12 13:06:32 -04:00
Shea Levy
a4c333474c lib/lists.nix: Remove uses of the tail function 
nix lists are not like haskell lists, and tail is an O(n) operation.
This makes recursion using tail less efficient than recursion using
length + elemAt.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-12 12:36:36 -04:00
Eelco Dolstra
074acec50b Doh 2013-07-03 16:35:13 +02:00
Eelco Dolstra
80213cbb05 meta.license is a list of strings (not attribute sets) 
http://hydra.nixos.org/build/5453648
 2013-07-03 12:41:27 +02:00
Rob Vermaas
4278f778b4 Improve error message for option that is not defined and has now default value. 2013-06-28 21:34:33 +02:00
Vladimír Čunát
38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
Vladimír Čunát
6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Shea Levy
8179bad658 Merge branch 'allow-imports-in-submodules' into upstream-master 
This allows submodules to use the full power of the module system.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-17 10:06:08 -04:00
Shea Levy
abfca0ad14 When printing submodule keys, print just the file name if known 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-17 10:05:46 -04:00
Jaka Hudoklin
a826c359c2 Add amdadl-sdk: amd display library sdk, usefull for ati gpu statistics 2013-06-16 21:39:54 +00:00
Jaka Hudoklin
4817f34f2b Add amdapp-sdk: accelerated parallel processing sdk with OpenCL support 2013-06-16 21:39:43 +00:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
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
 2013-06-13 17:12:43 +04:00
Michael Raskin
ed51d54610 Merge pull request #606 from fignuts/master 
Add keepass password manager and update mono DLLMap.
 2013-06-13 05:42:53 -07:00
Jason "Don" O'Conal
4fe22e28cb Add sup expression 2013-06-13 10:42:30 +10:00
Andrew Morsillo
e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Shea Levy
6d64b1d92c Give unique keys to submodule components 
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>
 2013-06-07 03:42:46 -04:00
Shea Levy
d465d6764a Allow imports in submodules 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-06 14:00:10 -04:00
Domen Kozar
b6f7f05b35 adding unfree-redistributable-firmware 2013-06-05 22:44:17 +02:00
Shea Levy
2952d7d114 Merge submodule extraArgs and individualExtraArgs 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-05 11:20:59 -04:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates 
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).
 2013-06-05 12:59:47 +02:00
Shea Levy
888c7f2757 modules: Enable setting extraArgs for all submodules or by name 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-04 17:47:42 -04:00
Ricardo M. Correia
17119e38e3 licenses: Add AGPLv3 and fix links to BSD licenses 2013-05-31 01:07:36 +00:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Jaka Hudoklin
f55b58bcc0 Add offline <Jaka Hudoklin> as a maintainer, so i can latter add myself as maintainer to packages 2013-05-26 13:23:28 +00:00
Bjørn Forsman
eaeb0c9c7d maintainers.nix: add myself (Bjørn Forsman) 
And keep the list sorted.
 2013-05-20 20:09:48 +02:00
Shea Levy
03b6fe7422 Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all outputs"" 
This reverts commit 18df66f466.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-15 00:39:17 -04:00
Shea Levy
05a02c639e Revert "Revert "Revert "Revert "overrideDerivation: Simplify"""" 
This reverts commit abf2d36773.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-15 00:38:03 -04:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Marc Weber
b50b9bf2b7 add versionedDerivation 2013-05-08 15:43:07 +03:00
Marc Weber
e0fab80c27 experimental/multiple-versions-in-one-file 
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>
 2013-05-08 15:43:07 +03:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Eelco Dolstra
abf2d36773 Revert "Revert "Revert "overrideDerivation: Simplify""" 
This reverts commit c2b1ca0296.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
 2013-05-07 10:49:22 +02:00
Eelco Dolstra
18df66f466 Revert "overrideDerivation: Re-attatch passthru and meta to all outputs" 
This reverts commit 6b0e94a516.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
 2013-05-07 10:48:53 +02:00
Shea Levy
6b0e94a516 overrideDerivation: Re-attatch passthru and meta to all outputs 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-03 09:12:55 -04:00
Shea Levy
c2b1ca0296 Revert "Revert "overrideDerivation: Simplify"" 
Now that `drv.passthru' actually is meaningful, this works.

This reverts commit d21bfddc57.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-03 09:09:58 -04:00
Eelco Dolstra
d21bfddc57 Revert "overrideDerivation: Simplify" 
This reverts commit 6640000cb7, 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
 2013-05-03 11:50:39 +02:00
Shea Levy
932dd06f3f Revert "Add isPath to trivial.nix" 
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 2742087bdd.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-02 15:04:21 -04:00
Shea Levy
2742087bdd Add isPath to trivial.nix 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-02 14:03:43 -04:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Evgeny Egorochkin
a8d1e3622f Google killed my old email 2013-04-24 16:22:28 +03:00
Vladimír Čunát
5e4aa51173 poppler: share most things between glib and qt4 versions 
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.
 2013-04-21 20:15:38 +00:00
Vladimír Čunát
ec736312d4 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
 2013-04-17 18:26:28 +02:00
Rok Garbas
f39f369ff1 pythonPackages.buildout: update to 1.7.1 and also: 
- rename to zc_builout* while keeping alias back to buildout (opening ticket
  later to remove it)
- meta: adding zpl licenses
- meta: adding me maintainer
 2013-04-17 01:25:45 +02:00
Eelco Dolstra
7745357f0e meta.license should be a (list of) string(s), not an attribute set 
http://hydra.nixos.org/build/4744513
 2013-04-14 20:10:58 +02:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
 2013-04-13 12:21:31 +02:00
Eelco Dolstra
4adad458e7 Remove the "proprietary" license 
We already had "unfree".
 2013-04-12 14:37:50 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00