mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
146113 commits 204 branches 125 tags 10 GiB
Commit graph

12 commits

Author SHA1 Message Date
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00:00
Lancelot SIX 38753d52bc pythonPackages.asgiref: 2.1.5 -> 2.2.0 2018-03-10 14:55:00 +01:00
Vladimír Čunát f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master" 
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
 2018-02-26 22:53:18 +01:00
Robert Schütz 8747ebd89f pythonPackages.asgiref: 2.1.5 -> 2.1.6 2018-02-22 01:46:11 +01:00
Robert Schütz b49db62f9d pythonPackages.asgiref: correct dependencies and enable tests 2018-02-22 01:46:11 +01:00
Frederik Rietdijk c92dcee8bd python: asgiref: 2.1.1 -> 2.1.5 2018-02-18 20:07:42 +01:00
Frederik Rietdijk 6e8273a5e1 python: asgiref: 2.1.0 -> 2.1.1 2018-02-03 17:43:29 +01:00
Frederik Rietdijk c18d3ac845 python: asgiref: 2.0.1 -> 2.1.0 2018-01-20 12:05:23 +01:00
Frederik Rietdijk e09ccfa379 python: asgiref: 1.1.2 -> 2.0.1 2017-12-30 17:06:31 +01:00
Frederik Rietdijk 6b999f3c42 Python: many package updates 
Did not test all packages. Likely we'll have some breakage.
 2017-05-27 14:25:08 +02:00
Frederik Rietdijk 959842a9c7 Python: add pname attributes to libraries 
so that we can use the update script.
 2017-05-27 11:30:21 +02:00
Lancelot SIX db0627336e
pythonPackages.asgiref: 1.0.0 -> 1.1.1 2017-05-02 09:28:28 +02:00