Commit Graph

1258 Commits

Author SHA1 Message Date
Sander van der Burg 95464bab66 dysnomia: 0.8 -> 0.9 2019-09-09 23:23:02 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Marek Mahut 0822314bba
Merge pull request #68230 from johanot/morph-1.3.0
morph: 1.2.0 -> 1.3.0
2019-09-07 09:56:16 +02:00
Johan Thomsen a932f966c3 morph: 1.2.0 -> 1.3.0 2019-09-07 00:14:41 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Will Dietz 4f493117bb
Merge pull request #68060 from dtzWill/update/xbps-0.57
xbps: 0.56 -> 0.57
2019-09-05 02:12:57 -05:00
Will Dietz 2e808509f0
xbps: fix build w/glibc, disable errors due to unused fread result 2019-09-04 20:47:29 -05:00
Eelco Dolstra 37e333af9a
nix: 2.2.2 -> 2.3 2019-09-04 21:36:49 +02:00
Timo Kaufmann ce37819c8b
home-manager: 2019-06-25 -> 2019-09-04 (#68100) 2019-09-04 16:01:59 +02:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz 31e8b2d069
xbps: 0.56 -> 0.57 2019-09-03 19:29:49 -05:00
Mario Rodas 2c71ef9ad5
nfpm: 0.12.0 -> 0.13.0
Changelog: https://github.com/goreleaser/nfpm/releases/tag/v0.13.0
2019-09-01 18:00:00 -05:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Eelco Dolstra 4388f7709a nixFlakes: 2.3pre20190829_ebc4dae -> 2.3pre20190830_04np4n6 2019-08-30 20:00:16 +02:00
Eelco Dolstra ebce65658f nix: Reduce closure size by 48 MiB 2019-08-30 19:35:04 +02:00
Edmund Wu 786804a104
nixFlakes: pre20190712_aa82f8b -> pre20190829_ebc4dae 2019-08-30 08:39:58 -04:00
Edmund Wu ad530918a5
nixUnstable: 2.3pre6779_324a5dc9 -> 2.3pre6895_84de821 2019-08-30 08:39:49 -04:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Robin Gloster 52ce7f49f9
cargo-download: 0.1.1 -> 0.1.2 2019-08-20 23:00:21 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00: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
Marek Mahut 11bbc69354
Merge pull request #66372 from kirelagin/fsfe-reuse-0.4.1
reuse: 0.3.4 -> 0.4.1
2019-08-12 13:24:34 +02:00
Sander van der Burg 5f01a2586a
Merge pull request #50805 from r-ryantm/auto-update/axis2
axis2: 1.6.4 -> 1.7.9
2019-08-11 12:15:33 +02:00
Marek Mahut 3633b3271d DisnixWebService: patching to use HttpTransportPropertiesImpl 2019-08-10 12:52:39 +02:00
Kirill Elagin a057dd2f8f reuse: 0.3.4 -> 0.4.1 2019-08-10 13:18:53 +03:00
MetaDark a0e09b9542 protontricks: 1.2.3 -> 1.2.4 2019-08-06 19:47:15 -04:00
Sarah Brofeldt 24f3b88efc
Merge pull request #65621 from marsam/init-nfpm
nfpm: init at 0.12.0
2019-08-03 08:43:10 +02:00
Robin Gloster 30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
adisbladis 9e9c6de50c
nodejs-8_x: Drop package
It will be EOL within the support period of 19.09
2019-08-02 02:34:47 +02:00
Mario Rodas 4133064047
nfpm: init at 0.12.0 2019-07-30 22:38:15 -05:00
Robin Gloster 242e52dbb1
treewide: remove openssl 1.1 pinning 2019-07-30 03:41:32 +02:00
Nick Novitski 7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
Sebastien Bourdeauducq c59966d786 conda: update default condaDeps
Conda PyQt5 applications require those packages in the system.
2019-07-20 12:33:30 +08:00
Aaron Andersen 1af592d65f
Merge pull request #64705 from MetaDark/protontricks
protontricks: init at 1.2.3
2019-07-19 20:45:27 -04:00
MetaDark 5d053d8333 protontricks: init at 1.2.3
fixes #61193
2019-07-18 19:59:19 -04:00
Eelco Dolstra 31c38894c9
nixFlakes: 2.3pre20190612_06010ea -> 2.3pre20190712_aa82f8b 2019-07-15 16:19:30 +02:00
Tadeo Kondrak dfd620068a xbps: 0.53 -> 0.56 2019-07-12 09:12:46 +02:00
Frederik Rietdijk 74c24385cb Merge master into staging-next 2019-07-09 15:46:00 +02:00
Profpatsch ddc8398e7f conda: Add LIBARCHIVE
`conda-build` needs to be able to find libarchive to extract packages;
it tries to `dlopen` the library given by `LIBARCHIVE`.
2019-07-08 20:11:23 +02:00
adisbladis d614edeb32
Revert Nodejs-8_x deprecation
This was supposed to go through a pull request

Revert "nodePackages: Regenerate node packages for nodejs 10 & 12"
This reverts commit 6a17bdf397.

Revert "nodejs-8_x: Drop package"
This reverts commit e06c97b71d.
2019-07-05 12:23:27 +01:00
adisbladis e06c97b71d
nodejs-8_x: Drop package
It will be EOL within the support period of 19.09
2019-07-05 12:21:42 +01:00
Frederik Rietdijk 25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00
worldofpeace 3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
arcnmx c75653b015 cargo-outdated: fix darwin build 2019-06-30 14:00:42 -07:00
adisbladis 8a1c8e6158
conda: Remove version suffix
Currently the `conda-shell` binary is installed as
`conda-shell-4.6.14` which is not very friendly to type.

With this change the binary is simply installed as `conda-shell`.
2019-06-28 11:34:54 +01:00
Izorkin 6eee555597 nixUnstable: pre6631_e58a7144 -> pre6631_324a5dc9 2019-06-27 13:12:28 +03:00
adisbladis ff6eb60c72
conda: 4.3.31 -> 4.6.14 2019-06-26 11:01:45 +01:00
Timo Kaufmann c6078c77be home-manager: 2019-05-24 -> 2019-06-25 2019-06-25 22:34:22 +02:00
Bas van Dijk b95c4ce302 cargo-license: add meta.homepage 2019-06-25 15:31:55 +02:00
Bas van Dijk 474da44339
Merge pull request #63706 from basvandijk/cargo-license-0.2.0
cargo-license: init at 0.2.0
2019-06-24 11:32:41 +02:00
Bas van Dijk 7720379005 cargo-license: init at 0.2.0 2019-06-24 00:20:57 +02:00
John Ericson 852d81d607
Merge pull request #63698 from tobim/overrideCC-buildPackages
Fix misuses of overrideCC
2019-06-23 18:19:18 -04:00
Tobias Mayer 79d72ccd3c dpkg: fix cross compilation 2019-06-23 17:07:38 +02:00
Pascal Hertleif ef08f42854 cargo-edit: 0.3.2 -> 0.3.3 2019-06-22 14:35:32 +02:00
Bas van Dijk 3e9f9a64d1
Merge pull request #63521 from basvandijk/cargo-graph-0.2.0-d895af1
cargo-graph: init at 0.2.0-d895af1
2019-06-20 09:25:02 +02:00
Bas van Dijk c2f3f169f9 cargo-graph: init at 0.2.0-d895af1 2019-06-20 08:39:00 +02:00
R. RyanTM 1dc837c8cb dpkg: 1.19.6 -> 1.19.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dpkg/versions
2019-06-17 15:29:06 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Florian Franzen aaf2043a15 reuse: init at 0.3.4 2019-06-15 11:27:35 +02:00
Pascal Wittmann 274ec595ed
opkg: 0.4.0 -> 0.4.1 2019-06-15 11:15:38 +02:00
Eelco Dolstra abd51d042c
nix: Add nixFlakes attribute for the flake branch 2019-06-12 18:23:19 +02:00
Vladyslav M 93725ddeb0
cargo-edit: 0.3.1 -> 0.3.2 (#62672)
cargo-edit: 0.3.1 -> 0.3.2
2019-06-06 11:37:42 +03:00
Sander van der Burg 18c2b52314 node2nix: 1.6.0 -> 1.7.0 and regenerate all Nix expressions, introduce nodePackages_12_x attribute set 2019-06-05 23:48:42 +02:00
Vladyslav M ed2be597fa
cargo-edit: 0.3.1 -> 0.3.2 2019-06-04 19:36:54 +03:00
Alyssa Ross 062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Timo Kaufmann 4e2d061650
home-manager: 2019-04-23 -> 2019-05-24 (#62007) 2019-05-24 16:44:18 +02:00
Frederik Rietdijk 0196d8f11c Merge master into staging-next 2019-05-07 09:00:06 +02:00
Jörg Thalheim cf5ed1d004
nix-review: 2.0.0 -> 2.0.1 2019-05-07 07:12:55 +01:00
Frederik Rietdijk 0f10b72b5f Merge master into staging-next 2019-05-03 19:56:31 +02:00
Michael Fellinger aed27facc0 fpm: 1.9.3 -> 1.11.0, use bundlerApp 2019-05-02 23:51:11 +02:00
Matthew Bauer c82bb3133c nix: use llvm6 on clang
nix-2.2.2 only works with libcxx 6. We should only set the stdenv to
clang when we are already using clang. Also, nixUnstable does support
libcxx 7.
2019-04-29 21:34:24 -04:00
Frederik Rietdijk 042a01efbf Merge staging-next into staging 2019-04-27 07:02:02 +02:00
Matthew Bauer 87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer c72c6a48ca treewide: use llvm6 in some places
Not everything works on llvm7. It’s easiest to just provide the llvm6
as backup in this case.
2019-04-26 21:55:01 -04:00
mtrsk b58a76c574
home-manager: add new dependencies and install script 2019-04-26 20:30:02 +02:00
mtrsk 1d54250e27
home-manager: 2018-11-04 -> 2019-04-23 2019-04-25 19:54:36 +02:00
Sondre Nilsen 67d03fec53
cargo-outdated: init at unstable-2019-04-13 2019-04-24 12:46:19 +03:00
Timo Kaufmann 0e8177ad10
Merge pull request #57169 from timokau/appimage-improvements
appimage-run improvements
2019-04-20 18:27:00 +02:00
Timo Kaufmann 19e075b53b appimage-run: pass arguments to appimage 2019-04-20 12:32:09 +02:00
Timo Kaufmann 6af25fd1ad appimage-run: add usage message 2019-04-20 12:31:44 +02:00
AmineChikhaoui 5b5ca459d2
nixopsUnstable: 1.6.1pre2728_8ed39f9 -> 1.7pre2764_932bf43 2019-04-17 11:10:40 -04:00
AmineChikhaoui 0db54f93fb
nixops: 1.6.1 -> 1.7
Add release 1.7, also keep version 1.6.1 available for Azure
backend users. Azure backend was disabled in v1.7 due to the
python API changes.
2019-04-17 10:18:03 -04:00
Eelco Dolstra 5399f34ad9
nix: 2.2 -> 2.2.2 2019-04-15 19:06:57 +02:00
jD91mZM2 1cbe2446f7
cargo-tree: 0.25.0 -> 0.26.0 2019-04-13 19:41:26 +02:00
Frederik Rietdijk 230c67f43b Merge master into staging-next 2019-04-11 07:50:23 +02:00
Renaud 8db38cdcd4
Merge pull request #58434 from matthiasbeyer/add-licenses
Add licenses
2019-04-09 19:57:17 +02:00
Frederik Rietdijk d108b49168 Merge master into staging-next 2019-04-09 16:38:35 +02:00
Samuel Dionne-Riel 40d59c6e8e
Merge pull request #58976 from gilligan/remove-nodejs6
Remove nodejs-6_x which is about to enter EOL
2019-04-07 19:49:24 -04:00
R. RyanTM a750496f56 dpkg: 1.19.5 -> 1.19.6 (#58667)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dpkg/versions
2019-04-07 23:42:47 +02:00
tobias pflug 0e296d5fcd
Remove nodejs-6_x which is about to enter EOL
- Remove nodejs-6_x
- Set nodejs / nodejs-slim to nodejs-8_x / nodejs-slim-8_x
- Re-generate node2nix generated files using nodejs-8_x instead
2019-04-04 18:43:06 +01:00
worldofpeace 0f3bf7de69 packagekit: make vala nativeBuildInputs 2019-04-03 16:52:28 -04:00
John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
Matthias Beyer 349921047e checkinstall: Add license
Source: http://checkinstall.izto.org/docs/LICENSE

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2019-03-27 12:54:17 +01:00
Pedro Pombeiro 7b1d4844d9 appimagekit: add some fixes (#57591)
* appimagekit: fix usage of `file` so it works on NixOS

* appimagekit: copy missing mksquashfs and desktop-file-utils
2019-03-23 10:59:10 -04:00