JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,581 Commits 2 Branches 0 Tags 13 GiB
ce08cf0a29
Commit Graph

42 Commits

Author SHA1 Message Date
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
zowoq
b67a367f7c libcap: 2.27 -> 2.44 2020-10-14 08:45:22 +10:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Will Dietz
e1c7c1981a libcap: 2.26 -> 2.27 
https://sites.google.com/site/fullycapable/release-notes-for-libcap/releasenotesfor227
 2019-04-18 08:43:05 +02:00
R. RyanTM
cbf9402574 libcap: 2.25 -> 2.26 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libcap/versions
 2018-12-18 15:33:16 -05:00
Pascal Wittmann
28905e828a
libcap: add license 
see issue #43716
 2018-08-08 21:18:16 +02:00
Matthew Bauer
143978a477 treewide: remove platform assertions 
linux: readd assertion
 2018-05-03 13:09:20 -05:00
Will Dietz
cea0765a29 libcap: depsBuildBuild, don't set CC/BUILD_CC 2018-02-13 09:44:57 -06:00
Ben Gamari
db9f302cf3 libcap: Fix cross-compilation 2018-02-13 09:44:57 -06:00
Florian Klink
a505abc948 libcap: already patch Make.Rules in prePatch 
Make.Rules gets already included during compilation, so set paths before
invoking make. This fixes wrong paths in libcap.pc.
 2017-10-22 21:21:27 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc) 
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
 2017-08-11 21:32:54 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Alexander Ried
7382afac40 libcap: replace old split with multi-output 2016-05-03 19:52:10 +02:00
Alexander Ried
64ef643833 libcap: 2.24 -> 2.25 2016-05-03 19:52:10 +02:00
Vladimír Čunát
54eef65533 libcap*: fix with multiple outputs 
I don't think we need the license file in each of these,
so I only left it with the library (it isn't big).
 2015-10-04 09:49:19 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Joel Taylor
740d3b1517 Remove isLinux assertion from libcap 
Heimdal evaluates libcap's meta.platforms to determine if it should be pulled in or not,
and that fails if the stdenv.isLinux assertion fails.
 2015-05-15 15:33:35 -07:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
William A. Kennington III
afca882265 libcap: 2.22 -> 2.24 2015-03-26 00:53:45 -07:00
j-keck
73ec7f243f libcap_progs: fix bash path 
* in progs/capsh.c is the bash path hardcoded to '/bin/bash'.
  * this fix removes the absolute path und use 'execvpe' to call 'bash'.
 2015-02-03 11:11:17 +01:00
j-keck
236f7fd20d libcap_progs: fix bash path 
* in progs/capsh.c is the bash path hardcoded to '/bin/bash'.
  * this fix set's the bash path from PATH.
 2015-02-03 10:25:16 +01:00
j-keck
eb54864494 libcap_progs: fix bash path 
* in progs/capsh.c is the bash path hardcoded to '/bin/bash'
  * this fix set's the path to '/var/run/current-system/sw/bin/bash'
 2015-02-02 22:07:23 +01:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Eelco Dolstra
7c8518c194 Cleanup 2013-08-23 10:02:07 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra
28a76a96be libcap: Update to 2.22 
Systemd requires the recent CAP_SYSLOG capability.
 2012-07-19 10:26:44 -04:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
25de2c279b Split libcap package 
libcap can be splitted for free (just cd subdir; make install).
So I've decided not to raise up disscussions "should we build cap_pam.so?" etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23967
 2010-09-27 13:49:13 +00:00
Yury G. Kudryashov
c911c64f9b libcap: with pam, just set prefix and lib 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23960
 2010-09-27 08:48:28 +00:00
Lluís Batlle i Rossell
9a0adf069f Updating libcap (i686-linux kde programs failed because libcap did not build there) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23615
 2010-09-03 12:11:33 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Eelco Dolstra
32a4d08be3 * Latest version. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11852
 2008-05-20 09:23:28 +00:00
Eelco Dolstra
b5da9e1d55 * Fixed an impurity in libcap that causes it to fail on non-NixOS 
systems: the makefile determines whether to build with PAM support
  by doing

    PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)


svn path=/nixpkgs/trunk/; revision=11285
 2008-03-26 09:37:09 +00:00
Eelco Dolstra
afe69eecbe * Use kernel 2.6 libcap. 
svn path=/nixpkgs/trunk/; revision=10895
 2008-02-29 09:42:12 +00:00
Eelco Dolstra
d39fd2a578 * Rewrite all the kernel.org URLs to mirror://kernel/. 
svn path=/nixpkgs/trunk/; revision=9202
 2007-08-27 13:59:40 +00:00
Eelco Dolstra
62b0dddf0e * Fix Darwin evaluation errors. 
svn path=/nixpkgs/trunk/; revision=8709
 2007-05-16 14:54:28 +00:00
Eelco Dolstra
ed8fff32af * Pass makeFlags to `make install' as well. This is because quite 
often the same flags need to be passed to both `make' and `make
  install'.  Added a variable buildFlags for flags that should only be
  passed to `make'.

svn path=/nixpkgs/trunk/; revision=7491
 2006-12-27 17:30:40 +00:00
Eelco Dolstra
7ca9054420 * Use substituteInPlace. 
svn path=/nixpkgs/trunk/; revision=7489
 2006-12-27 17:23:34 +00:00
Eelco Dolstra
33db7f3dd3 * Build ntpd with capabilities support. 
svn path=/nixpkgs/trunk/; revision=7462
 2006-12-22 19:22:57 +00:00