Commit Graph
11851 Commits
Author SHA1 Message Date
Martin Weinelt 5a22c6f167 Merge pull request #99521 from mweinelt/irc-stuff
python3Packages.{irctokens,ircstates,ircrobots}: init
2020-10-30 22:41:05 +01:00
luc65r 345f1d11d3 unicorn(-emu): 1.0.2-rc4 -> 1.0.2 2020-10-29 21:15:42 +01:00
Vladimír Čunát 0b32140b34 Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát 31839c352e Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
Daniël de Kok 93b3fa6088 python3Packages.setuptools-rust: init at 0.11.3 2020-10-28 10:41:27 -07: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
Kierán Meinhardt aa86d488cf python3Packages.lyricwikia: init at 0.1.11 2020-10-27 21:53:24 +01:00
Martin Weinelt 0ead6f8cfd Merge pull request #101557 from mvnetbiz/zigpy-znp
home-assistant: pythonPackages.zigpy-znp: init at 0.2.2; pythonPackages.zigpy: 0.22.2 -> 0.26.0; pythonPackages.zigpy-cc: 0.5.1 -> 0.5.2; pythonPackages.zigpy-xbee: 0.12.1 -> 0.13.0; pythonPackages.zigpy-zigate: 0.6.1 -> 0.6.2
2020-10-27 18:30:26 +01:00
Scriptkiddi 1e3f24f5f4 pythonPackages.googlemaps: init at 4.4.2 2020-10-27 11:35:06 +01:00
Timo Kaufmann f331acc1a2 Merge pull request #90430 from berbiche/byobu-screen
byobu: add screen backend
2020-10-27 09:45:03 +01:00
Matt Votava 760e367b6d python3Packages.zigpy-znp: init at 0.2.2, add tests 2020-10-26 22:48:40 -07:00
Denys Pavlov ff3dca56ed pythonPackages.sqlite-utils: init at 2.22 2020-10-26 22:04:12 -04:00
Nicolas Berbiche 3ac1ffe8b2 byobu: add support for the screen backend 2020-10-26 20:52:46 -04:00
Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01: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
Frederik Rietdijk 89a60382e4 Revert "Revert "pythonPackages.django: clarify versions, remove django_lts attribute""
Every major version will have only a single LTS release, which is the
one we typically keep in Nixpkgs.

https://www.djangoproject.com/download/

This reverts commit af8a48c3c1.
2020-10-25 13:55:44 +01:00
Frederik Rietdijk af8a48c3c1 Revert "pythonPackages.django: clarify versions, remove django_lts attribute"
Fix eval.

This reverts commit 00d5a13322.
2020-10-25 13:44:02 +01:00
Jonathan Strickland b775bc734e pinboard: init at 2.1.8 2020-10-25 10:29:53 +01:00
Ben Darwin 8e17389a56 graspy: rename to graspologic 2020-10-25 10:17:35 +01:00
Frederik Rietdijk 00d5a13322 pythonPackages.django: clarify versions, remove django_lts attribute
Every major version will have only a single LTS release, which is the
one we typically keep in Nixpkgs.

https://www.djangoproject.com/download/
2020-10-25 10:16:38 +01:00
Frederik Rietdijk f9ae2b7dac pythonPackages.django_3: init at 3.1 2020-10-25 10:16:38 +01:00
Vladimír Čunát 2f6b00b15e Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +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
Vladimír Čunát ed217bcc35 Merge #100446: python*Packages.apprise: fix dependencies 2020-10-25 08:39:18 +01:00
Kierán Meinhardt cd63b94b0d python3Packages.betacode: init at 1.0 2020-10-24 21:15:46 +02:00
Kierán Meinhardt 55d047fc0e python3Packages.pygtrie: init at 2.3 2020-10-24 21:15:46 +02:00
Nikolay Korotkiy 0c102b283d python3Packages.pygmt: init at 0.2.0 2020-10-23 18:05:52 -07:00
WORLDofPEACE 949f7f9227 Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00
WORLDofPEACE 9aaad83e43 zeitgeist: switch to Python 3 2020-10-24 01:17:30 +02:00
Jan Tojnar c252654584 Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
IvarWithoutBones cda313e3cc pythonPackages.imdbpy: init at 2020.9.25 2020-10-23 03:16:36 +02:00
Anderson Torres 253fb7648c Merge pull request #101244 from zaninime/nanovna-saver
nanovna-saver: init at 0.3.7
2020-10-22 20:42:56 -03:00
Jan Tojnar d13fc932cd Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Francesco Zanini 6bcc200340 pythonPackages.scipy_1_4: nanovna-saver dependency 2020-10-22 16:23:06 +02:00
Doron Behar 44dd65ffca Merge pull request #98093 from marius851000/portmod 2020-10-22 15:12:13 +03:00
Vladimír Čunát 90094b0468 Merge branch 'master' into staging-next
minor conflict: rust update vs. darwin fixes for it
  (not tested but seems quite OK)
2020-10-21 13:34:06 +02:00
Ryan Burns 40e9a2340a python3Packages.yamale: init at 3.0.4 2020-10-20 21:34:32 -07:00
Frederik Rietdijk 23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Spencer Baugh 3e28aad162 pythonPackages.pdoc3: init at 0.9.1
Seems broken on 3.6, hence the disabled = pythonOlder "3.7".
2020-10-20 14:06:07 -04:00
Jan Tojnar d4975d23f1 Merge pull request #101022 from jtojnar/pycairo-drop-xlibs
python3.pkgs.pycairo: drop xlibs
2020-10-20 13:54:32 +02:00
Jan Tojnar 17739fa570 python3.pkgs.pycairo: clean up
* drop unneeded xlibs dependency
* correct license
* do not use pkgconfig alias
* use pytestCheckHook
* format
2020-10-20 00:07:26 +02:00
Jamie Magee d804c4393f pythonPackages.pyaftership: init at 0.1.2 2020-10-18 23:10:23 +02:00
Jean-François Roche af87635776 python{2,3}Packages.gntp: init at 1.0.3 2020-10-18 22:22:59 +02:00
Jamie Magee 8fadee041c pythonPackages.accuweather: init at 0.0.11 2020-10-18 09:41:30 -07:00
Sandro Jäckel 29dcb8276c clintermission: init at 0.2.0 2020-10-18 12:01:28 +02:00
marius david 9c17a5448b patool: init at 1.12 2020-10-18 10:31:11 +02:00
marius david f4a58813fa python3Packages.redbaron: init at 0.9.2 2020-10-18 10:31:11 +02:00
marius david eca871cbaa python3Packages.baron: init at 0.9 2020-10-18 10:31:10 +02:00
marius david 1c8204e0fa python3Packages.python-sat: init at 0.1.6.dev6 2020-10-18 10:30:07 +02:00