swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 10:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
319586 commits 5 branches 0 tags 31 GiB
Commit graph

27 commits

Author SHA1 Message Date
Martin Weinelt 3951dc10fd python3Packages.arrow: 1.1.0 -> 1.1.1 2021-09-05 14:56:28 +02:00
Sandro Jäckel 4209fed914
pythonPackages: deprecate pytestcov alias 2021-07-21 13:32:17 +02:00
Alvar Penning 3ec31ffe8c
pythonPackages.arrow: 1.0.3 -> 1.1.0 2021-06-21 16:48:33 -07:00
Robert Schütz 882b692c4f python3Packages.arrow_1: merge into python3Packages.arrow 
They are the same version.
 2021-05-13 09:21:56 -07:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Alvar Penning 95794c43d9 pythonPackages.arrow_1: init at 1.0.3 
This is an alternative arrow package for the new major version one. The
other package is still at 0.17 and bumping it will result in a huge
amount of rebuilds. However, some packages are depending on the new
release, e.g., watson.
 2021-04-06 09:12:23 +02:00
Frederik Rietdijk b8f2632dbc python2Packages.arrow: keep 0.17.0 2021-04-03 17:49:43 +02:00
Frederik Rietdijk 66ebf2b76d python3Packages.arrow: 0.17.0 -> 1.0.3 2021-04-03 17:48:18 +02:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01: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 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
Drew Risinger 6a750f2466 pythonPackages.arrow: 0.15.8 -> 0.17.0 2020-10-12 11:58:14 -07:00
Frederik Rietdijk cba8a8c135 python: arrow: 0.15.6 -> 0.15.8 2020-08-04 21:54:40 +02:00
Frederik Rietdijk 0a344f99e0 python.pkgs.arrow: disable failing test 2020-06-11 10:00:26 +02:00
Jonathan Ringer 151b2bc407 python3Packages.arrow: fix dependencies 2020-05-11 22:13:16 +02:00
Frederik Rietdijk 186250b21b python3Packages.arrow: 0.15.5 -> 0.15.6 2020-05-11 22:12:09 +02:00
Drew af3e5fc48a
pythonPackages.arrow: fix license (#85803) 2020-04-22 16:40:23 -04:00
Drew Risinger 86973e5484 pythonPackages.arrow: 0.15.4 -> 0.15.5 2020-03-26 10:38:27 -07:00
Frederik Rietdijk 9f22a82af4 python: arrow: 0.15.2 -> 0.15.4 2019-11-22 08:37:04 +01:00
Jonathan Ringer b63ef1ae0b pythonPackages.arrow: fix build 2019-10-27 16:26:56 +01:00
Frederik Rietdijk 011b446d95 python: arrow: 0.13.2 -> 0.15.2 2019-10-27 15:29:11 +01:00
Frederik Rietdijk f9c18eccd2 python: arrow: 0.13.1 -> 0.13.2 2019-06-15 08:44:04 +02:00
Frederik Rietdijk 0a743603e5 python: arrow: 0.12.1 -> 0.13.1 2019-02-17 14:40:13 +01:00
Frederik Rietdijk 8af9928c9d python: arrow: 0.12.0 -> 0.12.1 2018-01-20 12:05:23 +01:00
Frederik Rietdijk 340cadd97d python.pkgs.arrow: fix python 2 build 2018-01-03 14:34:06 +01:00
Frederik Rietdijk a7200d1d89 python: arrow: 0.10.0 -> 0.12.0 2017-12-31 11:01:54 +01:00
Jörg Thalheim ce67c7c1ac pythonPackages.arrow: move to python-modules 2017-07-21 14:10:05 +01:00