jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,664 Commits 266 Branches 122 Tags 5.3 GiB
1848bfc92d
Commit Graph

86664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolay Amiantov
1848bfc92d Merge branch 'plymouth' into staging 2016-07-13 03:54:38 +03:00
Alexey Shmalko
0172558e82 buildEnv: build the whole tree of directories to pathsToLink 
This patch fixes #16614 and #16741.

The first issue was caused by the fact that both `/share` and
`/share/fish/vendor_completions.d` end in the `pathsToLink`. The
`pkgs/build-support/buildenv/builder.pl` creates `/share`, then links
`/share/fish` under `/share` and then tries to create the directory
`/share/fish/vendor_completions.d` and fails because it already exists.

The simplest way to reproduce the issue is to build the next Nix
expression:

```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
  name = "buildenv-issue";

  paths = [
    pkgs.fish
    pkgs.vim
  ];

  pathsToLink = [
    "/share"
    "/share/fish/vendor_completions.d"
  ];
}
```

The second issue is more critical and was caused by the fact findFiles
doesn't recurse deep enough. It stops at first unique directory for the
package (e.g., "/share" or even "/") and later the scripts decides it
shouldn't link it as it doesn't match pathsToLink (e.g., "/share/fish"),
so the result is empty.

The test:
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
  name = "buildenv-issue";

  paths = [
    pkgs.fish
    pkgs.vim
  ];

  pathsToLink = [
    "/share/fish/functions"
  ];
}
```

or

```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
  name = "buildenv-issue";

  paths = [
    pkgs.vim
  ];

  pathsToLink = [
    "/share"
  ];
}
```
 2016-07-13 03:54:11 +03:00
Vladimír Čunát
f56a319e3e ncurses: revert to 5.9 on Darwin (only) 
I don't want to investigate why it won't compile.
http://hydra.nixos.org/build/37537876/nixlog/1/raw
 2016-07-12 22:00:11 +02:00
Vladimír Čunát
40785f0dac Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1282763
 2016-07-12 22:00:10 +02:00
Nikolay Amiantov
246ad0159f gdm: build with plymouth support 2016-07-12 22:22:29 +03:00
Nikolay Amiantov
c69c76ca7e nixos stage-1: try to quit plymouth if started on failure 2016-07-12 22:22:29 +03:00
Nikolay Amiantov
a2d4235fe1 plymouth service: init 2016-07-12 22:22:29 +03:00
Nikolay Amiantov
d3e3e643cb nixos stage-1: set extraUtils variable 2016-07-12 22:22:29 +03:00
Nikolay Amiantov
3508918da2 nixos stage-1: replace udevadm in udevRules 2016-07-12 22:22:28 +03:00
Nikolay Amiantov
e02b5ace0b nixos stage-1: guard udevRules from extra references 2016-07-12 22:22:28 +03:00
Nikolay Amiantov
bd0ab027c1 nixos stage-1: recursively process binaries and libraries 2016-07-12 22:22:28 +03:00
Nikolay Amiantov
90ad879753 nixos stage-1: unconditionally mount /dev/pts 2016-07-12 22:22:28 +03:00
Nikolay Amiantov
6e21246dc4 plymouth: 0.9.0 -> 0.9.2 
Use system-wide directories for various resources.
 2016-07-12 22:22:28 +03:00
Eelco Dolstra
9aa3e78ab2 Update 16.03 AMIs 2016-07-12 17:26:29 +02:00
Eelco Dolstra
94cc18e9aa Add AMIs in ap-northeast-2 and ap-south-1 2016-07-12 17:26:25 +02:00
Eelco Dolstra
1e9b8bfb31 Copy AMIs in parallel 2016-07-12 17:26:16 +02:00
Eelco Dolstra
02db7d9821 Create AMIs with Enhanced Networking 
Fixes #15956.
 2016-07-12 17:25:52 +02:00
Graham Christensen
d9724bcdbf doc: add man page for nixos-version (#16869) 2016-07-12 16:29:13 +02:00
joachifm
3df7f3cbc3 Merge pull request #16831 from womfoo/fix-bump/gtkgnutella-1.1.9 
gtk-gnutella: fix build and 1.1.5 -> 1.1.9
 2016-07-12 16:21:36 +02:00
joachifm
7135dfd541 Merge pull request #16836 from brainrape/update-youtube-dl 
youtube-dl: 2016.07.03.1 -> 2016.07.09.2
 2016-07-12 16:21:26 +02:00
joachifm
4620221a51 Merge pull request #16839 from frlan/Update/Geany/1.28 
geany: 1.27 -> 1.28
 2016-07-12 16:21:02 +02:00
joachifm
03a7fa9104 Merge pull request #16840 from womfoo/bump/leatherman-0.7.5-facter-3.1.8 
Bump leatherman: 0.7.0 -> 0.7.5 and sole dependency facter 3.1.6 -> 3.1.8
 2016-07-12 16:20:51 +02:00
joachifm
ecb5a56b4e Merge pull request #16300 from schneefux/gopkg-minify 
minify: init at v2.0.0
 2016-07-12 16:20:28 +02:00
joachifm
7a54a71c9e Merge pull request #16808 from 4z3/urlwatch 
urlwatch: 2.1 -> 2.2
 2016-07-12 16:20:17 +02:00
Arseniy Seroka
356e9c04da Merge pull request #16771 from mimadrid/init/universal-ctags-2016-07-06 
universal-ctags: init at 2016-07-06
 2016-07-12 17:56:30 +04:00
joachifm
c07866a641 Merge pull request #16882 from elitak/factorio013 
factorio: 0.12.35 -> 0.13.8
 2016-07-12 15:51:43 +02:00
Joachim Fasting
416120e0c7
grsecurity: 4.6.3-201607070721 -> 4.6.4-201607112205 2016-07-12 15:15:09 +02:00
Eric Litak
2b47d24007 factorio: 0.12.35 -> 0.13.8 2016-07-12 05:03:51 -07:00
Eric Bailey
9d58f894cd lfe: init at 1.1.1 (#16865) 
This is a first pass at adding an LFE package.

N.B. man pages are ignored for now.
 2016-07-12 13:48:33 +02:00
Eelco Dolstra
0fa00cce01 awscli: 1.10.38 -> 1.10.46 2016-07-12 13:38:13 +02:00
Arseniy Seroka
e4c3f9402d Merge pull request #16819 from LnL7/elixir-1.3.1 
elixir: 1.3.0 -> 1.3.1
 2016-07-12 15:38:02 +04:00
Renzo Carbonara
103ae01173 zoom-us: init at 2.0.52458.0531 (#15607) 2016-07-12 13:37:11 +02:00
Frederik Rietdijk
8710a9d57c Merge pull request #16881 from martingms/mypy-missing-deps 
mypy-lang: Add missing lxml dependency
 2016-07-12 13:25:52 +02:00
Gabriel Ebner
2bb0d283af Merge pull request #16880 from mimadrid/update/i3lock-2.8 
i3lock: 2.7 -> 2.8
 2016-07-12 11:38:31 +02:00
Martin Gammelsæter
6c77af6f60 mypy-lang: Add missing lxml dependency 2016-07-12 11:22:24 +02:00
mimadrid
bab3d4c3e0
i3lock: 2.7 -> 2.8 2016-07-12 11:15:51 +02:00
Alex Berg
b5a95b1812 Improve overrideDerivation docs. (#16867) 
* Improve overrideDerivation docs.

Explain how antiquotation in a package's attribute behaves when overriding the package.

* Edit antiquotation note. Fix closing-element.
 2016-07-12 09:57:26 +02:00
Tim Steinbach
71ad2ed226 oh-my-zsh: 2016-06-18 -> 2016-07-05 (#16874) 2016-07-12 09:55:17 +02:00
Tim Steinbach
47da65923b kernel: 4.6.3 -> 4.6.4 (#16875) 2016-07-12 09:54:57 +02:00
Gabriel Ebner
05315dc183 Merge pull request #16873 from NeQuissimus/conky1_10_3 
conky: 1.10.1 -> 1.10.3
 2016-07-12 08:30:18 +02:00
Gabriel Ebner
51e1b2508c Merge pull request #16878 from womfoo/bump/siege-4.0.2 
siege: 4.0.1 -> 4.0.2
 2016-07-12 08:23:15 +02:00
Gabriel Ebner
e389f72403 Merge pull request #16871 from NeQuissimus/feh2161 
feh: 2.15.4 -> 2.16.1
 2016-07-12 08:16:51 +02:00
Kranium Gikos Mendoza
e54223e8bb siege: 4.0.1 -> 4.0.2 2016-07-12 13:31:31 +08:00
Tuomas Tynkkynen
9391640fa4 Merge pull request #16872 from NeQuissimus/kotlin103 
kotlin: 1.0.2 -> 1.0.3
 2016-07-12 05:35:47 +03:00
Rok Garbas
fc29868d24 pythonPackages.Flootty: init at 3.2.0 2016-07-12 02:06:47 +02:00
Tim Steinbach
9672c36651 conky: 1.10.1 -> 1.10.3 2016-07-11 23:20:25 +00:00
Tim Steinbach
f7ab48a401 feh: 2.15.4 -> 2.16.1 2016-07-11 23:15:51 +00:00
Tim Steinbach
a0009e1ae5 kotlin: 1.0.2 -> 1.0.3 2016-07-11 23:14:30 +00:00
Nikolay Amiantov
ec73d072ae lgogdownloader: 2.26 -> 2.28 2016-07-12 00:56:10 +03:00
Nikolay Amiantov
36725623f9 liboauth: propagate inputs wanted by pkgconfig 2016-07-12 00:56:10 +03:00