Commit graph

992 commits

Author SHA1 Message Date
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
R. RyanTM e776f923e4 elan: 0.10.2 -> 0.10.3 2021-01-18 15:20:28 +00:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Michael Raskin d714c53f17
fix mis-merge 2021-01-14 15:26:10 +00:00
Michael Raskin f2210b7287
Merge branch 'master' into remove-opensmt 2021-01-14 14:22:22 +00:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
John Ericson 05b5b5491e
Merge pull request #108507 from Ericson2314/ott-mode
ott-mode: Factor our from ott
2021-01-10 14:30:59 -05:00
Michael Weiss 8ae8602bf7
Merge branch 'master' into staging-next
Manually resolved a conflict in
pkgs/development/libraries/libbladeRF/default.nix.
2021-01-09 12:16:11 +01:00
Cyril Cohen 9ffd16b385 coqPackages: refactor 2021-01-09 11:56:17 +01:00
Jan Tojnar f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Devon Richards 7a16349789
lean: 3.23.0 -> 3.24.0
We have to update to be able to use the current version of mathlib.
2021-01-06 21:38:04 -06:00
John Ericson 4eb13669a0 ott: Don't also install emacs mode
There is now a separate package for that.
2021-01-05 14:41:52 -05:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
freezeboy 9fd99b5a32 opensmt: 20101017 -> 2.0.1 2021-01-01 23:38:04 +01:00
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Vincent Laporte 66c0fc3609 cryptoverif: 2.03pl1 → 2.04 2020-12-18 08:20:10 +01:00
Vincent Laporte b49a3fb852 cryptoverif: fix search for default library 2020-12-18 08:20:10 +01:00
Vincent Laporte c5556b7454 coq_8_12: 8.12.1 → 8.12.2 2020-12-16 07:45:54 +01:00
Vincent Laporte de8205f8bb coq_8_13: init at 8.13+β1 2020-12-15 21:13:40 +01:00
Alyssa Ross 8b8dfc5d40
cedille: 1.1.1 -> 1.1.2; fix build 2020-12-10 23:07:32 +00:00
R. RyanTM cec747d712 clingo: 5.4.0 -> 5.4.1 2020-12-07 13:03:03 +00:00
Austin Seipp e601758166
abc-verifier: 2020.06.22 -> 2020.11.24
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-12-02 07:18:05 -06:00
Austin Seipp a3ae8a4fcf
Merge pull request #100750 from arcz/boolector
boolector: enable darwin build
2020-12-02 03:19:54 -06:00
Artur Cygan da3c0ca0dd boolector: fix darwin build 2020-11-29 22:31:54 +01:00
Artur Cygan 38e6f15d98 btor2tools: fix install_name on darwin 2020-11-29 22:31:31 +01:00
Vincent Laporte 8ee7c2505f proverif: install emacs mode 2020-11-29 14:05:14 +01:00
Sandro 4dc26ca31d
Merge pull request #92646 from r-ryantm/auto-update/tla-toolbox
tlaplusToolbox: 1.6.0 -> 1.7.0
2020-11-29 04:01:21 +01:00
Michael Raskin 3ed321dfab z3: enable build on non-x86_64 unix; checked the build on aarch64-linux 2020-11-27 11:52:07 +01:00
Sandro 41408091bb
Merge pull request #105111 from r-ryantm/auto-update/workcraft
workcraft: 3.3.1 -> 3.3.2
2020-11-27 03:12:56 +01:00
R. RyanTM b25018203b workcraft: 3.3.1 -> 3.3.2 2020-11-27 01:53:34 +00:00
Patrick Hilhorst a6b3bb24e4
treewide: ran ./maintainers/scripts/update_redirected_urls.sh 2020-11-27 01:23:57 +01:00
Sandro ea49bac768
Merge pull request #99761 from fgaz/key/init
key: init at 2.6.3
2020-11-25 01:49:25 +01:00
Sandro 3da89983fd
Merge pull request #103590 from r-ryantm/auto-update/workcraft
workcraft: 3.3.0 -> 3.3.1
2020-11-24 02:07:43 +01:00
Vincent Laporte 2806eb2743 coq_8_12: 8.12.0 → 8.12.1 2020-11-15 12:03:15 +01:00
R. RyanTM 8acd7a3540 workcraft: 3.3.0 -> 3.3.1 2020-11-12 10:54:47 +00:00
R. RyanTM f7485d07b5 lean: 3.21.0 -> 3.23.0 2020-11-11 15:16:44 -08:00
Jan Tojnar a821be7531
Merge branch 'master' into staging-next 2020-11-05 09:42:47 +01:00
Gabriel Ebner 8279979f38 lean: build olean files 2020-11-04 16:32:56 +01:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Pavol Rusnak 2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Vincent Laporte 8cab21b48b Revert "coq: propagate and install ocaml and findlib"
This reverts commit 5d0e2dedd5.
2020-10-31 09:08:06 +01:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Ben Siraphob db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +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
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Vincent Laporte 2cb651ad14 cryptoverif: 2.01pl1 → 2.03pl1 2020-10-23 10:20:09 +02:00