3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

231 commits

Author SHA1 Message Date
Ben Siraphob 3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Sandro 6186f92cb7
Merge pull request #101520 from sikmir/udig
udig: init at 2.0.0
2021-01-19 12:06:57 +01: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
Nikolay Korotkiy cade5d7fa5
udig: init at 2.0.0 2021-01-19 02:05:32 +03:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07: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
Nikolay Korotkiy 1ed65d38c5
qgis: 3.10.11 → 3.10.13, mark unbroken 2020-12-23 20:53:15 +03:00
Pavol Rusnak ef21e636b9
Merge pull request #106809 from sikmir/saga
saga: 7.8.1 → 7.8.2
2020-12-14 17:43:17 +01:00
Nikolay Korotkiy 7b80f669f9
saga: 7.8.1 → 7.8.2 2020-12-13 12:40:45 +03:00
R. RyanTM 104f43c9b1 qmapshack: 1.15.1 -> 1.15.2 2020-12-11 00:17:49 +00:00
zimbatm bbc9af1f0a
tree-wide: do not use pkgs.extend in nixpkgs
Each invocation of pkgs.extends adds 130MB of allocation to the hydra
evaluator. We are already struggling with the amount of memory nixpkgs
requires.

`pkgs.extend` is a useful escape-hatch, but should be not be used inside
of nixpkgs directly.
2020-11-30 14:24:40 +01:00
Nikolay Korotkiy bea6a6f865
zombietrackergps: 1.01 → 1.03 2020-11-29 11:00:41 +03:00
Nikolay Korotkiy 92672cfff8
qmapshack: 1.15.0 → 1.15.1 2020-11-27 12:32:55 +03:00
Sandro de8335475d
Merge pull request #102741 from sikmir/whitebox
whitebox-tools: 1.3.0 → 1.4.0
2020-11-24 23:35:45 +01:00
freezeboy 8e375d71f0 saga: 7.7.0 -> 7.8.1
* Remove obsolete patches (merged into this release)
 * rewrite without stdenv
2020-11-20 22:24:20 +01:00
Lancelot SIX 10af77af13 qgis: 3.10.10 -> 3.10.11 2020-11-09 12:12:51 +00:00
Nikolay Korotkiy a9d894b85e
whitebox-tools: 1.3.0 → 1.4.0 2020-11-04 13:12:09 +03:00
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Nikolay Korotkiy f637dd34f6
openorienteering-mapper: 0.9.3 -> 0.9.4 2020-10-11 20:39:59 +03:00
Jan Tojnar aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
sohalt e96fd6e6b7 zombietrackergps: init at 1.01 2020-10-10 11:20:17 -04:00
Vladimír Čunát 338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
Frederik Rietdijk 084c4da16a qgis: 3.10.9 -> 3.10.10 2020-10-08 18:57:26 +02:00
WORLDofPEACE 34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Vincent Laporte ffc3f8227b saga: use proj 6 2020-09-15 21:47:28 +02:00
Thomas Tuegel 106616102d
grass: fix libmysqlclient include path 2020-09-12 06:58:26 -05:00
Frederik Rietdijk d362c0e54e Merge master into staging-next 2020-09-06 18:14:23 +02:00
R. RyanTM 77b366044b gmt: 6.1.0 -> 6.1.1 2020-09-04 22:39:53 +00:00
Nikolay Korotkiy 3106c30903 cmake: fix CMAKE_FIND_FRAMEWORK 2020-08-29 13:37:56 +02:00
Lancelot SIX 04f858ff5e
qgis: 3.10.7 -> 3.10.9 2020-08-28 09:40:16 +01:00
lassulus cedef0c6c7 gmt: use pname instead of name 2020-08-24 09:58:16 +02:00
Lassulus 76b7192972
Merge pull request #88837 from tviti/gmt
gmt: init at 6.1.0
2020-08-24 09:56:16 +02:00
Taylor Viti 115a36703e gmt: init at 6.1.0 2020-08-22 15:12:31 -10:00
Michael Raskin 5a3aa53600
Merge pull request #94619 from doronbehar/saga-opencv4
saga: 7.6.3 -> 7.7.0
2020-08-16 10:17:16 +00:00
zowoq 473536e3b5 buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
Doron Behar adaf0065a0 saga: 7.6.3 -> 7.7.0
Other changes include:
- Reformat inputs and arguments to drv.
- Use autoreconfHook as upstream's generated ./configure has proved to
be not reliable (it didn't detect properly missing deps).
- Add many more dependencies that were detected now with autoreconfHook.
- Upgrade gui dep to wxGTK31-gtk3.
- Upgrade opencv dep to opencv4.
2020-08-08 15:54:33 +03:00
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
2020-07-29 18:20:56 -05:00
Nikolay Korotkiy b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK 2020-07-28 19:05:43 +03:00
Lancelot SIX 3bdefc8802
qgis: 3.10.4 -> 3.10.7 2020-06-22 13:47:53 +01:00
Nikolay Korotkiy 1ae9228fb6
whitebox-tools: 1.2.0 -> 1.3.0 2020-06-18 12:06:37 +03:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Benjamin Hipple 33e9db21d6
Merge pull request #87950 from sikmir/mapper
openorienteering-mapper: 0.9.2 -> 0.9.3
2020-06-03 23:42:51 -04:00
R. RyanTM 84b0c4ee58 saga: 7.6.2 -> 7.6.3 2020-05-27 12:29:19 +00:00
Nikolay Korotkiy a46d7f2d72
openorienteering-mapper: 0.9.2 -> 0.9.3 2020-05-16 23:28:54 +03:00
Doron Behar c0137489ef saga: explicitly use opencv2 2020-05-05 10:32:14 +03:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM 73d63a68a3 saga: 7.6.1 -> 7.6.2 2020-04-07 17:00:20 +00:00
Lancelot SIX 8e8efc7ace qgis: 3.10.1 -> 3.10.4 2020-03-24 20:38:01 -07:00
Mario Rodas fa9290102e
Merge pull request #82717 from r-ryantm/auto-update/saga
saga: 7.5.0 -> 7.6.1
2020-03-17 08:20:22 -05:00
R. RyanTM c9836e9f6d saga: 7.5.0 -> 7.6.1 2020-03-16 09:54:28 +00:00
Nikolay Korotkiy cfb57680ee openorienteering-mapper: 0.9.1 -> 0.9.2 2020-03-15 08:03:51 +00:00
Benjamin Hipple 6a54fd3acf whitebox-tools: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-28 00:24:54 -08:00
Maxim Krivchikov bba9b7fe6e whitebox-tools: 0.16.0 -> 1.2.0 2020-02-22 10:45:35 +00:00
Benjamin Hipple eb11feaa0b treewide: change fetchCargoTarball default to opt-out
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
2020-02-13 22:41:37 -08:00
R. RyanTM 1543fd14be saga: 7.3.0 -> 7.5.0 2020-02-10 18:04:44 +01:00
Robin Gloster f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Renaud 013e439fd8
Merge pull request #75036 from sikmir/oom
openorienteering-mapper: 0.9.0 -> 0.9.1
2019-12-21 17:30:50 +01:00
Lancelot SIX 90ebbaa86a
qgis: 3.10.0 -> 3.10.1 2019-12-17 12:17:13 +01:00
Izorkin 154f6f1e43 grass: fix mysql_config query 2019-12-08 11:08:31 +01:00
Nikolay Korotkiy 191de93ea7
openorienteering-mapper: 0.9.0 -> 0.9.1 2019-12-05 10:52:55 +03:00
c0bw3b 9315000432 saga: remove jasper from inputs
It is unused since v2.2.6 (2016)
https://sourceforge.net/p/saga-gis/bugs/224/
2019-11-17 19:17:12 +01:00
Lancelot SIX c803971bfd
qgis: 3.8.2 -> 3.10.0
See http://changelog.qgis.org/en/qgis/version/3.10/
2019-10-29 10:22:01 +01:00
Nikolay Korotkiy f6b8a4d7ef openorienteering-mapper: 0.8.4 -> 0.9.0 2019-10-23 13:31:47 -07:00
Lancelot SIX 5d8ec9b99b
qgis: 3.8.0 -> 3.8.3 2019-10-02 10:03:06 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Daniel Schaefer a5b2e090ec whitebox: 0.9.0 -> 0.16.0 (#68682) 2019-09-13 17:08:57 +00:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +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
Frederik Rietdijk a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Jonathan Ringer c8ec54b969 saga_2_3_2: remove package
No longer used by qgis
2019-07-14 09:59:29 -07:00
Jonathan Ringer 70671e71d1 qgis: 3.4.8 -> 3.8.0 2019-07-14 09:59:28 -07:00
Jonathan Ringer c93c65a21d saga: 7.2.0 -> 7.3.0 2019-07-14 09:59:28 -07:00
Jonathan Ringer d43f0b5d6d grass: 7.2.2 -> 7.6.1 2019-07-14 09:59:28 -07:00
Jonathan Ringer d9504f9aab openorienteering-mapper: fix build 2019-07-14 09:59:27 -07:00
Thomas Tuegel 51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Vincent Laporte e478e6bdff saga: 6.3.0 -> 7.2.0 2019-06-25 07:07:32 +00:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00: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
Lancelot SIX 56835a890f
qgis: 3.4.7 -> 3.4.8 2019-05-27 16:26:59 +02:00
Lancelot SIX 2014975789
qgis: 3.4.6 -> 3.4.7 2019-04-26 15:11:28 +02:00
Daniel Schaefer bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Lancelot SIX 37aebd002a qgis: 3.4.5 -> 3.4.6 2019-04-16 18:39:27 +02:00
Lancelot SIX 9bcdf81708
qgis: 2.18.28 -> 3.4.5 2019-03-05 09:39:58 +01:00
Lancelot SIX 76b1610a35
qgis: 2.18.22 -> 2.18.28 2019-01-24 22:23:52 +01:00
R. RyanTM 1fb390b52a openorienteering-mapper: 0.8.3 -> 0.8.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openorienteering-mapper/versions
2019-01-02 19:54:20 -08:00
R. RyanTM 4b2a4a387e openorienteering-mapper: 0.8.2 -> 0.8.3 (#49217)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openorienteering-mapper/versions
2018-10-27 12:03:09 -04:00
Michael Raskin 08cc85951e saga: add mpickering as a co-maintainer after #39125 2018-10-15 13:28:24 +03:00
Michael Raskin 878c6c090d
Merge pull request #39125 from mpickering/darwin-saga
SAGA, SAGA LTS release, dependencies and QGIS SAGA plugin
2018-10-14 19:14:48 +00:00
Andrew Childs 90464f6049 qgis: patch for compatibility with cmake 3.12 (#45880) 2018-09-01 10:52:33 +02:00
R. RyanTM 45b5bef60f openorienteering-mapper: 0.8.1.2 -> 0.8.2 (#45552)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/OpenOrienteering-Mapper/versions.
2018-08-24 20:15:16 +02:00
Matthew Pickering 1c9af2d89c Remove unecessary option 2018-08-15 09:10:42 +01:00
Matthew Pickering 86b966f108 Patches for saga-6.3.0 2018-08-15 09:10:28 +01:00
Matthew Pickering 8a4661588a Fixes for rebase 2018-08-12 22:13:00 +01:00
Matthew Pickering 5caa3fcae9 Small fixes 2018-08-12 10:36:43 +01:00
Matthew Pickering 115027abe1 Fix linux build 2018-08-11 22:38:01 +01:00
Matthew Pickering f5b097b346 Build QGIS with SAGA plugins 2018-08-11 22:38:00 +01:00