diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 12:53:44 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 12:53:44 +0200 |
| commit | f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33 (patch) | |
| tree | 98bb48130a5c464418af19f314236e112ad20c55 | |
| parent | b8a79ac677bbc0f7b662bcc0c4fcb9df34c9f5f3 (diff) | |
| parent | ffbb4d26f9f93681576815be82142d14f2aa8234 (diff) | |
| download | nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.gz nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.bz2 nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.lz nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.xz nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.zst nixpkgs-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.zip | |
Merge master into staging-next
125 files changed, 3216 insertions, 884 deletions
diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 4f0952896e4..292d66864a4 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -210,8 +210,12 @@ </listitem> <listitem> <para> - Optionally commit the new package and open a pull request, or send a patch - to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>. + Optionally commit the new package and open a pull request <link + xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or + use <link + xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477"> + the Patches category</link> on Discourse for sending a patch without a + GitHub account. </para> </listitem> </orderedlist> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f559cd4657d..efbece40560 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7,6 +7,7 @@ # Optional github = "GithubUsername"; + githubId = your-github-id; keys = [{ longkeyid = "rsa2048/0x0123456789ABCDEF"; fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; @@ -19,6 +20,7 @@ - `name` is your, preferably real, name, - `email` is your maintainer email address, and - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), + - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, - `keys` is a list of your PGP/GPG key IDs and fingerprints. `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. @@ -42,6 +44,7 @@ email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; github = "0x4A6F"; + githubId = 9675338; keys = [{ longkeyid = "rsa8192/0x87027528B006D66D"; fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; @@ -50,36 +53,43 @@ "1000101" = { email = "jan.hrnko@satoshilabs.com"; github = "1000101"; + githubId = 791309; name = "Jan Hrnko"; }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; + githubId = 241628; name = "Adam Russell"; }; aanderse = { email = "aaron@fosslib.net"; github = "aanderse"; + githubId = 7755101; name = "Aaron Andersen"; }; aaronjanse = { email = "aaron@ajanse.me"; github = "aaronjanse"; + githubId = 16829510; name = "Aaron Janse"; }; aaronschif = { email = "aaronschif@gmail.com"; github = "aaronschif"; + githubId = 2258953; name = "Aaron Schif"; }; abaldeau = { email = "andreas@baldeau.net"; github = "baldo"; + githubId = 178750; name = "Andreas Baldeau"; }; abbe = { email = "ashish.is@lostca.se"; github = "wahjava"; + githubId = 2255192; name = "Ashish SHUKLA"; keys = [{ longkeyid = "rsa4096/0xC746CFA9E74FA4B0"; @@ -94,31 +104,37 @@ abhi18av = { email = "abhi18av@gmail.com"; github = "abhi18av"; + githubId = 12799326; name = "Abhinav Sharma"; }; abigailbuccaneer = { email = "abigailbuccaneer@gmail.com"; github = "abigailbuccaneer"; + githubId = 908758; name = "Abigail Bunyan"; }; aborsu = { email = "a.borsu@gmail.com"; github = "aborsu"; + githubId = 5033617; name = "Augustin Borsu"; }; aboseley = { email = "adam.boseley@gmail.com"; github = "aboseley"; + githubId = 13504599; name = "Adam Boseley"; }; abuibrahim = { email = "ruslan@babayev.com"; github = "abuibrahim"; + githubId = 2321000; name = "Ruslan Babayev"; }; acowley = { email = "acowley@gmail.com"; github = "acowley"; + githubId = 124545; name = "Anthony Cowley"; }; adamt = { @@ -129,61 +145,73 @@ adelbertc = { email = "adelbertc@gmail.com"; github = "adelbertc"; + githubId = 1332980; name = "Adelbert Chang"; }; adev = { email = "adev@adev.name"; github = "adevress"; + githubId = 1773511; name = "Adrien Devresse"; }; adisbladis = { email = "adis@blad.is"; github = "adisbladis"; + githubId = 63286; name = "Adam Hose"; }; Adjective-Object = { email = "mhuan13@gmail.com"; github = "Adjective-Object"; + githubId = 1174858; name = "Maxwell Huang-Hobbs"; }; adnelson = { email = "ithinkican@gmail.com"; github = "adnelson"; + githubId = 5091511; name = "Allen Nelson"; }; adolfogc = { email = "adolfo.garcia.cr@gmail.com"; github = "adolfogc"; + githubId = 1250775; name = "Adolfo E. García Castro"; }; aepsil0n = { email = "eduard.bopp@aepsil0n.de"; github = "aepsil0n"; + githubId = 3098430; name = "Eduard Bopp"; }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; github = "AerialX"; + githubId = 117295; name = "Aaron Lindsay"; }; aespinosa = { email = "allan.espinosa@outlook.com"; github = "aespinosa"; + githubId = 58771; name = "Allan Espinosa"; }; aethelz = { email = "aethelz@protonmail.com"; github = "aethelz"; + githubId = 10677343; name = "Eugene"; }; aflatter = { email = "flatter@fastmail.fm"; github = "aflatter"; + githubId = 168; name = "Alexander Flatter"; }; afldcr = { email = "alex@fldcr.com"; github = "afldcr"; + githubId = 335271; name = "James Alexander Feldman-Crough"; }; aforemny = { @@ -194,36 +222,43 @@ afranchuk = { email = "alex.franchuk@gmail.com"; github = "afranchuk"; + githubId = 4296804; name = "Alex Franchuk"; }; aherrmann = { email = "andreash87@gmx.ch"; github = "aherrmann"; + githubId = 732652; name = "Andreas Herrmann"; }; ahmedtd = { email = "ahmed.taahir@gmail.com"; github = "ahmedtd"; + githubId = 1017202; name = "Taahir Ahmed"; }; ahuzik = { email = "ales.guzik@gmail.com"; github = "alesguzik"; + githubId = 209175; name = "Ales Huzik"; }; aij = { email = "aij+git@mrph.org"; github = "aij"; + githubId = 4732885; name = "Ivan Jager"; }; ajs124 = { email = "nix@ajs124.de"; github = "ajs124"; + githubId = 1229027; name = "Andreas Schrägle"; }; ajgrf = { email = "a@ajgrf.com"; github = "ajgrf"; + githubId = 10733175; name = "Alex Griffin"; }; ak = { @@ -234,41 +269,49 @@ akavel = { email = "czapkofan@gmail.com"; github = "akavel"; + githubId = 273837; name = "Mateusz Czapliński"; }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; + githubId = 5836586; name = "Artjom Vejsel"; }; akc = { email = "akc@akc.is"; github = "akc"; + githubId = 1318982; name = "Anders Claesson"; }; akru = { email = "mail@akru.me"; github = "akru"; + githubId = 786394; name = "Alexander Krupenkin "; }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; + githubId = 17208985; name = "Alex Rice"; }; alexchapman = { email = "alex@farfromthere.net"; github = "AJChapman"; + githubId = 8316672; name = "Alex Chapman"; }; alexfmpe = { email = "alexandre.fmp.esteves@gmail.com"; github = "alexfmpe"; + githubId = 2335822; name = "Alexandre Esteves"; }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; + githubId = 782180; name = "Alex Vorobiev"; }; algorith = { @@ -278,6 +321,7 @@ alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; + githubId = 2822871; name = "Alistair Bill"; }; all = { @@ -287,6 +331,7 @@ allonsy = { email = "linuxbash8@gmail.com"; github = "allonsy"; + githubId = 5892756; name = "Alec Snyder"; }; alunduil = { @@ -297,6 +342,7 @@ amar1729 = { email = "amar.paul16@gmail.com"; github = "amar1729"; + githubId = 15623522; name = "Amar Paul"; }; ambrop72 = { @@ -307,11 +353,13 @@ amiddelk = { email = "amiddelk@gmail.com"; github = "amiddelk"; + githubId = 1358320; name = "Arie Middelkoop"; }; amiloradovsky = { email = "miloradovsky@gmail.com"; github = "amiloradovsky"; + githubId = 20530052; name = "Andrew Miloradovsky"; }; aminb = { @@ -322,36 +370,43 @@ aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; + githubId = 5149377; name = "Amine Chikhaoui"; }; amorsillo = { email = "andrew.morsillo@gmail.com"; github = "AndrewMorsillo"; + githubId = 858965; name = "Andrew Morsillo"; }; andersk = { email = "andersk@mit.edu"; github = "andersk"; + githubId = 26471; name = "Anders Kaseorg"; }; anderslundstedt = { email = "git@anderslundstedt.se"; github = "anderslundstedt"; + githubId = 4514101; name = "Anders Lundstedt"; }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; github = "AndersonTorres"; + githubId = 5954806; name = "Anderson Torres"; }; anderspapitto = { email = "anderspapitto@gmail.com"; github = "anderspapitto"; + githubId = 1388690; name = "Anders Papitto"; }; andir = { email = "andreas@rammhold.de"; github = "andir"; + githubId = 638836; name = "Andreas Rammhold"; }; andreabedini = { @@ -367,21 +422,25 @@ andrestylianos = { email = "andre.stylianos@gmail.com"; github = "andrestylianos"; + githubId = 7112447; name = "Andre S. Ramos"; }; andrew-d = { email = "andrew@du.nham.ca"; github = "andrew-d"; + githubId = 1079173; name = "Andrew Dunham"; }; andrewchambers = { email = "ac@acha.ninja"; github = "andrewchambers"; + githubId = 962885; name = "Andrew Chambers"; }; andrewrk = { email = "superjoe30@gmail.com"; github = "andrewrk"; + githubId = 106511; name = "Andrew Kelley"; }; andsild = { @@ -392,31 +451,37 @@ aneeshusa = { email = "aneeshusa@gmail.com"; github = "aneeshusa"; + githubId = 2085567; name = "Aneesh Agrawal"; }; angristan = { email = "angristan@pm.me"; github = "angristan"; + githubId = 11699655; name = "Stanislas Lange"; }; ankhers = { email = "justin.k.wood@gmail.com"; github = "ankhers"; + githubId = 750786; name = "Justin Wood"; }; anpryl = { email = "anpryl@gmail.com"; github = "anpryl"; + githubId = 5327697; name = "Anatolii Prylutskyi"; }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; + githubId = 2873280; name = "Anton Desyatov"; }; Anton-Latukha = { email = "anton.latuka+nixpkgs@gmail.com"; github = "Anton-Latukha"; + githubId = 20933385; name = "Anton Latukha"; }; antono = { @@ -427,51 +492,61 @@ antonxy = { email = "anton.schirg@posteo.de"; github = "antonxy"; + githubId = 4194320; name = "Anton Schirg"; }; apeschar = { email = "albert@peschar.net"; github = "apeschar"; + githubId = 122977; name = "Albert Peschar"; }; apeyroux = { email = "alex@px.io"; github = "apeyroux"; + githubId = 1078530; name = "Alexandre Peyroux"; }; ar1a = { email = "aria@ar1as.space"; github = "ar1a"; + githubId = 8436007; name = "Aria Edmonds"; }; arcadio = { email = "arc@well.ox.ac.uk"; github = "arcadio"; + githubId = 56009; name = "Arcadio Rubio García"; }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; + githubId = 718812; name = "Antoine R. Dumont"; }; aristid = { email = "aristidb@gmail.com"; github = "aristidb"; + githubId = 30712; name = "Aristid Breitkreuz"; }; ariutta = { email = "anders.riutta@gmail.com"; github = "ariutta"; + githubId = 1296771; name = "Anders Riutta"; }; arobyn = { email = "shados@shados.net"; github = "shados"; + githubId = 338268; name = "Alexei Robyn"; }; artemist = { email = "me@artem.ist"; github = "artemist"; + githubId = 1226638; name = "Artemis Tosini"; keys = [{ longkeyid = "rsa4096/0x4FDC96F161E7BA8A"; @@ -481,56 +556,67 @@ artuuge = { email = "artuuge@gmail.com"; github = "artuuge"; + githubId = 10285250; name = "Artur E. Ruuge"; }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; github = "ashalkhakov"; + githubId = 1270502; name = "Artyom Shalkhakov"; }; ashgillman = { email = "gillmanash@gmail.com"; github = "ashgillman"; + githubId = 816777; name = "Ashley Gillman"; }; aske = { email = "aske@fmap.me"; github = "aske"; + githubId = 869771; name = "Kirill Boltaev"; }; asppsa = { email = "asppsa@gmail.com"; github = "asppsa"; + githubId = 453170; name = "Alastair Pharo"; }; astro = { email = "astro@spaceboyz.net"; github = "astro"; + githubId = 12923; name = "Astro"; }; astsmtl = { email = "astsmtl@yandex.ru"; github = "astsmtl"; + githubId = 2093941; name = "Alexander Tsamutali"; }; asymmetric = { email = "lorenzo@mailbox.org"; github = "asymmetric"; + githubId = 101816; name = "Lorenzo Manacorda"; }; aszlig = { email = "aszlig@nix.build"; github = "aszlig"; + githubId = 192147; name = "aszlig"; }; athas = { email = "athas@sigkill.dk"; github = "athas"; + githubId = 55833; name = "Troels Henriksen"; }; atnnn = { email = "etienne@atnnn.com"; github = "atnnn"; + githubId = 706854; name = "Etienne Laurin"; }; auntie = { @@ -541,11 +627,13 @@ avaq = { email = "avaq+nixos@xs4all.nl"; github = "avaq"; + githubId = 1217745; name = "Aldwin Vlasblom"; }; avery = { email = "averyl+nixos@protonmail.com"; github = "AveryLychee"; + githubId = 9147625; name = "Avery Lychee"; }; averelld = { @@ -556,6 +644,7 @@ avitex = { email = "theavitex@gmail.com"; github = "avitex"; + githubId = 5110816; name = "avitex"; keys = [{ longkeyid = "rsa4096/0x8B366C443CABE942"; @@ -565,26 +654,31 @@ avnik = { email = "avn@avnik.info"; github = "avnik"; + githubId = 153538; name = "Alexander V. Nikolaev"; }; aw = { email = "aw-nixos@meterriblecrew.net"; github = "herrwiese"; + githubId = 206242; name = "Andreas Wiese"; }; aycanirican = { email = "iricanaycan@gmail.com"; github = "aycanirican"; + githubId = 135230; name = "Aycan iRiCAN"; }; babariviere = { email = "babariviere@protonmail.com"; github = "babariviere"; + githubId = 12128029; name = "babariviere"; }; bachp = { email = "pascal.bach@nextrem.ch"; github = "bachp"; + githubId = 333807; name = "Pascal Bach"; }; backuitist = { @@ -604,96 +698,115 @@ balsoft = { email = "balsoft75@gmail.com"; github = "balsoft"; + githubId = 18467667; name = "Alexander Bantyev"; }; bandresen = { email = "bandresen@gmail.com"; github = "bandresen"; + githubId = 80325; name = "Benjamin Andresen"; }; baracoder = { email = "baracoder@googlemail.com"; github = "baracoder"; + githubId = 127523; name = "Herman Fries"; }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; + githubId = 75235; name = "Michael Walker"; }; basvandijk = { email = "v.dijk.bas@gmail.com"; github = "basvandijk"; + githubId = 576355; name = "Bas van Dijk"; }; Baughn = { email = "sveina@gmail.com"; github = "Baughn"; + githubId = 45811; name = "Svein Ove Aas"; }; bb010g = { email = "me@bb010g.com"; github = "bb010g"; + githubId = 340132; name = "Brayden Banks"; }; bbarker = { email = "brandon.barker@gmail.com"; github = "bbarker"; + githubId = 916366; name = "Brandon Elam Barker"; }; bbigras = { email = "bigras.bruno@gmail.com"; github = "bbigras"; + githubId = 24027; name = "Bruno Bigras"; }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; + githubId = 1015044; name = "Brandon Carrell"; }; bcdarwin = { email = "bcdarwin@gmail.com"; github = "bcdarwin"; + githubId = 164148; name = "Ben Darwin"; }; bdesham = { email = "benjamin@esham.io"; github = "bdesham"; + githubId = 354230; name = "Benjamin Esham"; }; bdimcheff = { email = "brandon@dimcheff.com"; github = "bdimcheff"; + githubId = 14111; name = "Brandon Dimcheff"; }; bendlas = { email = "herwig@bendlas.net"; github = "bendlas"; + githubId = 214787; name = "Herwig Hochleitner"; }; benley = { email = "benley@gmail.com"; github = "benley"; + githubId = 1432730; name = "Benjamin Staffin"; }; bennofs = { email = "benno.fuenfstueck@gmail.com"; github = "bennofs"; + githubId = 3192959; name = "Benno Fünfstück"; }; benpye = { email = "ben@curlybracket.co.uk"; github = "benpye"; + githubId = 442623; name = "Ben Pye"; }; benwbooth = { email = "benwbooth@gmail.com"; github = "benwbooth"; + githubId = 75972; name = "Ben Booth"; }; berce = { email = "bert.moens@gmail.com"; github = "berce"; + githubId = 10439709; name = "Bert Moens"; }; berdario = { @@ -704,36 +817,43 @@ bergey = { email = "bergey@teallabs.org"; github = "bergey"; + githubId = 251106; name = "Daniel Bergey"; }; betaboon = { email = "betaboon@0x80.ninja"; github = "betaboon"; + githubId = 7346933; name = "betaboon"; }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; + githubId = 16426882; name = "Bernard Fortz"; }; bgamari = { email = "ben@smart-cactus.org"; github = "bgamari"; + githubId = 1010174; name = "Ben Gamari"; }; bhall = { email = "brendan.j.hall@bath.edu"; github = "brendan-hall"; + githubId = 34919100; name = "Brendan Hall"; }; bhipple = { email = "bhipple@protonmail.com"; github = "bhipple"; + githubId = 2071583; name = "Benjamin Hipple"; }; binarin = { email = "binarin@binarin.ru"; github = "binarin"; + githubId = 185443; name = "Alexey Lebedeff"; }; bjg = { @@ -743,11 +863,13 @@ bjornfor = { email = "bjorn.forsman@gmail.com"; github = "bjornfor"; + githubId = 133602; name = "Bjørn Forsman"; }; bkchr = { email = "nixos@kchr.de"; github = "bkchr"; + githubId = 5718007; name = "Bastian Köcher"; }; bluescreen303 = { @@ -758,21 +880,25 @@ bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; + githubId = 10221570; name = "Bo Bakker"; }; bobvanderlinden = { email = "bobvanderlinden@gmail.com"; github = "bobvanderlinden"; + githubId = 6375609; name = "Bob van der Linden"; }; bodil = { email = "nix@bodil.org"; github = "bodil"; + githubId = 17880; name = "Bodil Stokke"; }; boj = { email = "brian@uncannyworks.com"; github = "boj"; + githubId = 50839; name = "Brian Jones"; }; boothead = { @@ -783,181 +909,215 @@ borisbabic = { email = "boris.ivan.babic@gmail.com"; github = "borisbabic"; + githubId = 1743184; name = "Boris Babić"; }; bosu = { email = "boriss@gmail.com"; github = "bosu"; + githubId = 3465841; name = "Boris Sukholitko"; }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; + githubId = 4621; name = "Brad Ediger"; }; brainrape = { email = "martonboros@gmail.com"; github = "brainrape"; + githubId = 302429; name = "Marton Boros"; }; bramd = { email = "bram@bramd.nl"; github = "bramd"; + githubId = 86652; name = "Bram Duvigneau"; }; braydenjw = { email = "nixpkgs@willenborg.ca"; github = "braydenjw"; + githubId = 2506621; name = "Brayden Willenborg"; }; brian-dawn = { email = "brian.t.dawn@gmail.com"; github = "brian-dawn"; + githubId = 1274409; name = "Brian Dawn"; }; brianhicks = { email = "brian@brianthicks.com"; github = "BrianHicks"; + githubId = 355401; name = "Brian Hicks"; }; bricewge = { email = "bricewge@gmail.com"; github = "bricewge"; + githubId = 5525646; name = "Brice Waegeneire"; }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; + githubId = 7716744; name = "Berno Strik"; }; buffet = { email = "niclas@countingsort.com"; github = "buffet"; + githubId = 33751841; name = "Niclas Meyer"; }; bugworm = { email = "bugworm@zoho.com"; github = "bugworm"; + githubId = 7214361; name = "Roman Gerasimenko"; }; bzizou = { email = "Bruno@bzizou.net"; github = "bzizou"; + githubId = 2647566; name = "Bruno Bzeznik"; }; c0bw3b = { email = "c0bw3b@gmail.com"; github = "c0bw3b"; + githubId = 24417923; name = "Renaud"; }; c0deaddict = { email = "josvanbakel@protonmail.com"; github = "c0deaddict"; + githubId = 510553; name = "Jos van Bakel"; }; calbrecht = { email = "christian.albrecht@mayflower.de"; github = "calbrecht"; + githubId = 1516457; name = "Christian Albrecht"; }; callahad = { email = "dan.callahan@gmail.com"; github = "callahad"; + githubId = 24193; name = "Dan Callahan"; }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; + githubId = 7435854; name = "Victor Calvert"; }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; + githubId = 289492; name = "Philip Horger"; }; candeira = { email = "javier@candeira.com"; github = "candeira"; + githubId = 91694; name = "Javier Candeira"; }; canndrew = { email = "shum@canndrew.org"; github = "canndrew"; + githubId = 5555066; name = "Andrew Cann"; }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; + githubId = 686190; name = "Carlos D'Agostino"; }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; + githubId = 82591; name = "Carl Sverre"; }; cartr = { email = "carter.sande@duodecima.technology"; github = "cartr"; + githubId = 5241813; name = "Carter Sande"; }; casey = { email = "casey@rodarmor.net"; github = "casey"; + githubId = 1945; name = "Casey Rodarmor"; }; catern = { email = "sbaugh@catern.com"; github = "catern"; + githubId = 5394722; name = "Spencer Baugh"; }; caugner = { email = "nixos@caugner.de"; github = "caugner"; + githubId = 495429; name = "Claas Augner"; }; cbley = { email = "claudio.bley@gmail.com"; github = "avdv"; + githubId = 3471749; name = "Claudio Bley"; }; cdepillabout = { email = "cdep.illabout@gmail.com"; github = "cdepillabout"; + githubId = 64804; name = "Dennis Gosnell"; }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; + githubId = 977929; name = "Cody Allen"; }; cf6b88f = { email = "elmo.todurov@eesti.ee"; - github = "cf6b88f"; name = "Elmo Todurov"; }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; + githubId = 5771456; name = "Chaddaï Fouché"; }; chaduffy = { email = "charles@dyfis.net"; github = "charles-dyfis-net"; + githubId = 22370; name = "Charles Duffy"; }; changlinli = { email = "mail@changlinli.com"; github = "changlinli"; + githubId = 1762540; name = "Changlin Li"; }; CharlesHD = { email = "charleshdespointes@gmail.com"; github = "CharlesHD"; + githubId = 6608071; name = "Charles Huyghues-Despointes"; }; chaoflow = { email = "flo@chaoflow.net"; github = "chaoflow"; + githubId = 89596; name = "Florian Friesdorf"; }; chattered = { @@ -967,106 +1127,127 @@ ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; + githubId = 33503784; name = "Yucheng Zhang"; }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; + githubId = 18648043; name = "Daniel Cartwright"; }; chiiruno = { email = "okinan@protonmail.com"; github = "chiiruno"; + githubId = 30435868; name = "Okina Matara"; }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; + githubId = 803961; name = "Hurshal Patel"; }; chpatrick = { email = "chpatrick@gmail.com"; github = "chpatrick"; + githubId = 832719; name = "Patrick Chilton"; }; chreekat = { email = "b@chreekat.net"; github = "chreekat"; + githubId = 538538; name = "Bryan Richter"; }; chris-martin = { email = "ch.martin@gmail.com"; github = "chris-martin"; + githubId = 399718; name = "Chris Martin"; }; chrisaw = { email = "home@chrisaw.com"; github = "cawilliamson"; + githubId = 1141769; name = "Christopher A. Williamson"; }; chrisjefferson = { email = "chris@bubblescope.net"; github = "chrisjefferson"; + githubId = 811527; name = "Christopher Jefferson"; }; chrisrosset = { email = "chris@rosset.org.uk"; github = "chrisrosset"; + githubId = 1103294; name = "Christopher Rosset"; }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; + githubId = 2245737; name = "Christopher Mark Poole"; }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; + githubId = 3956062; name = "Simon Lackerbauer"; }; ck3d = { email = "ck3d@gmx.de"; github = "ck3d"; + githubId = 25088352; name = "Christian Kögler"; }; ckampka = { email = "christian@kampka.net"; github = "kampka"; + githubId = 422412; name = "Christian Kampka"; }; ckauhaus = { email = "kc@flyingcircus.io"; github = "ckauhaus"; + githubId = 1448923; name = "Christian Kauhaus"; }; cko = { email = "christine.koppelt@gmail.com"; github = "cko"; + githubId = 68239; name = "Christine Koppelt"; }; clacke = { email = "claes.wallin@greatsinodevelopment.com"; github = "clacke"; + githubId = 199180; name = "Claes Wallin"; }; cleverca22 = { email = "cleverca22@gmail.com"; github = "cleverca22"; + githubId = 848609; name = "Michael Bishop"; }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; github = "cmcdragonkai"; + githubId = 640797; name = "Roger Qiu"; }; cmfwyp = { email = "cmfwyp@riseup.net"; github = "cmfwyp"; + githubId = 20808761; name = "cmfwyp"; }; cobbal = { email = "andrew.cobb@gmail.com"; github = "cobbal"; + githubId = 180339; name = "Andrew Cobb"; }; coconnor = { @@ -1077,56 +1258,67 @@ codsl = { email = "codsl@riseup.net"; github = "codsl"; + githubId = 6402559; name = "codsl"; }; codyopel = { email = "codyopel@gmail.com"; github = "codyopel"; + githubId = 5561189; name = "Cody Opel"; }; cohencyril = { email = "cyril.cohen@inria.fr"; github = "CohenCyril"; + githubId = 298705; name = "Cyril Cohen"; }; colemickens = { email = "cole.mickens@gmail.com"; github = "colemickens"; + githubId = 327028; name = "Cole Mickens"; }; colescott = { email = "colescottsf@gmail.com"; github = "colescott"; + githubId = 5684605; name = "Cole Scott"; }; copumpkin = { email = "pumpkingod@gmail.com"; github = "copumpkin"; + githubId = 2623; name = "Dan Peebles"; }; corngood = { email = "corngood@gmail.com"; github = "corngood"; + githubId = 3077118; name = "David McFarland"; }; coroa = { email = "jonas@chaoflow.net"; github = "coroa"; + githubId = 2552981; name = "Jonas Hörsch"; }; costrouc = { email = "chris.ostrouchov@gmail.com"; github = "costrouc"; + githubId = 1740337; name = "Chris Ostrouchov"; }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; + githubId = 1573344; name = "Andrey Pavlov"; }; cpages = { email = "page@ruiec.cat"; github = "cpages"; + githubId = 411324; name = "Carles Pagès"; }; cransom = { @@ -1137,36 +1329,43 @@ CrazedProgrammer = { email = "crazedprogrammer@gmail.com"; github = "CrazedProgrammer"; + githubId = 12202789; name = "CrazedProgrammer"; }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; + githubId = 111202; name = "Henry Bubert"; }; CrystalGamma = { email = "nixos@crystalgamma.de"; github = "CrystalGamma"; + githubId = 6297001; name = "Jona Stubbe"; }; csingley = { email = "csingley@gmail.com"; github = "csingley"; + githubId = 398996; name = "Christopher Singley"; }; cstrahan = { email = "charles@cstrahan.com"; github = "cstrahan"; + githubId = 143982; name = "Charles Strahan"; }; cwoac = { email = "oliver@codersoffortune.net"; github = "cwoac"; + githubId = 1382175; name = "Oliver Matthews"; }; cypherpunk2140 = { email = "stefan.mihaila@pm.me"; github = "cypherpunk2140"; + githubId = 2217136; name = "Ștefan D. Mihăilă"; keys = [ { longkeyid = "rsa4096/6E68A39BF16A3ECB"; @@ -1180,46 +1379,55 @@ dalance = { email = "dalance@gmail.com"; github = "dalance"; + githubId = 4331004; name = "Naoya Hatta"; }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; + githubId = 217543; name = "Damien Cassou"; }; danbst = { email = "abcz2.uprola@gmail.com"; github = "danbst"; + githubId = 743057; name = "Danylo Hlynskyi"; }; dancek = { email = "hannu.hartikainen@gmail.com"; github = "dancek"; + githubId = 245394; name = "Hannu Hartikainen"; }; danharaj = { email = "dan@obsidian.systems"; github = "danharaj"; + githubId = 23366017; name = "Dan Haraj"; }; danieldk = { email = "me@danieldk.eu"; github = "danieldk"; + githubId = 49398; name = "Daniël de Kok"; }; danielfullmer = { email = "danielrf12@gmail.com"; github = "danielfullmer"; + githubId = 1298344; name = "Daniel Fullmer"; }; das-g = { email = "nixpkgs@raphael.dasgupta.ch"; github = "das-g"; + githubId = 97746; name = "Raphael Das Gupta"; }; das_j = { email = "janne@hess.ooo"; github = "dasJ"; + githubId = 4971975; name = "Janne Heß"; }; dasuxullebt = { @@ -1229,11 +1437,13 @@ david50407 = { email = "me@davy.tw"; github = "david50407"; + githubId = 841969; name = "David Kuo"; }; davidak = { email = "post@davidak.de"; github = "davidak"; + githubId = 91113; name = "David Kleuker"; }; davidrusu = { @@ -1244,61 +1454,73 @@ davorb = { email = "davor@davor.se"; github = "davorb"; + githubId = 798427; name = "Davor Babic"; }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; + githubId = 49904992; name = "Dawid Sowa"; }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; + githubId = 3179832; name = "D. Bohdan"; }; dbrock = { email = "daniel@brockman.se"; github = "dbrock"; + githubId = 14032; name = "Daniel Brockman"; }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; + githubId = 452652; name = "Kosyrev Serge"; }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; github = "delan"; + githubId = 465303; }; delroth = { email = "delroth@gmail.com"; github = "delroth"; + githubId = 202798; name = "Pierre Bourdon"; }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; + githubId = 8864716; name = "Duarte David"; }; demin-dmitriy = { email = "demindf@gmail.com"; github = "demin-dmitriy"; + githubId = 5503422; name = "Dmitriy Demin"; }; demize = { email = "johannes@kyriasis.com"; github = "kyrias"; + githubId = 2285387; name = "Johannes Löthberg"; }; demyanrogozhin = { email = "demyan.rogozhin@gmail.com"; github = "demyanrogozhin"; + githubId = 62989; name = "Demyan Rogozhin"; }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; + githubId = 706758; name = "Christian Gerbrandt"; }; DerGuteMoritz = { @@ -1309,11 +1531,13 @@ dermetfan = { email = "serverkorken@gmail.com"; github = "dermetfan"; + githubId = 4956158; name = "Robin Stumm"; }; DerTim1 = { email = "tim.digel@active-group.de"; github = "DerTim1"; + githubId = 21953890; name = "Tim Digel"; }; desiderius = { @@ -1324,21 +1548,25 @@ devhell = { email = "\"^\"@regexmail.net"; github = "devhell"; + githubId = 896182; name = "devhell"; }; dezgeg = { email = "tuomas.tynkkynen@iki.fi"; github = "dezgeg"; + githubId = 579369; name = "Tuomas Tynkkynen"; }; dfordivam = { email = "dfordivam+nixpkgs@gmail.com"; github = "dfordivam"; + githubId = 681060; name = "Divam"; }; dfoxfranke = { email = "dfoxfranke@gmail.com"; github = "dfoxfranke"; + githubId = 4708206; name = "Daniel Fox Franke"; }; dgonyeo = { @@ -1349,71 +1577,85 @@ dhkl = { email = "david@davidslab.com"; github = "dhl"; + githubId = 265220; name = "David Leung"; }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; + githubId = 11946442; name = "Dipin Hora"; }; disassembler = { email = "disasm@gmail.com"; github = "disassembler"; + githubId = 651205; name = "Samuel Leathers"; }; disserman = { email = "disserman@gmail.com"; github = "divi255"; + githubId = 40633781; name = "Sergei S."; }; dizfer = { email = "david@izquierdofernandez.com"; github = "dizfer"; + githubId = 8852888; name = "David Izquierdo"; }; Dje4321 = { email = "dje4321@gmail.com"; github = "dje4321"; + githubId = 10913120; name = "Dje4321"; }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; + githubId = 997543; name = "Dmitry Malikov"; }; DmitryTsygankov = { email = "dmitry.tsygankov@gmail.com"; github = "DmitryTsygankov"; + githubId = 425354; name = "Dmitry Tsygankov"; }; dmjio = { email = "djohnson.m@gmail.com"; github = "dmjio"; + githubId = 875324; name = "David Johnson"; }; dmvianna = { email = "dmlvianna@gmail.com"; github = "dmvianna"; + githubId = 1708810; name = "Daniel Vianna"; }; dochang = { email = "dochang@gmail.com"; github = "dochang"; + githubId = 129093; name = "Desmond O. Chang"; }; domenkozar = { email = "domen@dev.si"; github = "domenkozar"; + githubId = 126339; name = "Domen Kozar"; }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; + githubId = 10998835; name = "Doron Behar"; }; dotlambda = { email = "rschuetz17@gmail.com"; github = "dotlambda"; + githubId = 6806011; name = "Robert Schütz"; }; doublec = { @@ -1424,16 +1666,19 @@ dpaetzel = { email = "david.a.paetzel@gmail.com"; github = "dpaetzel"; + githubId = 974130; name = "David Pätzel"; }; dpflug = { email = "david@pflug.email"; github = "dpflug"; + githubId = 108501; name = "David Pflug"; }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; + githubId = 6199462; name = "Dmytro Rets"; }; drewkett = { @@ -1443,11 +1688,13 @@ dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza"; + githubId = 1931963; name = "David Sferruzza"; }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; + githubId = 817330; name = "Will Dietz"; keys = [{ longkeyid = "rsa4096/0xFD42C7D0D41494C8"; @@ -1462,51 +1709,61 @@ dysinger = { email = "tim@dysinger.net"; github = "dysinger"; + githubId = 447; name = "Tim Dysinger"; }; dywedir = { email = "dywedir@gra.red"; github = "dywedir"; + githubId = 399312; name = "Vladyslav M."; }; dzabraev = { email = "dzabraew@gmail.com"; github = "dzabraev"; + githubId = 15128988; name = "Maksim Dzabraev"; }; e-user = { email = "nixos@sodosopa.io"; github = "e-user"; + githubId = 93086; name = "Alexander Kahl"; }; eadwu = { email = "edmund.wu@protonmail.com"; github = "eadwu"; + githubId = 22758444; name = "Edmund Wu"; }; ealasu = { email = "emanuel.alasu@gmail.com"; github = "ealasu"; + githubId = 1362096; name = "Emanuel Alasu"; }; eamsden = { email = "edward@blackriversoft.com"; github = "eamsden"; + githubId = 54573; name = "Edward Amsden"; }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; + githubId = 424946; name = "James Earl Douglas"; }; earvstedt = { email = "erik.arvstedt@gmail.com"; github = "erikarvstedt"; + githubId = 36110478; name = "Erik Arvstedt"; }; ebzzry = { email = "ebzzry@ebzzry.io"; github = "ebzzry"; + githubId = 7875; name = "Rommel Martinez"; }; edanaher = { @@ -1517,46 +1774,55 @@ edef = { email = "edef@edef.eu"; github = "edef1c"; + githubId = 50854; name = "edef"; }; embr = { email = "hi@liclac.eu"; github = "liclac"; + githubId = 428026; name = "embr"; }; emily = { email = "nixpkgs@emily.moe"; github = "emilazy"; + githubId = 18535642; name = "Emily"; }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; + githubId = 119483; name = "Matthew Brown"; }; eduarrrd = { email = "e.bachmakov@gmail.com"; github = "eduarrrd"; + githubId = 1181393; name = "Eduard Bachmakov"; }; edude03 = { email = "michael@melenion.com"; github = "edude03"; + githubId = 494483; name = "Michael Francis"; }; edwtjo = { email = "ed@cflags.cc"; github = "edwtjo"; + githubId = 54799; name = "Edward Tjörnhammar"; }; eelco = { email = "eelco.dolstra@logicblox.com"; github = "edolstra"; + githubId = 1148549; name = "Eelco Dolstra"; }; ehegnes = { email = "eric.hegnes@gmail.com"; github = "ehegnes"; + githubId = 884970; name = "Eric Hegnes"; }; ehmry = { @@ -1566,56 +1832,67 @@ eikek = { email = "eike.kettner@posteo.de"; github = "eikek"; + githubId = 701128; name = "Eike Kettner"; }; ekleog = { email = "leo@gaspard.io"; github = "ekleog"; + githubId = 411447; name = "Leo Gaspard"; }; elasticdog = { email = "aaron@elasticdog.com"; github = "elasticdog"; + githubId = 4742; name = "Aaron Bull Schaefer"; }; eleanor = { email = "dejan@proteansec.com"; github = "proteansec"; + githubId = 1753498; name = "Dejan Lukan"; }; eliasp = { email = "mail@eliasprobst.eu"; github = "eliasp"; + githubId = 48491; name = "Elias Probst"; }; elijahcaine = { email = "elijahcainemv@gmail.com"; github = "pop"; + githubId = 1897147; name = "Elijah Caine"; }; elitak = { email = "elitak@gmail.com"; github = "elitak"; + githubId = 769073; name = "Eric Litak"; }; ellis = { email = "nixos@ellisw.net"; github = "ellis"; + githubId = 97852; name = "Ellis Whitehead"; }; elohmeier = { email = "elo-nixos@nerdworks.de"; github = "elohmeier"; + githubId = 2536303; name = "Enno Lohmeier"; }; elseym = { email = "elseym@me.com"; github = "elseym"; + githubId = 907478; name = "Simon Waibl"; }; elvishjerricco = { email = "elvishjerricco@gmail.com"; github = "ElvishJerricco"; + githubId = 1365692; name = "Will Fancher"; }; emmanuelrosa = { @@ -1626,21 +1903,25 @@ endgame = { email = "jack@jackkelly.name"; github = "endgame"; + githubId = 231483; name = "Jack Kelly"; }; enorris = { name = "Eric Norris"; email = "erictnorris@gmail.com"; github = "ericnorris"; + githubId = 1906605; }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; + githubId = 10492681; name = "Michael Hoang"; }; eperuffo = { email = "info@emanueleperuffo.com"; github = "emanueleperuffo"; + githubId = 5085029; name = "Emanuele Peruffo"; }; epitrochoid = { @@ -1650,16 +1931,19 @@ eqyiel = { email = "ruben@maher.fyi"; github = "eqyiel"; + githubId = 3422442; name = "Ruben Maher"; }; eraserhd = { email = "jason.m.felice@gmail.com"; github = "eraserhd"; + githubId = 147284; name = "Jason Felice"; }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; + githubId = 4828; name = "Eric Merritt"; }; ericsagnes = { @@ -1670,11 +1954,13 @@ ericson2314 = { email = "John.Ericson@Obsidian.Systems"; github = "ericson2314"; + githubId = 1055245; name = "John Ericson"; }; erictapen = { email = "justin.humm@posteo.de"; github = "erictapen"; + githubId = 11532355; name = "Justin Humm"; keys = [{ longkeyid = "rsa4096/0x438871E000AA178E"; @@ -1684,11 +1970,13 @@ erikryb = { email = "erik.rybakken@math.ntnu.no"; github = "erikryb"; + githubId = 3787281; name = "Erik Rybakken"; }; erosennin = { email = "ag@sologoc.com"; github = "erosennin"; + githubId = 1583484; name = "Andrey Golovizin"; }; ertes = { @@ -1703,11 +1991,13 @@ ethercrow = { email = "ethercrow@gmail.com"; github = "ethercrow"; + githubId = 222467; name = "Dmitry Ivanov"; }; etu = { email = "elis@hirwing.se"; github = "etu"; + githubId = 461970; name = "Elis Hirwing"; keys = [{ longkeyid = "rsa4096/0xD57EFA625C9A925F"; @@ -1717,56 +2007,67 @@ evanjs = { email = "evanjsx@gmail.com"; github = "evanjs"; + githubId = 1847524; name = "Evan Stoll"; }; evck = { email = "eric@evenchick.com"; github = "ericevenchick"; + githubId = 195032; name = "Eric Evenchick"; }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; + githubId = 1042674; name = "Andras Slemmer"; }; exi = { email = "nixos@reckling.org"; github = "exi"; + githubId = 449463; name = "Reno Reckling"; }; exlevan = { email = "exlevan@gmail.com"; github = "exlevan"; + githubId = 873530; name = "Alexey Levan"; }; expipiplus1 = { email = "nix@monoid.al"; github = "expipiplus1"; + githubId = 857308; name = "Joe Hermaszewski"; }; eyjhb = { email = "eyjhbb@gmail.com"; github = "eyJhb"; + githubId = 25955146; name = "eyJhb"; }; f--t = { email = "git@f-t.me"; github = "f--t"; + githubId = 2817965; name = "f--t"; }; f-breidenstein = { email = "mail@felixbreidenstein.de"; - github = "f-breidenstein"; + github = "fleaz"; + githubId = 2489598; name = "Felix Breidenstein"; }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; + githubId = 878822; name = "Tristan Helmich"; }; falsifian = { email = "james.cook@utoronto.ca"; github = "falsifian"; + githubId = 225893; name = "James Cook"; }; fare = { @@ -1777,6 +2078,7 @@ farlion = { email = "florian.peter@gmx.at"; github = "workflow"; + githubId = 1276854; name = "Florian Peter"; }; fdns = { @@ -1787,66 +2089,79 @@ ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; + githubId = 45924649; name = "Fabian Fink"; }; fgaz = { email = "fgaz@fgaz.me"; github = "fgaz"; + githubId = 8182846; name = "Francesco Gazzetta"; }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; + githubId = 415760; name = "Jonas Höglund"; }; flexw = { email = "felix.weilbach@t-online.de"; github = "FlexW"; + githubId = 19961516; name = "Felix Weilbach"; }; flokli = { email = "flokli@flokli.de"; github = "flokli"; + githubId = 183879; name = "Florian Klink"; }; FlorianFranzen = { email = "Florian.Franzen@gmail.com"; github = "FlorianFranzen"; + githubId = 781077; name = "Florian Franzen"; }; florianjacob = { email = "projects+nixos@florianjacob.de"; github = "florianjacob"; + githubId = 1109959; name = "Florian Jacob"; }; flosse = { email = "mail@markus-kohlhase.de"; github = "flosse"; + githubId = 276043; name = "Markus Kohlhase"; }; fluffynukeit = { email = "dan@fluffynukeit.com"; github = "fluffynukeit"; + githubId = 844574; name = "Daniel Austin"; }; fmthoma = { email = "f.m.thoma@googlemail.com"; github = "fmthoma"; + githubId = 5918766; name = "Franz Thoma"; }; forkk = { email = "forkk@forkk.net"; github = "forkk"; + githubId = 1300078; name = "Andrew Okin"; }; fornever = { email = "friedrich@fornever.me"; github = "fornever"; + githubId = 92793; name = "Friedrich von Never"; }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; + githubId = 114159; name = "Franz Pletz"; keys = [{ longkeyid = "rsa4096/0x846FDED7792617B4"; @@ -1856,6 +2171,7 @@ fps = { email = "mista.tapas@gmx.net"; github = "fps"; + githubId = 84968; name = "Florian Paul Schmidt"; }; @@ -1868,11 +2184,13 @@ fredeb = { email = "im@fredeb.dev"; github = "fredeeb"; + githubId = 7551358; name = "Frede Emil"; }; freepotion = { email = "free.potion@yandex.ru"; github = "freepotion"; + githubId = 42352817; name = "Free Potion"; }; freezeboy = { @@ -1888,31 +2206,37 @@ fridh = { email = "fridh@fridh.nl"; github = "fridh"; + githubId = 2129135; name = "Frederik Rietdijk"; }; frlan = { email = "frank@frank.uvena.de"; github = "frlan"; + githubId = 1010248; name = "Frank Lanitz"; }; fro_ozen = { email = "fro_ozen@gmx.de"; github = "froozen"; + githubId = 1943632; name = "fro_ozen"; }; frontsideair = { email = "photonia@gmail.com"; github = "frontsideair"; + githubId = 868283; name = "Fatih Altinok"; }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; + githubId = 248148; name = "Siarhei Zirukin"; }; fuerbringer = { email = "severin@fuerbringer.info"; github = "fuerbringer"; + githubId = 10528737; name = "Severin Fürbringer"; }; funfunctor = { @@ -1922,16 +2246,19 @@ fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; + githubId = 4717341; name = "Brenton Horne"; }; fuuzetsu = { email = "fuuzetsu@fuuzetsu.co.uk"; github = "fuuzetsu"; + githubId = 893115; name = "Mateusz Kowalczyk"; }; fuwa = { email = "echowss@gmail.com"; github = "fuwa0529"; + githubId = 40521440; name = "Haruka Akiyama"; }; fuzzy-id = { @@ -1941,16 +2268,19 @@ fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; + githubId = 3036816; name = "Edgar Aroutiounian"; }; gabesoft = { email = "gabesoft@gmail.com"; github = "gabesoft"; + githubId = 606000; name = "Gabriel Adomnicai"; }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; + githubId = 7047019; name = "Florent Becker"; }; garbas = { @@ -1961,6 +2291,7 @@ garrison = { email = "jim@garrison.cc"; github = "garrison"; + githubId = 91987; name = "Jim Garrison"; }; gavin = { @@ -1971,91 +2302,109 @@ gebner = { email = "gebner@gebner.org"; github = "gebner"; + githubId = 313929; name = "Gabriel Ebner"; }; geistesk = { email = "post@0x21.biz"; github = "geistesk"; + githubId = 8402811; name = "Alvar Penning"; }; genesis = { email = "ronan@aimao.org"; github = "bignaux"; + githubId = 149484; name = "Ronan Bignaux"; }; georgewhewell = { email = "georgerw@gmail.com"; github = "georgewhewell"; + githubId = 1176131; name = "George Whewell"; }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; + githubId = 10353047; name = "Tobias Happ"; }; ggpeti = { email = "ggpeti@gmail.com"; github = "ggpeti"; + githubId = 3217744; name = "Peter Ferenczy"; }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; + githubId = 27668; name = "Tobias Pflug"; }; giogadi = { email = "lgtorres42@gmail.com"; github = "giogadi"; + githubId = 1713676; name = "Luis G. Torres"; }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; + githubId = 33185; name = "Gleb Peregud"; }; glenns = { email = "glenn.searby@gmail.com"; github = "glenns"; + githubId = 615606; name = "Glenn Searby"; }; gloaming = { email = "ch9871@gmail.com"; github = "gloaming"; + githubId = 10156748; name = "Craig Hall"; }; globin = { email = "mail@glob.in"; github = "globin"; + githubId = 1447245; name = "Robin Gloster"; }; gnidorah = { email = "gnidorah@yandex.com"; github = "gnidorah"; + githubId = 12064730; name = "Alex Ivanov"; }; goibhniu = { email = "cillian.deroiste@gmail.com"; github = "cillianderoiste"; + githubId = 643494; name = "Cillian de Róiste"; }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; + githubId = 266275; name = "Max Gonzih"; }; goodrone = { email = "goodrone@gmail.com"; github = "goodrone"; + githubId = 1621335; name = "Andrew Trachenko"; }; gpyh = { email = "yacine.hmito@gmail.com"; github = "yacinehmito"; + githubId = 6893840; name = "Yacine Hmito"; }; grahamc = { email = "graham@grahamc.com"; github = "grahamc"; + githubId = 76716; name = "Graham Christensen"; }; grburst = { @@ -2066,6 +2415,7 @@ greydot = { email = "lanablack@amok.cc"; github = "greydot"; + githubId = 7385287; name = "Lana Black"; }; gridaphobe = { @@ -2076,106 +2426,127 @@ guibert = { email = "david.guibert@gmail.com"; github = "dguibert"; + githubId = 1178864; name = "David Guibert"; }; groodt = { email = "groodt@gmail.com"; github = "groodt"; + githubId = 343415; name = "Greg Roodt"; }; guibou = { email = "guillaum.bouchard@gmail.com"; github = "guibou"; + githubId = 9705357; name = "Guillaume Bouchard"; }; guillaumekoenig = { email = "guillaume.edward.koenig@gmail.com"; github = "guillaumekoenig"; + githubId = 10654650; name = "Guillaume Koenig"; }; guyonvarch = { email = "joris@guyonvarch.me"; github = "guyonvarch"; + githubId = 6768842; name = "Joris Guyonvarch"; }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; + githubId = 1498782; name = "Jesse Haber-Kucharsky"; }; hamhut1066 = { email = "github@hamhut1066.com"; - github = "hamhut1066"; + github = "moredhel"; + githubId = 1742172; name = "Hamish Hutchings"; }; hansjoergschurr = { email = "commits@schurr.at"; github = "hansjoergschurr"; + githubId = 9850776; name = "Hans-Jörg Schurr"; }; HaoZeke = { email = "r95g10@gmail.com"; github = "haozeke"; + githubId = 4336207; name = "Rohit Goswami"; }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; + githubId = 33969028; name = "Sebastian Hasler"; }; havvy = { email = "ryan.havvy@gmail.com"; github = "havvy"; + githubId = 731722; name = "Ryan Scheel"; }; hax404 = { email = "hax404foogit@hax404.de"; github = "hax404"; + githubId = 1379411; name = "Georg Haas"; }; hbunke = { email = "bunke.hendrik@gmail.com"; github = "hbunke"; + githubId = 1768793; name = "Hendrik Bunke"; }; hce = { email = "hc@hcesperer.org"; github = "hce"; + githubId = 147689; name = "Hans-Christian Esperer"; }; hectorj = { email = "hector.jusforgues+nixos@gmail.com"; github = "hectorj"; + githubId = 2427959; name = "Hector Jusforgues"; }; hedning = { email = "torhedinbronner@gmail.com"; github = "hedning"; + githubId = 71978; name = "Tor Hedin Brønner"; }; heel = { email = "parizhskiy@gmail.com"; github = "heel"; + githubId = 287769; name = "Sergii Paryzhskyi"; }; helkafen = { email = "arnaudpourseb@gmail.com"; github = "Helkafen"; + githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; henrytill = { email = "henrytill@gmail.com"; github = "henrytill"; + githubId = 6430643; name = "Henry Till"; }; herberteuler = { email = "herberteuler@gmail.com"; github = "herberteuler"; + githubId = 1401179; name = "Guanpeng Xu"; }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; + githubId = 3656888; name = "hhm"; }; hinton = { @@ -2185,101 +2556,121 @@ hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; + githubId = 6074754; name = "Hlodver Sigurdsson"; }; hugoreeves = { email = "hugolreeves@gmail.com"; github = "hugoreeves"; + githubId = 20039091; name = "Hugo Reeves"; }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; + githubId = 896431; name = "Chris Hodapp"; }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; + githubId = 1436960; name = "Christoph Hrdinka"; }; hschaeidt = { email = "he.schaeidt@gmail.com"; github = "hschaeidt"; + githubId = 1614615; name = "Hendrik Schaeidt"; }; htr = { email = "hugo@linux.com"; github = "htr"; + githubId = 39689; name = "Hugo Tavares Reis"; }; hyphon81 = { email = "zero812n@gmail.com"; github = "hyphon81"; + githubId = 12491746; name = "Masato Yonekawa"; }; iand675 = { email = "ian@iankduncan.com"; github = "iand675"; + githubId = 69209; name = "Ian Duncan"; }; ianwookim = { email = "ianwookim@gmail.com"; github = "wavewave"; + githubId = 1031119; name = "Ian-Woo Kim"; }; iblech = { email = "iblech@speicherleck.de"; github = "iblech"; + githubId = 3661115; name = "Ingo Blechschmidt"; }; idontgetoutmuch = { email = "dominic@steinitz.org"; github = "idontgetoutmuch"; + githubId = 1550265; name = "Dominic Steinitz"; }; igsha = { email = "igor.sharonov@gmail.com"; github = "igsha"; + githubId = 5345170; name = "Igor Sharonov"; }; iimog = { email = "iimog@iimog.org"; github = "iimog"; + githubId = 7403236; name = "Markus J. Ankenbrand"; }; ikervagyok = { email = "ikervagyok@gmail.com"; github = "ikervagyok"; + githubId = 7481521; name = "Balázs Lengyel"; }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; + githubId = 36193715; name = "Lassi Haasio"; }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; + githubId = 4401220; name = "Michael Eden"; }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; + githubId = 592849; name = "Ilya Kolpakov"; }; imalison = { email = "IvanMalison@gmail.com"; github = "IvanMalison"; + githubId = 1246619; name = "Ivan Malison"; }; imalsogreg = { email = "imalsogreg@gmail.com"; github = "imalsogreg"; + githubId = 993484; name = "Greg Hale"; }; imuli = { email = "i@imu.li"; github = "imuli"; + githubId = 4085046; name = "Imuli"; }; infinisil = { @@ -2290,16 +2681,19 @@ ingenieroariel = { email = "ariel@nunez.co"; github = "ingenieroariel"; + githubId = 54999; name = "Ariel Nunez"; }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; + githubId = 137306; name = "Michele Catalano"; }; ivan = { email = "ivan@ludios.org"; github = "ivan"; + githubId = 4458; name = "Ivan Kozik"; }; ivan-tkatchev = { @@ -2309,6 +2703,7 @@ ivanbrennan = { email = "ivan.brennan@gmail.com"; github = "ivanbrennan"; + githubId = 1672874; name = "Ivan Brennan"; keys = [{ longkeyid = "rsa4096/0x79C3C47DC652EA54"; @@ -2318,6 +2713,7 @@ ivegotasthma = { email = "ivegotasthma@protonmail.com"; github = "ivegotasthma"; + githubId = 2437675; name = "John Doe"; keys = [{ longkeyid = "rsa4096/09AC52AEA87817A4"; @@ -2327,21 +2723,25 @@ ixmatus = { email = "parnell@digitalmentat.com"; github = "ixmatus"; + githubId = 30714; name = "Parnell Springmeyer"; }; ixxie = { email = "matan@fluxcraft.net"; github = "ixxie"; + githubId = 20320695; name = "Matan Bendix Shenhav"; }; izorkin = { email = "Izorkin@gmail.com"; github = "izorkin"; + githubId = 26877687; name = "Yurii Izorkin"; }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; + githubId = 3081095; name = "Jürgen Keck"; }; j03 = { @@ -2352,51 +2752,61 @@ jagajaga = { email = "ars.seroka@gmail.com"; github = "jagajaga"; + githubId = 2179419; name = "Arseniy Seroka"; }; jakelogemann = { email = "jake.logemann@gmail.com"; github = "jakelogemann"; + githubId = 820715; name = "Jake Logemann"; }; jakewaksbaum = { email = "jake.waksbaum@gmail.com"; github = "jbaum98"; + githubId = 5283991; name = "Jake Waksbaum"; }; jammerful = { email = "jammerful@gmail.com"; github = "jammerful"; + githubId = 20176306; name = "jammerful"; }; jansol = { email = "jan.solanti@paivola.fi"; github = "jansol"; + githubId = 2588851; name = "Jan Solanti"; }; javaguirre = { email = "contacto@javaguirre.net"; github = "javaguirre"; + githubId = 488556; name = "Javier Aguirre"; }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; + githubId = 45598; name = "William Casarin"; }; jbedo = { email = "cu@cua0.org"; github = "jbedo"; + githubId = 372912; name = "Justin Bedő"; }; jbgi = { email = "jb@giraudeau.info"; github = "jbgi"; + githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; jchw = { email = "johnwchadwick@gmail.com"; github = "jchv"; + githubId = 938744; name = "John Chadwick"; }; jcumming = { @@ -2406,31 +2816,37 @@ jD91mZM2 = { email = "me@krake.one"; github = "jD91mZM2"; + githubId = 12830969; name = "jD91mZM2"; }; jdagilliland = { email = "jdagilliland@gmail.com"; github = "jdagilliland"; + githubId = 1383440; name = "Jason Gilliland"; }; jdehaas = { email = "qqlq@nullptr.club"; github = "jeroendehaas"; + githubId = 117874; name = "Jeroen de Haas"; }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; + githubId = 1198065; name = "Jeffrey David Johnson"; }; jensbin = { email = "jensbin+git@pm.me"; github = "jensbin"; + githubId = 1608697; name = "Jens Binkert"; }; jerith666 = { email = "github@matt.mchenryfamily.org"; github = "jerith666"; + githubId = 854319; name = "Matt McHenry"; }; jeschli = { @@ -2441,6 +2857,7 @@ jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; + githubId = 1667473; name = "Jethro Kuan"; }; jfb = { @@ -2451,71 +2868,85 @@ jflanglois = { email = "yourstruly@julienlanglois.me"; github = "jflanglois"; + githubId = 18501; name = "Julien Langlois"; }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; + githubId = 2736480; name = "Johannes Frankenau"; }; jgeerds = { email = "jascha@geerds.org"; github = "jgeerds"; + githubId = 1473909; name = "Jascha Geerds"; }; jgertm = { email = "jger.tm@gmail.com"; github = "jgertm"; + githubId = 6616642; name = "Tim Jaeger"; }; jgillich = { email = "jakob@gillich.me"; github = "jgillich"; + githubId = 347965; name = "Jakob Gillich"; }; jglukasik = { email = "joseph@jgl.me"; github = "jglukasik"; + githubId = 6445082; name = "Joseph Lukasik"; }; jhhuh = { email = "jhhuh.note@gmail.com"; github = "jhhuh"; + githubId = 5843245; name = "Ji-Haeng Huh"; }; jhillyerd = { email = "james+nixos@hillyerd.com"; github = "jhillyerd"; + githubId = 2502736; name = "James Hillyerd"; }; jirkamarsik = { email = "jiri.marsik89@gmail.com"; github = "jirkamarsik"; + githubId = 184898; name = "Jirka Marsik"; }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; + githubId = 1058504; name = "José Luis Lafuente"; }; jluttine = { email = "jaakko.luttinen@iki.fi"; github = "jluttine"; + githubId = 2195834; name = "Jaakko Luttinen"; }; jmagnusj = { email = "jmagnusj@gmail.com"; github = "magnusjonsson"; + githubId = 8900; name = "Johan Magnus Jonsson"; }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; + githubId = 587870; name = "Jonathan Mettes"; }; joachifm = { email = "joachifm@fastmail.fm"; github = "joachifm"; + githubId = 41977; name = "Joachim Fasting"; }; joamaki = { @@ -2526,11 +2957,13 @@ joelburget = { email = "joelburget@gmail.com"; github = "joelburget"; + githubId = 310981; name = "Joel Burget"; }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; + githubId = 336631; name = "Joel Moberg"; }; joelteon = { @@ -2542,39 +2975,51 @@ name = "Sven Slootweg"; github = "joepie91"; }; + joesalisbury = { + email = "salisbury.joseph@gmail.com"; + github = "JosephSalisbury"; + name = "Joe Salisbury"; + }; johanot = { email = "write@ownrisk.dk"; github = "johanot"; + githubId = 998763; name = "Johan Thomsen"; }; johbo = { email = "johannes@bornhold.name"; github = "johbo"; + githubId = 117805; name = "Johannes Bornhold"; }; johnazoidberg = { email = "git@danielschaefer.me"; github = "johnazoidberg"; + githubId = 5307138; name = "Daniel Schäfer"; }; johnchildren = { email = "john.a.children@gmail.com"; github = "johnchildren"; + githubId = 32305209; name = "John Children"; }; johnmh = { email = "johnmh@openblox.org"; github = "johnmh"; + githubId = 2576152; name = "John M. Harris, Jr."; }; johnramsden = { email = "johnramsden@riseup.net"; github = "johnramsden"; + githubId = 8735102; name = "John Ramsden"; }; joko = { email = "ioannis.koutras@gmail.com"; github = "jokogr"; + githubId = 1252547; keys = [{ # compare with https://keybase.io/joko longkeyid = "rsa2048/0x85EAE7D9DF56C5CA"; @@ -2585,71 +3030,85 @@ jonafato = { email = "jon@jonafato.com"; github = "jonafato"; + githubId = 392720; name = "Jon Banafato"; }; jonathanreeve = { email = "jon.reeve@gmail.com"; github = "JonathanReeve"; + githubId = 1843676; name = "Jonathan Reeve"; }; joncojonathan = { email = "joncojonathan@gmail.com"; github = "joncojonathan"; + githubId = 11414454; name = "Jonathan Haddock"; }; jonringer = { email = "jonringer117@gmail.com"; github = "jonringer"; + githubId = 7673602; name = "Jonathan Ringer"; }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; + githubId = 1767283; name = "Joris Engbers"; }; jorsn = { name = "Johannes Rosenberger"; email = "johannes@jorsn.eu"; github = "jorsn"; + githubId = 4646725; }; jpdoyle = { email = "joethedoyle@gmail.com"; github = "jpdoyle"; + githubId = 1918771; name = "Joe Doyle"; }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; + githubId = 954536; name = "Jean-Pierre PRUNARET"; }; jpotier = { email = "jpo.contributes.to.nixos@marvid.fr"; github = "jpotier"; + githubId = 752510; name = "Martin Potier"; }; jqueiroz = { email = "nixos@johnjq.com"; github = "jqueiroz"; + githubId = 4968215; name = "Jonathan Queiroz"; }; jraygauthier = { email = "jraygauthier@gmail.com"; github = "jraygauthier"; + githubId = 4611077; name = "Raymond Gauthier"; }; jtobin = { email = "jared@jtobin.io"; github = "jtobin"; + githubId = 1414434; name = "Jared Tobin"; }; jtojnar = { email = "jtojnar@gmail.com"; github = "jtojnar"; + githubId = 705123; name = "Jan Tojnar"; }; juaningan = { email = "juaningan@gmail.com"; github = "juaningan"; + githubId = 810075; name = "Juan Rodal"; }; juliendehos = { @@ -2660,11 +3119,13 @@ justinwoo = { email = "moomoowoo@gmail.com"; github = "justinwoo"; + githubId = 2396926; name = "Justin Woo"; }; jwiegley = { email = "johnw@newartisans.com"; github = "jwiegley"; + githubId = 8460; name = "John Wiegley"; }; jwilberding = { @@ -2679,21 +3140,25 @@ jzellner = { email = "jeffz@eml.cc"; github = "sofuture"; + githubId = 66669; name = "Jeff Zellner"; }; kaiha = { email = "kai.harries@gmail.com"; github = "kaiha"; + githubId = 6544084; name = "Kai Harries"; }; kalbasit = { email = "wael.nasreddine@gmail.com"; github = "kalbasit"; + githubId = 87115; name = "Wael Nasreddine"; }; kamilchm = { email = "kamil.chm@gmail.com"; github = "kamilchm"; + githubId = 1621930; name = "Kamil Chmielewski"; }; kampfschlaefer = { @@ -2708,66 +3173,79 @@ kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; + githubId = 1047859; name = "Kaz Wesley"; }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; + githubId = 2029444; name = "James Kent"; }; kevincox = { email = "kevincox@kevincox.ca"; github = "kevincox"; + githubId = 494012; name = "Kevin Cox"; }; khumba = { email = "bog@khumba.net"; github = "khumba"; + githubId = 788813; name = "Bryan Gardiner"; }; KibaFox = { email = "kiba.fox@foxypossibilities.com"; github = "KibaFox"; + githubId = 16481032; name = "Kiba Fox"; }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; + githubId = 845652; name = "Kier Davis"; }; killercup = { email = "killercup@gmail.com"; github = "killercup"; + githubId = 20063; name = "Pascal Hertleif"; }; kiloreux = { email = "kiloreux@gmail.com"; github = "kiloreux"; + githubId = 6282557; name = "Kiloreux Emperex"; }; kimburgess = { email = "kim@acaprojects.com"; github = "kimburgess"; + githubId = 843652; name = "Kim Burgess"; }; kini = { email = "keshav.kini@gmail.com"; github = "kini"; + githubId = 691290; name = "Keshav Kini"; }; kirelagin = { email = "kirelagin@gmail.com"; github = "kirelagin"; + githubId = 451835; name = "Kirill Elagin"; }; kisonecat = { email = "kisonecat@gmail.com"; github = "kisonecat"; + githubId = 148352; name = "Jim Fowler"; }; kiwi = { email = "envy1988@gmail.com"; github = "Kiwi"; + githubId = 35715; name = "Robert Djubek"; keys = [{ longkeyid = "rsa4096/0x156C88A5B0A04B2A"; @@ -2777,6 +3255,7 @@ kjuvi = { email = "quentin.vaucher@pm.me"; github = "kjuvi"; + githubId = 17534323; name = "Quentin Vaucher"; }; kkallio = { @@ -2787,37 +3266,44 @@ email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; github = "klntsky"; + githubId = 18447310; }; kmeakin = { email = "karlwfmeakin@gmail.com"; name = "Karl Meakin"; github = "Kmeakin"; + githubId = 19665139; }; kmein = { email = "kieran.meinhardt@gmail.com"; name = "Kierán Meinhardt"; github = "kmein"; + githubId = 10352507; }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; + githubId = 3287933; name = "Josef Kemetmüller"; }; knl = { email = "nikola@knezevic.co"; github = "knl"; + githubId = 361496; name = "Nikola Knežević"; }; kolaente = { email = "k@knt.li"; github = "kolaente"; + githubId = 13721712; name = "Konrad Langenberg"; }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; + githubId = 15692230; name = "Muhammad Herdiansyah"; }; koral = { @@ -2828,61 +3314,73 @@ kovirobi = { email = "kovirobi@gmail.com"; github = "kovirobi"; + githubId = 1903418; name = "Kovacsics Robert"; }; kquick = { email = "quick@sparq.org"; github = "kquick"; + githubId = 787421; name = "Kevin Quick"; }; kragniz = { email = "louis@kragniz.eu"; github = "kragniz"; + githubId = 735008; name = "Louis Taylor"; }; krav = { email = "kristoffer@microdisko.no"; github = "krav"; + githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; kroell = { email = "nixosmainter@makroell.de"; github = "rokk4"; + githubId = 17659803; name = "Matthias Axel Kröll"; }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; + githubId = 160317; name = "Kristoffer Søholm"; }; ktf = { email = "giulio.eulisse@cern.ch"; github = "ktf"; + githubId = 10544; name = "Giuluo Eulisse"; }; ktosiek = { email = "tomasz.kontusz@gmail.com"; github = "ktosiek"; + githubId = 278013; name = "Tomasz Kontusz"; }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; + githubId = 449813; name = "Roman Kuznetsov"; }; kylewlacy = { email = "kylelacy+nix@pm.me"; github = "kylewlacy"; + githubId = 1362179; name = "Kyle Lacy"; }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; + githubId = 2034420; name = "Luke Sandell"; }; lambda-11235 = { email = "taranlynn0@gmail.com"; github = "lambda-11235"; + githubId = 16354815; name = "Taran Lynn"; }; lassulus = { @@ -2893,26 +3391,31 @@ layus = { email = "layus.on@gmail.com"; github = "layus"; + githubId = 632767; name = "Guillaume Maudoux"; }; lblasc = { email = "lblasc@znode.net"; github = "lblasc"; + githubId = 32152; name = "Luka Blaskovic"; }; ldesgoui = { email = "ldesgoui@gmail.com"; github = "ldesgoui"; + githubId = 2472678; name = "Lucas Desgouilles"; }; league = { email = "league@contrapunctus.net"; github = "league"; + githubId = 50286; name = "Christopher League"; }; leahneukirchen = { email = "leah@vuxu.org"; github = "leahneukirchen"; + githubId = 139; name = "Leah Neukirchen"; }; lebastr = { @@ -2923,26 +3426,31 @@ ledif = { email = "refuse@gmail.com"; github = "ledif"; + githubId = 307744; name = "Adam Fidel"; }; leemachin = { email = "me@mrl.ee"; github = "leemachin"; + githubId = 736291; name = "Lee Machin"; }; leenaars = { email = "ml.software@leenaa.rs"; github = "leenaars"; + githubId = 4158274; name = "Michiel Leenaars"; }; lejonet = { email = "daniel@kuehn.se"; github = "lejonet"; + githubId = 567634; name = "Daniel Kuehn"; }; leo60228 = { email = "iakornfeld@gmail.com"; github = "leo60228"; + githubId = 8355305; name = "leo60228"; }; leonardoce = { @@ -2953,66 +3461,79 @@ lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; + githubId = 480920; name = "Luca Bruno"; }; lewo = { email = "lewo@abesis.fr"; github = "nlewo"; + githubId = 3425311; name = "Antoine Eiche"; }; lheckemann = { email = "git@sphalerite.org"; github = "lheckemann"; + githubId = 341954; name = "Linus Heckemann"; }; lhvwb = { email = "nathaniel.baxter@gmail.com"; github = "nathanielbaxter"; + githubId = 307589; name = "Nathaniel Baxter"; }; lightdiscord = { email = "root@arnaud.sh"; github = "lightdiscord"; + githubId = 24509182; name = "Arnaud Pascal"; }; lihop = { email = "nixos@leroy.geek.nz"; github = "lihop"; + githubId = 3696783; name = "Leroy Hopson"; }; lilyball = { email = "lily@sb.org"; github = "lilyball"; + githubId = 714; name = "Lily Ballard"; }; limeytexan = { email = "limeytexan@gmail.com"; github = "limeytexan"; + githubId = 36448130; name = "Michael Brantley"; }; linarcx = { email = "linarcx@gmail.com"; github = "linarcx"; + githubId = 10884422; name = "Kaveh Ahangar"; }; linc01n = { email = "git@lincoln.hk"; github = "linc01n"; + githubId = 667272; name = "Lincoln Lee"; }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; + githubId = 791115; name = "Linquize"; }; linus = { email = "linusarver@gmail.com"; github = "listx"; + githubId = 725613; name = "Linus Arver"; }; livnev = { email = "lev@liv.nev.org.uk"; github = "livnev"; + githubId = 3964494; name = "Lev Livnev"; keys = [{ longkeyid = "rsa2048/0x68FF81E6A7850F49"; @@ -3022,41 +3543,49 @@ luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; + githubId = 22085373; name = "Luis Hebendanz"; }; lionello = { email = "lio@lunesu.com"; github = "lionello"; + githubId = 591860; name = "Lionello Lunesu"; }; lluchs = { email = "lukas.werling@gmail.com"; github = "lluchs"; + githubId = 516527; name = "Lukas Werling"; }; lnl7 = { email = "daiderd@gmail.com"; github = "lnl7"; + githubId = 689294; name = "Daiderd Jordan"; }; lo1tuma = { email = "schreck.mathias@gmail.com"; github = "lo1tuma"; + githubId = 169170; name = "Mathias Schreck"; }; loewenheim = { email = "loewenheim@mailbox.org"; github = "loewenheim"; + githubId = 7622248; name = "Sebastian Zivota"; }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; + githubId = 5624721; name = "Ben Wolsieffer"; }; loskutov = { email = "ignat.loskutov@gmail.com"; github = "loskutov"; + githubId = 1202012; name = "Ignat Loskutov"; }; lovek323 = { @@ -3067,16 +3596,19 @@ lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; github = "lowfatcomputing"; + githubId = 10626; name = "Andreas Wagner"; }; lschuermann = { email = "leon.git@is.currently.online"; github = "lschuermann"; + githubId = 5341193; name = "Leon Schuermann"; }; lsix = { email = "lsix@lancelotsix.com"; github = "lsix"; + githubId = 724339; name = "Lancelot SIX"; }; ltavard = { @@ -3087,51 +3619,61 @@ lucas8 = { email = "luc.linux@mailoo.org"; github = "lucas8"; + githubId = 2025623; name = "Luc Chabassier"; }; lucus16 = { email = "lars.jellema@gmail.com"; github = "Lucus16"; + githubId = 2487922; name = "Lars Jellema"; }; ludo = { email = "ludo@gnu.org"; github = "civodul"; + githubId = 1168435; name = "Ludovic Courtès"; }; lufia = { email = "lufia@lufia.org"; github = "lufia"; + githubId = 1784379; name = "Kyohei Kadota"; }; luispedro = { email = "luis@luispedro.org"; github = "luispedro"; + githubId = 79334; name = "Luis Pedro Coelho"; }; lukeadams = { email = "luke.adams@belljar.io"; github = "lukeadams"; + githubId = 3508077; name = "Luke Adams"; }; lukebfox = { email = "lbentley-fox1@sheffield.ac.uk"; github = "lukebfox"; + githubId = 34683288; name = "Luke Bentley-Fox"; }; lukego = { email = "luke@snabb.co"; github = "lukego"; + githubId = 13791; name = "Luke Gorrie"; }; luz = { email = "luz666@daum.net"; github = "Luz"; + githubId = 208297; name = "Luz"; }; lw = { email = "lw@fmap.me"; github = "lolwat97"; + githubId = 2057309; name = "Sergey Sofeychuk"; }; lyt = { @@ -3145,71 +3687,85 @@ ma27 = { email = "maximilian@mbosch.me"; github = "ma27"; + githubId = 6025220; name = "Maximilian Bosch"; }; ma9e = { email = "sean@lfo.team"; - github = "ma9e"; + github = "furrycatherder"; + githubId = 36235154; name = "Sean Haugh"; }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; + githubId = 109141; name = "Georges Dubus"; }; mafo = { email = "Marc.Fontaine@gmx.de"; github = "MarcFontaine"; + githubId = 1433367; name = "Marc Fontaine"; }; magenbluten = { email = "magenbluten@codemonkey.cc"; github = "magenbluten"; + githubId = 1140462; name = "magenbluten"; }; magnetophon = { email = "bart@magnetophon.nl"; github = "magnetophon"; + githubId = 7645711; name = "Bart Brouns"; }; mahe = { email = "matthias.mh.herrmann@gmail.com"; github = "2chilled"; + githubId = 1238350; name = "Matthias Herrmann"; }; makefu = { email = "makefu@syntax-fehler.de"; github = "makefu"; + githubId = 115218; name = "Felix Richter"; }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; + githubId = 346094; name = "Michael Alyn Miller"; }; manveru = { email = "m.fellinger@gmail.com"; github = "manveru"; + githubId = 3507; name = "Michael Fellinger"; }; marcweber = { email = "marco-oweber@gmx.de"; github = "marcweber"; + githubId = 34086; name = "Marc Weber"; }; marenz = { email = "marenz@arkom.men"; github = "marenz2569"; + githubId = 12773269; name = "Markus Schmidl"; }; markus1189 = { email = "markus1189@gmail.com"; github = "markus1189"; + githubId = 591567; name = "Markus Hauck"; }; markuskowa = { email = "markus.kowalewski@gmail.com"; github = "markuskowa"; + githubId = 26470037; name = "Markus Kowalewski"; }; markWot = { @@ -3220,25 +3776,30 @@ email = "mariusdavid@laposte.net"; name = "Marius David"; github = "marius851000"; + githubId = 22586596; }; marsam = { email = "marsam@users.noreply.github.com"; github = "marsam"; + githubId = 65531; name = "Mario Rodas"; }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; + githubId = 623509; name = "Martijn Vermaat"; }; martingms = { email = "martin@mg.am"; github = "martingms"; + githubId = 458783; name = "Martin Gammelsæter"; }; marzipankaiser = { email = "nixos@gaisseml.de"; github = "marzipankaiser"; + githubId = 2551444; name = "Marcial Gaißert"; keys = [{ longkeyid = "rsa2048/0xB629036BE399EEE9"; @@ -3248,16 +3809,19 @@ matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; + githubId = 854770; name = "Matej Cotman"; }; mathnerd314 = { email = "mathnerd314.gph+hs@gmail.com"; github = "mathnerd314"; + githubId = 322214; name = "Mathnerd314"; }; matklad = { email = "aleksey.kladov@gmail.com"; github = "matklad"; + githubId = 1711539; name = "matklad"; }; matthewbauer = { @@ -3268,6 +3832,7 @@ matthiasbeyer = { email = "mail@beyermatthias.de"; github = "matthiasbeyer"; + githubId = 427866; name = "Matthias Beyer"; }; matti-kariluoma = { @@ -3278,76 +3843,91 @@ maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; + githubId = 136037; name = "Matthew Maurer"; }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; + githubId = 1269099; name = "Marius Bakke"; }; mbbx6spp = { email = "me@susanpotter.net"; github = "mbbx6spp"; + githubId = 564; name = "Susan Potter"; }; mbe = { email = "brandonedens@gmail.com"; github = "brandonedens"; + githubId = 396449; name = "Brandon Edens"; }; mbode = { email = "maxbode@gmail.com"; github = "mbode"; + githubId = 9051309; name = "Maximilian Bode"; }; mboes = { email = "mboes@tweag.net"; github = "mboes"; + githubId = 51356; name = "Mathieu Boespflug"; }; mbrgm = { email = "marius@yeai.de"; github = "mbrgm"; + githubId = 2971615; name = "Marius Bergmann"; }; mcmtroffaes = { email = "matthias.troffaes@gmail.com"; github = "mcmtroffaes"; + githubId = 158568; name = "Matthias C. M. Troffaes"; }; mdaiter = { email = "mdaiter8121@gmail.com"; github = "mdaiter"; + githubId = 1377571; name = "Matthew S. Daiter"; }; mdevlamynck = { email = "matthias.devlamynck@mailoo.org"; github = "mdevlamynck"; + githubId = 4378377; name = "Matthias Devlamynck"; }; meditans = { email = "meditans@gmail.com"; github = "meditans"; + githubId = 4641445; name = "Carlo Nucera"; }; megheaiulian = { email = "iulian.meghea@gmail.com"; github = "megheaiulian"; + githubId = 1788114; name = "Meghea Iulian"; }; mehandes = { email = "niewskici@gmail.com"; github = "mehandes"; + githubId = 32581276; name = "Matt Deming"; }; meisternu = { email = "meister@krutt.org"; github = "meisternu"; + githubId = 8263431; name = "Matt Miemiec"; }; melchips = { email = "truphemus.francois@gmail.com"; github = "melchips"; + githubId = 365721; name = "Francois Truphemus"; }; melsigl = { @@ -3358,6 +3938,7 @@ melkor333 = { email = "samuel@ton-kunst.ch"; github = "melkor333"; + githubId = 6412377; name = "Samuel Ruprecht"; }; metabar = { @@ -3368,40 +3949,48 @@ email = "kira.bruneau@gmail.com"; name = "Kira Bruneau"; github = "metadark"; + githubId = 382041; }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; + githubId = 3300322; name = "Mitchell Fossen"; }; mgdelacroix = { email = "mgdelacroix@gmail.com"; github = "mgdelacroix"; + githubId = 223323; name = "Miguel de la Cruz"; }; mgregoire = { email = "gregoire@martinache.net"; github = "M-Gregoire"; + githubId = 9469313; name = "Gregoire Martinache"; }; mgttlinger = { email = "megoettlinger@gmail.com"; github = "mgttlinger"; + githubId = 5120487; name = "Merlin Göttlinger"; }; mguentner = { email = "code@klandest.in"; github = "mguentner"; + githubId = 668926; name = "Maximilian Güntner"; }; mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; + githubId = 20536514; name = "Magdalena Haselsteiner"; }; mic92 = { email = "joerg@thalheim.io"; github = "mic92"; + githubId = 96200; name = "Jörg Thalheim"; keys = [{ # compare with https://keybase.io/Mic92 @@ -3417,6 +4006,7 @@ michalrus = { email = "m@michalrus.com"; github = "michalrus"; + githubId = 4366292; name = "Michal Rus"; }; michelk = { @@ -3427,26 +4017,31 @@ michojel = { email = "mic.liamg@gmail.com"; github = "michojel"; + githubId = 21156022; name = "Michal Minář"; }; mickours = { email = "mickours@gmail.com<"; github = "mickours"; + githubId = 837312; name = "Michael Mercier"; }; midchildan = { email = "midchildan+nix@gmail.com"; github = "midchildan"; + githubId = 7343721; name = "midchildan"; }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; + githubId = 978196; name = "Michaël Faille"; }; mikoim = { email = "ek@esh.ink"; github = "mikoim"; + githubId = 3958340; name = "Eshin Kunishima"; }; miltador = { @@ -3456,6 +4051,7 @@ mimadrid = { email = "mimadrid@ucm.es"; github = "mimadrid"; + githubId = 3269878; name = "Miguel Madrid"; }; minijackson = { @@ -3471,36 +4067,43 @@ mirrexagon = { email = "mirrexagon@mirrexagon.com"; github = "mirrexagon"; + githubId = 1776903; name = "Andrew Abbott"; }; mjanczyk = { email = "m@dragonvr.pl"; github = "mjanczyk"; + githubId = 1001112; name = "Marcin Janczyk"; }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; + githubId = 16974598; name = "Mike Playle"; }; mkazulak = { email = "kazulakm@gmail.com"; github = "mulderr"; + githubId = 5698461; name = "Maciej Kazulak"; }; mkg = { email = "mkg@vt.edu"; github = "mkgvt"; + githubId = 22477669; name = "Mark K Gardner"; }; mlieberman85 = { email = "mlieberman85@gmail.com"; github = "mlieberman85"; + githubId = 622577; name = "Michael Lieberman"; }; mmahut = { email = "marek.mahut@gmail.com"; github = "mmahut"; + githubId = 104795; name = "Marek Mahut"; }; mmlb = { @@ -3511,21 +4114,25 @@ mnacamura = { email = "m.nacamura@gmail.com"; github = "mnacamura"; + githubId = 45770; name = "Mitsuhiro Nakamura"; }; moaxcp = { email = "moaxcp@gmail.com"; github = "moaxcp"; + githubId = 7831184; name = "John Mercier"; }; modulistic = { email = "modulistic@gmail.com"; github = "modulistic"; + githubId = 1902456; name = "Pablo Costa"; }; mog = { email = "mog-lists@rldn.net"; github = "mogorman"; + githubId = 64710; name = "Matthew O'Gorman"; }; Mogria = { @@ -3536,36 +4143,43 @@ monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; + githubId = 350116; name = "Patrice Clement"; }; montag451 = { email = "montag451@laposte.net"; github = "montag451"; + githubId = 249317; name = "montag451"; }; moosingin3space = { email = "moosingin3space@gmail.com"; github = "moosingin3space"; + githubId = 830082; name = "Nathan Moos"; }; moredread = { email = "code@apb.name"; github = "moredread"; + githubId = 100848; name = "André-Patrick Bubel"; }; moretea = { email = "maarten@moretea.nl"; github = "moretea"; + githubId = 99988; name = "Maarten Hoogendoorn"; }; MostAwesomeDude = { email = "cds@corbinsimpson.com"; github = "MostAwesomeDude"; + githubId = 118035; name = "Corbin Simpson"; }; mounium = { email = "muoniurn@gmail.com"; github = "mounium"; + githubId = 20026143; name = "Katona László"; }; MP2E = { @@ -3576,16 +4190,19 @@ mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; + githubId = 2894019; name = "Mark Cohen"; }; mpickering = { email = "matthewtpickering@gmail.com"; github = "mpickering"; + githubId = 1216657; name = "Matthew Pickering"; }; mpoquet = { email = "millian.poquet@gmail.com"; github = "mpoquet"; + githubId = 3502831; name = "Millian Poquet"; }; mpscholten = { @@ -3596,6 +4213,7 @@ mpsyco = { email = "fr.st-amour@gmail.com"; github = "fstamour"; + githubId = 2881922; name = "Francis St-Amour"; }; mredaelli = { @@ -3606,16 +4224,19 @@ mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; + githubId = 8165792; name = "Mark Karpov"; }; mrmebelman = { email = "burzakovskij@protonmail.com"; github = "MrMebelMan"; + githubId = 15896005; name = "Vladyslav Burzakovskyy"; }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; + githubId = 839693; name = "Ingolf Wanger"; }; msackman = { @@ -3629,26 +4250,31 @@ mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; + githubId = 437005; name = "Mikkel Christiansen"; }; msiedlarek = { email = "mikolaj@siedlarek.pl"; github = "msiedlarek"; + githubId = 133448; name = "Mikołaj Siedlarek"; }; mstarzyk = { email = "mstarzyk@gmail.com"; github = "mstarzyk"; + githubId = 111304; name = "Maciek Starzyk"; }; msteen = { email = "emailmatthijs@gmail.com"; github = "msteen"; + githubId = 788953; name = "Matthijs Steen"; }; mt-caret = { email = "mtakeda.enigsol@gmail.com"; github = "mt-caret"; + githubId = 4996739; name = "Masayuki Takeda"; }; MtP = { @@ -3659,46 +4285,55 @@ mtreskin = { email = "zerthurd@gmail.com"; github = "Zert"; + githubId = 39034; name = "Max Treskin"; }; mudri = { email = "lamudri@gmail.com"; github = "laMudri"; + githubId = 5139265; name = "James Wood"; }; muflax = { email = "mail@muflax.com"; github = "muflax"; + githubId = 69918; name = "Stefan Dorn"; }; mvnetbiz = { email = "mvnetbiz@gmail.com"; github = "mvnetbiz"; + githubId = 6455574; name = "Matt Votava"; }; mwilsoninsight = { email = "max.wilson@insight.com"; github = "mwilsoninsight"; + githubId = 47782621; name = "Max Wilson"; }; myrl = { email = "myrl.0xf@gmail.com"; github = "myrl"; + githubId = 9636071; name = "Myrl Hex"; }; nadrieril = { email = "nadrieril@gmail.com"; github = "nadrieril"; + githubId = 6783654; name = "Nadrieril Feneanar"; }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; + githubId = 1009523; name = "Ashijit Pramanik"; }; namore = { email = "namor@hemio.de"; github = "namore"; + githubId = 1222539; name = "Roman Naumann"; }; nand0p = { @@ -3713,146 +4348,173 @@ nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; + githubId = 330943; name = "Nathan Bijnens"; }; nathyong = { email = "nathyong@noreply.github.com"; github = "nathyong"; + githubId = 818502; name = "Nathan Yong"; }; nckx = { email = "github@tobias.gr"; github = "nckx"; + githubId = 364510; name = "Tobias Geerinckx-Rice"; }; ndowens = { email = "ndowens04@gmail.com"; github = "ndowens"; + githubId = 117743; name = "Nathan Owens"; }; neeasade = { email = "nathanisom27@gmail.com"; github = "neeasade"; + githubId = 3747396; name = "Nathan Isom"; }; neonfuz = { email = "neonfuz@gmail.com"; github = "neonfuz"; + githubId = 2590830; name = "Sage Raflik"; }; nequissimus = { email = "tim@nequissimus.com"; github = "nequissimus"; + githubId = 628342; name = "Tim Steinbach"; }; netixx = { email = "dev.espinetfrancois@gmail.com"; github = "netixx"; + githubId = 1488603; name = "François Espinet"; }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; + githubId = 6391776; name = "Nikita Voloboev"; }; nfjinjing = { email = "nfjinjing@gmail.com"; - github = "nfjinjing"; name = "Jinjing Wang"; }; nh2 = { email = "mail@nh2.me"; github = "nh2"; + githubId = 399535; name = "Niklas Hambüchen"; }; nhooyr = { email = "anmol@aubble.com"; github = "nhooyr"; + githubId = 10180857; name = "Anmol Sethi"; }; nickhu = { email = "me@nickhu.co.uk"; github = "nickhu"; + githubId = 450276; name = "Nick Hu"; }; nicknovitski = { email = "nixpkgs@nicknovitski.com"; github = "nicknovitski"; + githubId = 151337; name = "Nick Novitski"; }; nico202 = { email = "anothersms@gmail.com"; github = "nico202"; + githubId = 8214542; name = "Nicolò Balzarotti"; }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; + githubId = 4368690; name = "Ratko Mladic"; }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; + githubId = 1219785; name = "Félix Baylac-Jacqué"; }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; + githubId = 3159451; name = "Nicolas Schneider"; }; nipav = { email = "niko.pavlinek@gmail.com"; github = "nipav"; + githubId = 16385648; name = "Niko Pavlinek"; }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; + githubId = 7588406; name = "Andrew R. M."; }; nmattia = { email = "nicolas@nmattia.com"; github = "nmattia"; + githubId = 6930756; name = "Nicolas Mattia"; }; nocent = { email = "nocent@protonmail.ch"; github = "nocent"; + githubId = 25505957; name = "nocent"; }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; + githubId = 810877; name = "Tom Doggett"; }; nomeata = { email = "mail@joachim-breitner.de"; github = "nomeata"; + githubId = 148037; name = "Joachim Breitner"; }; noneucat = { email = "andy@lolc.at"; github = "noneucat"; + githubId = 40049608; name = "Andy Chun"; }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; + githubId = 2946283; name = "Brian Cohen"; }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; + githubId = 5548; name = "Nicolas Pouillard"; }; nphilou = { email = "nphilou@gmail.com"; github = "nphilou"; + githubId = 9939720; name = "Philippe Nguyen"; }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; + githubId = 20391; name = "Nahum Shalman"; }; nslqqq = { @@ -3862,51 +4524,61 @@ nthorne = { email = "notrupertthorne@gmail.com"; github = "nthorne"; + githubId = 1839979; name = "Niklas Thörne"; }; numinit = { email = "me@numin.it"; github = "numinit"; + githubId = 369111; name = "Morgan Jones"; }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; + githubId = 7677321; name = "Paul Trehiou"; }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; + githubId = 127548; name = "Judson Lester"; }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; github = "nzhang-zh"; + githubId = 30825096; name = "Ning Zhang"; }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; + githubId = 3359345; name = "obadz"; }; ocharles = { email = "ollie@ocharles.org.uk"; github = "ocharles"; + githubId = 20878; name = "Oliver Charles"; }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; + githubId = 158758; name = "Oliver Dunkl"; }; offline = { email = "jaka@x-truder.net"; github = "offlinehacker"; + githubId = 585547; name = "Jaka Hudoklin"; }; oida = { email = "oida@posteo.de"; github = "oida"; + githubId = 7249506; name = "oida"; }; okasu = { @@ -3916,11 +4588,13 @@ olcai = { email = "dev@timan.info"; github = "olcai"; + githubId = 20923; name = "Erik Timan"; }; olejorgenb = { email = "olejorgenb@yahoo.no"; github = "olejorgenb"; + githubId = 72201; name = "Ole Jørgen Brønner"; }; olynch = { @@ -3931,16 +4605,19 @@ omnipotententity = { email = "omnipotententity@gmail.com"; github = "omnipotententity"; + githubId = 1538622; name = "Michael Reilly"; }; OPNA2608 = { email = "christoph.neidahl@gmail.com"; github = "OPNA2608"; + githubId = 23431373; name = "Christoph Neidahl"; }; orbekk = { email = "kjetil.orbekk@gmail.com"; github = "orbekk"; + githubId = 19862; name = "KJ Ørbekk"; }; orbitz = { @@ -3951,21 +4628,25 @@ orivej = { email = "orivej@gmx.fr"; github = "orivej"; + githubId = 101514; name = "Orivej Desh"; }; osener = { email = "ozan@ozansener.com"; github = "osener"; + githubId = 111265; name = "Ozan Sener"; }; otwieracz = { email = "slawek@otwiera.cz"; github = "otwieracz"; + githubId = 108072; name = "Slawomir Gonet"; }; oxij = { email = "oxij@oxij.org"; github = "oxij"; + githubId = 391919; name = "Jan Malakhovski"; keys = [{ longkeyid = "rsa2048/0x0E6CA66E5C557AA8"; @@ -3975,66 +4656,79 @@ oyren = { email = "m.scheuren@oyra.eu"; github = "oyren"; + githubId = 15930073; name = "Moritz Scheuren"; }; pacien = { email = "b4gx3q.nixpkgs@pacien.net"; github = "pacien"; + githubId = 1449319; name = "Pacien Tran-Girard"; }; paddygord = { email = "pgpatrickgordon@gmail.com"; github = "paddygord"; + githubId = 10776658; name = "Patrick Gordon"; }; paholg = { email = "paho@paholg.com"; github = "paholg"; + githubId = 4908217; name = "Paho Lurie-Gregg"; }; pakhfn = { email = "pakhfn@gmail.com"; github = "pakhfn"; + githubId = 11016164; name = "Fedor Pakhomov"; }; panaeon = { email = "vitalii.voloshyn@gmail.com"; github = "panaeon"; + githubId = 686076; name = "Vitalii Voloshyn"; }; pandaman = { email = "kointosudesuyo@infoseek.jp"; github = "pandaman64"; + githubId = 1788628; name = "pandaman"; }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; + githubId = 71795; name = "Mica Semrick"; }; paraseba = { email = "paraseba@gmail.com"; github = "paraseba"; + githubId = 20792; name = "Sebastian Galkin"; }; pashev = { email = "pashev.igor@gmail.com"; github = "ip1981"; + githubId = 131844; name = "Igor Pashev"; }; patternspandemic = { email = "patternspandemic@live.com"; github = "patternspandemic"; + githubId = 15645854; name = "Brad Christensen"; }; pawelpacana = { email = "pawel.pacana@gmail.com"; github = "pawelpacana"; + githubId = 116740; name = "Paweł Pacana"; }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; + githubId = 157610; name = "Piotr Bogdan"; }; pcarrier = { @@ -4045,81 +4739,97 @@ periklis = { email = "theopompos@gmail.com"; github = "periklis"; + githubId = 152312; name = "Periklis Tsirakidis"; }; pesterhazy = { email = "pesterhazy@gmail.com"; github = "pesterhazy"; + githubId = 106328; name = "Paulus Esterhazy"; }; petabyteboy = { email = "me@pbb.lc"; github = "petabyteboy"; + githubId = 3250809; name = "Milan Pässler"; }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; + githubId = 722550; name = "Peter Hoeg"; }; peterromfeldhk = { email = "peter.romfeld.hk@gmail.com"; github = "peterromfeldhk"; + githubId = 5515707; name = "Peter Romfeld"; }; peti = { email = "simons@cryp.to"; github = "peti"; + githubId = 28323; name = "Peter Simons"; }; philandstuff = { email = "philip.g.potter@gmail.com"; github = "philandstuff"; + githubId = 581269; name = "Philip Potter"; }; phile314 = { email = "nix@314.ch"; github = "phile314"; + githubId = 1640697; name = "Philipp Hausmann"; }; Phlogistique = { email = "noe.rubinstein@gmail.com"; github = "Phlogistique"; + githubId = 421510; name = "Noé Rubinstein"; }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; + githubId = 62577; name = "Evgeny Egorochkin"; }; phryneas = { email = "mail@lenzw.de"; github = "phryneas"; + githubId = 4282439; name = "Lenz Weber"; }; phunehehe = { email = "phunehehe@gmail.com"; github = "phunehehe"; + githubId = 627831; name = "Hoang Xuan Phu"; }; pierrechevalier83 = { email = "pierrechevalier83@gmail.com"; github = "pierrechevalier83"; + githubId = 5790907; name = "Pierre Chevalier"; }; pierreis = { email = "pierre@pierre.is"; github = "pierreis"; + githubId = 203973; name = "Pierre Matri"; }; pierrer = { email = "pierrer@pi3r.be"; github = "pierrer"; + githubId = 93115; name = "Pierre Radermecker"; }; pierron = { email = "nixos@nbp.name"; github = "nbp"; + githubId = 1179566; name = "Nicolas B. Pierron"; }; piotr = { @@ -4129,16 +4839,19 @@ pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "pjbarnoy"; + githubId = 119460; name = "Perry Barnoy"; }; pjones = { email = "pjones@devalot.com"; github = "pjones"; + githubId = 3737; name = "Peter Jones"; }; pkmx = { email = "pkmx.tw@gmail.com"; github = "pkmx"; + githubId = 610615; name = "Chih-Mao Chen"; }; plchldr = { @@ -4149,16 +4862,19 @@ plcplc = { email = "plcplc@gmail.com"; github = "plcplc"; + githubId = 358550; name = "Philip Lykke Carlsen"; }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; + githubId = 13000278; name = "Maksim Bronsky"; }; pmahoney = { email = "pat@polycrystal.org"; github = "pmahoney"; + githubId = 103822; name = "Patrick Mahoney"; }; pmeunier = { @@ -4169,21 +4885,25 @@ pmiddend = { email = "pmidden@secure.mailbox.org"; github = "pmiddend"; + githubId = 178496; name = "Philipp Middendorf"; }; pmyjavec = { email = "pauly@myjavec.com"; github = "pmyjavec"; + githubId = 315096; name = "Pauly Myjavec"; }; pnelson = { email = "me@pnelson.ca"; github = "pnelson"; + githubId = 579773; name = "Philip Nelson"; }; pneumaticat = { email = "kevin@potatofrom.space"; github = "pneumaticat"; + githubId = 11365056; name = "Kevin Liu"; }; polyrod = { @@ -4194,16 +4914,19 @@ pombeirp = { email = "nix@endgr.33mail.com"; github = "PombeirP"; + githubId = 138074; name = "Pedro Pombeiro"; }; pradeepchhetri = { email = "pradeep.chhetri89@gmail.com"; github = "pradeepchhetri"; + githubId = 2232667; name = "Pradeep Chhetri"; }; pradyuman = { email = "me@pradyuman.co"; github = "pradyuman"; + githubId = 9904569; name = "Pradyuman Vig"; keys = [ { longkeyid = "rsa4096/4F74D5361C4CA31E"; @@ -4214,11 +4937,13 @@ prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; + githubId = 1304102; name = "Pavan Rikhi"; }; primeos = { email = "dev.primeos@gmail.com"; github = "primeos"; + githubId = 7537109; name = "Michael Weiss"; keys = [ { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only @@ -4232,21 +4957,25 @@ Profpatsch = { email = "mail@profpatsch.de"; github = "Profpatsch"; + githubId = 3153638; name = "Profpatsch"; }; proglodyte = { email = "proglodyte23@gmail.com"; github = "proglodyte"; + githubId = 18549627; name = "Proglodyte"; }; protoben = { email = "protob3n@gmail.com"; github = "protoben"; + githubId = 4633847; name = "Ben Hamlin"; }; prusnak = { email = "pavol@rusnak.io"; github = "prusnak"; + githubId = 42201; name = "Pavol Rusnak"; keys = [{ longkeyid = "rsa4096/0x91F3B339B9A02A3D"; @@ -4256,11 +4985,13 @@ pshendry = { email = "paul@pshendry.com"; github = "pshendry"; + githubId = 1829032; name = "Paul Hendry"; }; psibi = { email = "sibi@psibi.in"; github = "psibi"; + githubId = 737477; name = "Sibi"; }; pstn = { @@ -4270,26 +5001,31 @@ pSub = { email = "mail@pascal-wittmann.de"; github = "pSub"; + githubId = 83842; name = "Pascal Wittmann"; }; psyanticy = { email = "iuns@outlook.fr"; github = "PsyanticY"; + githubId = 20524473; name = "Psyanticy"; }; ptival = { email = "valentin.robert.42@gmail.com"; github = "Ptival"; + githubId = 478606; name = "Valentin Robert"; }; ptrhlm = { email = "ptrhlm0@gmail.com"; github = "ptrhlm"; + githubId = 9568176; name = "Piotr Halama"; }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; + githubId = 37715; name = "Brian McKenna"; }; pxc = { @@ -4299,26 +5035,31 @@ pyrolagus = { email = "pyrolagus@gmail.com"; github = "PyroLagus"; + githubId = 4579165; name = "Danny Bautista"; }; q3k = { email = "q3k@q3k.org"; github = "q3k"; + githubId = 315234; name = "Serge Bazanski"; }; qknight = { email = "js@lastlog.de"; github = "qknight"; + githubId = 137406; name = "Joachim Schiele"; }; qoelet = { email = "kenny@machinesung.com"; github = "qoelet"; + githubId = 115877; name = "Kenny Shen"; }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; + githubId = 2768870; name = "Alyssa Ross"; keys = [{ longkeyid = "rsa4096/736CCDF9EF51BD97"; @@ -4333,36 +5074,43 @@ raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; + githubId = 1246959; name = "Raquel García"; }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; + githubId = 882; name = "Ragnar Dahlen"; }; ralith = { email = "ben.e.saunders@gmail.com"; github = "ralith"; + githubId = 104558; name = "Benjamin Saunders"; }; ramkromberg = { email = "ramkromberg@mail.com"; github = "ramkromberg"; + githubId = 14829269; name = "Ram Kromberg"; }; rardiol = { email = "ricardo.ardissone@gmail.com"; github = "rardiol"; + githubId = 11351304; name = "Ricardo Ardissone"; }; rasendubi = { email = "rasen.dubi@gmail.com"; github = "rasendubi"; + githubId = 1366419; name = "Alexey Shmalko"; }; raskin = { email = "7c6f434c@mail.ru"; github = "7c6f434c"; + githubId = 1891350; name = "Michael Raskin"; }; ravloony = { @@ -4372,101 +5120,121 @@ rawkode = { email = "david.andrew.mckay@gmail.com"; github = "rawkode"; + githubId = 145816; name = "David McKay"; }; razvan = { email = "razvan.panda@gmail.com"; github = "razvan-panda"; + githubId = 1758708; name = "Răzvan Flavius Panda"; }; rbasso = { email = "rbasso@sharpgeeks.net"; github = "rbasso"; + githubId = 16487165; name = "Rafael Basso"; }; rbrewer = { email = "rwb123@gmail.com"; github = "rbrewer123"; + githubId = 743058; name = "Rob Brewer"; }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; + githubId = 1973389; name = "Reuben D'Netto"; }; redbaron = { email = "ivanov.maxim@gmail.com"; github = "redbaron"; + githubId = 16624; name = "Maxim Ivanov"; }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; + githubId = 1922770; name = "Tim Engler"; }; redvers = { email = "red@infect.me"; github = "redvers"; + githubId = 816465; name = "Redvers Davies"; }; refnil = { email = "broemartino@gmail.com"; github = "refnil"; + githubId = 1142322; name = "Martin Lavoie"; }; regnat = { email = "regnat@regnat.ovh"; github = "regnat"; + githubId = 7226587; name = "Théophane Hufschmitt"; }; relrod = { email = "ricky@elrod.me"; github = "relrod"; + githubId = 43930; name = "Ricky Elrod"; }; rembo10 = { email = "rembo10@users.noreply.github.com"; github = "rembo10"; + githubId = 801525; name = "rembo10"; }; renatoGarcia = { email = "fgarcia.renato@gmail.com"; github = "renatoGarcia"; + githubId = 220211; name = "Renato Garcia"; }; rencire = { email = "546296+rencire@users.noreply.github.com"; github = "rencire"; + githubId = 546296; name = "Eric Ren"; }; renzo = { email = "renzocarbonara@gmail.com"; github = "k0001"; + githubId = 3302; name = "Renzo Carbonara"; }; retrry = { email = "retrry@gmail.com"; github = "retrry"; + githubId = 500703; name = "Tadas Barzdžius"; }; rexim = { email = "reximkut@gmail.com"; github = "rexim"; + githubId = 165283; name = "Alexey Kutepov"; }; rht = { email = "rhtbot@protonmail.com"; github = "rht"; + githubId = 395821; name = "rht"; }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; + githubId = 10631029; name = "Richard Ipsum"; }; rick68 = { email = "rick68@gmail.com"; github = "rick68"; + githubId = 42619; name = "Wei-Ming Yang"; }; rickynils = { @@ -4477,31 +5245,37 @@ ris = { email = "code@humanleg.org.uk"; github = "risicle"; + githubId = 807447; name = "Robert Scott"; }; rittelle = { email = "rittelle@posteo.de"; github = "rittelle"; + githubId = 33598633; name = "Lennart Rittel"; }; rixed = { email = "rixed-github@happyleptic.org"; github = "rixed"; + githubId = 449990; name = "Cedric Cellier"; }; rkoe = { email = "rk@simple-is-better.org"; github = "rkoe"; + githubId = 2507744; name = "Roland Koebler"; }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; + githubId = 13752145; name = "Richard Lupton"; }; rnhmjoj = { email = "micheleguerinirocco@me.com"; github = "rnhmjoj"; + githubId = 2817565; name = "Michele Guerini Rocco"; }; rob = { @@ -4517,91 +5291,109 @@ robbinch = { email = "robbinch33@gmail.com"; github = "robbinch"; + githubId = 12312980; name = "Robbin C."; }; roberth = { email = "nixpkgs@roberthensing.nl"; github = "roberth"; + githubId = 496447; name = "Robert Hensing"; }; robertodr = { email = "roberto.diremigio@gmail.com"; github = "robertodr"; + githubId = 3708689; name = "Roberto Di Remigio"; }; robgssp = { email = "robgssp@gmail.com"; github = "robgssp"; + githubId = 521306; name = "Rob Glossop"; }; roblabla = { email = "robinlambertz+dev@gmail.com"; github = "roblabla"; + githubId = 1069318; name = "Robin Lambertz"; }; roconnor = { email = "roconnor@theorem.ca"; github = "roconnor"; + githubId = 852967; name = "Russell O'Connor"; }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; + githubId = 1217934; name = "José Romildo Malaquias"; }; rongcuid = { email = "rongcuid@outlook.com"; github = "rongcuid"; + githubId = 1312525; name = "Rongcui Dong"; }; roosemberth = { email = "roosembert.palacios+nixpkgs@gmail.com"; github = "roosemberth"; + githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; }; royneary = { email = "christian@ulrich.earth"; github = "royneary"; + githubId = 1942810; name = "Christian Ulrich"; }; rprospero = { email = "rprospero+nix@gmail.com"; github = "rprospero"; + githubId = 1728853; name = "Adam Washington"; }; rps = { email = "robbpseaton@gmail.com"; github = "robertseaton"; + githubId = 221121; name = "Robert P. Seaton"; }; rszibele = { email = "richard@szibele.com"; github = "rszibele"; + githubId = 1387224; name = "Richard Szibele"; }; rtreffer = { email = "treffer+nixos@measite.de"; github = "rtreffer"; + githubId = 61306; name = "Rene Treffer"; }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; + githubId = 4958190; name = "Rushmore Mushambi"; }; ruuda = { email = "dev+nix@veniogames.com"; github = "ruuda"; + githubId = 506953; name = "Ruud van Asseldonk"; }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; + githubId = 1019641; name = "Rodney Lorrimar"; }; rvlander = { email = "rvlander@gaetanandre.eu"; github = "rvlander"; + githubId = 5236428; name = "Gaëtan André"; }; rvolosatovs = { @@ -4612,6 +5404,7 @@ ryanartecona = { email = "ryanartecona@gmail.com"; github = "ryanartecona"; + githubId = 889991; name = "Ryan Artecona"; }; ryansydnor = { @@ -4622,21 +5415,25 @@ ryantm = { email = "ryan@ryantm.com"; github = "ryantm"; + githubId = 4804; name = "Ryan Mulligan"; }; ryantrinkle = { email = "ryan.trinkle@gmail.com"; github = "ryantrinkle"; + githubId = 1156448; name = "Ryan Trinkle"; }; rybern = { email = "ryan.bernstein@columbia.edu"; github = "rybern"; + githubId = 4982341; name = "Ryan Bernstein"; }; rycee = { email = "robert@rycee.net"; github = "rycee"; + githubId = 798147; name = "Robert Helgesson"; keys = [{ longkeyid = "rsa4096/0x3573356C25C424D4"; @@ -4646,31 +5443,37 @@ ryneeverett = { email = "ryneeverett@gmail.com"; github = "ryneeverett"; + githubId = 3280280; name = "Ryne Everett"; }; rzetterberg = { email = "richard.zetterberg@gmail.com"; github = "rzetterberg"; + githubId = 766350; name = "Richard Zetterberg"; }; samdroid-apps = { email = "sam@sam.today"; github = "samdroid-apps"; + githubId = 6022042; name = "Sam Parkinson"; }; samrose = { email = "samuel.rose@gmail.com"; github = "samrose"; + githubId = 115821; name = "Sam Rose"; }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr"; + githubId = 132835; name = "Samuel Dionne-Riel"; }; samuelrivas = { email = "samuelrivas@gmail.com"; github = "samuelrivas"; + githubId = 107703; name = "Samuel Rivas"; }; sander = { @@ -4681,26 +5484,31 @@ sargon = { email = "danielehlers@mindeye.net"; github = "sargon"; + githubId = 178904; name = "Daniel Ehlers"; }; saschagrunert = { email = "mail@saschagrunert.de"; github = "saschagrunert"; + githubId = 695473; name = "Sascha Grunert"; }; sauyon = { email = "s@uyon.co"; github = "sauyon"; + githubId = 2347889; name = "Sauyon Lee"; }; sb0 = { email = "sb@m-labs.hk"; github = "sbourdeauducq"; + githubId = 720864; name = "Sébastien Bourdeauducq"; }; sboosali = { email = "SamBoosalis@gmail.com"; github = "sboosali"; + githubId = 2320433; name = "Sam Boosalis"; }; scalavision = { @@ -4711,6 +5519,7 @@ schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; + githubId = 354463; name = "Fabian Schmitthenner"; }; schmittlauch = { @@ -4720,6 +5529,7 @@ schneefux = { email = "schneefux+nixos_pkg@schneefux.xyz"; github = "schneefux"; + githubId = 15379000; name = "schneefux"; }; schristo = { @@ -4729,21 +5539,25 @@ scode = { email = "peter.schuller@infidyne.com"; github = "scode"; + githubId = 59476; name = "Peter Schuller"; }; scolobb = { email = "sivanov@colimite.fr"; github = "scolobb"; + githubId = 11320; name = "Sergiu Ivanov"; }; screendriver = { email = "nix@echooff.de"; github = "screendriver"; + githubId = 149248; name = "Christian Rackerseder"; }; Scriptkiddi = { email = "nixos@scriptkiddi.de"; github = "scriptkiddi"; + githubId = 3598650; name = "Fritz Otlinghaus"; }; scubed2 = { @@ -4754,61 +5568,73 @@ sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; + githubId = 17913919; name = "Sasha Illarionov"; }; SeanZicari = { email = "sean.zicari@gmail.com"; github = "SeanZicari"; + githubId = 2343853; name = "Sean Zicari"; }; sellout = { email = "greg@technomadic.org"; github = "sellout"; + githubId = 33031; name = "Greg Pfeil"; }; sengaya = { email = "tlo@sengaya.de"; github = "sengaya"; + githubId = 1286668; name = "Thilo Uttendorfer"; }; sephalon = { email = "me@sephalon.net"; github = "sephalon"; + githubId = 893474; name = "Stefan Wiehler"; }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; + githubId = 529649; name = "Raffael Mancini"; }; seppeljordan = { email = "sebastian.jordan.mail@googlemail.com"; github = "seppeljordan"; + githubId = 4805746; name = "Sebastian Jordan"; }; seqizz = { email = "seqizz@gmail.com"; github = "seqizz"; + githubId = 307899; name = "Gurkan Gur"; }; sfrijters = { email = "sfrijters@gmail.com"; github = "sfrijters"; + githubId = 918365; name = "Stefan Frijters"; }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; + githubId = 1151264; name = "Sebastian Graf"; }; shanemikel = { email = "shanemikel1@gmail.com"; github = "shanemikel"; + githubId = 6720672; name = "Shane Pearlman"; }; shawndellysse = { email = "sdellysse@gmail.com"; github = "shawndellysse"; + githubId = 293035; name = "Shawn Dellysse"; }; shazow = { @@ -4819,16 +5645,19 @@ sheenobu = { email = "sheena.artrip@gmail.com"; github = "sheenobu"; + githubId = 1443459; name = "Sheena Artrip"; }; sheganinans = { email = "sheganinans@gmail.com"; github = "sheganinans"; + githubId = 2146203; name = "Aistis Raulinaitis"; }; shell = { email = "cam.turn@gmail.com"; github = "VShell"; + githubId = 251028; name = "Shell Turner"; }; shlevy = { @@ -4844,51 +5673,61 @@ shou = { email = "x+g@shou.io"; github = "Shou"; + githubId = 819413; name = "Benedict Aas"; }; siddharthist = { email = "langston.barrett@gmail.com"; - github = "siddharthist"; + github = "langston-barrett"; + githubId = 4294323; name = "Langston Barrett"; }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; + githubId = 235147; name = "Raitis Veinbahs"; }; sifmelcara = { email = "ming@culpring.com"; github = "sifmelcara"; + githubId = 10496191; name = "Ming Chuan"; }; sigma = { email = "yann.hodique@gmail.com"; github = "sigma"; + githubId = 16090; name = "Yann Hodique"; }; sikmir = { email = "sikmir@gmail.com"; github = "sikmir"; + githubId = 688044; name = "Nikolay Korotkiy"; }; simonvandel = { email = "simon.vandel@gmail.com"; github = "simonvandel"; + githubId = 2770647; name = "Simon Vandel Sillesen"; }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; + githubId = 8017899; name = "Sivaram Balakrishnan"; }; sjagoe = { email = "simon@simonjagoe.com"; github = "sjagoe"; + githubId = 80012; name = "Simon Jagoe"; }; sjau = { email = "nixos@sjau.ch"; github = "sjau"; + githubId = 848812; name = "Stephan Jau"; }; sjmackenzie = { @@ -4903,6 +5742,7 @@ skeidel = { email = "svenkeidel@gmail.com"; github = "svenkeidel"; + githubId = 266500; name = "Sven Keidel"; }; skrzyp = { @@ -4912,11 +5752,13 @@ sleexyz = { email = "freshdried@gmail.com"; github = "sleexyz"; + githubId = 1505617; name = "Sean Lee"; }; smakarov = { email = "setser200018@gmail.com"; github = "setser"; + githubId = 12733495; name = "Sergey Makarov"; keys = [{ longkeyid = "rsa2048/6AA23A1193B7064B"; @@ -4926,6 +5768,7 @@ smaret = { email = "sebastien.maret@icloud.com"; github = "smaret"; + githubId = 95471; name = "Sébastien Maret"; keys = [{ longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; @@ -4935,31 +5778,37 @@ smironov = { email = "grrwlf@gmail.com"; github = "grwlf"; + githubId = 4477729; name = "Sergey Mironov"; }; sna = { email = "abouzahra.9@wright.edu"; github = "s-na"; + githubId = 20214715; name = "S. Nordin Abouzahra"; }; snaar = { email = "snaar@snaar.net"; github = "snaar"; + githubId = 602439; name = "Serguei Narojnyi"; }; snyh = { email = "snyh@snyh.org"; github = "snyh"; + githubId = 1437166; name = "Xia Bin"; }; solson = { email = "scott@solson.me"; github = "solson"; + githubId = 26806; name = "Scott Olson"; }; sondr3 = { email = "nilsen.sondre@gmail.com"; github = "sondr3"; + githubId = 2280539; name = "Sondre Nilsen"; keys = [{ longkeyid = "ed25519/0x25676BCBFFAD76B1"; @@ -4969,31 +5818,37 @@ sorki = { email = "srk@48.io"; github = "sorki"; + githubId = 115308; name = "Richard Marko"; }; sorpaas = { email = "hi@that.world"; github = "sorpaas"; + githubId = 6277322; name = "Wei Tang"; }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; + githubId = 167881; name = "Michael Raitza"; }; spacekookie = { email = "kookie@spacekookie.de"; github = "spacekookie"; + githubId = 7669898; name = "Katharina Fey"; }; spencerjanssen = { email = "spencerjanssen@gmail.com"; github = "spencerjanssen"; + githubId = 2600039; name = "Spencer Janssen"; }; spinus = { email = "tomasz.czyz@gmail.com"; github = "spinus"; + githubId = 950799; name = "Tomasz Czyż"; }; sprock = { @@ -5004,6 +5859,7 @@ spwhitt = { email = "sw@swhitt.me"; github = "spwhitt"; + githubId = 1414088; name = "Spencer Whitt"; }; srghma = { @@ -5014,37 +5870,44 @@ srgom = { email = "srgom@users.noreply.github.com"; github = "srgom"; + githubId = 8103619; name = "SRGOM"; }; srhb = { email = "sbrofeldt@gmail.com"; github = "srhb"; + githubId = 219362; name = "Sarah Brofeldt"; }; SShrike = { email = "severen@shrike.me"; github = "severen"; + githubId = 4061736; name = "Severen Redwood"; }; steell = { email = "steve@steellworks.com"; github = "Steell"; + githubId = 1699155; name = "Steve Elliott"; }; stephenmw = { email = "stephen@q5comm.com"; github = "stephenmw"; + githubId = 231788; name = "Stephen Weinberg"; }; sternenseemann = { email = "post@lukasepple.de"; github = "sternenseemann"; + githubId = 3154475; name = "Lukas Epple"; }; steshaw = { name = "Steven Shaw"; email = "steven@steshaw.org"; github = "steshaw"; + githubId = 45735; keys = [{ longkeyid = "rsa4096/0x1D9A17DFD23DCB91"; fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; @@ -5053,111 +5916,133 @@ stesie = { email = "stesie@brokenpipe.de"; github = "stesie"; + githubId = 113068; name = "Stefan Siegl"; }; steve-chavez = { email = "stevechavezast@gmail.com"; github = "steve-chavez"; + githubId = 1829294; name = "Steve Chávez"; }; steveej = { email = "mail@stefanjunker.de"; github = "steveej"; + githubId = 1181362; name = "Stefan Junker"; }; StijnDW = { email = "stekke@airmail.cc"; github = "StijnDW"; + githubId = 1751956; name = "Stijn DW"; }; StillerHarpo = { email = "florianengel39@gmail.com"; github = "StillerHarpo"; + githubId = 25526706; name = "Florian Engel"; }; stites = { email = "sam@stites.io"; github = "stites"; + githubId = 1694705; name = "Sam Stites"; }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; + githubId = 638763; name = "Stuart Moss"; }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; + githubId = 65870; name = "Сухарик"; }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; + githubId = 187109; name = "Bjarki Ágúst Guðmundsson"; }; suvash = { email = "suvash+nixpkgs@gmail.com"; github = "suvash"; + githubId = 144952; name = "Suvash Thapaliya"; }; sveitser = { email = "sveitser@gmail.com"; github = "sveitser"; + githubId = 1040871; name = "Mathis Antony"; }; svsdep = { email = "svsdep@gmail.com"; github = "svsdep"; + githubId = 36695359; name = "Vasyl Solovei"; }; swarren83 = { email = "shawn.w.warren@gmail.com"; github = "swarren83"; + githubId = 4572854; name = "Shawn Warren"; }; swdunlop = { email = "swdunlop@gmail.com"; github = "swdunlop"; + githubId = 120188; name = "Scott W. Dunlop"; }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; + githubId = 1771109; name = "Samuel W. Flint"; }; swistak35 = { email = "me@swistak35.com"; github = "swistak35"; + githubId = 332289; name = "Rafał Łasocha"; }; symphorien = { email = "symphorien_nixpkgs@xlumurb.eu"; github = "symphorien"; + githubId = 12595971; name = "Guillaume Girol"; }; synthetica = { email = "nix@hilhorst.be"; github = "Synthetica9"; + githubId = 7075751; name = "Patrick Hilhorst"; }; szczyp = { email = "qb@szczyp.com"; github = "szczyp"; + githubId = 203195; name = "Szczyp"; }; sztupi = { email = "attila.sztupak@gmail.com"; github = "sztupi"; + githubId = 143103; name = "Attila Sztupak"; }; t184256 = { email = "monk@unboiled.info"; github = "t184256"; + githubId = 5991987; name = "Alexander Sosedkin"; }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; + githubId = 4098453; name = "Tadeo Kondrak"; keys = [{ longkeyid = "ed25519/0xFBE607FCC49516D3"; @@ -5167,11 +6052,13 @@ tadfisher = { email = "tadfisher@gmail.com"; github = "tadfisher"; + githubId = 129148; name = "Tad Fisher"; }; taeer = { email = "taeer@necsi.edu"; github = "Radvendii"; + githubId = 1239929; name = "Taeer Bar-Yam"; }; taha = { @@ -5182,76 +6069,91 @@ tailhook = { email = "paul@colomiets.name"; github = "tailhook"; + githubId = 321799; name = "Paul Colomiets"; }; taketwo = { email = "alexandrov88@gmail.com"; github = "taketwo"; + githubId = 1241736; name = "Sergey Alexandrov"; }; takikawa = { email = "asumu@igalia.com"; github = "takikawa"; + githubId = 64192; name = "Asumu Takikawa"; }; taktoa = { email = "taktoa@gmail.com"; github = "taktoa"; + githubId = 553443; name = "Remy Goldschmidt"; }; taku0 = { email = "mxxouy6x3m_github@tatapa.org"; github = "taku0"; + githubId = 870673; name = "Takuo Yonezawa"; }; talyz = { email = "kim.lindberger@gmail.com"; github = "talyz"; + githubId = 63433; name = "Kim Lindberger"; }; taneb = { email = "nvd1234@gmail.com"; github = "Taneb"; + githubId = 1901799; name = "Nathan van Doorn"; }; tari = { email = "peter@taricorp.net"; github = "tari"; + githubId = 506181; name = "Peter Marheine"; }; tavyc = { email = "octavian.cerna@gmail.com"; github = "tavyc"; + githubId = 3650609; name = "Octavian Cerna"; }; tazjin = { email = "mail@tazj.in"; github = "tazjin"; + githubId = 1552853; name = "Vincent Ambo"; }; tbenst = { email = "nix@tylerbenster.com"; github = "tbenst"; + githubId = 863327; name = "Tyler Benster"; }; teh = { email = "tehunger@gmail.com"; github = "teh"; + githubId = 139251; name = "Tom Hunger"; }; telotortium = { email = "rirelan@gmail.com"; github = "telotortium"; + githubId = 1755789; name = "Robert Irelan"; }; teozkr = { email = "teo@nullable.se"; github = "teozkr"; + githubId = 649832; name = "Teo Klestrup Röijezon"; }; terlar = { email = "terlar@gmail.com"; github = "terlar"; + githubId = 280235; name = "Terje Larsen"; }; tesq0 = { @@ -5267,26 +6169,31 @@ tex = { email = "milan.svoboda@centrum.cz"; github = "tex"; + githubId = 27386; name = "Milan Svoboda"; }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; + githubId = 378734; name = "TG ⊗ Θ"; }; thall = { email = "niclas.thall@gmail.com"; github = "thall"; + githubId = 102452; name = "Niclas Thall"; }; thammers = { email = "jawr@gmx.de"; github = "tobias-hammerschmidt"; + githubId = 2543259; name = "Tobias Hammerschmidt"; }; thanegill = { email = "me@thanegill.com"; github = "thanegill"; + githubId = 1141680; name = "Thane Gill"; }; the-kenny = { @@ -5297,16 +6204,19 @@ thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; + githubId = 629710; name = "David Meister"; }; thefloweringash = { email = "lorne@cons.org.nz"; github = "thefloweringash"; + githubId = 42933; name = "Andrew Childs"; }; thesola10 = { email = "thesola10@bobile.fr"; github = "thesola10"; + githubId = 7287268; keys = [{ longkeyid = "rsa4096/0x89245619BEBB95BA"; fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; @@ -5316,31 +6226,37 @@ theuni = { email = "ct@flyingcircus.io"; github = "ctheune"; + githubId = 1220572; name = "Christian Theune"; }; thiagokokada = { email = "thiagokokada@gmail.com"; github = "thiagokokada"; + githubId = 844343; name = "Thiago K. Okada"; }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; + githubId = 678511; name = "Thomas Mader"; }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; + githubId = 3416; name = "Austin Seipp"; }; thpham = { email = "thomas.pham@ithings.ch"; github = "thpham"; + githubId = 224674; name = "Thomas Pham"; }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; + githubId = 4322055; name = "Till Höppner"; }; timbertson = { @@ -5351,31 +6267,37 @@ timokau = { email = "timokau@zoho.com"; github = "timokau"; + githubId = 3799330; name = "Timo Kaufmann"; }; timor = { email = "timor.dd@googlemail.com"; github = "timor"; + githubId = 174156; name = "timor"; }; timput = { email = "tim@timput.com"; github = "TimPut"; + githubId = 2845239; name = "Tim Put"; }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; + githubId = 1292007; name = "Sébastien Maccagnoni"; }; titanous = { email = "jonathan@titanous.com"; github = "titanous"; + githubId = 13026; name = "Jonathan Rudenberg"; }; tmplt = { email = "tmplt@dragons.rocks"; github = "tmplt"; + githubId = 6118602; name = "Viktor"; }; tnias = { @@ -5385,67 +6307,80 @@ }; tobim = { email = "nix@tobim.fastmail.fm"; - github = "tobimpub"; + github = "tobim"; + githubId = 858790; name = "Tobias Mayer"; }; tobiasBora = { email = "tobias.bora.list@gmail.com"; github = "tobiasBora"; + githubId = 2164118; name = "Tobias Bora"; }; tohl = { email = "tom@logand.com"; github = "tohl"; + githubId = 12159013; name = "Tomas Hlavaty"; }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; + githubId = 692610; name = "Daniel Frank"; }; tomahna = { email = "kevin.rauscher@tomahna.fr"; github = "Tomahna"; + githubId = 8577941; name = "Kevin Rauscher"; }; tomberek = { email = "tomberek@gmail.com"; github = "tomberek"; + githubId = 178444; name = "Thomas Bereknyei"; }; tomsmeets = { email = "tom.tsmeets@gmail.com"; github = "tomsmeets"; + githubId = 6740669; name = "Tom Smeets"; }; toonn = { email = "nnoot@toonn.io"; github = "toonn"; + githubId = 1486805; name = "Toon Nolten"; }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; + githubId = 10110; name = "Travis B. Hartwell"; }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; + githubId = 207457; name = "Matthieu Chevrier"; }; trevorj = { email = "nix@trevor.joynson.io"; github = "akatrevorjay"; + githubId = 1312290; name = "Trevor Joynson"; }; trino = { email = "muehlhans.hubert@ekodia.de"; github = "hmuehlhans"; + githubId = 9870613; name = "Hubert Mühlhans"; }; troydm = { email = "d.geurkov@gmail.com"; github = "troydm"; + githubId = 483735; name = "Dmitry Geurkov"; }; tstrobel = { @@ -5455,11 +6390,13 @@ ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; + githubId = 563054; name = "Thomas Tuegel"; }; tv = { email = "tv@krebsco.de"; github = "4z3"; + githubId = 427872; name = "Tomislav Viljetić"; }; tvestelind = { @@ -5470,6 +6407,7 @@ tvorog = { email = "marszaripov@gmail.com"; github = "tvorog"; + githubId = 1325161; name = "Marsel Zaripov"; }; tweber = { @@ -5486,6 +6424,7 @@ name = "Tyson Whitehead"; email = "twhitehead@gmail.com"; github = "twhitehead"; + githubId = 787843; keys = [{ longkeyid = "rsa2048/0x594258F0389D2802"; fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; @@ -5494,41 +6433,49 @@ typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; + githubId = 1983821; name = "Eric Wolf"; }; udono = { email = "udono@virtual-things.biz"; github = "udono"; + githubId = 347983; name = "Udo Spallek"; }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; + githubId = 122319; name = "Renato Alves"; }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; + githubId = 619015; name = "Svintsov Dmitry"; }; uri-canva = { email = "uri@canva.com"; github = "uri-canva"; + githubId = 33242106; name = "Uri Baghin"; }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; + githubId = 120451; name = "Urban Skudnik"; }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; + githubId = 928084; name = "Utku Demir"; }; uvnikita = { email = "uv.nikita@gmail.com"; github = "uvNikita"; + githubId = 1084748; name = "Nikita Uvarov"; }; uwap = { @@ -5539,11 +6486,13 @@ va1entin = { email = "github@valentinsblog.com"; github = "va1entin"; + githubId = 31535155; name = "Valentin Heidelberger"; }; vaibhavsagar = { email = "vaibhavsagar@gmail.com"; github = "vaibhavsagar"; + githubId = 1525767; name = "Vaibhav Sagar"; }; valeriangalliat = { @@ -5554,37 +6503,44 @@ vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; + githubId = 608417; name = "Jos van den Oever"; }; vanschelven = { email = "klaas@vanschelven.com"; github = "vanschelven"; + githubId = 223833; name = "Klaas van Schelven"; }; vanzef = { email = "vanzef@gmail.com"; github = "vanzef"; + githubId = 12428837; name = "Ivan Solyankin"; }; varunpatro = { email = "varun.kumar.patro@gmail.com"; github = "varunpatro"; + githubId = 6943308; name = "Varun Patro"; }; vbgl = { email = "Vincent.Laporte@gmail.com"; github = "vbgl"; + githubId = 2612464; name = "Vincent Laporte"; }; vbmithr = { email = "vb@luminar.eu.org"; github = "vbmithr"; + githubId = 797581; name = "Vincent Bernardoff"; }; vcunat = { name = "Vladimír Čunát"; email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 github = "vcunat"; + githubId = 1785925; keys = [{ longkeyid = "rsa4096/0xE747DF1F9575A3AA"; fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; @@ -5593,31 +6549,37 @@ vdemeester = { email = "vincent@sbr.pm"; github = "vdemeester"; + githubId = 6508; name = "Vincent Demeester"; }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; + githubId = 2856634; name = "Tyler Compton"; }; veprbl = { email = "veprbl@gmail.com"; github = "veprbl"; + githubId = 245573; name = "Dmitry Kalinkin"; }; vidbina = { email = "vid@bina.me"; github = "vidbina"; + githubId = 335406; name = "David Asabina"; }; vifino = { email = "vifino@tty.sh"; github = "vifino"; + githubId = 5837359; name = "Adrian Pistol"; }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; + githubId = 118959; name = "VinyMeuh"; }; viric = { @@ -5628,6 +6590,7 @@ virusdave = { email = "dave.nicponski@gmail.com"; github = "virusdave"; + githubId = 6148271; name = "Dave Nicponski"; }; vizanto = { @@ -5638,21 +6601,25 @@ vklquevs = { email = "vklquevs@gmail.com"; github = "vklquevs"; + githubId = 1771234; name = "vklquevs"; }; vlaci = { email = "laszlo.vasko@outlook.com"; github = "vlaci"; + githubId = 1771332; name = "László Vaskó"; }; vlstill = { email = "xstill@fi.muni.cz"; github = "vlstill"; + githubId = 4070422; name = "Vladimír Štill"; }; vmandela = { email = "venkat.mandela@gmail.com"; github = "vmandela"; + githubId = 849772; name = "Venkateswara Rao Mandela"; }; vmchale = { @@ -5663,11 +6630,13 @@ volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; + githubId = 5604643; name = "Mikhail Volkhov"; }; volth = { email = "jaroslavas@volth.com"; github = "volth"; + githubId = 508305; name = "Jaroslavas Pocepko"; }; vozz = { @@ -5677,31 +6646,37 @@ vrthra = { email = "rahul@gopinath.org"; github = "vrthra"; + githubId = 70410; name = "Rahul Gopinath"; }; vskilet = { email = "victor@sene.ovh"; github = "vskilet"; + githubId = 7677567; name = "Victor SENE"; }; vyorkin = { email = "vasiliy.yorkin@gmail.com"; github = "vyorkin"; + githubId = 988849; name = "Vasiliy Yorkin"; }; vyp = { email = "elisp.vim@gmail.com"; github = "vyp"; + githubId = 3889405; name = "vyp"; }; waynr = { name = "Wayne Warren"; email = "wayne.warren.s@gmail.com"; github = "waynr"; + githubId = 1441126; }; wchresta = { email = "wchresta.nix@chrummibei.ch"; github = "wchresta"; + githubId = 34962284; name = "wchresta"; }; wedens = { @@ -5711,6 +6686,7 @@ willibutz = { email = "willibutz@posteo.de"; github = "willibutz"; + githubId = 20464732; name = "Willi Butz"; }; willtim = { @@ -5724,36 +6700,43 @@ winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; + githubId = 6016963; name = "Patrick Winter"; }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; + githubId = 168610; name = "Ricardo M. Correia"; }; wjlroe = { email = "willroe@gmail.com"; github = "wjlroe"; + githubId = 43315; name = "William Roe"; }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; + githubId = 54934; name = "Wout Mertens"; }; woffs = { email = "github@woffs.de"; github = "woffs"; + githubId = 895853; name = "Frank Doepper"; }; womfoo = { email = "kranium@gikos.net"; github = "womfoo"; + githubId = 1595132; name = "Kranium Gikos Mendoza"; }; worldofpeace = { email = "worldofpeace@protonmail.ch"; github = "worldofpeace"; + githubId = 28888242; name = "Worldofpeace"; }; wscott = { @@ -5764,31 +6747,37 @@ wucke13 = { email = "info@wucke13.de"; github = "wucke13"; + githubId = 20400405; name = "Wucke"; }; wykurz = { email = "wykurz@gmail.com"; github = "wykurz"; + githubId = 483465; name = "Mateusz Wykurz"; }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; + githubId = 3992240; name = "Elijah Rum"; }; xaverdh = { email = "hoe.dom@gmx.de"; github = "xaverdh"; + githubId = 11050617; name = "Dominik Xaver Hörl"; }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; + githubId = 13489144; name = "Calle Rosenquist"; }; xeji = { email = "xeji@cat3.de"; github = "xeji"; + githubId = 36407913; name = "Uli Baum"; }; xnaveira = { @@ -5799,31 +6788,37 @@ xnwdd = { email = "nwdd+nixos@no.team"; github = "xnwdd"; + githubId = 3028542; name = "Guillermo NWDD"; }; xrelkd = { email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; + githubId = 46590321; name = "xrelkd"; }; xurei = { email = "olivier.bourdoux@gmail.com"; github = "xurei"; + githubId = 621695; name = "Olivier Bourdoux"; }; xvapx = { email = "marti.serra.coscollano@gmail.com"; github = "xvapx"; + githubId = 11824817; name = "Marti Serra"; }; xwvvvvwx = { email = "davidterry@posteo.de"; github = "xwvvvvwx"; + githubId = 6689924; name = "David Terry"; }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; + githubId = 5121426; name = "Albert Safin"; }; y0no = { @@ -5834,71 +6829,85 @@ yarny = { email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; + githubId = 41838844; name = "Yarny"; }; yarr = { email = "savraz@gmail.com"; github = "Eternity-Yarr"; + githubId = 3705333; name = "Dmitry V."; }; yegortimoshenko = { email = "yegortimoshenko@riseup.net"; github = "yegortimoshenko"; + githubId = 1643293; name = "Yegor Timoshenko"; }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; + githubId = 4113027; name = "Jesper Geertsen Jonsson"; }; ylwghst = { email = "ylwghst@onionmail.info"; github = "ylwghst"; + githubId = 26011724; name = "Burim Augustin Berisa"; }; yochai = { email = "yochai@titat.info"; github = "yochai"; + githubId = 1322201; name = "Yochai"; }; yorickvp = { email = "yorickvanpelt@gmail.com"; github = "yorickvp"; + githubId = 647076; name = "Yorick van Pelt"; }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; + githubId = 452; name = "Yurii Rashkovskii"; }; ysndr = { email = "me@ysndr.de"; github = "ysndr"; + githubId = 7040031; name = "Yannik Sander"; }; yuriaisaka = { email = "yuri.aisaka+nix@gmail.com"; github = "yuriaisaka"; + githubId = 687198; name = "Yuri Aisaka"; }; yurrriq = { email = "eric@ericb.me"; github = "yurrriq"; + githubId = 1866448; name = "Eric Bailey"; }; z77z = { email = "maggesi@math.unifi.it"; github = "maggesi"; + githubId = 1809783; name = "Marco Maggesi"; }; zachcoyle = { email = "zach.coyle@gmail.com"; github = "zachcoyle"; + githubId = 908716; name = "Zach Coyle"; }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; + githubId = 568532; name = "Christian Zagrodnick"; }; zalakain = { @@ -5909,16 +6918,19 @@ zaninime = { email = "francesco@zanini.me"; github = "zaninime"; + githubId = 450885; name = "Francesco Zanini"; }; zarelit = { email = "david@zarel.net"; github = "zarelit"; + githubId = 3449926; name = "David Costa"; }; zauberpony = { email = "elmar@athmer.org"; github = "zauberpony"; + githubId = 250877; name = "Elmar Athmer"; }; zef = { @@ -5928,61 +6940,73 @@ zgrannan = { email = "zgrannan@gmail.com"; github = "zgrannan"; + githubId = 1141948; name = "Zack Grannan"; }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; + githubId = 3248; name = "zimbatm"; }; Zimmi48 = { email = "theo.zimmermann@univ-paris-diderot.fr"; github = "Zimmi48"; + githubId = 1108325; name = "Théo Zimmermann"; }; zohl = { email = "zohl@fmap.me"; github = "zohl"; + githubId = 6067895; name = "Al Zohali"; }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; + githubId = 1772064; name = "Tim Zook"; }; zoomulator = { email = "zoomulator@gmail.com"; github = "zoomulator"; + githubId = 1069303; name = "Kim Simmons"; }; zraexy = { email = "zraexy@gmail.com"; github = "zraexy"; + githubId = 8100652; name = "David Mell"; }; zx2c4 = { email = "Jason@zx2c4.com"; github = "zx2c4"; + githubId = 10643; name = "Jason A. Donenfeld"; }; zzamboni = { email = "diego@zzamboni.org"; github = "zzamboni"; + githubId = 32876; name = "Diego Zamboni"; }; turbomack = { email = "marek.faj@gmail.com"; github = "turboMaCk"; + githubId = 2130305; name = "Marek Fajkus"; }; melling = { email = "mattmelling@fastmail.com"; github = "mattmelling"; + githubId = 1215331; name = "Matt Melling"; }; wd15 = { email = "daniel.wheeler2@gmail.com"; github = "wd15"; + githubId = 1986844; name = "Daniel Wheeler"; }; } diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e5fb95f7dcf..9cea2db610e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -335,7 +335,7 @@ If you’re using the graphical ISO image, other editors may be available (such as <command>vim</command>). If you have network access, you can also install other editors — for instance, you can install Emacs by running - <literal>nix-env -i emacs</literal>. + <literal>nix-env -f '<nixpkgs>' -iA emacs</literal>. </para> <variablelist> <varlistentry> @@ -467,10 +467,10 @@ Retype new UNIX password: ***</screen> <para> You may also want to install some software. For instance, <screen> -<prompt>$ </prompt>nix-env -qa \*</screen> +<prompt>$ </prompt>nix-env -qaP \*</screen> shows what packages are available, and <screen> -<prompt>$ </prompt>nix-env -i w3m</screen> +<prompt>$ </prompt>nix-env -f '<nixpkgs>' -iA w3m</screen> install the <literal>w3m</literal> browser. </para> </listitem> diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 1492d855aa0..7fb0024f37d 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -38,5 +38,16 @@ in { "$HOME/.local/share/flatpak/exports" "/var/lib/flatpak/exports" ]; + + # It has been possible since https://github.com/flatpak/flatpak/releases/tag/1.3.2 + # to build a SELinux policy module. + + users.users.flatpak = { + description = "Flatpak system helper"; + group = "flatpak"; + isSystemUser = true; + }; + + users.groups.flatpak = { }; }; } diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index a3041ae22e7..acd69f18376 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -552,7 +552,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal <xref linkend="opt-environment.systemPackages"/> (<link linkend="sec-declarative-package-mgmt">NixOS</link>), or run - <literal>nix-env -i pkgs.docbook5</literal> + <literal>nix-env -f '<nixpkgs>' -iA docbook5</literal> (<link linkend="sec-ad-hoc-packages">Nix</link>). </para> diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix index 4d11360d07e..f4eec7e0d28 100644 --- a/nixos/modules/services/monitoring/loki.nix +++ b/nixos/modules/services/monitoring/loki.nix @@ -103,7 +103,7 @@ in { PrivateTmp = true; ProtectHome = true; ProtectSystem = "full"; - DecvicePolicy = "closed"; + DevicePolicy = "closed"; NoNewPrivileges = true; WorkingDirectory = cfg.dataDir; }; diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 9cfcd1697c1..90abed30db5 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -120,7 +120,8 @@ in name = mkOption { type = types.str; - default = "zabbix"; + default = if cfg.database.type == "sqlite" then "${stateDir}/zabbix.db" else "zabbix"; + defaultText = "zabbix"; description = "Database name."; }; @@ -261,17 +262,17 @@ in preStart = optionalString pgsqlLocal '' if ! test -e "${stateDir}/db-created"; then cat ${cfg.package}/share/zabbix/database/postgresql/schema.sql | ${pgsql.package}/bin/psql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/postgresql/images.sql | ${pgsql.package}/bin/psql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/postgresql/data.sql | ${pgsql.package}/bin/psql ${cfg.database.name} touch "${stateDir}/db-created" fi '' + optionalString mysqlLocal '' if ! test -e "${stateDir}/db-created"; then cat ${cfg.package}/share/zabbix/database/mysql/schema.sql | ${mysql.package}/bin/mysql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/mysql/images.sql | ${mysql.package}/bin/mysql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/mysql/data.sql | ${mysql.package}/bin/mysql ${cfg.database.name} touch "${stateDir}/db-created" fi + '' + optionalString (cfg.database.type == "sqlite") '' + if ! test -e "${cfg.database.name}"; then + ${pkgs.sqlite}/bin/sqlite3 "${cfg.database.name}" < ${cfg.package}/share/zabbix/database/sqlite3/schema.sql + fi '' + optionalString (cfg.database.passwordFile != null) '' # create a copy of the supplied password file in a format zabbix can consume touch ${passwordFile} diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 8e1272f3c92..f0cafc37758 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -123,11 +123,9 @@ in ]; services.pantheon.contractor.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; - services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; - services.gnome3.file-roller.enable = mkDefault true; - # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully services.gnome3.glib-networking.enable = true; + # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon; @@ -140,7 +138,6 @@ in services.xserver.libinput.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; services.zeitgeist.enable = mkDefault true; - services.geoclue2.enable = mkDefault true; # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; @@ -149,6 +146,9 @@ in isSystem = true; }; + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 58a75ac44ce..5cf9b1b8ab7 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r"; + sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg"; }; buildInputs = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b3a7c2c817c..7f691b30418 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j"; }; latestVersion = { # canary & dev - version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" - build = "191.5618338"; - sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; + version = "3.6.0.6"; # "Android Studio 3.6 Canary 6" + build = "192.5787298"; + sha256Hash = "1rri8b5nkxj65hq13s5d31fy08llf3ad9s5mn56ridd4nsy2c5df"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6072cb62b59..f24fbb65e55 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi"; + sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 5d3564f38e6..e401a7c0b8e 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "barrier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0"; + sha256 = "1dakpgs4jcwg06f45xg6adc83jd2qnpywmjm1z7g0hzd2vd0qg4k"; }; buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a949f0400cb..39fdc8e5e1c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "calibre"; - version = "3.45.2"; + version = "3.46.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05"; + sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9"; }; patches = [ diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix new file mode 100644 index 00000000000..e93d0ab69a7 --- /dev/null +++ b/pkgs/applications/misc/firestarter/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, python3, cudatoolkit, + withCuda ? true +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "firestarter"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "tud-zih-energy"; + repo = "FIRESTARTER"; + rev = "v${version}"; + sha256 = "1gc7kmzx9nw22lyfmpyz72p974jf1hvw5nvszcaq7x6h8cz9ip15"; + }; + + nativeBuildInputs = [ python3 ]; + buildInputs = optionals withCuda [ cudatoolkit ]; + preBuild = '' + mkdir -p build + cd build + python ../code-generator.py ${optionalString withCuda "--enable-cuda"} + ''; + makeFlags = optionals withCuda [ "LINUX_CUDA_PATH=${cudatoolkit}" ]; + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp FIRESTARTER $out/bin/firestarter + ''; + + meta = with stdenv.lib; { + homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter; + description = "Processor Stress Test Utility"; + platforms = platforms.linux; + maintainers = with maintainers; [ astro ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 9a12ba2bfd5..6cd77318754 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -36,7 +36,7 @@ GEM mime-types-data (3.2019.0331) mini_portile2 (2.4.0) mustache (0.99.8) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) posix-spawn (0.3.13) rack (1.6.11) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 6de5553ac7c..f9bdf94db17 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; posix-spawn = { groups = ["default"]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix new file mode 100644 index 00000000000..b84053b94ad --- /dev/null +++ b/pkgs/applications/misc/gsctl/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "gsctl"; + version = "0.15.4"; + + goPackagePath = "github.com/giantswarm/gsctl"; + + src = fetchFromGitHub { + owner = "giantswarm"; + repo = pname; + rev = version; + sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj"; + }; + + meta = with stdenv.lib; { + description = "The Giant Swarm command line interface"; + homepage = https://github.com/giantswarm/gsctl; + license = licenses.asl20; + maintainers = with maintainers; [ joesalisbury ]; + }; +} diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 7954b6dc03e..00088aef8ad 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -17,7 +17,7 @@ GEM ffi (1.11.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.11.0) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -36,8 +36,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-mentions (1.5.1) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -49,7 +49,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.0) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) @@ -62,7 +62,7 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -70,7 +70,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rouge (3.5.1) + rouge (3.8.0) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 741b5e2a069..1107ba745fd 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -141,10 +141,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-mentions = { dependencies = ["html-pipeline" "jekyll"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -331,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.5.1"; + version = "3.8.0"; }; ruby_dep = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 7baf6a45fc5..7b9b74ef1b7 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -28,7 +28,7 @@ GEM ffi (1.11.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.11.0) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -47,8 +47,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) coffee-script-source (~> 1.12) @@ -70,7 +70,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.0) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) @@ -90,7 +90,7 @@ GEM minitest (5.11.3) multi_json (1.13.1) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -104,8 +104,8 @@ GEM ffi (~> 1.0) rdiscount (2.2.0.1) rdoc (6.1.1) - redcarpet (3.4.0) - rouge (3.5.1) + redcarpet (3.5.0) + rouge (3.8.0) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 63209d4ff45..917ba51caab 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -195,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -238,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -358,10 +358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; @@ -518,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; octokit = { dependencies = ["sawyer"]; @@ -648,20 +648,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.5.1"; + version = "3.8.0"; }; ruby_dep = { groups = ["default"]; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 6bc608ee5d4..ed3c8672269 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -20,11 +20,11 @@ mkDerivation rec { pname = "kdeconnect"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz"; - sha256 = "12ijvp86wm6k81dggypxh3c0dmwg5mczxy43ra8rgv63aavmf42h"; + sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"; }; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index fb36d3729c0..b5276818f79 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cni-plugins"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws"; + sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia"; }; buildInputs = [ removeReferencesTo go ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index ef4009b0e96..94d5be030da 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0b4"; + previewVersion = "2.2.0rc3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "03jlg4ncs69gv1dn1zsdm0ipvlg6r0lwf8myxric6vv4ks7qqd3w"; + sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0mzn62649hmmqq8z2vphqvi0w38jwq8ps4zzbl1dqygbf4gadnqa"; + sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d"; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2338f2478f8..189092a6d5e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.91"; + version = "0.0.93"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.91/discord-canary-0.0.91.tar.gz"; - sha256 = "0sw5m4z5k29rzqrsxbvjqd8fxjwd9jn7nbq65nyg7f0d790rhpy8"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz"; + sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 97ba8f20de9..c97a908d33d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1s48mgya1gvidk0fmm7pifhqj2k0dc9xdq3h5ifz9kivjp7h0z09"; + sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index fbf6047af60..b3b21174bc3 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "6"; - minor = "2"; - patch = "4"; - tweak = "2"; + minor = "3"; + patch = "0"; + tweak = "4"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1drq59lc6p4s8mil2syz93l97phsbk9dcrd5gikqi2dwlzkli0gz"; + sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6acd692a95b..b5cfefd7820 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c"; + sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s"; + sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; }; }; @@ -145,6 +145,8 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx @@ -307,6 +309,9 @@ in stdenv.mkDerivation rec { # Without these, configure does not finish "--without-junit" + # Schema files for validation are not included in the source tarball + "--without-export-validation" + "--disable-libnumbertext" # system-libnumbertext" # We do tarball prefetching ourselves diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index bfb74d1bb50..4df8ce1059b 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.64.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz"; - sha256 = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5"; + name = "curl-7.65.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; + sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; md5 = ""; - md5name = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5-curl-7.64.0.tar.gz"; + md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -539,11 +539,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { name = "libxml2-2.9.9.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.38-with-nspr-4.19.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz"; - sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9"; + name = "nss-3.45-with-nspr-4.21.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; + sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; md5 = ""; - md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz"; + md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 0fc7220c43b..064ad204aff 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "symbiyosys"; - version = "2019.04.18"; + version = "2019.08.13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "b1de59032ef3de35e56fa420a914c2f14d2495e4"; - sha256 = "0zci1n062csswl5xxjh9fwq09p9clv95ckag3yywxq06hnqzx0r7"; + rev = "9cb542ac7a310b3dfa626349db53bed6236b670c"; + sha256 = "0c7nz740738ybk33zzlfl00cq86n31wvra8pqqkpl4ygxnwca1d6"; }; buildInputs = [ python3 yosys ]; @@ -26,9 +26,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/sby \ --replace "##yosys-sys-path##" \ "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" - substituteInPlace $out/share/yosys/python3/sby_core.py \ - --replace "/bin/bash" \ - "${bash}/bin/bash" ''; meta = { description = "Tooling for Yosys-based verification flows"; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 1566719084c..91666e85d92 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,9 +1,9 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, jre, swt, gtk, libXtst, glib +, gtk, libXtst, glib, zlib }: let - version = "1.5.7"; + version = "1.6.0"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -25,7 +25,7 @@ in stdenv.mkDerivation { inherit version; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; + sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; }; buildInputs = [ makeWrapper ]; @@ -35,17 +35,20 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" cp -r "$src" "$out/toolbox" - chmod +w "$out/toolbox" "$out/toolbox/toolbox" + chmod -R +w "$out/toolbox" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$(find "$out/toolbox" -name java)" + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 5068647e879..c7d77bf3498 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -145,7 +145,7 @@ let lab = callPackage ./lab { }; - pre-commit = callPackage ./pre-commit { }; + pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index bb2b4b3e0b8..8b2b15a0078 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -8,7 +8,8 @@ buildPythonApplication rec { # Mercurial should be added as a build input but because it's a Python # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests - buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; + checkInputs = [ pytest pytest-flake8 pytest-cram git ]; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; # PyPI source is currently missing tests. Thus, use GitHub instead. diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 72568ab0f5c..c28d900dd9f 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { pname = "avidemux"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld"; + sha256 = "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x"; }; patches = [ diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 3895bafb5a9..e863a382470 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bspwm"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1vc4pdm4fwb5gz7hyzwvjqkx5087f0vrw11898nq1s7kxzl2lhbx"; + sha256 = "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index f0299f7e41e..c0e6c4b5004 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "88"; + defaultVersion = "89"; # Map from git revs to SHA256 hashes sha256s = { - "version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi"; + "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index ca35026b493..d32d3fa67f1 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2019.04.19"; + version = "2019.08.10"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "5344bc3b65f4e06f983db781e9a82d30b3f1512b"; - sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a"; + rev = "3f26cf50767143e48d29ae691b2a0052c359eb15"; + sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr"; }; nativeBuildInputs @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_ROOT=${trellisRoot}/trellis" "-DUSE_OPENMP=ON" + # warning: high RAM usage + "-DSERIALIZE_CHIPDB=OFF" + # use PyPy for icestorm if enabled + "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index e7f70136675..aaa8628efbe 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub , pkgconfig, bison, flex , tcl, readline, libffi, python3 -, protobuf +, protobuf, zlib }: with builtins; stdenv.mkDerivation rec { pname = "yosys"; - version = "2019.04.23"; + version = "2019.08.13"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "d9daf09cf3aab202b6da058c5e959f6375a4541e"; - sha256 = "0l27r9l3fvkqhmbqqpjz1f3ny4wdh5mdc7jlnbgy6nxx6vqcmkh0"; + rev = "19d6b8846f55b4c7be705619f753bec86deadac8"; + sha256 = "185sbkxajx3k9j03n0cxq2qvzwfwdbcxp19h8vnk7ghd5y9gp602"; name = "yosys"; }) @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "3709744c60696c5e3f4cc123939921ce8107fe04"; - sha256 = "18a9cjng3qfalq8m9az5ck1y5h4l2pf9ycrvkzs9hn82b1j7vrax"; + rev = "5776ad07e7247993976bffed4802a5737c456782"; + sha256 = "1la4idmssg44rp6hd63sd5vybvs3vr14yzvwcg03ls37p39cslnl"; name = "yosys-abc"; }) ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf ]; + buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b3b506783cd..c8856ea2aa3 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -115,25 +115,25 @@ in { self = pypy27; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894"; + sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg"; pythonVersion = "2.7"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; }; - pypy35 = callPackage ./pypy { - self = pypy35; + pypy36 = callPackage ./pypy { + self = pypy36; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w"; - pythonVersion = "3.5"; + sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1"; + pythonVersion = "3.6"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; @@ -143,26 +143,26 @@ in { # Not included at top-level self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64 pythonVersion = "2.7"; inherit passthruFun; ncurses = ncurses5; }; - pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { - # Not included at top-level - self = pythonInterpreters.pypy35_prebuilt; + pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy36_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 - pythonVersion = "3.5"; + sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64 + pythonVersion = "3.6"; inherit passthruFun; ncurses = ncurses5; }; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index db7e51a51f3..7ec476b1ea4 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -88,7 +88,9 @@ in with passthru; stdenv.mkDerivation rec { setupHook = python-setup-hook sitePackages; - doCheck = true; + # TODO: A bunch of tests are failing as of 7.1.1, please feel free to + # fix and re-enable if you have the patience and tenacity. + doCheck = false; checkPhase = let disabledTests = [ # disable shutils because it assumes gid 0 exists @@ -139,7 +141,7 @@ in with passthru; stdenv.mkDerivation rec { echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py ''; inherit passthru; @@ -149,8 +151,7 @@ in with passthru; stdenv.mkDerivation rec { homepage = http://pypy.org/; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ andersk ]; - broken = true; # TODO: Tests are failing! }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1ac779ed25e..af933f0a4bd 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; @@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index af94de525f7..04ab1331475 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "6.5.5"; + version = "6.5.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39"; + sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4"; }; enableParallelBuilding = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; - + preConfigure = '' export INSTALL_PREFIX=$out export ACE_ROOT=$(pwd) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 27204e8e339..127c2f3ae31 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.600.5"; pname = "armadillo"; + version = "9.600.6"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x"; + sha256 = "0wlk1yv9531vpvgja4cpy0sxykrn0p5w376kx86vl45b50yamx7g"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 0e1445ca9ee..3552e335fed 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,32 +1,38 @@ { stdenv, unzip, fetchurl }: -let - version = "24"; +# Upstream changes files in-place, to update: +# 1. Check latest version at http://www.un4seen.com/ +# 2. Update `version`s and `sha256` sums. +# See also http://www.un4seen.com/forum/?topic=18614.0 +let allBass = { bass = { h = "bass.h"; + version = "2.4.14"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; }; - urlpath = "bass${version}-linux.zip"; - sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz"; + urlpath = "bass24-linux.zip"; + sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; }; bass_fx = { h = "C/bass_fx.h"; + version = "2.4.12.1"; so = { i686_linux = "libbass_fx.so"; x86_64-linux = "x64/libbass_fx.so"; }; - urlpath = "z/0/bass_fx${version}-linux.zip"; + urlpath = "z/0/bass_fx24-linux.zip"; sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; }; }; dropBass = name: bass: stdenv.mkDerivation { - name = "lib${name}-${version}"; + pname = "lib${name}"; + inherit (bass) version; src = fetchurl { url = "https://www.un4seen.com/files/${bass.urlpath}"; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 904874b2290..3e7ef6d96ee 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - pname = "cimg"; - version = "2.6.7"; + version = "2.7.0"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m"; + sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch index 79257fd6be5..407811736f8 100644 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..8c621ec4 100644 +index 9e885070..d02eeb8c 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width, "--unshare-ipc", "--unshare-net", "--unshare-pid", diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 4c4949b37be..d29be4cb930 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.2.4"; + version = "1.4.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; + sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xorg.libXau + libsoup lzma ostree polkit python3 systemd xorg.libXau fuse gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon ]; diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch index 49fcaa2b3f9..746b4382864 100644 --- a/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c +index 5dd7629e..ddc71a4c 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c -@@ -624,7 +624,7 @@ +@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir) g_auto(GStrv) stdout_lines = NULL; int i; char *p11_argv[] = { @@ -9,7 +11,7 @@ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. -@@ -770,7 +770,7 @@ +@@ -836,7 +836,7 @@ main (int argc, exit (1); } diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index f987899e3bc..85b222152d0 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,8 @@ +diff --git a/tests/libtest.sh b/tests/libtest.sh +index 46bcefb3..0134425e 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -328,7 +328,7 @@ +@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +11,7 @@ _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -309,12 +309,12 @@ +@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -24,9 +26,11 @@ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then +diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh +index 0a0a28f1..16fd51fe 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -114,13 +114,13 @@ msgid "Hello world" +@@ -129,13 +129,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -42,9 +46,11 @@ flatpak build-finish ${DIR} mkdir -p repos +diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh +index 57899b75..9236996f 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -26,6 +26,7 @@ +@@ -28,6 +28,7 @@ EOF PATH="$PATH:/usr/sbin:/sbin" # Add bash and dependencies @@ -52,7 +58,7 @@ mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -35,48 +36,27 @@ +@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -105,21 +111,20 @@ -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but -# the real en_US locale is often not available, because its in the -# local archive. +-mkdir -p ${DIR}/usr/lib/locale/ +-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US +mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store +chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed +find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths +find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets -+ -+# We copy the whole locale archive because we do not have C.UTF8 locale - mkdir -p ${DIR}/usr/lib/locale/ --cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US -+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} +diff --git a/tests/testlibrary.c b/tests/testlibrary.c +index f2773dc8..3af9026f 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -584,7 +584,7 @@ +@@ -1053,7 +1053,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -128,6 +133,8 @@ g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); +diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger +index 711cfab2..10c220ec 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,7 +1,7 @@ diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch index 0e259aebd8a..4cee60be2d0 100644 --- a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch +++ b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch @@ -1,6 +1,8 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 92ec3985..b3fccf1d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -40,8 +40,8 @@ +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], [ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 798e388b23c..63ce0d12fe0 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 8d52d3a5..81700183 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { +@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { {"PERLLIB", NULL}, {"PERL5LIB", NULL}, {"XCURSOR_PATH", NULL}, diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch index 408198bda5c..01363ffb7b3 100644 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 8f9dc66c..d3ab6e5f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c -@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app, +@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app, new_exec = g_string_new (""); g_string_append_printf (new_exec, @@ -9,7 +11,7 @@ escaped_branch, escaped_arch); -@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self, +@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self, error)) return FALSE; @@ -21,28 +23,28 @@ G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) return FALSE; diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index 6937b041..01f8add7 100755 +index dff17f33..a9857adc 100755 --- a/tests/test-bundle.sh +++ b/tests/test-bundle.sh @@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/tests/test-run.sh b/tests/test-run.sh -index 9d83d82e..234e4ec6 100755 +index 233df9ad..76e0b23b 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh -@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export +@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch index 5b8cc2d0383..086114e11c3 100644 --- a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch +++ b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..f0659a78 100644 +index 9e885070..44fea035 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width, add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); if (g_getenv ("G_MESSAGES_PREFIXED")) add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 1486b5bfc55..909c504870f 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5 +, libsForQt5, makeWrapper }: stdenv.mkDerivation rec { pname = "g2o"; @@ -11,8 +12,33 @@ stdenv.mkDerivation rec { sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen suitesparse ]; + # Removes a reference to gcc that is only used in a debug message + patches = [ ./remove-compiler-reference.patch ]; + + separateDebugInfo = true; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ]; + + cmakeFlags = [ + # Detection script is broken + "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" + "-DG2O_BUILD_EXAMPLES=OFF" + ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { + "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; + "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; + "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + + postInstall = '' + wrapProgram $out/bin/g2o_viewer \ + --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" + ''; meta = { description = "A General Framework for Graph Optimization"; diff --git a/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/pkgs/development/libraries/g2o/remove-compiler-reference.patch new file mode 100644 index 00000000000..347c5780240 --- /dev/null +++ b/pkgs/development/libraries/g2o/remove-compiler-reference.patch @@ -0,0 +1,25 @@ +From b9bfed09e4e3c481b7eb36bee1ff4202ccf69dee Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Fri, 17 May 2019 19:05:36 -0400 +Subject: [PATCH] Remove reference to compiler. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3f66dd..bb05bd0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -371,7 +371,7 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND}) + set(G2O_HAVE_CSPARSE ${CSPARSE_FOUND}) + set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS}) +-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}") ++set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} unknown") + + configure_file(config.h.in "${PROJECT_BINARY_DIR}/g2o/config.h") + install(FILES ${PROJECT_BINARY_DIR}/g2o/config.h DESTINATION ${INCLUDES_DESTINATION}/g2o) +-- +2.21.0 + diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix new file mode 100644 index 00000000000..174296375e0 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/1.nix @@ -0,0 +1,21 @@ +{ libmodulemd, fetchurl }: + +libmodulemd.overrideAttrs(old: rec { + name = "libmodulemd-${version}"; + version = "1.8.15"; + + # Removes py output since there's no overrides here + outputs = [ "out" "devdoc" ]; + + patches = [ + # Checks for glib docs in glib's prefix + # but they're installed to another + ./dont-check-docs.patch + ]; + + src = fetchurl { + url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; + sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; + }; + +}) diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix new file mode 100644 index 00000000000..ba77c7806b5 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, gobject-introspection +, python3 +, libyaml +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libmodulemd"; + version = "2.6.0"; + + outputs = [ "out" "devdoc" "py" ]; + + src = fetchFromGitHub { + owner = "fedora-modularity"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; + }; + + patches = [ + ./pygobject-dir.patch + ]; + + nativeBuildInputs = [ + pkgconfig + meson + ninja + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + gobject-introspection + ]; + + buildInputs = [ + libyaml + glib + ]; + + mesonFlags = [ + "-Ddeveloper_build=false" + "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + meta = with stdenv.lib; { + description = "C Library for manipulating module metadata files"; + homepage = "https://github.com/fedora-modularity/libmodulemd"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch new file mode 100644 index 00000000000..38ad5683692 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index 155c9e7..9125372 100644 +--- a/meson.build ++++ b/meson.build +@@ -60,15 +60,15 @@ sh = find_program('sh') + sed = find_program('sed') + test = find_program('test') + +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GLib.') +-endif +- +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GObject.') +-endif ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GLib.') ++# endif ++ ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GObject.') ++# endif + + python_name = get_option('python_name') + diff --git a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch new file mode 100644 index 00000000000..a367872eec6 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch @@ -0,0 +1,45 @@ +diff --git a/bindings/python/meson.build b/bindings/python/meson.build +index 4358b79..61fd5a5 100644 +--- a/bindings/python/meson.build ++++ b/bindings/python/meson.build +@@ -1,3 +1,5 @@ ++pygobject_override_dir = get_option('pygobject_override_dir') ++ + get_overridedir = ''' + import os + import sysconfig +@@ -21,7 +23,7 @@ print(overridedir) + ''' + + # Python 3 +-if (get_option('with_py3_overrides')) ++if (get_option('with_py3_overrides')) and pygobject_override_dir == '' + ret = run_command([python3, '-c', get_overridedir]) + + if ret.returncode() != 0 +@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides')) + endif + + # Python 2 +-if (get_option('with_py2_overrides')) ++if (get_option('with_py2_overrides')) and pygobject_override_dir == '' + ret2 = run_command([python2, '-c', get_overridedir]) + + if ret2.returncode() != 0 +@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides')) + + install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir) + endif ++ ++if pygobject_override_dir != '' ++ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 147419f..9071a04 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false) + option('python_name', type : 'string') + option('with_py2_overrides', type : 'boolean', value : false) + option('with_py3_overrides', type : 'boolean', value : true) ++option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index e68c5052beb..34b396a7102 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: stdenv.mkDerivation rec { - name = "libqglviewer-2.6.3"; - version = "2.6.3"; + pname = "libqglviewer"; + version = "2.7.1"; src = fetchurl { url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; + sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz"; }; - buildInputs = [ qt4 qmake4Hook ] + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase libGLU ] ++ stdenv.lib.optional stdenv.isDarwin AGL; - postPatch = - '' - cd QGLViewer - ''; + postPatch = '' + cd QGLViewer + ''; meta = with stdenv.lib; { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; - homepage = http://libqglviewer.com/; + homepage = "http://libqglviewer.com"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix index b8019fb3350..433da83dab9 100644 --- a/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.0-patches.nix @@ -1,4 +1,5 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") ] diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b8cf86999e0..9b031602371 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,18 +1,39 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, libxml2 +, xdg-desktop-portal +, gtk3 +, glib +, wrapGAppsHook +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; + sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ + autoreconfHook + libxml2 + pkgconfig + wrapGAppsHook + xdg-desktop-portal + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk3 + ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 3f02946c770..4be7bd1474c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.2.0"; + version = "1.4.2"; outputs = [ "out" "installedTests" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; + sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6"; }; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch index f884899ecd1..d970f5636ae 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch @@ -1,10 +1,12 @@ ---- a/src/xdg-desktop-portal.c -+++ b/src/xdg-desktop-portal.c -@@ -177,38 +177,50 @@ - static void - load_installed_portals (void) +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 4fd48ff..346da7c 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a, + void + load_installed_portals (gboolean opt_verbose) { -- const char *portal_dir = PKGDATADIR "/portals"; +- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals"; - g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); - g_autoptr(GFileEnumerator) enumerator = NULL; @@ -14,7 +16,7 @@ + const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH"); + + if (portal_dir == NULL) -+ portal_dir = PKGDATADIR "/portals"; ++ portal_dir = DATADIR "/portals"; - if (enumerator == NULL) - return; @@ -56,7 +58,7 @@ - path = g_file_get_path (child); + name = g_file_info_get_name (info); -- if (!register_portal (path, &error)) +- if (!register_portal (path, opt_verbose, &error)) - { - g_warning ("Error loading %s: %s", path, error->message); - continue; @@ -66,7 +68,7 @@ + child = g_file_enumerator_get_child (enumerator, info); + path = g_file_get_path (child); + -+ if (!register_portal (path, &error)) ++ if (!register_portal (path, opt_verbose, &error)) + { + g_warning ("Error loading %s: %s", path, error->message); + continue; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 9f5af47c726..592abea4ea0 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,24 +1,19 @@ { stdenv , fetchurl -# Regarding static/shared libaries, the current behaviour is: -# -# - static=true, shared=true: builds both and moves .a to the .static output; -# in this case `pkg-config` auto detection will -# not work if the .static output is given as -# buildInputs to another package (#66461) -# - static=true, shared=false: builds .a only and leaves it in the main output -# - static=false, shared=true: builds shared only -# -# To get both `.a` and shared libraries in one output, -# you currently have to use -# static=false, shared=true -# and use -# .overrideAttrs (old: { dontDisableStatic = true; }) -# This is because by default, upstream zlib ./configure builds both. -, static ? true +# Note: If `{ static = false; shared = false; }`, upstream's default is used +# (which is building both static and shared as of zlib 1.2.11). , shared ? true +, static ? true +# If true, a separate .static ouput is created and the .a is moved there. +# In this case `pkg-config` will auto detection will currently not work if the +# .static output is given as `buildInputs` to another package (#66461), because +# the `.pc` file lists only the main output's lib dir. +# If false, and if `{ static = true; }`, the .a stays in the main output. +, splitStaticOutput ? static }: +assert splitStaticOutput -> static; + stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -41,14 +36,35 @@ stdenv.mkDerivation (rec { ''; outputs = [ "out" "dev" ] - ++ stdenv.lib.optional (shared && static) "static"; + ++ stdenv.lib.optional splitStaticOutput "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - configureFlags = stdenv.lib.optional shared "--shared" - ++ stdenv.lib.optional (static && !shared) "--static"; + # For zlib's ./configure (as of verion 1.2.11), the order + # of --static/--shared flags matters! + # `--shared --static` builds only static libs, while + # `--static --shared` builds both. + # So we use the latter order to be able to build both. + # Also, giving just `--shared` builds both, + # giving just `--static` builds only static, + # and giving nothing builds both. + # So we have 3 possible ways to build both: + # `--static --shared`, `--shared` and giving nothing. + # Of these, we choose `--shared`, only because that's + # what we did in the past and we can avoid mass rebuilds this way. + # As a result, we pass `--static` only when we want just static. + configureFlags = stdenv.lib.optional (static && !shared) "--static" + ++ stdenv.lib.optional shared "--shared"; + + # Note we don't need to set `dontDisableStatic`, because static-disabling + # works by grepping for `enable-static` in the `./configure` script + # (see `pkgs/stdenv/generic/setup.sh`), and zlib's handwritten one does + # not have such. + # It wouldn't hurt setting `dontDisableStatic = static && !splitStaticOutput` + # here (in case zlib ever switches to autoconf in the future), + # but we don't do it simply to avoid mass rebuilds. - postInstall = stdenv.lib.optionalString (shared && static) '' + postInstall = stdenv.lib.optionalString splitStaticOutput '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on @@ -69,6 +85,8 @@ stdenv.mkDerivation (rec { # to the bootstrap-tools libgcc (as uses to happen on arm/mips) NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + # We don't strip on static cross-compilation because of reports that native + # stripping corrupted the target library; see commit 12e960f5 for the report. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 4bc9b7f8629..1287c9b80b5 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 , resource-pooling }: -buildOcaml rec -{ - name = "ocsigen-start"; - version = "1.5.0"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocsigen-start-${version}"; + version = "1.8.0"; - buildInputs = [ eliom js_of_ocaml-camlp4 ]; + buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,12 +15,14 @@ buildOcaml rec postPatch = '' substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; + + createFindlibDestdir = true; src = fetchFromGitHub { owner = "ocsigen"; - repo = name; + repo = "ocsigen-start"; rev = version; - sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; + sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s"; }; meta = { @@ -31,6 +32,7 @@ buildOcaml rec An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 4e46c1534d8..6c9e72f95d7 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.0.0"; + version = "2.2.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ ocaml findlib opaline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; + sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s"; }; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 91e00ed7e43..2bd22ebf0d9 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "capstone"; - version = "3.0.4"; + version = "3.0.5.post1"; + + setupPyBuildFlags = [ + "--plat-name x86_64-linux" + ]; src = fetchPypi { inherit pname version; - sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225"; + sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; }; patches = [ diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix new file mode 100644 index 00000000000..ee7c89d8167 --- /dev/null +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, + wrapt, pytest, tox }: + +buildPythonPackage rec { + pname = "Deprecated"; + version = "1.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hcw9y7dvhwg5flk6wy8aa4kkgpvcqq3q4jd53h54586fp7w85d5"; + }; + + postPatch = '' + # odd broken tests, don't appear in GitHub repo + rm tests/demo_classic_usage*.py + ''; + + propagatedBuildInputs = [ wrapt ]; + checkInputs = [ pytest ]; + meta = with stdenv.lib; { + homepage = "https://github.com/tantale/deprecated"; + description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ tilpner ]; + }; +} diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index a2597b2e6e7..2a20d610485 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, requests }: buildPythonPackage rec { @@ -12,10 +13,15 @@ buildPythonPackage rec { sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; + propagatedBuildInputs = [ requests ]; + meta = with stdenv.lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; }; + # No tests included + doCheck = false; + } diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix new file mode 100644 index 00000000000..d5492b3b641 --- /dev/null +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lxml +, pillow +, reportlab +, stdenv +}: +buildPythonPackage rec { + pname = "hocr-tools"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "tmbdev"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; + }; + + # hocr-tools uses a test framework that requires internet access + doCheck = false; + + propagatedBuildInputs = [ pillow lxml reportlab ]; + + meta = with stdenv.lib; { + description = " +Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; + homepage = https://github.com/tmbdev/hocr-tools; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix new file mode 100644 index 00000000000..7d83d2c4338 --- /dev/null +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "kconfiglib"; + version = "10.36.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b"; + }; + + # doesnt work out of the box but might be possible + doCheck = false; + + meta = with lib; { + description = "A flexible Python 2/3 Kconfig implementation and library"; + homepage = https://github.com/ulfalizer/Kconfiglib; + license = licenses.isc; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix new file mode 100644 index 00000000000..c2662915b12 --- /dev/null +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -0,0 +1,73 @@ +{ attrs +, buildPythonPackage +, defusedxml +, fetchPypi +, hypothesis +, isPy3k +, lxml +, pillow +, pybind11 +, pytest +, pytest-helpers-namespace +, pytest-timeout +, pytest_xdist +, pytestrunner +, python-xmp-toolkit +, python3 +, qpdf +, setuptools-scm-git-archive +, setuptools_scm +, stdenv +}: + +buildPythonPackage rec { + pname = "pikepdf"; + version = "1.1.0"; + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + }; + + buildInputs = [ + pybind11 + qpdf + ]; + + nativeBuildInputs = [ + setuptools-scm-git-archive + setuptools_scm + ]; + + checkInputs = [ + attrs + hypothesis + pillow + pytest + pytest-helpers-namespace + pytest-timeout + pytest_xdist + pytestrunner + python-xmp-toolkit + ]; + + propagatedBuildInputs = [ defusedxml lxml ]; + + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + ''; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pikepdf/pikepdf"; + description = "Read and write PDFs with Python, powered by qpdf"; + license = licenses.mpl20; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 98608b20b57..6b65af073f4 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,5 +1,18 @@ -{ stdenv, python3Packages }: -with python3Packages; buildPythonApplication rec { +{ lib, fetchPypi, buildPythonApplication, pythonOlder +, aspy-yaml +, cached-property +, cfgv +, futures +, identify +, importlib-metadata +, importlib-resources +, nodeenv +, six +, toml +, virtualenv +}: + +buildPythonApplication rec { pname = "pre-commit"; version = "1.18.1"; @@ -19,13 +32,13 @@ with python3Packages; buildPythonApplication rec { toml virtualenv importlib-metadata - ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources - ++ stdenv.lib.optional (pythonOlder "3.2") futures; + ] ++ lib.optional (pythonOlder "3.7") importlib-resources + ++ lib.optional (pythonOlder "3.2") futures; - # Tests fail due to a missing windll dependency + # slow and impure doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = https://pre-commit.com/; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 5ffe46e5b6f..a4e3cada1fc 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,22 +1,20 @@ { stdenv, fetchFromGitHub -, buildPythonPackage, python-jose, pyjwt }: +, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: buildPythonPackage rec { pname = "PyGithub"; - version = "1.36"; + version = "1.43.8"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w"; + sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw"; }; - postPatch = '' - # requires network - echo "" > github/tests/Issue142.py - ''; - propagatedBuildInputs = [ python-jose pyjwt ]; + propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/PyGithub/PyGithub; description = "A Python (2 and 3) library to access the GitHub API v3"; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index ce0df266332..559b75eec41 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -1,31 +1,33 @@ -{ buildPythonPackage, lib, fetchPypi -, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder , requests , pytest +, pre-commit }: buildPythonPackage rec { pname = "pylibgen"; - version = "2.0.1"; + version = "2.0.2"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; + src = fetchFromGitHub { + owner = "joshuarli"; + repo = pname; + rev = "v${version}"; + sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1"; }; - disabled = !isPy3k; - propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pre-commit ]; - # no tests in PyPI tarball + # literally every tests does a network call doCheck = false; - meta = { + meta = with lib; { description = "Python interface to Library Genesis"; homepage = https://pypi.org/project/pylibgen/; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.nico202 ]; + license = licenses.mit; + maintainers = [ maintainers.nico202 ]; }; } diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index a2d98bcf238..198445177c4 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pyprof2calltree"; version = "1.4.4"; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix new file mode 100644 index 00000000000..a4e0cb809ae --- /dev/null +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchFromGitHub +, pytest +, stdenv +}: + +buildPythonPackage rec { + pname = "pytest-helpers-namespace"; + version = "2019.1.8"; + + src = fetchFromGitHub { + owner = "saltstack"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; + }; + + buildInputs = [ pytest ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + # The tests fail with newest pytest. They passed with pytest_3, which no longer exists + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/saltstack/pytest-helpers-namespace"; + description = "PyTest Helpers Namespace"; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix new file mode 100644 index 00000000000..93fa36fa2fc --- /dev/null +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, exempi +, fetchFromGitHub +, mock +, pythonOlder +, pytz +, stdenv +}: + +buildPythonPackage rec { + pname = "python-xmp-toolkit"; + version = "2.0.2"; + + # PyPi has version 2.0.1; the tests fail + # There are commits for a 2.0.2 release that was never published + # Not to github, not to PyPi + # This is the latest commit from Jun 29, 2017 (as of Mar 13, 2019) + # It includes the commits for the unreleased version 2.0.2 and more + # Tests pass with this version + src = fetchFromGitHub { + owner = "python-xmp-toolkit"; + repo = "python-xmp-toolkit"; + rev = "5692bdf8dac3581a0d5fb3c5aeb29be0ab6a54fc"; + sha256 = "16bylcm183ilzp7mrpdzw0pzp6csv9v5v247914qsv2abg0hgl5y"; + }; + + buildInputs = [ exempi ]; + + checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ]; + + propagatedBuildInputs = [ pytz ]; + + postPatch = '' + substituteInPlace libxmp/exempi.py \ + --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit; + description = "Python XMP Toolkit for working with metadata"; + license = licenses.bsd3; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix new file mode 100644 index 00000000000..1b3b271fb61 --- /dev/null +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -0,0 +1,53 @@ +{ gevent +, buildPythonPackage +, fetchFromGitHub +, hostname +, pytest +, python +, stdenv +}: + +buildPythonPackage rec { + pname = "ruffus"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "cgat-developers"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9"; + }; + + propagatedBuildInputs = [ gevent ]; + + postPatch = '' + sed -i -e 's|/bin/bash|${stdenv.shell}|' ruffus/test/Makefile + sed -i -e 's|\tpytest|\t${pytest}/bin/pytest|' ruffus/test/Makefile + sed -i -e 's|\tpython|\t${python.interpreter}|' ruffus/test/Makefile + sed -i -e 's|/usr/bin/env bash|${stdenv.shell}|' ruffus/test/run_all_unit_tests.cmd + sed -i -e 's|python3|${python.interpreter}|' ruffus/test/run_all_unit_tests3.cmd + sed -i -e 's|python %s|${python.interpreter} %s|' ruffus/test/test_drmaa_wrapper_run_job_locally.py + ''; + + makefile = "ruffus/test/Makefile"; + + checkInputs = [ + gevent + hostname + pytest + ]; + + checkPhase = '' + export HOME=$TMPDIR + cd ruffus/test + make all PYTEST_OPTIONS="-q --disable-warnings" + ''; + + meta = with stdenv.lib; { + description = "Light-weight Python Computational Pipeline Management"; + homepage = http://www.ruffus.org.uk; + license = licenses.mit; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix new file mode 100644 index 00000000000..ec34a451156 --- /dev/null +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.0.1"; + pname = "unittest-data-provider"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gn2ka4vqpayx4cpbp8712agqjh3wdpk9smdxnp709ccc2v7zg46"; + }; + + meta = with lib; { + description = "PHPUnit-like @dataprovider decorator for unittest"; + homepage = https://github.com/yourlabs/unittest-data-provider; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index b4f5d74d1d2..b7b302fe08c 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub , pkgconfig, libftdi , python3, pypy3 + +# PyPy yields large improvements in build time and runtime performance, +# and IceStorm isn't intended to be used as a library other than by the +# nextpnr build process (which is also sped up by using PyPy), so we +# use it by default. See 18839e1 for more details. +, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */ }: let - pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */ - pythonPkg = if pypyCompatible then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; -in - -stdenv.mkDerivation rec { + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; +in stdenv.mkDerivation rec { pname = "icestorm"; - version = "2019.04.16"; + version = "2019.08.08"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86"; - sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky"; + rev = "2ccae0d3864fd7268118287a85963c0116745cff"; + sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index e5bbdc562b1..f823519fb34 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cgdb"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; - sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; + sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; buildInputs = [ ncurses readline flex texinfo ]; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 565811b2048..0888130c2d4 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,21 +8,21 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2019.04.22"; + version = "2019.08.09"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "5eb0ad870f30422b95d090ac9a476343809c62b9"; - sha256 = "10jkjfhqdr2bff41mh3w8a7kszf2whqqgk5s1z5z07mlh6zfdjlg"; + rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; + sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; - sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; + rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986"; + sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx"; name = "database"; }) ]; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 3b0693705b7..46eb054bc8e 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.1.3"; pname = "angband"; + version = "4.2.0"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "0g9m7pq8a1hzhr83v552hfk37qc868lms2mlsq29pbi8vxdjybk7"; + sha256 = "0fr59986swx9a2xkxkbfgadzpwy2lq55fgcib05k393kibyz49kg"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fd7b208fc96..b8e9dd2d960 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-08-02"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857"; - sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj"; + rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4"; + sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq"; }; }; @@ -391,12 +391,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-08-01"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "999865c6bd3745689d1eb4009b9b706cb5a68617"; - sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy"; + rev = "2c502ceec9816259350969970e76402c984ac4f9"; + sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9"; }; }; @@ -799,12 +799,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-04"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "fb56c2ca2ff655c4d82e000e13e233629894caac"; - sha256 = "1bwcm7smvfpllbkxb512ys9gjc5gin7v75jkys7q0xq0xb73d1hn"; + rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0"; + sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n"; }; }; @@ -912,12 +912,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-11"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "153e242b07cfe5d67cd217eda3163730046de88b"; - sha256 = "08slqd2kcy94xs669y8rbyz8xz72zn4rasa0yyk3i7yp8w4awgp8"; + rev = "bb2b16309b94695a3344c713282368b3329a2412"; + sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9"; }; }; @@ -1024,12 +1024,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-08-01"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73"; - sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn"; + rev = "d642592f062c5e4d195e627ac4104d4e0355a125"; + sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac"; }; }; @@ -1057,12 +1057,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-06-12"; + version = "2019-08-13"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "f6d7d01de8a92baee83218001c0bdbade8458a72"; - sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr"; + rev = "aeb47b01b36021aaf84ff4f7f1a4cf64bc68fe53"; + sha256 = "1cssvdpkmrlby50p2lyqfz1jhp5igyv1bqd34588p3ivsd3hrhyy"; }; }; @@ -1366,12 +1366,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-07-13"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "b9f83175951654256cff41737841b4abc0c9266d"; - sha256 = "0w24zqs1026khdzr7v283yx9yc3sp5rw4kzsjwalclg5xnyy55c0"; + rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827"; + sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86"; fetchSubmodules = true; }; }; @@ -1488,12 +1488,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-06"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f5039419d87b76accee7000319b394ce25a0dbfb"; - sha256 = "0cfjw1jpddw92jz62ly8m6waxknj19cazff01x8drk1lr9xj6wdy"; + rev = "09c61dc3f650eccd2c165c36db8330496321aa50"; + sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb"; }; }; @@ -1708,12 +1708,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-08-10"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "ebfb1f5a24f39561b0299ffe4d346582a6e2432d"; - sha256 = "0yjd3h36zd5g4m0ldijx0p75hlf2dq69y38ilwpm2zp8rqhqgmaw"; + rev = "cad94240c8284ab3502c62acc18e420ca22107de"; + sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq"; }; }; @@ -1906,12 +1906,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2019-06-26"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "408104a30ae4f220096e591350a72e60cc15f9b3"; - sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2"; + rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; + sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; }; }; @@ -2148,12 +2148,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-08-01"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50"; - sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf"; + rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff"; + sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x"; }; }; @@ -2225,12 +2225,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2019-06-26"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8"; - sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c"; + rev = "9f7bee325f32db1ee509b82e5144df522fa2aca2"; + sha256 = "1i9kyipnd7fkv7vdlwpsb44h0yzvf0rjrwrj09w8bj2lqmcv8yjp"; }; }; @@ -2874,12 +2874,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2019-01-30"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939"; - sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f"; + rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; + sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; }; }; @@ -2962,12 +2962,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-06-16"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "0de948ca411c65ee1d07be84ee406e38f7a725d8"; - sha256 = "1cyvj1q94frnii1mcx1f1dhl5z38ppmly6wjgz71hs1w5qdy12qh"; + rev = "18f47c3ac563b60f71103b1e1d29b349ff9d8549"; + sha256 = "0z36jjj1bxb4xz9lyjrbv769797g3x475ncamflfj6yj72vvhfy4"; }; }; @@ -3204,12 +3204,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-07-22"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "46a68476fc7b4f454c829d83d21997b82ac66f76"; - sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs"; + rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5"; + sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm"; }; }; @@ -3248,12 +3248,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-09"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "c4f084bc36bbb7b2ab4216d87f1cce644d278dc7"; - sha256 = "1c3vfpq7d3fibjz748sracfbxg6xp28c2y5780cc1jkph5z7wvvj"; + rev = "8712a165da4d1de9fb6ae918322ece843ac742e0"; + sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7"; }; }; @@ -3314,12 +3314,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-11"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4daa0c558ceb14223c6c6861063ef0ae9a35233b"; - sha256 = "13m30hl6syha9pkr58w23sch89m2nd9cgxbdnkkcqvbzlq202nfh"; + rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5"; + sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh"; }; }; @@ -3358,12 +3358,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-08-10"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "9bf988bd1d2d8001f84126d8bf74036bab33bb9b"; - sha256 = "0ksz7k29nzs00apnimp2r3hqjamdhcpr9h241hcagil3dqraqi5d"; + rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89"; + sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw"; }; }; @@ -3391,12 +3391,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-09"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ed63c87496c030d436507c4eb211a923aa5dc90b"; - sha256 = "0vxqx343wgc9dr9s7jx33hai7ib8cqlfqfpwbmv7zq83x5ff0sh6"; + rev = "007b69c27b63fbcbe2e0766073b09281274b0231"; + sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w"; }; }; @@ -3644,12 +3644,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-07-08"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a"; - sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s"; + rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5"; + sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f"; }; }; @@ -3843,23 +3843,23 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-10"; + version = "2019-08-13"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "329d894f941945287e9797c42e6125838c8a2ac0"; - sha256 = "1cv1mgdc4i68kvbh1z090vj29yl2axqfnnlizikbf1z68s2ghnvr"; + rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a"; + sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25"; }; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2019-01-24"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "ec7a094e602babc2e0d43dc5fa5411e46e3bd70c"; - sha256 = "1377wqzrsvwvmzb91a6fm5ma2hnnlas0wgia5bk62a8f1rsgyfgc"; + rev = "ed4357d2caf1d04bd229a24191098759f94b2e25"; + sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v"; }; }; @@ -4107,12 +4107,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-07-16"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962"; - sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3"; + rev = "307b0f244d99408decda3a98f58e864d49626818"; + sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw"; }; }; @@ -4327,12 +4327,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-08-09"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "2673d732dd329b012b1f319de8ba289dbf5a281e"; - sha256 = "0qmf32yi6kk8y020qgi2g7xw3c7kxh0i58r5y3mfwya9f4lqm43r"; + rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad"; + sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc"; }; }; @@ -4448,12 +4448,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-08-07"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "2486ab67bc5a84414ec8792f5ce7aaf04a91138c"; - sha256 = "1wpk9xflhj2cklfk9ac6dpp436gizl6la8877d8ra19774zgw0k1"; + rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33"; + sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr"; }; }; @@ -4547,12 +4547,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-07-12"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "6781cc1dbfec16efc7a67bf8f8c118898664da11"; - sha256 = "0iqbb5ycl33q0542gj7kr3dyalvha59y0dyyzymzs5lqa1q0y7in"; + rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b"; + sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9"; }; }; @@ -4855,12 +4855,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-09"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d01f136c068451ef99795ceb15d285d362bec61b"; - sha256 = "06hqzw63mijiqadczaf2x3sy117hlzil16la1w6ynf6d37hr1zq1"; + rev = "866699bdae3696130159e7115954c64de8e7bdcd"; + sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq"; }; }; @@ -4899,12 +4899,12 @@ let vundle = buildVimPluginFrom2Nix { pname = "vundle"; - version = "2018-02-03"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "gmarik"; repo = "vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; + sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; }; @@ -5055,12 +5055,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-08-03"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "5ef469df4f663a81e983f5ee4dce9b50b8a612af"; - sha256 = "0bmcc051n9jhzggsi1mwcmlsg5qhhzycvsrziladl7xg22nv8w5m"; + rev = "defc660d235152e82271a48bd89bfcc9fa58b432"; + sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q"; }; }; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index cb240ba1695..1f24f4182de 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2019.2"; + ver = "2019.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1whbi39sx3gz91yvynr7vmnc2l9lcvyynjbd3d9wg6bsm7lz0mmn"; + sha256 = "0rj7vyir4m63b69fgrz06mqlw7nivjfc8mdv19l02xs9vqh7khx4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index dc704dc167e..01e70fbb040 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "04lzwm24d576h425rgvgjj2wim29i3961jrj35r43wrswmrsc3r2"; + sha256 = "00s4qg4h9s9vi46jyw7lz36lb5i8h3s9cmicnngp17764xgkr916"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index ad30f52d145..f826ddd423d 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.11.3"; + version = "1.11.5"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv"; + sha256 = "1a75ss48mn9pknrxy33dh5rdgm67a5kpddsyqfhlcn1761kfzzyp"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 4194a679698..76257f94fe7 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.8.1"; + version = "1.9"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0"; + sha256 = "08x0x7nq8v7gr8a4lrrhclkz6n8fxlhhizxl2nz56w1xmfghcnfv"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + # To omit the hostnqn and hostid files that are impure and should be unique + # for each target host: + installTargets = "install-spec"; + meta = with lib; { inherit (src.meta) homepage; description = "NVM-Express user space tooling for Linux"; diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index ac44dbbf04d..d94f34ebd21 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -1,17 +1,35 @@ { lib, python3Packages }: -python3Packages.buildPythonApplication rec { +with python3Packages; +buildPythonApplication rec { pname = "doh-proxy"; - version = "0.0.8"; + version = "0.0.9"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c"; + sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - propagatedBuildInputs = with python3Packages; - [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ]; - doCheck = false; # Trouble packaging unittest-data-provider + nativeBuildInputs = [ pytestrunner flake8]; + + propagatedBuildInputs = [ + aioh2 + dnspython + aiohttp-remotes + ]; + + checkInputs = [ + asynctest + unittest-data-provider + pytest + pytestcov + pytest-aiohttp + ]; + + # attempts to resolve address + checkPhase = '' + pytest -k 'not servers' + ''; meta = with lib; { homepage = https://facebookexperimental.github.io/doh-proxy/; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 34601ed708b..1afe1e8b946 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.3.1"; + version = "10.4.0"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "15y56h7zy94408605cchvf2fqg3aicylpzgd1g8fxyl42h216816"; + sha256 = "1m4l10hp5m010ljsvn2ba4bbh8i26d04xffw81gfgjw08gya2hh8"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 2062dc6659f..48b72dc0590 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -63,7 +63,10 @@ in mkdir -p $out/share/zabbix/database/ '' + optionalString sqliteSupport '' mkdir -p $out/share/zabbix/database/sqlite3 - cp -prvd database/sqlite3/*.sql $out/share/zabbix/database/sqlite3/ + cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/ + '' + optionalString mysqlSupport '' + mkdir -p $out/share/zabbix/database/mysql + cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/ '' + optionalString postgresqlSupport '' mkdir -p $out/share/zabbix/database/postgresql cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/ diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 588483b8343..9f3cd508fb0 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.3.1402-22929c8a2"; + version = "1.16.4.1469-6d5612c2f"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5"; + sha256 = "16ifgqsxgpqyd1m0xmwrrv4cic1yccklv1jlv7fhq8wc6vz9l6lx"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 2375e81ff9e..8a63ed3ea7f 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python3, makeWrapper }: +, python2, python3, makeWrapper }: let - common = { version, sha256, extraBuildInputs ? [] }: + common = { version, sha256, python, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { pname = "varnish"; inherit version; @@ -12,11 +12,12 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + passthru.python = python; + + nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; buildInputs = [ - pcre libxslt groff ncurses readline python3 libedit - python3.pkgs.docutils makeWrapper - ] ++ extraBuildInputs; + pcre libxslt groff ncurses readline libedit makeWrapper python + ]; buildFlags = "localstatedir=/var/spool"; @@ -42,14 +43,17 @@ in varnish4 = common { version = "4.1.10"; sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; + python = python2; }; varnish5 = common { version = "5.2.1"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; + python = python2; }; varnish6 = common { version = "6.2.0"; sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; - extraBuildInputs = [ python3.pkgs.sphinx ]; + python = python3; + extraNativeBuildInputs = [ python3.pkgs.sphinx ]; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 711bc1cf78f..b3e86387ee3 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "0.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" ''; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 7775221d163..16c74956db7 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.14.0"; @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ + autoreconfHook + docutils + pkgconfig + removeReferencesTo + varnish.python # use same python version as varnish server + ]; + + buildInputs = [ varnish ]; postPatch = '' substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix index 99c0bb17659..c27633a2d33 100644 --- a/pkgs/servers/varnish/rtstatus.nix +++ b/pkgs/servers/varnish/rtstatus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchurl, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; }; - nativeBuildInputs = [ pkgconfig docutils ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils varnish.python ]; + buildInputs = [ varnish ]; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 478f0d7fed9..5327e0f8c8f 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.192"; + version = "1.193"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x"; + sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index d0731c1f599..68046be2eee 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "analog"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "c-amie"; repo = "analog-ce"; rev = version; - sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m"; + sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk"; }; configurePhase = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 4ee9ef352bb..773b09958ea 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2019.08.02"; + version = "2019.08.11"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1iz4m86lc4nyf312qk749kgvq60g6x1zn2y70859g16ki16mk8m3"; + sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 9fd3e854065..963d7945b89 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, utillinux, asciidoc, makeWrapper }: +, utillinux, asciidoc, asciidoctor, makeWrapper }: stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.28.0"; + version = "0.28.3"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf"; + sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz"; }; - nativeBuildInputs = [ asciidoc makeWrapper ]; + nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; buildInputs = with perlPackages; [ perl DateCalc ]; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 356d7ada6d0..b95a9ad68a8 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7"; + sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 75649845edc..f5588cc51ab 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw"; + sha256 = "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 00ab4cd75d0..5055ce67d30 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.0.1"; + version = "1.2.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04"; + sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index a5500d65c51..b6fffddeb53 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "chezmoi"; - version = "1.3.0"; + version = "1.5.5"; goPackagePath = "github.com/twpayne/chezmoi"; @@ -10,13 +10,13 @@ buildGoPackage rec { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0dvdjx5khpw62lprn06k271xfc9fdrw4c1q74vd1vffaz60yfd8d"; + sha256 = "18kc3b2ncjzxivycx3mhqw9kbqp0sxmlgc2ddvhgj2vpvlkayzkh"; }; goDeps = ./deps.nix; buildFlagsArray = [ - "-ldflags=-s -w -X ${goPackagePath}/cmd.version=${version}" + "-ldflags=-s -w -X ${goPackagePath}/cmd.VersionStr=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/chezmoi/deps.nix b/pkgs/tools/misc/chezmoi/deps.nix index 4fb1bd53552..6641a58931d 100644 --- a/pkgs/tools/misc/chezmoi/deps.nix +++ b/pkgs/tools/misc/chezmoi/deps.nix @@ -46,15 +46,6 @@ }; } { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { goPackagePath = "github.com/coreos/etcd"; fetch = { type = "git"; @@ -82,15 +73,6 @@ }; } { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "v1.2.1"; - sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; - }; - } - { goPackagePath = "github.com/danieljoos/wincred"; fetch = { type = "git"; @@ -127,6 +109,33 @@ }; } { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v25.0.1"; + sha256 = "1wggj64dm73zmav64qfgw8v3pkzxxmlaqrccvs5rf66j0wij9g20"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { goPackagePath = "github.com/google/renameio"; fetch = { type = "git"; @@ -181,6 +190,24 @@ }; } { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; @@ -190,12 +217,12 @@ }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mattn/go-isatty"; fetch = { type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -226,12 +253,30 @@ }; } { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + rev = "v1.2.2"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; }; } { @@ -284,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + rev = "v0.2.0"; + sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; }; } { @@ -293,8 +338,17 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/twpayne/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-difflib"; + rev = "v1.3.0"; + sha256 = "01lidr7brrdv4xqx87n6c2ppyaj8rdf9lqj85qhbbalwy6z34fj8"; }; } { @@ -311,8 +365,17 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-vfs"; - rev = "v1.0.3"; - sha256 = "138ykzmb4994qwbv3m99536p75804ap15c2drvz6d3k0v95rbw38"; + rev = "v1.0.6"; + sha256 = "0sqjng5qm4s7crq9s1f5y5niq4wss6dizip62zx37iyvws1yngjd"; + }; + } + { + goPackagePath = "github.com/twpayne/go-vfsafero"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-vfsafero"; + rev = "v1.0.0"; + sha256 = "18jwxhlrjd06z8xzg9ij0irl4f79jfy5jpwiz6xqlhzb1fja19pw"; }; } { @@ -320,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-xdg"; - rev = "v1.0.0"; - sha256 = "06np468cl8bbpal6x0mf8q6jzlkz65rzma5y65n7wfmrg2k7yn72"; + rev = "v3.1.0"; + sha256 = "0j8q7yzixs6jlaad0lpa8hs6b240gm2cmy0yxgnprrbpa0y2r7ln"; }; } { @@ -352,12 +415,48 @@ }; } { + goPackagePath = "go.etcd.io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "4af6cfab7010"; + sha256 = "1zgirl82lph606vw39wj4mvk8bkq2bakvnx49dpq7l5dsdhiydpv"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d8887717615a"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "e225da77a7e6"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; }; } { @@ -365,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + rev = "10058d7d4faa"; + sha256 = "0y83433yjgsr7057h99g5ayljzlivx2bnkcp01xnzqz8lppv8fql"; }; } { @@ -379,6 +478,15 @@ }; } { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { goPackagePath = "gopkg.in/check.v1"; fetch = { type = "git"; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index f951e6cba70..0f448cc089c 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "3.0.2"; pname = "graylog"; + version = "3.1.0"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj"; + sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd"; }; dontBuild = true; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 5080203d515..6b0d5d3387c 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -26,7 +26,7 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) parallel (1.17.0) public_suffix (3.1.1) @@ -45,4 +45,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 4777d5d53e6..256243f3d5d 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -1,6 +1,8 @@ { activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; @@ -10,6 +12,8 @@ }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; @@ -18,6 +22,8 @@ version = "2.6.0"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; @@ -27,6 +33,8 @@ }; ethon = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; @@ -35,6 +43,8 @@ version = "0.12.0"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; @@ -44,6 +54,8 @@ }; html-proofer = { dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kpcz7p0yjr1y9fs8gila2bkgb8y6qkyqv5a8yymw0hkvddnqig4"; @@ -53,6 +65,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; @@ -61,6 +75,8 @@ version = "1.6.0"; }; mercenary = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; @@ -69,6 +85,8 @@ version = "0.3.6"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; @@ -77,6 +95,8 @@ version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -86,14 +106,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; parallel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; @@ -102,6 +126,8 @@ version = "1.17.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; @@ -110,6 +136,8 @@ version = "3.1.1"; }; rainbow = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -118,6 +146,8 @@ version = "3.0.0"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -127,6 +157,8 @@ }; typhoeus = { dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; @@ -136,6 +168,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -144,6 +178,8 @@ version = "1.2.5"; }; yell = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1394pf8wsv4wx2lf1d9iqqx6lcww9bgmgh9sms3dbga804cns0n8"; diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch new file mode 100644 index 00000000000..9c334436162 --- /dev/null +++ b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -0,0 +1,271 @@ +From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Tue, 19 Jun 2018 09:34:18 -0400 +Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory + +See https://github.com/ostreedev/ostree/issues/1593 + +Basically this makes it easier for people packaging, as the trivial-httpd +is only for tests, and this way the binary will live with the tests. + +Also at this point nothing should depend on `ostree trivial-httpd`. +--- + Makefile-man.am | 6 -- + Makefile-ostree.am | 7 --- + Makefile-tests.am | 7 +++ + configure.ac | 10 --- + man/ostree-trivial-httpd.xml | 118 ----------------------------------- + src/ostree/main.c | 5 -- + tests/libtest.sh | 13 ++-- + 7 files changed, 12 insertions(+), 154 deletions(-) + delete mode 100644 man/ostree-trivial-httpd.xml + +diff --git a/Makefile-man.am b/Makefile-man.am +index 8ccbba8c..d204aa3e 100644 +--- a/Makefile-man.am ++++ b/Makefile-man.am +@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ + ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ + ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ + ostree-static-delta.1 +-if BUILDOPT_TRIVIAL_HTTPD +-man1_files += ostree-trivial-httpd.1 +-else +-# We still want to distribute the source, even if we are not building it +-EXTRA_DIST += man/ostree-trivial-httpd.xml +-endif + + if BUILDOPT_FUSE + man1_files += rofiles-fuse.1 +diff --git a/Makefile-ostree.am b/Makefile-ostree.am +index 8d352e38..1471b3e5 100644 +--- a/Makefile-ostree.am ++++ b/Makefile-ostree.am +@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c + endif + + if USE_LIBSOUP +-# Eventually once we stop things from using this, we should support disabling this +-ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c +-pkglibexec_PROGRAMS += ostree-trivial-httpd +-ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c +-ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) +-ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) +- + if !USE_CURL + # This is necessary for the cookie jar bits + ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) +diff --git a/Makefile-tests.am b/Makefile-tests.am +index 2c0916f6..b11fde89 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u + tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ + tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h + ++if USE_LIBSOUP ++test_extra_programs += ostree-trivial-httpd ++ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c ++ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS) ++ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS) ++endif ++ + if USE_AVAHI + test_programs += tests/test-repo-finder-avahi + endif +diff --git a/configure.ac b/configure.ac +index e6e145db..1e36e6a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi + AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) + AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) + +-AC_ARG_ENABLE(trivial-httpd-cmdline, +- [AS_HELP_STRING([--enable-trivial-httpd-cmdline], +- [Continue to support "ostree trivial-httpd" [default=no]])],, +- enable_trivial_httpd_cmdline=no) +-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) +-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, +- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] +-) +- + AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ + AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) + ]) +@@ -602,7 +593,6 @@ echo " + Rust (internal oxidation): $rust_debug_release + rofiles-fuse: $enable_rofiles_fuse + HTTP backend: $fetcher_backend +- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline + SELinux: $with_selinux + cryptographic checksums: $with_crypto + systemd: $have_libsystemd +diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml +deleted file mode 100644 +index d03c12be..00000000 +--- a/man/ostree-trivial-httpd.xml ++++ /dev/null +@@ -1,118 +0,0 @@ +-<?xml version='1.0'?> <!--*-nxml-*--> +-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +- +-<!-- +-Copyright 2011,2013 Colin Walters <walters@verbum.org> +- +-SPDX-License-Identifier: LGPL-2.0+ +- +-This library is free software; you can redistribute it and/or +-modify it under the terms of the GNU Lesser General Public +-License as published by the Free Software Foundation; either +-version 2 of the License, or (at your option) any later version. +- +-This library is distributed in the hope that it will be useful, +-but WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-Lesser General Public License for more details. +- +-You should have received a copy of the GNU Lesser General Public +-License along with this library; if not, write to the +-Free Software Foundation, Inc., 59 Temple Place - Suite 330, +-Boston, MA 02111-1307, USA. +---> +- +-<refentry id="ostree"> +- +- <refentryinfo> +- <title>ostree trivial-httpd</title> +- <productname>OSTree</productname> +- +- <authorgroup> +- <author> +- <contrib>Developer</contrib> +- <firstname>Colin</firstname> +- <surname>Walters</surname> +- <email>walters@verbum.org</email> +- </author> +- </authorgroup> +- </refentryinfo> +- +- <refmeta> +- <refentrytitle>ostree trivial-httpd</refentrytitle> +- <manvolnum>1</manvolnum> +- </refmeta> +- +- <refnamediv> +- <refname>ostree-trivial-httpd</refname> +- <refpurpose>Simple webserver</refpurpose> +- </refnamediv> +- +- <refsynopsisdiv> +- <cmdsynopsis> +- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg> +- </cmdsynopsis> +- </refsynopsisdiv> +- +-<!-- Don't entirely understand this command. Needs details, better content--> +- <refsect1> +- <title>Description</title> +- +- <para> +- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory. +- </para> +- </refsect1> +- +- <refsect1> +- <title>Options</title> +- +- <variablelist> +- <varlistentry> +- <term><option>--daemonize</option>,<option>-d</option></term> +- +- <listitem><para> +- Fork into background when ready. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--autoexit</option></term> +- +- <listitem><para> +- Automatically exit when directory is deleted. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--port-file</option>,<option>-p</option>="PATH"</term> +- +- <listitem><para> +- Write port number to PATH (- for standard output). +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--port</option>,<option>-P</option></term> +- +- <listitem><para> +- Use the specified TCP port to listen on. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--force-range-requests</option></term> +- +- <listitem><para> +- Force range requests by only serving half of files. +- </para></listitem> +- </varlistentry> +- </variablelist> +- </refsect1> +- +-<!-- NEED EXAMPLE OUTPUT HERE!--> +- <refsect1> +- <title>Example</title> +- <para><command>$ ostree trivial-httpd</command></para> +- </refsect1> +-</refentry> +diff --git a/src/ostree/main.c b/src/ostree/main.c +index c5b45012..6478a62b 100644 +--- a/src/ostree/main.c ++++ b/src/ostree/main.c +@@ -116,11 +116,6 @@ static OstreeCommand commands[] = { + { "summary", OSTREE_BUILTIN_FLAG_NONE, + ostree_builtin_summary, + "Manage summary metadata" }, +-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE) +- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE, +- ostree_builtin_trivial_httpd, +- NULL }, +-#endif + { NULL } + }; + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index e0022512..b07dc962 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -149,15 +149,12 @@ fi + if test -n "${OSTREE_UNINSTALLED:-}"; then + OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd + else +- # trivial-httpd is now in $libexecdir by default, which we don't +- # know at this point. Fortunately, libtest.sh is also in +- # $libexecdir, so make an educated guess. If it's not found, assume +- # it's still runnable as "ostree trivial-httpd". +- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then +- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd" +- else +- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd" ++ # trivial-httpd is now the test directory. ++ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd" ++ if ! [ -x "${OSTREE_HTTPD}" ]; then ++ fatal "Failed to find ${OSTREE_HTTPD}" + fi ++ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}" + fi + + files_are_hardlinked() { +-- +2.22.0 + diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 0054e38ed2d..9f423cf6a4d 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ostree"; - version = "2019.1"; + version = "2019.2"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm"; + sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y"; }; patches = [ @@ -22,10 +22,7 @@ stdenv.mkDerivation rec { ./disable-test-gpg-verify-result.patch # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 - (fetchpatch { - url = https://github.com/ostreedev/ostree/pull/1633.patch; - sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; - }) + ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch index d3ef7e08357..8da2fb82dd0 100644 --- a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch +++ b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch @@ -1,12 +1,12 @@ -diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am ---- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100 -+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200 -@@ -243,7 +243,7 @@ +diff --git a/Makefile-tests.am b/Makefile-tests.am +index b11fde89..82937a67 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -245,7 +245,6 @@ endif _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ - tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ -+ tests/test-checksum tests/test-lzma tests/test-rollsum \ tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h - if USE_AVAHI + if USE_LIBSOUP diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch index f26a924c0d8..1eccd74bfa7 100644 --- a/pkgs/tools/misc/ostree/fix-1592.patch +++ b/pkgs/tools/misc/ostree/fix-1592.patch @@ -1,6 +1,7 @@ -diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh ---- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200 +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index a8bc49a9..4a08ebb5 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh @@ -275,7 +275,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then fatal "pull with mixed refs succeeded?" @@ -19,23 +20,62 @@ diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh echo "ok pull-local nonexistent branch" cd ${test_tmpdir} -@@ -587,5 +587,5 @@ +@@ -593,5 +593,5 @@ if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then fatal "pull of invalid ref succeeded" fi -assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' +assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' echo "ok pull got HTML for a ref" -diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh ---- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200 +diff --git a/tests/test-config.sh b/tests/test-config.sh +index 7e913d32..69d1675d 100755 +--- a/tests/test-config.sh ++++ b/tests/test-config.sh +@@ -46,7 +46,7 @@ + if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config get should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config get" + + ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only +@@ -63,7 +63,7 @@ + if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then + assert_not_reached "ostree config set should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config set" + + # Check that "ostree config unset" works +@@ -78,7 +78,7 @@ + fi + # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian + # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 +-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core." ++assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core." + + # Check that it's idempotent + ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs +@@ -95,5 +95,5 @@ + if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config unset should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config unset" +diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh +index dc6bcfeb..4a5eef55 100755 +--- a/tests/test-fsck-collections.sh ++++ b/tests/test-fsck-collections.sh @@ -100,7 +100,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 3 fsck detects missing ref bindings" @@ -113,7 +113,7 @@ @@ -44,26 +84,26 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -127,7 +127,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi --assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’" -+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2." - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" +-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’" ++assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2." + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -147,7 +147,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi --assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist" -+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" +-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -186,7 +186,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then @@ -71,7 +111,7 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 9 fsck detects missing ref bindings" @@ -205,7 +205,7 @@ @@ -80,12 +120,13 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" +assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 11 fsck ignores unreferenced ref bindings" -diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh ---- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200 +diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh +index bb7eae89..62a3bcd7 100755 +--- a/tests/test-remote-add.sh ++++ b/tests/test-remote-add.sh @@ -83,7 +83,7 @@ if $OSTREE remote delete nosuchremote 2>err.txt; then assert_not_reached "Deleting remote unexpectedly succeeded" diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 0680f360209..409e65dff77 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake, libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, - bubblewrap, pcre, check, python }: + bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit }: stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.2"; + version = "2019.5"; src = fetchurl { url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0sxjlcq15avb0fv6v89z2xrqv095dck4k5s9f0pk6y7sm063n2pk"; + sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; }; patches = [ @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { libcap ostree rpm glib systemd polkit bubblewrap json-glib libarchive libsolv librepo pcre check python + # libdnf + json_c libmodulemd_1 utillinux sqlite cppunit ]; configureFlags = [ diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index ce372f6b752..e593bccbd1d 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.5"; + name = "babeld-1.9.0"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90"; + sha256 = "0g7nhvd0hhb3jxdzpbqdxnb68375vm6apj2wslkxb70ip6rkk2hj"; }; preBuild = '' diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix new file mode 100644 index 00000000000..2073c0b8497 --- /dev/null +++ b/pkgs/tools/networking/curlie/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "curlie"; + version = "1.2.0"; + + src= fetchFromGitHub { + owner = "rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0jgwd1amwjpmfgg08j9m9i15rpxijhmld9najzqb2gf8c1n5d8cf"; + }; + + modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + + meta = with lib; { + description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; + homepage = https://curlie.io/; + maintainers = with maintainers; [ ma27 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 5200a751be4..bcaca9ef0ce 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.linux; # can only test on linux + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index d1640ebc43d..aa161460904 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,9 +1,11 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..ff2d50d +index 0000000..09a545a --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1205 @@ +@@ -0,0 +1,1174 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.3" @@ -11,10 +13,10 @@ index 0000000..ff2d50d + +[[package]] +name = "aho-corasick" -+version = "0.7.3" ++version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -32,17 +34,16 @@ index 0000000..ff2d50d + +[[package]] +name = "atty" -+version = "0.2.11" ++version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.2" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -50,8 +51,8 @@ index 0000000..ff2d50d +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -59,17 +60,12 @@ index 0000000..ff2d50d +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bitflags" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -77,8 +73,8 @@ index 0000000..ff2d50d +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -87,17 +83,12 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "build_const" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "byteorder" -+version = "1.3.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -106,7 +97,7 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -114,18 +105,27 @@ index 0000000..ff2d50d +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cc" -+version = "1.0.35" ++version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" -+version = "0.1.7" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -134,8 +134,8 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -147,59 +147,48 @@ index 0000000..ff2d50d +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation" -+version = "0.2.3" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.2.3" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crc" -+version = "1.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "crc32fast" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ctrlc" -+version = "3.1.2" ++version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dtoa" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "embed-resource" -+version = "1.2.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -208,13 +197,13 @@ index 0000000..ff2d50d + +[[package]] +name = "flate2" -+version = "1.0.7" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -241,37 +230,47 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "getrandom" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "httparse" -+version = "1.3.3" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "https" -+version = "1.5.0" ++version = "1.5.1" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -281,11 +280,11 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -295,12 +294,12 @@ index 0000000..ff2d50d + +[[package]] +name = "hyper-native-tls" -+version = "0.2.4" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -315,15 +314,15 @@ index 0000000..ff2d50d + +[[package]] +name = "iron" -+version = "0.6.0" ++version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -341,11 +340,6 @@ index 0000000..ff2d50d + +[[package]] +name = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazy_static" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + @@ -356,7 +350,7 @@ index 0000000..ff2d50d + +[[package]] +name = "libc" -+version = "0.2.53" ++version = "0.2.62" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -364,15 +358,15 @@ index 0000000..ff2d50d +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "log" -+version = "0.4.6" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -386,12 +380,12 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "memchr" -+version = "2.2.0" ++version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -404,7 +398,7 @@ index 0000000..ff2d50d + +[[package]] +name = "mime_guess" -+version = "1.8.6" ++version = "1.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -415,60 +409,52 @@ index 0000000..ff2d50d + +[[package]] +name = "miniz-sys" -+version = "0.1.11" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miniz_oxide" -+version = "0.2.1" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "miniz_oxide_c_api" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "native-tls" -+version = "0.1.5" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "nix" -+version = "0.13.0" ++version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -477,49 +463,53 @@ index 0000000..ff2d50d +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "num_cpus" -+version = "1.10.0" ++version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "numtoa" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "openssl" -+version = "0.9.24" ++version = "0.10.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "openssl-sys" -+version = "0.9.43" ++version = "0.9.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -564,7 +554,7 @@ index 0000000..ff2d50d + +[[package]] +name = "pkg-config" -+version = "0.3.14" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -576,34 +566,27 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "quote" -+version = "0.3.15" ++name = "ppv-lite86" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "rand" -+version = "0.4.6" ++name = "quote" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -611,28 +594,57 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" -+version = "0.4.0" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "rand_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -641,6 +653,14 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -650,11 +670,11 @@ index 0000000..ff2d50d + +[[package]] +name = "rand_jitter" -+version = "0.1.3" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -665,8 +685,8 @@ index 0000000..ff2d50d +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -676,8 +696,8 @@ index 0000000..ff2d50d +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -698,40 +718,28 @@ index 0000000..ff2d50d + +[[package]] +name = "redox_syscall" -+version = "0.1.54" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.1" ++version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "regex" -+version = "1.1.6" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.6" ++version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "remove_dir_all" -+version = "0.5.1" ++version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -750,16 +758,8 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "safemem" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -773,38 +773,24 @@ index 0000000..ff2d50d + +[[package]] +name = "security-framework" -+version = "0.1.16" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "security-framework-sys" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -832,7 +818,7 @@ index 0000000..ff2d50d +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -845,7 +831,7 @@ index 0000000..ff2d50d + +[[package]] +name = "smallvec" -+version = "0.6.9" ++version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -872,23 +858,16 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "tempdir" -+version = "0.3.7" ++name = "tempfile" ++version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -912,8 +891,8 @@ index 0000000..ff2d50d +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -941,11 +920,6 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "ucd-util" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -955,7 +929,7 @@ index 0000000..ff2d50d + +[[package]] +name = "unicase" -+version = "2.3.0" ++version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -974,7 +948,7 @@ index 0000000..ff2d50d +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1006,13 +980,8 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "utf8-ranges" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "vcpkg" -+version = "0.2.6" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1035,7 +1004,7 @@ index 0000000..ff2d50d +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1044,11 +1013,16 @@ index 0000000..ff2d50d +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "wasi" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "winapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1077,111 +1051,107 @@ index 0000000..ff2d50d + +[metadata] +"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" -+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" -+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67" -+"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" -+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" ++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5531b7f0698d9220b4729f8811931dbe0e91a05be2f7b3245fdc50dd856bae26" -+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" -+"checksum embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee11dd277e159f3a7845341f8c800899cf918a366956e31dd52f35eff638a403" -+"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa" ++"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" ++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum embed-resource 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e691c6cebf9fc63d525a8308df4094f07dc8b391dad7fafd09b3c96081f834d" ++"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" ++"checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096" ++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+"checksum hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72332e4a35d3059583623b50e98e491b78f8b96c5521fcb3f428167955aa56e8" ++"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8e17268922834707e1c29e8badbf9c712c9c43378e1b6a3388946baff10be2" ++"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" +"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" +"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee" ++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" -+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649" -+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e" -+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab" ++"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" ++"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" ++"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10" +"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0" -+"checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" ++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" ++"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" -+"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" -+"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -+"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985" -+"checksum openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)" = "33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" ++"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884" +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" +"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" +"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" -+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" -+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" -+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" ++"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" ++"checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5" +"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" -+"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332" -+"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" ++"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" +"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -+"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" @@ -1189,22 +1159,21 @@ index 0000000..ff2d50d +"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" +"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd" ++"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" -+"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" +"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 21fc08a39a9..f8ea5f2dae6 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgs }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }: rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0mb2wifz8pba03bdpiqadih33jimhg9crs4b72rcyfmj9l8fd1ba"; + sha256 = "00w8sy0m92by6lby1zb8hh36dnsrvwyyl56p6p7a1mf3iiq84r1y"; }; - buildInputs = with pkgs; [ openssl pkgconfig ]; + buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0cy23smal6y5qj6a202zf7l76vwkpzvcjmlbq0ffyph3gq07ps7b"; + cargoSha256 = "1axf15ma7fkbphjc6hjrbcj9rbd1x5i4kyz7fjrlqjgdsmvaqc93"; meta = with stdenv.lib; { description = "A basic http server for hosting a folder fast and simply"; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index dd1772d4931..8d0b3a89a34 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.30"; pname = "ccid"; + version = "1.4.31"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc"; + sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; }; postPatch = '' diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix new file mode 100644 index 00000000000..514f3f67539 --- /dev/null +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -0,0 +1,103 @@ +{ fetchFromGitHub +, ghostscript +, img2pdf +, jbig2enc +, leptonica +, pngquant +, python3 +, python3Packages +, qpdf +, stdenv +, tesseract4 +, unpaper +}: + +let + inherit (python3Packages) buildPythonApplication; + + runtimeDeps = with python3Packages; [ + ghostscript + jbig2enc + leptonica + pngquant + qpdf + tesseract4 + unpaper + pillow + ]; + +in buildPythonApplication rec { + pname = "ocrmypdf"; + version = "8.2.3"; + disabled = ! python3Packages.isPy3k; + + src = fetchFromGitHub { + owner = "jbarlow83"; + repo = "OCRmyPDF"; + rev = "v${version}"; + sha256 = "1ldlyhxkav34y9d7g2kx3d4p26c2b82vnwi0ywnfynb16sav36d5"; + }; + + nativeBuildInputs = with python3Packages; [ + pytestrunner + setuptools + setuptools-scm-git-archive + setuptools_scm + ]; + + propagatedBuildInputs = with python3Packages; [ + cffi + chardet + img2pdf + pdfminer + pikepdf + reportlab + ruffus + ]; + + checkInputs = with python3Packages; [ + hocr-tools + pypdf2 + pytest + pytest-helpers-namespace + pytest_xdist + pytestcov + pytestrunner + python-xmp-toolkit + setuptools + ] ++ runtimeDeps; + + + postPatch = '' + substituteInPlace src/ocrmypdf/leptonica.py \ + --replace "ffi.dlopen(find_library('lept'))" \ + 'ffi.dlopen("${stdenv.lib.makeLibraryPath [leptonica]}/liblept${stdenv.hostPlatform.extensions.sharedLibrary}")' + ''; + + # The tests take potentially 20+ minutes, depending on machine + doCheck = false; + + # These tests fail and it might be upstream problem... or packaging. :) + # development is happening on macos and the pinned test versions are + # significantly newer than nixpkgs has. Program still works... + # (to the extent I've used it) -- Kiwi + checkPhase = '' + export HOME=$TMPDIR + pytest -k 'not test_force_ocr_on_pdf_with_no_images \ + and not test_tesseract_crash \ + and not test_tesseract_crash_autorotate \ + and not test_ghostscript_pdfa_failure \ + and not test_gs_render_failure \ + and not test_gs_raster_failure \ + and not test_bad_utf8 \ + and not test_old_unpaper' + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jbarlow83/OCRmyPDF"; + description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 23aca98ec81..a3b58e7274d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -170,7 +170,7 @@ in platforms = lib.platforms.all; hydraPlatforms = lib.optionals (lib.elem pname ["scheme-small" "scheme-basic"]) platforms; - maintainers = with lib.maintainers; [ vcunat veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; } (combine { ${pname} = attrs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e846a6b8b1e..b1833ae9cdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1596,6 +1596,8 @@ in firecracker = callPackage ../applications/virtualization/firecracker { }; + firestarter = callPackage ../applications/misc/firestarter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1686,6 +1688,8 @@ in gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gsctl = callPackage ../applications/misc/gsctl { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1700,6 +1704,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; + home-manager = callPackage ../tools/package-management/home-manager {}; hostsblock = callPackage ../tools/misc/hostsblock { }; @@ -1824,6 +1830,8 @@ in nyx = callPackage ../tools/networking/nyx { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + onboard = callPackage ../applications/misc/onboard { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2469,6 +2477,8 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curlie = callPackage ../tools/networking/curlie { }; + cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -5517,6 +5527,8 @@ in pptpd = callPackage ../tools/networking/pptpd {}; + pre-commit = gitAndTools.pre-commit; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -8723,7 +8735,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy35; + pypy3 = pypy36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -8742,7 +8754,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -9786,7 +9798,7 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; - pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -11916,10 +11928,6 @@ in libplist = callPackage ../development/libraries/libplist { }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (darwin.apple_sdk.frameworks) AGL; - }; - libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; @@ -12340,6 +12348,9 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; + libmodulemd = callPackage ../development/libraries/libmodulemd { }; + libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libversion = callPackage ../development/libraries/libversion { }; @@ -13139,6 +13150,10 @@ in libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { + inherit (darwin.apple_sdk.frameworks) AGL; + }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cc0d980318..ab045cabe4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -643,6 +643,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + holoviews = callPackage ../development/python-modules/holoviews { }; hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { @@ -673,6 +675,8 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; @@ -1915,6 +1919,8 @@ in { pkginfo = callPackage ../development/python-modules/pkginfo { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; + pretend = callPackage ../development/python-modules/pretend { }; detox = callPackage ../development/python-modules/detox { }; @@ -1959,6 +1965,8 @@ in { hypothesis = self.hypothesis.override { doCheck = false; }; }; + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; @@ -2146,6 +2154,8 @@ in { demjson = callPackage ../development/python-modules/demjson { }; + deprecated = callPackage ../development/python-modules/deprecated { }; + deprecation = callPackage ../development/python-modules/deprecation { }; derpconf = callPackage ../development/python-modules/derpconf { }; @@ -4153,6 +4163,8 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; + pikepdf = callPackage ../development/python-modules/pikepdf { }; + kmapper = callPackage ../development/python-modules/kmapper { }; kmsxx = (callPackage ../development/libraries/kmsxx { @@ -5093,6 +5105,8 @@ in { ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + ruffus = callPackage ../development/python-modules/ruffus { }; + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; pysendfile = callPackage ../development/python-modules/pysendfile { }; @@ -5340,6 +5354,8 @@ in { units = callPackage ../development/python-modules/units { }; + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; @@ -5677,6 +5693,8 @@ in { python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pluggy = callPackage ../development/python-modules/pluggy {}; xcffib = callPackage ../development/python-modules/xcffib {}; @@ -6176,6 +6194,8 @@ in { wget = callPackage ../development/python-modules/wget { }; runway-python = callPackage ../development/python-modules/runway-python { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; }); in fix' (extends overrides packages) |