3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

896 commits

Author SHA1 Message Date
Frederik Rietdijk ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Jörg Thalheim 6bd669f0f9 nix-review: 0.1.0 -> 0.1.2 2018-04-11 11:46:43 +01:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Jörg Thalheim 9392b10d4a
Merge pull request #38374 from timbertson/nix-pin
nix-pin: init at 0.1.2
2018-04-09 10:04:57 +01:00
Tim Cuthbertson a1cf616537 nix-pin: init at 0.1.2 2018-04-09 09:04:37 +10:00
Frederik Rietdijk a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Jörg Thalheim 96b106bc5c nix-review: init at 0.1.0 2018-04-04 14:42:43 +01:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Rob Vermaas 93a77eee1a
nixops: update to 1.6
(cherry picked from commit 2a28e65742)
2018-03-28 13:06:47 +02:00
Shea Levy 26e8d58cb5
libseccomp: Disable only on RISC-V if Linux.
The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
2018-03-27 08:16:24 -04:00
Matthew Bauer ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Jan Tojnar 2f5fc51479
packagekit: 1.1.8 → 1.1.9 2018-03-22 07:46:52 +01:00
zimbatm 8add42f90c
nix-serve: patch for nix 2.0 (#37459)
Fixes incompatible secret file handling. See https://github.com/edolstra/nix-serve/pull/8
2018-03-20 16:40:35 +00:00
Pascal Wittmann 26db7314c8
opkg: 0.3.5 -> 0.3.6 2018-03-17 23:47:38 +01:00
volth e47175638b
rpm: 4.14.0 -> 4.14.1 2018-03-16 10:08:46 +00:00
Sander van der Burg e2cb020a27 nixui: regenerate with node2nix 1.5.3 2018-03-13 10:43:37 +01:00
Samuel Leathers ba0e18829e
nixui: inherit libtool for derivation 2018-03-12 23:30:52 -04:00
Tuomas Tynkkynen 22df741045 nix: Fix build on ARMv6 2018-03-11 19:44:44 +02:00
Eelco Dolstra 1deb779a7a nixUnstable: Point to Nix 2.0 2018-03-07 10:31:09 +01:00
Eelco Dolstra 40f9a3e9d2
Merge pull request #36360 from dtzWill/fix/nix-use-brotli-for-sanity
nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
2018-03-06 12:01:31 +01:00
Will Dietz 7dafa09ed9 nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
cc https://github.com/NixOS/nix/issues/1951
2018-03-05 17:23:47 -06:00
volth 30877b1ed8 nix-serve: nix 2.0 fixes 2018-03-05 19:32:42 +00:00
Vladimír Čunát b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Ryan Mulligan ba979433dc mynewt-newt: 1.0.0 -> 1.3.0
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt -h` got 0 exit code
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt --help` got 0 exit code
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt help` got 0 exit code
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt version` and found version 1.3.0
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newtmgr -h` got 0 exit code
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newtmgr --help` got 0 exit code
- ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newtmgr help` got 0 exit code
- found 1.3.0 with grep in /nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin
- found 1.3.0 in filename of file in /nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin

cc "@pjones @ehmry @lethalman"
2018-02-28 20:31:10 +00:00
Masayuki Takeda 6370467d2c pacman: init at 5.0.2 2018-02-28 12:21:00 +09:00
adisbladis 9b63265551 nixui: Regenerate using nodejs-6_x 2018-02-27 10:19:23 +01:00
Sander van der Burg 7817d879eb disnixos: 0.6.1 -> 0.7 2018-02-25 22:27:41 +01:00
Sander van der Burg ceeed463e9 DisnixWebService: 0.7 -> 0.8 2018-02-25 22:26:26 +01:00
Sander van der Burg db5c7f34d3 disnix: 0.7.2 -> 0.8 2018-02-25 22:25:00 +01:00
Sander van der Burg a4e388c978 dysnomia: 0.7.1 -> 0.8 2018-02-25 22:23:03 +01:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Shea Levy 3c57e770cf
Only build libseccomp on supported systems 2018-02-24 23:05:08 -05:00
Eelco Dolstra d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0 2018-02-22 17:28:51 +01:00
Eelco Dolstra fab12188b8
Doh 2018-02-22 17:26:52 +01:00
Eelco Dolstra bae19ef9f6
Doh 2018-02-22 17:20:59 +01:00
Eelco Dolstra 32af695a22
nix: 1.11.16 -> 2.0 2018-02-22 17:03:27 +01:00
Peter Hoeg 1fa60974e7
Merge pull request #35316 from peterhoeg/u/pk
packagekit: 1.1.7 -> 1.1.8 (packagekit-qt: init at 1.0.1)
2018-02-22 16:04:34 +08:00
Peter Hoeg 353b00f296 packagekit-qt: init at 1.0.1 2018-02-22 12:43:09 +08:00
Peter Hoeg 49a8b3d22c packagekit: 1.1.7 -> 1.1.8 2018-02-22 12:43:02 +08:00
Jörg Thalheim b6cad72585
Merge pull request #35142 from Kaali/master
rpm: Add Darwin support
2018-02-21 10:18:00 +00:00
Väinö Järvelä 2a532e2496 rpm: Add Darwin support 2018-02-21 07:33:11 +02:00
Will Dietz cbae401982 nixUnstable: bump for minor fix to unbreak seccomp builds 2018-02-19 12:28:09 -06:00
Shea Levy d1cb2ee899
nixUnstable: 2.0pre5951_690ac7c9 -> 2.0pre5967_623fcb07.
Important security patch for no-seccomp systems.
2018-02-19 12:10:28 -05:00
Shea Levy a96886863a
Merge branch 'riscv-initial-cross-support' of git://github.com/shlevy/nixpkgs 2018-02-18 16:16:48 -05:00
Benjamin Hipple 5ab428799e conda: init at miniconda3 4.3.31 (#34872)
* conda: init at miniconda3 4.3.31
2018-02-18 18:21:25 +00:00
Shea Levy 765194d7ab
nixUnstable: Disable seccomp support on RISC-V. 2018-02-18 09:02:10 -05:00
Shea Levy 5a0eec1de1
nixUnstable: 2.0pre5950_3a5a241b -> 2.0pre5951_690ac7c9. 2018-02-18 09:02:10 -05:00
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