Commit Graph

54024 Commits

Author SHA1 Message Date
Sandro Jäckel
e0e37f4261
libthai: init at 0.1.28 2020-11-01 00:13:37 +01:00
Sandro Jäckel
6b72fd5c3b
libdatrie: init at 0.2.12 2020-11-01 00:13:36 +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
Emery Hemingway
17a9d2187d vix: init at 0.1.2 2020-10-28 12:34:43 +01:00
Maximilian Bosch
3d04e9a779
Merge pull request #101669 from Zopieux/nxdomain
nxdomain: init at 1.0.1
2020-10-28 10:49:50 +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
Alexandre Macabies
c7f2086af5 nxdomain: init at 1.0.1 2020-10-27 23:41:01 +01:00
Vincent Laporte
47183f25a0 ocamlPackages.mirage-block: init at 2.0.1 2020-10-27 22:00:51 +01:00
Timo Kaufmann
55669a901b
Merge pull request #95530 from midchildan/package/sourcetrail
sourcetrail: 2019.3.46 -> 2020.2.43
2020-10-27 20:33:59 +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
Michael Raskin
7371c2cc9b
Merge pull request #101837 from xfix/sgtpuzzles-20200610
sgtpuzzles: 20191114 -> 20200610
2020-10-27 16:08:02 +00:00
Eelco Dolstra
c54308d27c
Disable the metrics job
We currently don't have a machine to build this job
(https://github.com/NixOS/nixos-org-configurations/issues/127) which
delays channel updates until hydra-queue-runner auto-cancels the job.
2020-10-27 17:05:35 +01:00
Aaron L. Zeng
d240c4e1d1 ocamlPackages.bignum: init at 0.13 2020-10-27 16:04:06 +01:00
midchildan
f806d4c79a
sourcetrail: 2019.3.46 -> 2020.2.43 2020-10-27 22:55:18 +09:00
Konrad Borowski
d838ef0795 sgtpuzzles: 20191114 -> 20200610 2020-10-27 11:28:02 +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
Lassulus
6a62663c60
Merge pull request #101548 from kmein/feature/vimv
vimv: init at unstable-2019-10-31
2020-10-27 07:44:33 +01:00
Matt Votava
760e367b6d python3Packages.zigpy-znp: init at 0.2.2, add tests 2020-10-26 22:48:40 -07:00
Ryan Mulligan
178d373a8a
Merge pull request #83687 from primeos/wshowkeys
wshowkeys: init at 2020-03-29
2020-10-26 18:55:16 -07:00
Nicolas Berbiche
3ac1ffe8b2
byobu: add support for the screen backend 2020-10-26 20:52:46 -04:00
Florian Klink
5f8a741abf systemdMinimal: build without glib
This takes glib (and by this, gtk-doc) out of systemdMinimal's build
closure.
2020-10-26 21:58:49 +01:00
Sarah Brofeldt
d699505277
Merge pull request #100688 from henrikolsson/master
noise-suppression-for-voice: init at 2020-10-10
2020-10-26 20:05:27 +01:00
Henrik Olsson
c24433bedb noise-suppression-for-voice: init at 2020-10-10 2020-10-26 19:40:26 +01:00
Maximilian Bosch
7b55516f94
Merge pull request #101762 from p-h/gradle-6.7
gradle: 6.6 -> 6.7
2020-10-26 16:20:02 +01:00
Ryan Mulligan
99725609cd
Merge pull request #89227 from f4814/rcon-init
rcon: init at 0.5
2020-10-26 06:56:21 -07:00
Anderson Torres
ac08a3973c
Merge pull request #100536 from AndersonTorres/corectrl
corectrl: init at 1.1.1
2020-10-26 10:34:12 -03:00
Philippe Hürlimann
fe217b9fb9 gradle: 6.6 -> 6.7 2020-10-26 14:26:24 +01:00
Sandro Jäckel
fd29e9a3c0 rustscan: fix building on darwin 2020-10-26 21:55:34 +10:00
Anderson Torres
ad19f56230
Merge pull request #90276 from Ralith/pfsfix
pfstools: fix Qt environment
2020-10-26 08:39:23 -03:00
Anderson Torres
81573a6435
Merge pull request #81608 from layus/dafny-update3
dafny: pin z3 and Boogie version
2020-10-26 08:36:31 -03: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
AndersonTorres
846266d9af corectrl: init at 1.1.1 2020-10-25 23:11:40 -03:00
Kierán Meinhardt
ea0d888242 vimv: init at unstable-2019-10-31 2020-10-25 19:13:20 +01:00
Vincent Laporte
b5f396e43a ocamlPackages.mirage-net: init at 3.0.1 2020-10-25 16:02:34 +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
Vincent Laporte
aa7977af2c ocamlPackages.mirage-bootvar-unix: init at 0.1.0 2020-10-25 11:09:43 +01:00
Vincent Laporte
8b2e5dcf27 ocamlPackages.parse-argv: init at 0.2.0 2020-10-25 11:09:43 +01:00
georgewhewell
53c52f1a45 kodi: remove jre override, use headless 2020-10-25 10:52:45 +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
volth
3dc6b14b72 all-packages.nix: pkgs.config.cudaSupport -> config.cudaSupport 2020-10-25 10:02:45 +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
4bd836b381
Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
Michele Guerini Rocco
c868baa4ca
Merge pull request #101614 from rnhmjoj/arx
arx-libertatis: 2019-07-22 -> 2020-10-20
2020-10-25 09:43:28 +01:00