1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

847 commits

Author SHA1 Message Date
Vladimír Čunát b5aaaf87a7
Merge staging and PR #35021
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
Shea Levy ce35114ee4
nixUnstable: 2.0pre5943_52c777a7 -> 2.0pre5950_3a5a241b 2018-02-15 16:22:21 -05:00
Frederik Rietdijk 672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Shea Levy f73b358842
nixUnstable: Bump 2018-02-13 12:18:50 -05:00
Will Dietz 5a802afb75 nix: doInstallCheck is disabled on cross already. 2018-02-13 09:44:59 -06:00
Ben Gamari 5d6e229ec0 nixUnstable: Enable cross-compilation
Older nix versions likely aren't feasible due to the perl dependency.
2018-02-13 09:44:58 -06:00
Will Dietz 3aa61e33be nix: simplify bzip2 dependency, this is handled properly now 2018-02-13 09:44:30 -06:00
Will Dietz afe517acd5 nix: 1.11 needs 'curl' on PATH so provide as nativeBuildInput. 2018-02-13 09:44:30 -06:00
Frederik Rietdijk 9d69ebe5a8 Merge staging at '256ba86' into master 2018-02-11 08:54:49 +01:00
Tuomas Tynkkynen 48f3036e87 Merge remote-tracking branch 'upstream/master' into staging 2018-02-11 02:10:02 +02:00
Jörg Thalheim df0fe7aa56
Merge pull request #34510 from sorki/nixops-dns
nixops-dns: init at f6c3f79
2018-02-10 10:47:25 +00:00
Will Dietz 6ec60e8c44 busybox-sandbox-shell: extract basic shell to new attribute
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.
2018-02-05 11:26:01 -06:00
Will Dietz 74d928cf8b nix: enable more features in busybox shell to resolve build failures 2018-02-05 09:19:54 -06:00
Will Dietz 4faac207bc nix: fix config for echo/test on newer busybox
Matches
2f1a1c5a49
2018-02-05 09:18:39 -06:00
Richard Marko da6b85be51 nixops-dns: init at 1.0 2018-02-03 07:28:28 +01:00
Vladimír Čunát 2fb4606f38
Merge branch 'master' into staging
Haskell rebuild.
Hydra: ?compare=1430378
2018-02-01 09:36:23 +01:00
Eelco Dolstra 75a20284f4 nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 2018-01-31 22:24:50 +01:00
Eelco Dolstra ef351646ba Revert "Restore "nixUnstable: rename to nix-unstable""
This reverts commit 695027f61c.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
2018-01-31 22:24:24 +01:00
Frederik Rietdijk 769342b37b Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-24 14:17:49 +01:00
Dan Peebles 533cc72d4d nixUnstable: pre5849_74f75c85 -> pre5873_b76e282d 2018-01-23 16:07:25 -05:00
Ben Gamari 2b04cddf7e nix-prefetch-scripts: makeWrapper is a nativeBuildInput 2018-01-22 20:25:45 -05:00
Frederik Rietdijk 27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall
maintainers: remove mornfall from packages
2018-01-18 11:27:31 +01:00
adisbladis 43d1a38b8d
dpkg: 1.19.0.4 -> 1.19.0.5 2018-01-18 02:24:23 +08:00
Yegor Timoshenko 506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Tobias Geerinckx-Rice 0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Dan Peebles 4c96412189 nixUnstable: pre5810_5d5b931f -> pre5849_74f75c85 2018-01-12 14:19:24 -05:00
pasqui23 0dd7d213c2 home-manager:init at 2017-10-11 (#30330)
home-manager: init at 2017-12-07
2017-12-30 08:52:26 +08:00
Sander van der Burg 6b4687741e dysnomia: 0.7 -> 0.7.1 2017-12-20 21:37:33 +01:00
Orivej Desh 137bf46ee7 nixUnstable: 1.12pre5788_e3013543 -> 1.12pre5810_5d5b931f
Fixes build after 3430b0e859 with
5d5b931fb1
2017-12-14 18:34:36 +00:00
Eelco Dolstra 875eaf0821
nix: 1.11.15 -> 1.11.16 2017-12-12 17:46:21 +01:00
Eelco Dolstra 0e58684c41
nixUnstable: Remove unused dependencies 2017-12-08 16:01:06 +01:00
Orivej Desh 695027f61c Restore "nixUnstable: rename to nix-unstable"
as discussed in bed3695848

Different names make it easier for the users to notice updates to Nix stable,
and to have Nix stable and unstable simultaneously.

This reverts commit bed3695848.
2017-12-08 11:17:33 +00:00
Shea Levy bed3695848
Revert "nixUnstable: rename to nix-unstable"
This commit effectively makes it impossible to upgrade to nixUnstable
with nix-env without mucking about with priorities, as you can't
uninstall the old nix transactionally with the new nix and if you
uninstall the old one first you no longer have nix at your disposal to
install the new one.

This reverts commit 9711aac642.
2017-12-07 14:17:53 -05:00
Shea Levy 0235f1249e
nixUnstable: Bump to pre5788_e3013543 for fetchGit bug fix 2017-12-07 14:02:03 -05:00
Frederik Rietdijk 0b8417823d librepo: add bindings to python-packages.nix 2017-12-05 16:04:24 +01:00
Vladimír Čunát 7dfa97969a
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
2017-11-24 18:36:54 +01:00
Bas van Dijk bfade3206c nixopsUnstable: upgrade to HEAD and use a tarball from hydra 2017-11-22 09:42:41 +00:00
John Ericson d7bddc27b2 treewide: Try to avoid depending on binutils directly
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
2017-11-13 00:47:48 -05:00
Sander van der Burg 39015dbe4b nixui: do not copy node-env.nix on regeneration 2017-11-08 11:25:02 +01:00
Vladimír Čunát 6ffafc78fb
Merge branch 'staging'
Main change: glibc: 2.25-x -> 2.26-y, containing security fixes,
and various features and deprecations.  Unfortunately, some of the
latter still cause (transitively) a couple hundred newly failing jobs.
I'm not delaying anymore, so that we have the security fix on master.
I mainly patched gcc, llvm and icu, but I can't fix everything...
2017-11-07 16:00:35 +01:00
Raphael Das Gupta 139d931d4d nox: add license information: MIT
nox was licensed under MIT License
since at least 0.0.2. See
b7e084a7c5
2017-11-07 13:50:23 +02:00
Eelco Dolstra d2df286df7
nixUnstable: nix-1.12pre5663_c7af84ce -> nix-1.12pre5732_fd10f6f2 2017-11-07 12:25:17 +01:00
Vladimír Čunát 1d9a8e2289
Merge branch 'master' into staging 2017-11-06 13:24:06 +01:00
Jan Tojnar dcb074ae9c
packagekit: 1.1.3 → 1.1.7 2017-11-05 20:44:17 +01:00
Vladimír Čunát eed6e0a946
Merge branch 'master' into staging
Lots of rebuilds from master; at least some of them due to security.
2017-11-04 10:28:00 +01:00
c0bw3b 525380b472 treewide: abandon Google Code homepages 2017-11-03 18:52:28 +00:00
Frederik Rietdijk 2c822b16fb
Merge pull request #30880 from orivej/nix-unstable
nixUnstable: rename to nix-unstable
2017-11-03 19:21:36 +01:00
adisbladis 9fa8f3ed0d
rpm: 4.13.0.1 -> 4.14.0 2017-11-03 02:07:38 +08:00
adisbladis ef97adf60c
fpm: 1.6.2 -> 1.9.3 2017-11-02 10:22:51 +08:00
Rob Vermaas 0767d2984b
nixops: update to 1.5.2
(cherry picked from commit c291a10776)
2017-10-29 10:24:53 +01:00