4615 commits

Author	SHA1	Message	Date
Jonathan Ringer	11a9ac00fc	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/tools/networking/xh/default.nix	2021-05-22 18:19:10 -07:00
Sandro Jäckel	d6ff646b3f	pythonPackages.smart_open: rename to smart-open	2021-05-22 15:02:50 -07:00
Stéphan Kochen	c47425a230	sambamba: fix darwin build	2021-05-22 20:56:09 +02:00
github-actions[bot]	cc35c7fc85	Merge master into staging-next	2021-05-22 06:21:55 +00:00
Robert Scott	bcc99b83d0	libpoly: fix darwin build ... issue reported upstream	2021-05-21 20:21:20 -07:00
Jonathan Ringer	6b15fdce86	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix	2021-05-20 22:11:42 -07:00
Mauricio Collares	22c86a0466	sageWithDoc: fix static asset deduplication	2021-05-20 18:29:02 -07:00
Mauricio Collares	874d1aba74	sageWithDoc: update sagedoc.py test for sphinx 3.5	2021-05-20 18:29:02 -07:00
Mauricio Collares	cd9e8e284c	sage: fix deprecation warning from matplotlib upgrade	2021-05-20 18:29:02 -07:00
Jonathan Ringer	14f3686af1	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/applications/terminal-emulators/alacritty/default.nix pkgs/servers/clickhouse/default.nix	2021-05-20 09:12:42 -07:00
markuskowa	b0b97660af	Merge pull request #123667 from markuskowa/upd-molcas ... openmolcas: 20.10 -> 21.02	2021-05-19 23:17:31 +02:00
Jonathan Ringer	c1f8a15dac	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix	2021-05-19 10:39:54 -07:00
Pavol Rusnak	f7ed00be13	Merge pull request #123689 from prusnak/bcal ... bcal: cleanup package, enable aarch64-darwin build	2021-05-19 17:47:35 +02:00
Pavol Rusnak	6996896b48	bcal: cleanup package, enable aarch64-darwin build	2021-05-19 16:36:17 +02:00
Timo Kaufmann	6cf6470429	Merge pull request #122624 from collares/pari-2.13 ... pari: 2.11.4 -> 2.13.1, update sage test expectations	2021-05-19 16:07:15 +02:00
Markus Kowalewski	40f276c07d	openmolcas: 20.10 -> 21.02	2021-05-19 13:44:46 +02:00
github-actions[bot]	7000ae2b9a	Merge master into staging-next	2021-05-19 00:55:36 +00:00
Stéphan Kochen	7c0c956a57	starspace: fix darwin build	2021-05-18 20:35:09 +02:00
Jonathan Ringer	ca46ad3762	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/tools/package-management/cargo-release/default.nix	2021-05-18 11:03:38 -07:00
Pavol Rusnak	6be706bbe5	Merge pull request #123503 from stephank/fix-samblaster-darwin ... samblaster: fix darwin build	2021-05-18 18:55:29 +02:00
Jonathan Ringer	f7a112f6c4	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/applications/graphics/emulsion/default.nix pkgs/development/tools/misc/texlab/default.nix pkgs/development/tools/rust/bindgen/default.nix pkgs/development/tools/rust/cargo-udeps/default.nix pkgs/misc/emulators/ruffle/default.nix pkgs/tools/misc/code-minimap/default.nix	2021-05-18 08:57:16 -07:00
Stéphan Kochen	7e9451ffb3	rink: fix darwin build (#123501)	2021-05-18 10:34:25 -04:00
Stéphan Kochen	20f36556dc	samblaster: fix darwin build	2021-05-18 13:41:51 +02:00
Sandro	64b7457313	Merge pull request #123329 from evils/kicad-symlink	2021-05-18 01:40:23 +02:00
Sandro	f85bc843c2	Merge pull request #122759 from dotlambda/mono6	2021-05-18 01:25:35 +02:00
R. RyanTM	161b02937d	gtkwave: 3.3.108 -> 3.3.109	2021-05-17 13:51:47 -07:00
R. RyanTM	ea5ad2b8e0	gwyddion: 2.57 -> 2.58	2021-05-17 11:49:58 -07:00
Erik Bäckman	5b143ccc91	numworks-epsilon: 15.3.2 -> 15.5.0 (#122760) ... Co-authored-by: erikbackman <erikbackman@users.noreply.github.com>	2021-05-17 19:16:51 +02:00
Sandro	83c5d21320	Merge pull request #123083 from stephank/fix-est-sfs-darwin ... est-sfs: fix darwin build	2021-05-17 18:58:33 +02:00
Jonathan Ringer	c227fb4b17	Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/tools/rust/cargo-cache/default.nix pkgs/development/tools/rust/cargo-embed/default.nix pkgs/development/tools/rust/cargo-flash/default.nix pkgs/servers/nosql/influxdb2/default.nix	2021-05-17 07:01:38 -07:00
Evils	bed2e8ef28	kicad-unstable: 2021-05-13 -> 2021-05-16	2021-05-17 09:47:28 +02:00
Evils	9f6de20292	kicad: correctly handle share/metainfo and appdata ... fixes issue 123299 blindly linking unstable's metainfo resulted in a dangling symlink this is still share/appdata in the stable package so i linked that	2021-05-17 09:47:07 +02:00
Stéphan Kochen	04aa238c1a	gnucap: broken on darwin ... Gnucap relies on LD_LIBRARY_PATH both in its build process and in code, which Darwin does not understand.	2021-05-16 23:51:10 -07:00
github-actions[bot]	3ff6965554	Merge master into staging-next	2021-05-17 06:22:23 +00:00
Austin Butler	66201e2c1d	cntk: fix build	2021-05-16 20:03:06 -07:00
github-actions[bot]	6cdac75d25	Merge staging-next into staging	2021-05-16 18:32:44 +00:00
github-actions[bot]	8c6d819143	Merge master into staging-next	2021-05-16 18:32:41 +00:00
Anderson Torres	cf45c45605	Merge pull request #121588 from eduardosm/sip-rename ... pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip	2021-05-16 13:31:55 -03:00
Jan Tojnar	684991c696	Merge branch 'master' into staging-next ... - Thunderbird 68 has been dropped on master. - gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.	2021-05-16 15:34:51 +02:00
Vincenzo Mantova	4ef47f32d7	eukleides: use $CC instead of hardcoded gcc	2021-05-16 12:03:47 +01:00
Vladimír Čunát	9de0430aac	Merge #122322: eukleides: Fix build, expose tex package	2021-05-16 10:35:28 +02:00
Bjørn Forsman	3d18eddae2	pulseview: fix patch hash	2021-05-16 08:56:46 +02:00
R. RyanTM	9528bf9fd9	bowtie2: 2.4.2 -> 2.4.3	2021-05-16 02:53:03 -04:00
sophrosyne97	2558acf870	pulseview: fix build error	2021-05-16 08:50:47 +02:00
github-actions[bot]	9911b1c75b	Merge staging-next into staging	2021-05-16 01:01:01 +00:00
github-actions[bot]	b484cef365	Merge master into staging-next	2021-05-16 01:00:58 +00:00
Sandro	6b5f106b05	Merge pull request #122930 from lopsided98/qgroundcontrol-update ... qgroundcontrol: 4.1.2 -> 4.1.3	2021-05-15 21:32:56 +02:00
Sandro	936dd70d45	Merge pull request #122791 from lopsided98/mavproxy-update	2021-05-15 21:31:03 +02:00
github-actions[bot]	c10600230e	Merge staging-next into staging	2021-05-15 18:30:31 +00:00
github-actions[bot]	f1b78f8618	Merge master into staging-next	2021-05-15 18:30:28 +00:00