diff --git a/doc/meta.xml b/doc/meta.xml index 0f9dccfb91b58d31094cb777a3fb2bc8dc22a9dd..35632599186089965e2bd3c2fe6b628ab054e7bc 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -53,7 +53,7 @@ $ nix-env -qa hello --json "x86_64-linux", "armv5tel-linux", "armv7l-linux", - "mips64el-linux", + "mips32-linux", "x86_64-darwin", "i686-cygwin", "i686-freebsd", diff --git a/lib/customisation.nix b/lib/customisation.nix index 823395f04d4a46d1c34ab173452f0f893afc1747..d942f54ee7989f66b51dd252f6671d872e8dfcff 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -155,12 +155,6 @@ rec { outPath = assert condition; drv.outPath; }; - /* Add attributes to each output of a derivation without changing - the derivation itself. */ - addPassthru = - lib.warn "`addPassthru drv passthru` is deprecated, replace with `extendDerivation true passthru drv`" - (drv: passthru: extendDerivation true passthru drv); - /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the result to ensure that there are no thunks kept alive to prevent diff --git a/lib/default.nix b/lib/default.nix index 77cfa712557c7ebb9f707413afc020d99f33ad0b..4c36f3b0d790ee61328ca126d2c4183a9c4fa582 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,10 +21,10 @@ let # packaging customisation = callLibs ./customisation.nix; - maintainers = callLibs ./maintainers.nix; + maintainers = import ./maintainers-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; - + versions = callLibs ./versions.nix; # module system modules = callLibs ./modules.nix; @@ -88,7 +88,7 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith extendDerivation addPassthru + callPackageWith callPackagesWith extendDerivation hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio diff --git a/lib/maintainers-list.nix b/lib/maintainers-list.nix new file mode 100644 index 0000000000000000000000000000000000000000..f397ee0ddb8c9e8ddb7ef7fa8c20b1d4ecee85f9 --- /dev/null +++ b/lib/maintainers-list.nix @@ -0,0 +1,3955 @@ +/* List of NixOS maintainers. + + handle = { + name = "Real name"; + email = "address@example.org"; + github = "GithubUsername"; + }; + + where `name` is your 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/`). + address + The only required fields are `name` and `email`. + More fields may be added in the future. + + Please keep the list alphabetically sorted. + See `../maintainers/scripts/check-maintainer-github-handles.sh` + for an example on how to work with this data. + */ +{ + Adjective-Object = { + email = "mhuan13@gmail.com"; + github = "Adjective-Object"; + name = "Maxwell Huang-Hobbs"; + }; + AndersonTorres = { + email = "torres.anderson.85@gmail.com"; + github = "AndersonTorres"; + name = "Anderson Torres"; + }; + Baughn = { + email = "sveina@gmail.com"; + github = "Baughn"; + name = "Svein Ove Aas"; + }; + ChengCat = { + email = "yu@cheng.cat"; + github = "ChengCat"; + name = "Yucheng Zhang"; + }; + CrystalGamma = { + email = "nixos@crystalgamma.de"; + github = "CrystalGamma"; + name = "Jona Stubbe"; + }; + DamienCassou = { + email = "damien@cassou.me"; + github = "DamienCassou"; + name = "Damien Cassou"; + }; + DerGuteMoritz = { + email = "moritz@twoticketsplease.de"; + github = "DerGuteMoritz"; + name = "Moritz Heidkamp"; + }; + DerTim1 = { + email = "tim.digel@active-group.de"; + github = "DerTim1"; + name = "Tim Digel"; + }; + DmitryTsygankov = { + email = "dmitry.tsygankov@gmail.com"; + github = "DmitryTsygankov"; + name = "Dmitry Tsygankov"; + }; + FireyFly = { + email = "nix@firefly.nu"; + github = "FireyFly"; + name = "Jonas Höglund"; + }; + Gonzih = { + email = "gonzih@gmail.com"; + github = "Gonzih"; + name = "Max Gonzih"; + }; + Jo = { + email = "0x4A6F@shackspace.de"; + name = "Joachim Ernst"; + }; + KibaFox = { + email = "kiba.fox@foxypossibilities.com"; + github = "KibaFox"; + name = "Kiba Fox"; + }; + MP2E = { + email = "MP2E@archlinux.us"; + github = "MP2E"; + name = "Cray Elliott"; + }; + MostAwesomeDude = { + email = "cds@corbinsimpson.com"; + github = "MostAwesomeDude"; + name = "Corbin Simpson"; + }; + Nate-Devv = { + email = "natedevv@gmail.com"; + name = "Nathan Moore"; + }; + NikolaMandic = { + email = "nikola@mandic.email"; + github = "NikolaMandic"; + name = "Ratko Mladic"; + }; + Phlogistique = { + email = "noe.rubinstein@gmail.com"; + github = "Phlogistique"; + name = "Noé Rubinstein"; + }; + Profpatsch = { + email = "mail@profpatsch.de"; + github = "Profpatsch"; + name = "Profpatsch"; + }; + SShrike = { + email = "severen@shrike.me"; + github = "severen"; + name = "Severen Redwood"; + }; + SeanZicari = { + email = "sean.zicari@gmail.com"; + github = "SeanZicari"; + name = "Sean Zicari"; + }; + StijnDW = { + email = "stekke@airmail.cc"; + github = "StijnDW"; + name = "Stijn DW"; + }; + StillerHarpo = { + email = "florianengel39@gmail.com"; + github = "StillerHarpo"; + name = "Florian Engel"; + }; + SuprDewd = { + email = "suprdewd@gmail.com"; + github = "SuprDewd"; + name = "Bjarki Ágúst Guðmundsson"; + }; + TealG = { + email = "~@Teal.Gr"; + github = "TealG"; + name = "Teal Gaure"; + }; + ThomasMader = { + email = "thomas.mader@gmail.com"; + github = "ThomasMader"; + name = "Thomas Mader"; + }; + Zimmi48 = { + email = "theo.zimmermann@univ-paris-diderot.fr"; + github = "Zimmi48"; + name = "Théo Zimmermann"; + }; + a1russell = { + email = "adamlr6+pub@gmail.com"; + github = "a1russell"; + name = "Adam Russell"; + }; + aaronschif = { + email = "aaronschif@gmail.com"; + github = "aaronschif"; + name = "Aaron Schif"; + }; + abaldeau = { + email = "andreas@baldeau.net"; + github = "baldo"; + name = "Andreas Baldeau"; + }; + abbradar = { + email = "ab@fmap.me"; + github = "abbradar"; + name = "Nikolay Amiantov"; + }; + abigailbuccaneer = { + email = "abigailbuccaneer@gmail.com"; + github = "abigailbuccaneer"; + name = "Abigail Bunyan"; + }; + aboseley = { + email = "adam.boseley@gmail.com"; + github = "aboseley"; + name = "Adam Boseley"; + }; + abuibrahim = { + email = "ruslan@babayev.com"; + github = "abuibrahim"; + name = "Ruslan Babayev"; + }; + acowley = { + email = "acowley@gmail.com"; + github = "acowley"; + name = "Anthony Cowley"; + }; + adelbertc = { + email = "adelbertc@gmail.com"; + github = "adelbertc"; + name = "Adelbert Chang"; + }; + adev = { + email = "adev@adev.name"; + github = "adevress"; + name = "Adrien Devresse"; + }; + adisbladis = { + email = "adis@blad.is"; + github = "adisbladis"; + name = "Adam Hose"; + }; + adnelson = { + email = "ithinkican@gmail.com"; + github = "adnelson"; + name = "Allen Nelson"; + }; + adolfogc = { + email = "adolfo.garcia.cr@gmail.com"; + github = "adolfogc"; + name = "Adolfo E. García Castro"; + }; + aespinosa = { + email = "allan.espinosa@outlook.com"; + github = "aespinosa"; + name = "Allan Espinosa"; + }; + aflatter = { + email = "flatter@fastmail.fm"; + github = "aflatter"; + name = "Alexander Flatter"; + }; + afldcr = { + email = "alex@fldcr.com"; + github = "afldcr"; + name = "James Alexander Feldman-Crough"; + }; + aforemny = { + email = "alexanderforemny@googlemail.com"; + github = "aforemny"; + name = "Alexander Foremny"; + }; + afranchuk = { + email = "alex.franchuk@gmail.com"; + github = "afranchuk"; + name = "Alex Franchuk"; + }; + aherrmann = { + email = "andreash87@gmx.ch"; + github = "aherrmann"; + name = "Andreas Herrmann"; + }; + ahmedtd = { + email = "ahmed.taahir@gmail.com"; + github = "ahmedtd"; + name = "Taahir Ahmed"; + }; + aij = { + email = "aij+git@mrph.org"; + github = "aij"; + name = "Ivan Jager"; + }; + ajgrf = { + email = "a@ajgrf.com"; + github = "ajgrf"; + name = "Alex Griffin"; + }; + ak = { + email = "ak@formalprivacy.com"; + github = "alexanderkjeldaas"; + name = "Alexander Kjeldaas"; + }; + akaWolf = { + email = "akawolf0@gmail.com"; + github = "akaWolf"; + name = "Artjom Vejsel"; + }; + akc = { + email = "akc@akc.is"; + github = "akc"; + name = "Anders Claesson"; + }; + alexvorobiev = { + email = "alexander.vorobiev@gmail.com"; + github = "alexvorobiev"; + name = "Alex Vorobiev"; + }; + algorith = { + email = "dries_van_daele@telenet.be"; + name = "Dries Van Daele"; + }; + alibabzo = { + email = "alistair.bill@gmail.com"; + github = "alibabzo"; + name = "Alistair Bill"; + }; + all = { + email = "nix-commits@lists.science.uu.nl"; + name = "Nix Committers"; + }; + alunduil = { + email = "alunduil@alunduil.com"; + github = "alunduil"; + name = "Alex Brandt"; + }; + ambrop72 = { + email = "ambrop7@gmail.com"; + github = "ambrop72"; + name = "Ambroz Bizjak"; + }; + amiddelk = { + email = "amiddelk@gmail.com"; + github = "amiddelk"; + name = "Arie Middelkoop"; + }; + amiloradovsky = { + email = "miloradovsky@gmail.com"; + github = "amiloradovsky"; + name = "Andrew Miloradovsky"; + }; + amorsillo = { + email = "andrew.morsillo@gmail.com"; + github = "AndrewMorsillo"; + name = "Andrew Morsillo"; + }; + anderspapitto = { + email = "anderspapitto@gmail.com"; + github = "anderspapitto"; + name = "Anders Papitto"; + }; + andir = { + email = "andreas@rammhold.de"; + github = "andir"; + name = "Andreas Rammhold"; + }; + andres = { + email = "ksnixos@andres-loeh.de"; + github = "kosmikus"; + name = "Andres Loeh"; + }; + andrestylianos = { + email = "andre.stylianos@gmail.com"; + github = "andrestylianos"; + name = "Andre S. Ramos"; + }; + andrew-d = { + email = "andrew@du.nham.ca"; + github = "andrew-d"; + name = "Andrew Dunham"; + }; + andrewrk = { + email = "superjoe30@gmail.com"; + github = "andrewrk"; + name = "Andrew Kelley"; + }; + andsild = { + email = "andsild@gmail.com"; + github = "andsild"; + name = "Anders Sildnes"; + }; + aneeshusa = { + email = "aneeshusa@gmail.com"; + github = "aneeshusa"; + name = "Aneesh Agrawal"; + }; + ankhers = { + email = "justin.k.wood@gmail.com"; + github = "ankhers"; + name = "Justin Wood"; + }; + antono = { + email = "self@antono.info"; + github = "antono"; + name = "Antono Vasiljev"; + }; + antonxy = { + email = "anton.schirg@posteo.de"; + github = "antonxy"; + name = "Anton Schirg"; + }; + apeschar = { + email = "albert@peschar.net"; + github = "apeschar"; + name = "Albert Peschar"; + }; + apeyroux = { + email = "alex@px.io"; + github = "apeyroux"; + name = "Alexandre Peyroux"; + }; + arcadio = { + email = "arc@well.ox.ac.uk"; + github = "arcadio"; + name = "Arcadio Rubio García"; + }; + ardumont = { + email = "eniotna.t@gmail.com"; + github = "ardumont"; + name = "Antoine R. Dumont"; + }; + aristid = { + email = "aristidb@gmail.com"; + github = "aristidb"; + name = "Aristid Breitkreuz"; + }; + arobyn = { + email = "shados@shados.net"; + github = "shados"; + name = "Alexei Robyn"; + }; + artuuge = { + email = "artuuge@gmail.com"; + github = "artuuge"; + name = "Artur E. Ruuge"; + }; + ashalkhakov = { + email = "artyom.shalkhakov@gmail.com"; + github = "ashalkhakov"; + name = "Artyom Shalkhakov"; + }; + ashgillman = { + email = "gillmanash@gmail.com"; + github = "ashgillman"; + name = "Ashley Gillman"; + }; + aske = { + email = "aske@fmap.me"; + github = "aske"; + name = "Kirill Boltaev"; + }; + asppsa = { + email = "asppsa@gmail.com"; + github = "asppsa"; + name = "Alastair Pharo"; + }; + astsmtl = { + email = "astsmtl@yandex.ru"; + github = "astsmtl"; + name = "Alexander Tsamutali"; + }; + asymmetric = { + email = "lorenzo@mailbox.org"; + github = "asymmetric"; + name = "Lorenzo Manacorda"; + }; + aszlig = { + email = "aszlig@nix.build"; + github = "aszlig"; + name = "aszlig"; + }; + auntie = { + email = "auntieNeo@gmail.com"; + github = "auntie"; + name = "Jonathan Glines"; + }; + avnik = { + email = "avn@avnik.info"; + github = "avnik"; + name = "Alexander V. Nikolaev"; + }; + aycanirican = { + email = "iricanaycan@gmail.com"; + github = "aycanirican"; + name = "Aycan iRiCAN"; + }; + babariviere = { + email = "babariviere@protonmail.com"; + github = "babariviere"; + name = "babariviere"; + }; + bachp = { + email = "pascal.bach@nextrem.ch"; + github = "bachp"; + name = "Pascal Bach"; + }; + backuitist = { + email = null; + github = "backuitist"; + name = "Bruno Bieth"; + }; + badi = { + email = "abdulwahidc@gmail.com"; + github = "badi"; + name = "Badi' Abdul-Wahid"; + }; + balajisivaraman = { + email = "sivaraman.balaji@gmail.com"; + name = "Balaji Sivaraman"; + }; + barrucadu = { + email = "mike@barrucadu.co.uk"; + github = "barrucadu"; + name = "Michael Walker"; + }; + basvandijk = { + email = "v.dijk.bas@gmail.com"; + github = "basvandijk"; + name = "Bas van Dijk"; + }; + bcarrell = { + email = "brandoncarrell@gmail.com"; + github = "bcarrell"; + name = "Brandon Carrell"; + }; + bcdarwin = { + email = "bcdarwin@gmail.com"; + github = "bcdarwin"; + name = "Ben Darwin"; + }; + bdimcheff = { + email = "brandon@dimcheff.com"; + github = "bdimcheff"; + name = "Brandon Dimcheff"; + }; + bendlas = { + email = "herwig@bendlas.net"; + github = "bendlas"; + name = "Herwig Hochleitner"; + }; + benley = { + email = "benley@gmail.com"; + github = "benley"; + name = "Benjamin Staffin"; + }; + bennofs = { + email = "benno.fuenfstueck@gmail.com"; + github = "bennofs"; + name = "Benno Fünfstück"; + }; + benwbooth = { + email = "benwbooth@gmail.com"; + github = "benwbooth"; + name = "Ben Booth"; + }; + berce = { + email = "bert.moens@gmail.com"; + github = "berce"; + name = "Bert Moens"; + }; + berdario = { + email = "berdario@gmail.com"; + github = "berdario"; + name = "Dario Bertini"; + }; + bergey = { + email = "bergey@teallabs.org"; + github = "bergey"; + name = "Daniel Bergey"; + }; + bhipple = { + email = "bhipple@protonmail.com"; + github = "bhipple"; + name = "Benjamin Hipple"; + }; + binarin = { + email = "binarin@binarin.ru"; + github = "binarin"; + name = "Alexey Lebedeff"; + }; + bjg = { + email = "bjg@gnu.org"; + github = "civodul"; + name = "Brian Gough"; + }; + bjornfor = { + email = "bjorn.forsman@gmail.com"; + github = "bjornfor"; + name = "Bjørn Forsman"; + }; + bluescreen303 = { + email = "mathijs@bluescreen303.nl"; + github = "bluescreen303"; + name = "Mathijs Kwik"; + }; + bobakker = { + email = "bobakk3r@gmail.com"; + github = "bobakker"; + name = "Bo Bakker"; + }; + bobvanderlinden = { + email = "bobvanderlinden@gmail.com"; + github = "bobvanderlinden"; + name = "Bob van der Linden"; + }; + bodil = { + email = "nix@bodil.org"; + github = "bodil"; + name = "Bodil Stokke"; + }; + boothead = { + email = "ben@perurbis.com"; + github = "boothead"; + name = "Ben Ford"; + }; + bosu = { + email = "boriss@gmail.com"; + github = "bosu"; + name = "Boris Sukholitko"; + }; + bradediger = { + email = "brad@bradediger.com"; + github = "bradediger"; + name = "Brad Ediger"; + }; + bramd = { + email = "bram@bramd.nl"; + github = "bramd"; + name = "Bram Duvigneau"; + }; + bstrik = { + email = "dutchman55@gmx.com"; + github = "bstrik"; + name = "Berno Strik"; + }; + bugworm = { + email = "bugworm@zoho.com"; + github = "bugworm"; + name = "Roman Gerasimenko"; + }; + bzizou = { + email = "Bruno@bzizou.net"; + github = "bzizou"; + name = "Bruno Bzeznik"; + }; + c0bw3b = { + email = "c0bw3b@gmail.com"; + github = "c0bw3b"; + name = "Renaud"; + }; + c0dehero = { + email = "codehero@nerdpol.ch"; + name = "CodeHero"; + }; + calbrecht = { + email = "christian.albrecht@mayflower.de"; + github = "calbrecht"; + name = "Christian Albrecht"; + }; + calrama = { + email = "moritz@ucworks.org"; + github = "MoritzMaxeiner"; + name = "Moritz Maxeiner"; + }; + calvertvl = { + email = "calvertvl@gmail.com"; + github = "calvertvl"; + name = "Victor Calvert"; + }; + campadrenalin = { + email = "campadrenalin@gmail.com"; + github = "campadrenalin"; + name = "Philip Horger"; + }; + canndrew = { + email = "shum@canndrew.org"; + github = "canndrew"; + name = "Andrew Cann"; + }; + carlsverre = { + email = "accounts@carlsverre.com"; + github = "carlsverre"; + name = "Carl Sverre"; + }; + casey = { + email = "casey@rodarmor.net"; + github = "casey"; + name = "Casey Rodarmor"; + }; + catern = { + email = "sbaugh@catern.com"; + github = "catern"; + name = "Spencer Baugh"; + }; + caugner = { + email = "nixos@caugner.de"; + github = "caugner"; + name = "Claas Augner"; + }; + cdepillabout = { + email = "cdep.illabout@gmail.com"; + github = "cdepillabout"; + name = "Dennis Gosnell"; + }; + cfouche = { + email = "chaddai.fouche@gmail.com"; + github = "Chaddai"; + name = "Chaddaï Fouché"; + }; + changlinli = { + email = "mail@changlinli.com"; + github = "changlinli"; + name = "Changlin Li"; + }; + chaoflow = { + email = "flo@chaoflow.net"; + github = "chaoflow"; + name = "Florian Friesdorf"; + }; + chattered = { + email = "me@philscotted.com"; + name = "Phil Scott"; + }; + chiiruno = { + email = "okinan@protonmail.com"; + github = "chiiruno"; + name = "Okina Matara"; + }; + choochootrain = { + email = "hurshal@imap.cc"; + github = "choochootrain"; + name = "Hurshal Patel"; + }; + chpatrick = { + email = "chpatrick@gmail.com"; + github = "chpatrick"; + name = "Patrick Chilton"; + }; + chreekat = { + email = "b@chreekat.net"; + github = "chreekat"; + name = "Bryan Richter"; + }; + chris-martin = { + email = "ch.martin@gmail.com"; + github = "chris-martin"; + name = "Chris Martin"; + }; + chrisjefferson = { + email = "chris@bubblescope.net"; + github = "chrisjefferson"; + name = "Christopher Jefferson"; + }; + chrisrosset = { + email = "chris@rosset.org.uk"; + github = "chrisrosset"; + name = "Christopher Rosset"; + }; + christopherpoole = { + email = "mail@christopherpoole.net"; + github = "christopherpoole"; + name = "Christopher Mark Poole"; + }; + ciil = { + email = "simon@lackerbauer.com"; + github = "ciil"; + name = "Simon Lackerbauer"; + }; + ck3d = { + email = "ck3d@gmx.de"; + github = "ck3d"; + name = "Christian Kögler"; + }; + ckampka = { + email = "christian@kampka.net"; + github = "kampka"; + name = "Christian Kampka"; + }; + ckauhaus = { + email = "kc@flyingcircus.io"; + github = "ckauhaus"; + name = "Christian Kauhaus"; + }; + cko = { + email = "christine.koppelt@gmail.com"; + github = "cko"; + name = "Christine Koppelt"; + }; + cleverca22 = { + email = "cleverca22@gmail.com"; + github = "cleverca22"; + name = "Michael Bishop"; + }; + cmcdragonkai = { + email = "roger.qiu@matrix.ai"; + github = "cmcdragonkai"; + name = "Roger Qiu"; + }; + cmfwyp = { + email = "cmfwyp@riseup.net"; + github = "cmfwyp"; + name = "cmfwyp"; + }; + cobbal = { + email = "andrew.cobb@gmail.com"; + github = "cobbal"; + name = "Andrew Cobb"; + }; + coconnor = { + email = "coreyoconnor@gmail.com"; + github = "coreyoconnor"; + name = "Corey O'Connor"; + }; + codsl = { + email = "codsl@riseup.net"; + github = "codsl"; + name = "codsl"; + }; + codyopel = { + email = "codyopel@gmail.com"; + github = "codyopel"; + name = "Cody Opel"; + }; + colemickens = { + email = "cole.mickens@gmail.com"; + github = "colemickens"; + name = "Cole Mickens"; + }; + colescott = { + email = "colescottsf@gmail.com"; + github = "colescott"; + name = "Cole Scott"; + }; + copumpkin = { + email = "pumpkingod@gmail.com"; + github = "copumpkin"; + name = "Dan Peebles"; + }; + corngood = { + email = "corngood@gmail.com"; + github = "corngood"; + name = "David McFarland"; + }; + coroa = { + email = "jonas@chaoflow.net"; + github = "coroa"; + name = "Jonas Hörsch"; + }; + couchemar = { + email = "couchemar@yandex.ru"; + github = "couchemar"; + name = "Andrey Pavlov"; + }; + cpages = { + email = "page@ruiec.cat"; + github = "cpages"; + name = "Carles Pagès"; + }; + cransom = { + email = "cransom@hubns.net"; + github = "cransom"; + name = "Casey Ransom"; + }; + cryptix = { + email = "cryptix@riseup.net"; + github = "cryptix"; + name = "Henry Bubert"; + }; + csingley = { + email = "csingley@gmail.com"; + github = "csingley"; + name = "Christopher Singley"; + }; + cstrahan = { + email = "charles@cstrahan.com"; + github = "cstrahan"; + name = "Charles Strahan"; + }; + cwoac = { + email = "oliver@codersoffortune.net"; + github = "cwoac"; + name = "Oliver Matthews"; + }; + danbst = { + email = "abcz2.uprola@gmail.com"; + github = "danbst"; + name = "Danylo Hlynskyi"; + }; + dancek = { + email = "hannu.hartikainen@gmail.com"; + github = "dancek"; + name = "Hannu Hartikainen"; + }; + danharaj = { + email = "dan@obsidian.systems"; + github = "danharaj"; + name = "Dan Haraj"; + }; + danielfullmer = { + email = "danielrf12@gmail.com"; + github = "danielfullmer"; + name = "Daniel Fullmer"; + }; + dasuxullebt = { + email = "christoph.senjak@googlemail.com"; + name = "Christoph-Simon Senjak"; + }; + david50407 = { + email = "me@davy.tw"; + github = "david50407"; + name = "David Kuo"; + }; + davidak = { + email = "post@davidak.de"; + github = "davidak"; + name = "David Kleuker"; + }; + davidrusu = { + email = "davidrusu.me@gmail.com"; + github = "davidrusu"; + name = "David Rusu"; + }; + davorb = { + email = "davor@davor.se"; + github = "davorb"; + name = "Davor Babic"; + }; + dbohdan = { + email = "danyil.bohdan@gmail.com"; + github = "dbohdan"; + name = "Danyil Bohdan"; + }; + dbrock = { + email = "daniel@brockman.se"; + github = "dbrock"; + name = "Daniel Brockman"; + }; + deepfire = { + email = "_deepfire@feelingofgreen.ru"; + github = "deepfire"; + name = "Kosyrev Serge"; + }; + demin-dmitriy = { + email = "demindf@gmail.com"; + github = "demin-dmitriy"; + name = "Dmitriy Demin"; + }; + derchris = { + email = "derchris@me.com"; + github = "derchrisuk"; + name = "Christian Gerbrandt"; + }; + dermetfan = { + email = "serverkorken@gmail.com"; + github = "dermetfan"; + name = "Robin Stumm"; + }; + desiderius = { + email = "didier@devroye.name"; + github = "desiderius"; + name = "Didier J. Devroye"; + }; + devhell = { + email = "\"^\"@regexmail.net"; + github = "devhell"; + name = "devhell"; + }; + dezgeg = { + email = "tuomas.tynkkynen@iki.fi"; + github = "dezgeg"; + name = "Tuomas Tynkkynen"; + }; + dfordivam = { + email = "dfordivam+nixpkgs@gmail.com"; + github = "dfordivam"; + name = "Divam"; + }; + dfoxfranke = { + email = "dfoxfranke@gmail.com"; + github = "dfoxfranke"; + name = "Daniel Fox Franke"; + }; + dgonyeo = { + email = "derek@gonyeo.com"; + github = "dgonyeo"; + name = "Derek Gonyeo"; + }; + dipinhora = { + email = "dipinhora+github@gmail.com"; + github = "dipinhora"; + name = "Dipin Hora"; + }; + disassembler = { + email = "disasm@gmail.com"; + github = "disassembler"; + name = "Samuel Leathers"; + }; + dizfer = { + email = "david@izquierdofernandez.com"; + github = "dizfer"; + name = "David Izquierdo"; + }; + dmalikov = { + email = "malikov.d.y@gmail.com"; + github = "dmalikov"; + name = "Dmitry Malikov"; + }; + dmjio = { + email = "djohnson.m@gmail.com"; + github = "dmjio"; + name = "David Johnson"; + }; + dochang = { + email = "dochang@gmail.com"; + github = "dochang"; + name = "Desmond O. Chang"; + }; + domenkozar = { + email = "domen@dev.si"; + github = "domenkozar"; + name = "Domen Kozar"; + }; + dotlambda = { + email = "rschuetz17@gmail.com"; + github = "dotlambda"; + name = "Robert Schütz"; + }; + doublec = { + email = "chris.double@double.co.nz"; + github = "doublec"; + name = "Chris Double"; + }; + dpaetzel = { + email = "david.a.paetzel@gmail.com"; + github = "dpaetzel"; + name = "David Pätzel"; + }; + dpflug = { + email = "david@pflug.email"; + github = "dpflug"; + name = "David Pflug"; + }; + drets = { + email = "dmitryrets@gmail.com"; + github = "drets"; + name = "Dmytro Rets"; + }; + drewkett = { + email = "burkett.andrew@gmail.com"; + name = "Andrew Burkett"; + }; + dsferruzza = { + email = "david.sferruzza@gmail.com"; + github = "dsferruzza"; + name = "David Sferruzza"; + }; + dtzWill = { + email = "nix@wdtz.org"; + github = "dtzWill"; + name = "Will Dietz"; + }; + dupgit = { + email = "olivier.delhomme@free.fr"; + github = "dupgit"; + name = "Olivier Delhomme"; + }; + dywedir = { + email = "dywedir@protonmail.ch"; + github = "dywedir"; + name = "Vladyslav M."; + }; + dzabraev = { + email = "dzabraew@gmail.com"; + github = "dzabraev"; + name = "Maksim Dzabraev"; + }; + e-user = { + email = "nixos@sodosopa.io"; + github = "e-user"; + name = "Alexander Kahl"; + }; + earldouglas = { + email = "james@earldouglas.com"; + github = "earldouglas"; + name = "James Earl Douglas"; + }; + earvstedt = { + email = "erik.arvstedt@gmail.com"; + github = "erikarvstedt"; + name = "Erik Arvstedt"; + }; + ebzzry = { + email = "ebzzry@ebzzry.io"; + github = "ebzzry"; + name = "Rommel Martinez"; + }; + edanaher = { + email = "nixos@edanaher.net"; + github = "edanaher"; + name = "Evan Danaher"; + }; + edef = { + email = "edef@edef.eu"; + github = "edef1c"; + name = "edef"; + }; + ederoyd46 = { + email = "matt@ederoyd.co.uk"; + github = "ederoyd46"; + name = "Matthew Brown"; + }; + eduarrrd = { + email = "e.bachmakov@gmail.com"; + github = "eduarrrd"; + name = "Eduard Bachmakov"; + }; + edwtjo = { + email = "ed@cflags.cc"; + github = "edwtjo"; + name = "Edward Tjörnhammar"; + }; + eelco = { + email = "eelco.dolstra@logicblox.com"; + github = "edolstra"; + name = "Eelco Dolstra"; + }; + ehegnes = { + email = "eric.hegnes@gmail.com"; + github = "ehegnes"; + name = "Eric Hegnes"; + }; + ehmry = { + email = "emery@vfemail.net"; + name = "Emery Hemingway"; + }; + eikek = { + email = "eike.kettner@posteo.de"; + github = "eikek"; + name = "Eike Kettner"; + }; + ekleog = { + email = "leo@gaspard.io"; + github = "ekleog"; + name = "Leo Gaspard"; + }; + elasticdog = { + email = "aaron@elasticdog.com"; + github = "elasticdog"; + name = "Aaron Bull Schaefer"; + }; + eleanor = { + email = "dejan@proteansec.com"; + github = "proteansec"; + name = "Dejan Lukan"; + }; + elijahcaine = { + email = "elijahcainemv@gmail.com"; + github = "pop"; + name = "Elijah Caine"; + }; + elitak = { + email = "elitak@gmail.com"; + github = "elitak"; + name = "Eric Litak"; + }; + ellis = { + email = "nixos@ellisw.net"; + github = "ellis"; + name = "Ellis Whitehead"; + }; + enzime = { + email = "enzime@users.noreply.github.com"; + github = "enzime"; + name = "Michael Hoang"; + }; + eperuffo = { + email = "info@emanueleperuffo.com"; + github = "emanueleperuffo"; + name = "Emanuele Peruffo"; + }; + epitrochoid = { + email = "mpcervin@uncg.edu"; + name = "Mabry Cervin"; + }; + eqyiel = { + email = "r@rkm.id.au"; + github = "eqyiel"; + name = "Ruben Maher"; + }; + ericbmerritt = { + email = "eric@afiniate.com"; + github = "ericbmerritt"; + name = "Eric Merritt"; + }; + erosennin = { + email = "ag@sologoc.com"; + github = "erosennin"; + name = "Andrey Golovizin"; + }; + ericsagnes = { + email = "eric.sagnes@gmail.com"; + github = "ericsagnes"; + name = "Eric Sagnes"; + }; + ericson2314 = { + email = "John.Ericson@Obsidian.Systems"; + github = "ericson2314"; + name = "John Ericson"; + }; + erictapen = { + email = "justin.humm@posteo.de"; + github = "erictapen"; + name = "Justin Humm"; + }; + erikryb = { + email = "erik.rybakken@math.ntnu.no"; + github = "erikryb"; + name = "Erik Rybakken"; + }; + ertes = { + email = "esz@posteo.de"; + github = "ertes"; + name = "Ertugrul Söylemez"; + }; + ethercrow = { + email = "ethercrow@gmail.com"; + github = "ethercrow"; + name = "Dmitry Ivanov"; + }; + etu = { + email = "elis@hirwing.se"; + github = "etu"; + name = "Elis Hirwing"; + }; + exfalso = { + email = "0slemi0@gmail.com"; + github = "exfalso"; + name = "Andras Slemmer"; + }; + exi = { + email = "nixos@reckling.org"; + github = "exi"; + name = "Reno Reckling"; + }; + exlevan = { + email = "exlevan@gmail.com"; + github = "exlevan"; + name = "Alexey Levan"; + }; + expipiplus1 = { + email = "nix@monoid.al"; + github = "expipiplus1"; + name = "Joe Hermaszewski"; + }; + f-breidenstein = { + email = "mail@felixbreidenstein.de"; + github = "f-breidenstein"; + name = "Felix Breidenstein"; + }; + fadenb = { + email = "tristan.helmich+nixos@gmail.com"; + github = "fadenb"; + name = "Tristan Helmich"; + }; + falsifian = { + email = "james.cook@utoronto.ca"; + github = "falsifian"; + name = "James Cook"; + }; + fare = { + email = "fahree@gmail.com"; + github = "fare"; + name = "Francois-Rene Rideau"; + }; + fgaz = { + email = "francygazz@gmail.com"; + github = "fgaz"; + name = "Francesco Gazzetta"; + }; + flokli = { + email = "flokli@flokli.de"; + github = "flokli"; + name = "Florian Klink"; + }; + florianjacob = { + email = "projects+nixos@florianjacob.de"; + github = "florianjacob"; + name = "Florian Jacob"; + }; + flosse = { + email = "mail@markus-kohlhase.de"; + github = "flosse"; + name = "Markus Kohlhase"; + }; + fluffynukeit = { + email = "dan@fluffynukeit.com"; + github = "fluffynukeit"; + name = "Daniel Austin"; + }; + fmthoma = { + email = "f.m.thoma@googlemail.com"; + github = "fmthoma"; + name = "Franz Thoma"; + }; + forkk = { + email = "forkk@forkk.net"; + github = "forkk"; + name = "Andrew Okin"; + }; + fornever = { + email = "friedrich@fornever.me"; + github = "fornever"; + name = "Friedrich von Never"; + }; + fpletz = { + email = "fpletz@fnordicwalking.de"; + github = "fpletz"; + name = "Franz Pletz"; + }; + fps = { + email = "mista.tapas@gmx.net"; + github = "fps"; + name = "Florian Paul Schmidt"; + }; + fridh = { + email = "fridh@fridh.nl"; + github = "fridh"; + name = "Frederik Rietdijk"; + }; + frlan = { + email = "frank@frank.uvena.de"; + github = "frlan"; + name = "Frank Lanitz"; + }; + fro_ozen = { + email = "fro_ozen@gmx.de"; + github = "froozen"; + name = "fro_ozen"; + }; + ftrvxmtrx = { + email = "ftrvxmtrx@gmail.com"; + github = "ftrvxmtrx"; + name = "Siarhei Zirukin"; + }; + funfunctor = { + email = "eocallaghan@alterapraxis.com"; + name = "Edward O'Callaghan"; + }; + fuuzetsu = { + email = "fuuzetsu@fuuzetsu.co.uk"; + github = "fuuzetsu"; + name = "Mateusz Kowalczyk"; + }; + fuzzy-id = { + email = "hacking+nixos@babibo.de"; + name = "Thomas Bach"; + }; + fxfactorial = { + email = "edgar.factorial@gmail.com"; + github = "fxfactorial"; + name = "Edgar Aroutiounian"; + }; + gabesoft = { + email = "gabesoft@gmail.com"; + github = "gabesoft"; + name = "Gabriel Adomnicai"; + }; + gal_bolle = { + email = "florent.becker@ens-lyon.org"; + github = "FlorentBecker"; + name = "Florent Becker"; + }; + garbas = { + email = "rok@garbas.si"; + github = "garbas"; + name = "Rok Garbas"; + }; + garrison = { + email = "jim@garrison.cc"; + github = "garrison"; + name = "Jim Garrison"; + }; + gavin = { + email = "gavin@praxeology.co.uk"; + github = "gavinrogers"; + name = "Gavin Rogers"; + }; + gebner = { + email = "gebner@gebner.org"; + github = "gebner"; + name = "Gabriel Ebner"; + }; + geistesk = { + email = "post@0x21.biz"; + github = "geistesk"; + name = "Alvar Penning"; + }; + genesis = { + email = "ronan@aimao.org"; + github = "bignaux"; + name = "Ronan Bignaux"; + }; + georgewhewell = { + email = "georgerw@gmail.com"; + github = "georgewhewell"; + name = "George Whewell"; + }; + gilligan = { + email = "tobias.pflug@gmail.com"; + github = "gilligan"; + name = "Tobias Pflug"; + }; + giogadi = { + email = "lgtorres42@gmail.com"; + github = "giogadi"; + name = "Luis G. Torres"; + }; + gleber = { + email = "gleber.p@gmail.com"; + github = "gleber"; + name = "Gleb Peregud"; + }; + glenns = { + email = "glenn.searby@gmail.com"; + github = "glenns"; + name = "Glenn Searby"; + }; + globin = { + email = "mail@glob.in"; + github = "globin"; + name = "Robin Gloster"; + }; + gnidorah = { + email = "yourbestfriend@opmbx.org"; + github = "gnidorah"; + name = "Alex Ivanov"; + }; + goibhniu = { + email = "cillian.deroiste@gmail.com"; + github = "cillianderoiste"; + name = "Cillian de Róiste"; + }; + goodrone = { + email = "goodrone@gmail.com"; + github = "goodrone"; + name = "Andrew Trachenko"; + }; + gpyh = { + email = "yacine.hmito@gmail.com"; + github = "yacinehmito"; + name = "Yacine Hmito"; + }; + grahamc = { + email = "graham@grahamc.com"; + github = "grahamc"; + name = "Graham Christensen"; + }; + grburst = { + email = "grburst@openmailbox.org"; + github = "grburst"; + name = "Julius Elias"; + }; + gridaphobe = { + email = "eric@seidel.io"; + github = "gridaphobe"; + name = "Eric Seidel"; + }; + guibert = { + email = "david.guibert@gmail.com"; + github = "dguibert"; + name = "David Guibert"; + }; + guibou = { + email = "guillaum.bouchard@gmail.com"; + github = "guibou"; + name = "Guillaume Bouchard"; + }; + guillaumekoenig = { + email = "guillaume.edward.koenig@gmail.com"; + github = "guillaumekoenig"; + name = "Guillaume Koenig"; + }; + guyonvarch = { + email = "joris@guyonvarch.me"; + github = "guyonvarch"; + name = "Joris Guyonvarch"; + }; + hakuch = { + email = "hakuch@gmail.com"; + github = "hakuch"; + name = "Jesse Haber-Kucharsky"; + }; + hamhut1066 = { + email = "github@hamhut1066.com"; + github = "hamhut1066"; + name = "Hamish Hutchings"; + }; + havvy = { + email = "ryan.havvy@gmail.com"; + github = "havvy"; + name = "Ryan Scheel"; + }; + hbunke = { + email = "bunke.hendrik@gmail.com"; + github = "hbunke"; + name = "Hendrik Bunke"; + }; + hce = { + email = "hc@hcesperer.org"; + github = "hce"; + name = "Hans-Christian Esperer"; + }; + hectorj = { + email = "hector.jusforgues+nixos@gmail.com"; + github = "hectorj"; + name = "Hector Jusforgues"; + }; + hedning = { + email = "torhedinbronner@gmail.com"; + github = "hedning"; + name = "Tor Hedin Brønner"; + }; + heel = { + email = "parizhskiy@gmail.com"; + github = "heel"; + name = "Sergii Paryzhskyi"; + }; + henrytill = { + email = "henrytill@gmail.com"; + github = "henrytill"; + name = "Henry Till"; + }; + hhm = { + email = "heehooman+nixpkgs@gmail.com"; + github = "hhm0"; + name = "hhm"; + }; + hinton = { + email = "t@larkery.com"; + name = "Tom Hinton"; + }; + hodapp = { + email = "hodapp87@gmail.com"; + github = "Hodapp87"; + name = "Chris Hodapp"; + }; + hrdinka = { + email = "c.nix@hrdinka.at"; + github = "hrdinka"; + name = "Christoph Hrdinka"; + }; + htr = { + email = "hugo@linux.com"; + github = "htr"; + name = "Hugo Tavares Reis"; + }; + hyphon81 = { + email = "zero812n@gmail.com"; + github = "hyphon81"; + name = "Masato Yonekawa"; + }; + iand675 = { + email = "ian@iankduncan.com"; + github = "iand675"; + name = "Ian Duncan"; + }; + ianwookim = { + email = "ianwookim@gmail.com"; + github = "wavewave"; + name = "Ian-Woo Kim"; + }; + iblech = { + email = "iblech@speicherleck.de"; + github = "iblech"; + name = "Ingo Blechschmidt"; + }; + igsha = { + email = "igor.sharonov@gmail.com"; + github = "igsha"; + name = "Igor Sharonov"; + }; + ikervagyok = { + email = "ikervagyok@gmail.com"; + github = "ikervagyok"; + name = "Balázs Lengyel"; + }; + ilya-kolpakov = { + email = "ilya.kolpakov@gmail.com"; + github = "ilya-kolpakov"; + name = "Ilya Kolpakov"; + }; + infinisil = { + email = "infinisil@icloud.com"; + github = "infinisil"; + name = "Silvan Mosberger"; + }; + ironpinguin = { + email = "michele@catalano.de"; + github = "ironpinguin"; + name = "Michele Catalano"; + }; + ivan-tkatchev = { + email = "tkatchev@gmail.com"; + name = "Ivan Tkatchev"; + }; + ixmatus = { + email = "parnell@digitalmentat.com"; + github = "ixmatus"; + name = "Parnell Springmeyer"; + }; + ixxie = { + email = "matan@fluxcraft.net"; + github = "ixxie"; + name = "Matan Bendix Shenhav"; + }; + izorkin = { + email = "Izorkin@gmail.com"; + github = "izorkin"; + name = "Yurii Izorkin"; + }; + j-keck = { + email = "jhyphenkeck@gmail.com"; + github = "j-keck"; + name = "Jürgen Keck"; + }; + jagajaga = { + email = "ars.seroka@gmail.com"; + github = "jagajaga"; + name = "Arseniy Seroka"; + }; + jammerful = { + email = "jammerful@gmail.com"; + github = "jammerful"; + name = "jammerful"; + }; + jansol = { + email = "jan.solanti@paivola.fi"; + github = "jansol"; + name = "Jan Solanti"; + }; + javaguirre = { + email = "contacto@javaguirre.net"; + github = "javaguirre"; + name = "Javier Aguirre"; + }; + jb55 = { + email = "jb55@jb55.com"; + github = "jb55"; + name = "William Casarin"; + }; + jbedo = { + email = "cu@cua0.org"; + github = "jbedo"; + name = "Justin Bedő"; + }; + jcumming = { + email = "jack@mudshark.org"; + name = "Jack Cummings"; + }; + jdagilliland = { + email = "jdagilliland@gmail.com"; + github = "jdagilliland"; + name = "Jason Gilliland"; + }; + jefdaj = { + email = "jefdaj@gmail.com"; + github = "jefdaj"; + name = "Jeffrey David Johnson"; + }; + jensbin = { + email = "jensbin@protonmail.com"; + github = "jensbin"; + name = "Jens Binkert"; + }; + jerith666 = { + email = "github@matt.mchenryfamily.org"; + github = "jerith666"; + name = "Matt McHenry"; + }; + jfb = { + email = "james@yamtime.com"; + github = "tftio"; + name = "James Felix Black"; + }; + jfrankenau = { + email = "johannes@frankenau.net"; + github = "jfrankenau"; + name = "Johannes Frankenau"; + }; + jgeerds = { + email = "jascha@jgeerds.name"; + github = "jgeerds"; + name = "Jascha Geerds"; + }; + jgertm = { + email = "jger.tm@gmail.com"; + github = "jgertm"; + name = "Tim Jaeger"; + }; + jgillich = { + email = "jakob@gillich.me"; + github = "jgillich"; + name = "Jakob Gillich"; + }; + jhhuh = { + email = "jhhuh.note@gmail.com"; + github = "jhhuh"; + name = "Ji-Haeng Huh"; + }; + jirkamarsik = { + email = "jiri.marsik89@gmail.com"; + github = "jirkamarsik"; + name = "Jirka Marsik"; + }; + jlesquembre = { + email = "jl@lafuente.me"; + github = "jlesquembre"; + name = "José Luis Lafuente"; + }; + jluttine = { + email = "jaakko.luttinen@iki.fi"; + github = "jluttine"; + name = "Jaakko Luttinen"; + }; + joachifm = { + email = "joachifm@fastmail.fm"; + github = "joachifm"; + name = "Joachim Fasting"; + }; + joamaki = { + email = "joamaki@gmail.com"; + github = "joamaki"; + name = "Jussi Maki"; + }; + joelmo = { + email = "joel.moberg@gmail.com"; + github = "joelmo"; + name = "Joel Moberg"; + }; + joelteon = { + email = "me@joelt.io"; + name = "Joel Taylor"; + }; + johbo = { + email = "johannes@bornhold.name"; + github = "johbo"; + name = "Johannes Bornhold"; + }; + johnazoidberg = { + email = "git@danielschaefer.me"; + github = "johnazoidberg"; + name = "Daniel Schäfer"; + }; + johnmh = { + email = "johnmh@openblox.org"; + github = "johnmh"; + name = "John M. Harris, Jr."; + }; + johnramsden = { + email = "johnramsden@riseup.net"; + github = "johnramsden"; + name = "John Ramsden"; + }; + joko = { + email = "ioannis.koutras@gmail.com"; + github = "jokogr"; + name = "Ioannis Koutras"; + }; + jonafato = { + email = "jon@jonafato.com"; + github = "jonafato"; + name = "Jon Banafato"; + }; + joncojonathan = { + email = "joncojonathan@gmail.com"; + github = "joncojonathan"; + name = "Jonathan Haddock"; + }; + jpdoyle = { + email = "joethedoyle@gmail.com"; + github = "jpdoyle"; + name = "Joe Doyle"; + }; + jpierre03 = { + email = "nix@prunetwork.fr"; + github = "jpierre03"; + name = "Jean-Pierre PRUNARET"; + }; + jpotier = { + email = "jpo.contributes.to.nixos@marvid.fr"; + github = "jpotier"; + name = "Martin Potier"; + }; + jraygauthier = { + email = "jraygauthier@gmail.com"; + github = "jraygauthier"; + name = "Raymond Gauthier"; + }; + jtojnar = { + email = "jtojnar@gmail.com"; + github = "jtojnar"; + name = "Jan Tojnar"; + }; + juliendehos = { + email = "dehos@lisic.univ-littoral.fr"; + github = "juliendehos"; + name = "Julien Dehos"; + }; + jwiegley = { + email = "johnw@newartisans.com"; + github = "jwiegley"; + name = "John Wiegley"; + }; + jwilberding = { + email = "jwilberding@afiniate.com"; + name = "Jordan Wilberding"; + }; + jyp = { + email = "jeanphilippe.bernardy@gmail.com"; + github = "jyp"; + name = "Jean-Philippe Bernardy"; + }; + jzellner = { + email = "jeffz@eml.cc"; + github = "sofuture"; + name = "Jeff Zellner"; + }; + kaiha = { + email = "kai.harries@gmail.com"; + github = "kaiha"; + name = "Kai Harries"; + }; + kamilchm = { + email = "kamil.chm@gmail.com"; + github = "kamilchm"; + name = "Kamil Chmielewski"; + }; + kampfschlaefer = { + email = "arnold@arnoldarts.de"; + github = "kampfschlaefer"; + name = "Arnold Krille"; + }; + karolchmist = { + email = "info+nix@chmist.com"; + name = "karolchmist"; + }; + kentjames = { + email = "jameschristopherkent@gmail.com"; + github = "kentjames"; + name = "James Kent"; + }; + kevincox = { + email = "kevincox@kevincox.ca"; + github = "kevincox"; + name = "Kevin Cox"; + }; + khumba = { + email = "bog@khumba.net"; + github = "khumba"; + name = "Bryan Gardiner"; + }; + kierdavis = { + email = "kierdavis@gmail.com"; + github = "kierdavis"; + name = "Kier Davis"; + }; + kiloreux = { + email = "kiloreux@gmail.com"; + github = "kiloreux"; + name = "Kiloreux Emperex"; + }; + kini = { + email = "keshav.kini@gmail.com"; + github = "kini"; + name = "Keshav Kini"; + }; + kkallio = { + email = "tierpluspluslists@gmail.com"; + name = "Karn Kallio"; + }; + knedlsepp = { + email = "josef.kemetmueller@gmail.com"; + github = "knedlsepp"; + name = "Josef Kemetmüller"; + }; + konimex = { + email = "herdiansyah@netc.eu"; + github = "konimex"; + name = "Muhammad Herdiansyah"; + }; + koral = { + email = "koral@mailoo.org"; + github = "k0ral"; + name = "Koral"; + }; + kovirobi = { + email = "kovirobi@gmail.com"; + github = "kovirobi"; + name = "Kovacsics Robert"; + }; + kquick = { + email = "quick@sparq.org"; + github = "kquick"; + name = "Kevin Quick"; + }; + kragniz = { + email = "louis@kragniz.eu"; + github = "kragniz"; + name = "Louis Taylor"; + }; + kristoff3r = { + email = "k.soeholm@gmail.com"; + github = "kristoff3r"; + name = "Kristoffer Søholm"; + }; + ktosiek = { + email = "tomasz.kontusz@gmail.com"; + github = "ktosiek"; + name = "Tomasz Kontusz"; + }; + kuznero = { + email = "roman@kuznero.com"; + github = "kuznero"; + name = "Roman Kuznetsov"; + }; + lasandell = { + email = "lasandell@gmail.com"; + github = "lasandell"; + name = "Luke Sandell"; + }; + lassulus = { + email = "lassulus@gmail.com"; + github = "Lassulus"; + name = "Lassulus"; + }; + layus = { + email = "layus.on@gmail.com"; + github = "layus"; + name = "Guillaume Maudoux"; + }; + lblasc = { + email = "lblasc@znode.net"; + github = "lblasc"; + name = "Luka Blaskovic"; + }; + ldesgoui = { + email = "ldesgoui@gmail.com"; + github = "ldesgoui"; + name = "Lucas Desgouilles"; + }; + league = { + email = "league@contrapunctus.net"; + github = "league"; + name = "Christopher League"; + }; + lebastr = { + email = "lebastr@gmail.com"; + github = "lebastr"; + name = "Alexander Lebedev"; + }; + ledif = { + email = "refuse@gmail.com"; + github = "ledif"; + name = "Adam Fidel"; + }; + leemachin = { + email = "me@mrl.ee"; + github = "leemachin"; + name = "Lee Machin"; + }; + leenaars = { + email = "ml.software@leenaa.rs"; + github = "leenaars"; + name = "Michiel Leenaars"; + }; + leonardoce = { + email = "leonardo.cecchi@gmail.com"; + github = "leonardoce"; + name = "Leonardo Cecchi"; + }; + lejonet = { + email = "daniel@kuehn.se"; + github = "lejonet"; + name = "Daniel Kuehn"; + }; + lethalman = { + email = "lucabru@src.gnome.org"; + github = "lethalman"; + name = "Luca Bruno"; + }; + lewo = { + email = "lewo@abesis.fr"; + github = "nlewo"; + name = "Antoine Eiche"; + }; + lheckemann = { + email = "git@sphalerite.org"; + github = "lheckemann"; + name = "Linus Heckemann"; + }; + lhvwb = { + email = "nathaniel.baxter@gmail.com"; + github = "nathanielbaxter"; + name = "Nathaniel Baxter"; + }; + lihop = { + email = "nixos@leroy.geek.nz"; + github = "lihop"; + name = "Leroy Hopson"; + }; + limeytexan = { + email = "limeytexan@gmail.com"; + github = "limeytexan"; + name = "Michael Brantley"; + }; + linquize = { + email = "linquize@yahoo.com.hk"; + github = "linquize"; + name = "Linquize"; + }; + linus = { + email = "linusarver@gmail.com"; + github = "listx"; + name = "Linus Arver"; + }; + lluchs = { + email = "lukas.werling@gmail.com"; + github = "lluchs"; + name = "Lukas Werling"; + }; + lnl7 = { + email = "daiderd@gmail.com"; + github = "lnl7"; + name = "Daiderd Jordan"; + }; + lo1tuma = { + email = "schreck.mathias@gmail.com"; + github = "lo1tuma"; + name = "Mathias Schreck"; + }; + loskutov = { + email = "ignat.loskutov@gmail.com"; + github = "loskutov"; + name = "Ignat Loskutov"; + }; + lovek323 = { + email = "jason@oconal.id.au"; + github = "lovek323"; + name = "Jason O'Conal"; + }; + lowfatcomputing = { + email = "andreas.wagner@lowfatcomputing.org"; + github = "lowfatcomputing"; + name = "Andreas Wagner"; + }; + lschuermann = { + email = "leon.git@is.currently.online"; + github = "lschuermann"; + name = "Leon Schuermann"; + }; + lsix = { + email = "lsix@lancelotsix.com"; + github = "lsix"; + name = "Lancelot SIX"; + }; + ltavard = { + email = "laure.tavard@univ-grenoble-alpes.fr"; + github = "ltavard"; + name = "Laure Tavard"; + }; + lucas8 = { + email = "luc.linux@mailoo.org"; + github = "lucas8"; + name = "Luc Chabassier"; + }; + ludo = { + email = "ludo@gnu.org"; + github = "civodul"; + name = "Ludovic Courtès"; + }; + lufia = { + email = "lufia@lufia.org"; + github = "lufia"; + name = "Kyohei Kadota"; + }; + luispedro = { + email = "luis@luispedro.org"; + github = "luispedro"; + name = "Luis Pedro Coelho"; + }; + lukego = { + email = "luke@snabb.co"; + github = "lukego"; + name = "Luke Gorrie"; + }; + luz = { + email = "luz666@daum.net"; + github = "Luz"; + name = "Luz"; + }; + lw = { + email = "lw@fmap.me"; + github = "lolwat97"; + name = "Sergey Sofeychuk"; + }; + lyt = { + email = "wheatdoge@gmail.com"; + name = "Tim Liou"; + }; + m3tti = { + email = "mathaeus.peter.sander@gmail.com"; + name = "Mathaeus Sander"; + }; + ma27 = { + email = "maximilian@mbosch.me"; + github = "ma27"; + name = "Maximilian Bosch"; + }; + madjar = { + email = "georges.dubus@compiletoi.net"; + github = "madjar"; + name = "Georges Dubus"; + }; + magnetophon = { + email = "bart@magnetophon.nl"; + github = "magnetophon"; + name = "Bart Brouns"; + }; + mahe = { + email = "matthias.mh.herrmann@gmail.com"; + github = "2chilled"; + name = "Matthias Herrmann"; + }; + makefu = { + email = "makefu@syntax-fehler.de"; + github = "makefu"; + name = "Felix Richter"; + }; + malyn = { + email = "malyn@strangeGizmo.com"; + github = "malyn"; + name = "Michael Alyn Miller"; + }; + manveru = { + email = "m.fellinger@gmail.com"; + github = "manveru"; + name = "Michael Fellinger"; + }; + marcweber = { + email = "marco-oweber@gmx.de"; + github = "marcweber"; + name = "Marc Weber"; + }; + markWot = { + email = "markus@wotringer.de"; + name = "Markus Wotringer"; + }; + markus1189 = { + email = "markus1189@gmail.com"; + github = "markus1189"; + name = "Markus Hauck"; + }; + markuskowa = { + email = "markus.kowalewski@gmail.com"; + github = "markuskowa"; + name = "Markus Kowalewski"; + }; + martijnvermaat = { + email = "martijn@vermaat.name"; + github = "martijnvermaat"; + name = "Martijn Vermaat"; + }; + martingms = { + email = "martin@mg.am"; + github = "martingms"; + name = "Martin Gammelsæter"; + }; + matejc = { + email = "cotman.matej@gmail.com"; + github = "matejc"; + name = "Matej Cotman"; + }; + mathnerd314 = { + email = "mathnerd314.gph+hs@gmail.com"; + github = "mathnerd314"; + name = "Mathnerd314"; + }; + matthewbauer = { + email = "mjbauer95@gmail.com"; + github = "matthewbauer"; + name = "Matthew Bauer"; + }; + matthiasbeyer = { + email = "mail@beyermatthias.de"; + github = "matthiasbeyer"; + name = "Matthias Beyer"; + }; + maurer = { + email = "matthew.r.maurer+nix@gmail.com"; + github = "maurer"; + name = "Matthew Maurer"; + }; + mbakke = { + email = "mbakke@fastmail.com"; + github = "mbakke"; + name = "Marius Bakke"; + }; + mbbx6spp = { + email = "me@susanpotter.net"; + github = "mbbx6spp"; + name = "Susan Potter"; + }; + mbe = { + email = "brandonedens@gmail.com"; + github = "brandonedens"; + name = "Brandon Edens"; + }; + mbode = { + email = "maxbode@gmail.com"; + github = "mbode"; + name = "Maximilian Bode"; + }; + mboes = { + email = "mboes@tweag.net"; + github = "mboes"; + name = "Mathieu Boespflug"; + }; + mbrgm = { + email = "marius@yeai.de"; + github = "mbrgm"; + name = "Marius Bergmann"; + }; + mcmtroffaes = { + email = "matthias.troffaes@gmail.com"; + github = "mcmtroffaes"; + name = "Matthias C. M. Troffaes"; + }; + mdaiter = { + email = "mdaiter8121@gmail.com"; + github = "mdaiter"; + name = "Matthew S. Daiter"; + }; + meditans = { + email = "meditans@gmail.com"; + github = "meditans"; + name = "Carlo Nucera"; + }; + mehandes = { + email = "niewskici@gmail.com"; + github = "mehandes"; + name = "Matt Deming"; + }; + meisternu = { + email = "meister@krutt.org"; + github = "meisternu"; + name = "Matt Miemiec"; + }; + metabar = { + email = "softs@metabarcoding.org"; + name = "Celine Mercier"; + }; + mgdelacroix = { + email = "mgdelacroix@gmail.com"; + github = "mgdelacroix"; + name = "Miguel de la Cruz"; + }; + mgttlinger = { + email = "megoettlinger@gmail.com"; + github = "mgttlinger"; + name = "Merlin Göttlinger"; + }; + mguentner = { + email = "code@klandest.in"; + github = "mguentner"; + name = "Maximilian Güntner"; + }; + mic92 = { + email = "joerg@thalheim.io"; + github = "mic92"; + name = "Jörg Thalheim"; + }; + michaelpj = { + email = "michaelpj@gmail.com"; + github = "michaelpj"; + name = "Michael Peyton Jones"; + }; + michalrus = { + email = "m@michalrus.com"; + github = "michalrus"; + name = "Michal Rus"; + }; + michelk = { + email = "michel@kuhlmanns.info"; + github = "michelk"; + name = "Michel Kuhlmann"; + }; + mickours = { + email = "mickours@gmail.com<"; + github = "mickours"; + name = "Michael Mercier"; + }; + midchildan = { + email = "midchildan+nix@gmail.com"; + github = "midchildan"; + name = "midchildan"; + }; + mikefaille = { + email = "michael@faille.io"; + github = "mikefaille"; + name = "Michaël Faille"; + }; + mikoim = { + email = "ek@esh.ink"; + github = "mikoim"; + name = "Eshin Kunishima"; + }; + miltador = { + email = "miltador@yandex.ua"; + name = "Vasiliy Solovey"; + }; + mimadrid = { + email = "mimadrid@ucm.es"; + github = "mimadrid"; + name = "Miguel Madrid"; + }; + mirdhyn = { + email = "mirdhyn@gmail.com"; + github = "mirdhyn"; + name = "Merlin Gaillard"; + }; + mirrexagon = { + email = "mirrexagon@mirrexagon.com"; + github = "mirrexagon"; + name = "Andrew Abbott"; + }; + mjanczyk = { + email = "m@dragonvr.pl"; + github = "mjanczyk"; + name = "Marcin Janczyk"; + }; + mjp = { + email = "mike@mythik.co.uk"; + github = "MikePlayle"; + name = "Mike Playle"; + }; + mkg = { + email = "mkg@vt.edu"; + github = "mkgvt"; + name = "Mark K Gardner"; + }; + mlieberman85 = { + email = "mlieberman85@gmail.com"; + github = "mlieberman85"; + name = "Michael Lieberman"; + }; + mmahut = { + email = "marek.mahut@gmail.com"; + github = "mmahut"; + name = "Marek Mahut"; + }; + moaxcp = { + email = "moaxcp@gmail.com"; + github = "moaxcp"; + name = "John Mercier"; + }; + modulistic = { + email = "modulistic@gmail.com"; + github = "modulistic"; + name = "Pablo Costa"; + }; + mog = { + email = "mog-lists@rldn.net"; + github = "mogorman"; + name = "Matthew O'Gorman"; + }; + montag451 = { + email = "montag451@laposte.net"; + github = "montag451"; + name = "montag451"; + }; + moosingin3space = { + email = "moosingin3space@gmail.com"; + github = "moosingin3space"; + name = "Nathan Moos"; + }; + moredread = { + email = "code@apb.name"; + github = "moredread"; + name = "André-Patrick Bubel"; + }; + moretea = { + email = "maarten@moretea.nl"; + github = "moretea"; + name = "Maarten Hoogendoorn"; + }; + mounium = { + email = "muoniurn@gmail.com"; + github = "mounium"; + name = "Katona László"; + }; + mpcsh = { + email = "m@mpc.sh"; + github = "mpcsh"; + name = "Mark Cohen"; + }; + mpickering = { + email = "matthewtpickering@gmail.com"; + github = "mpickering"; + name = "Matthew Pickering"; + }; + mpscholten = { + email = "marc@mpscholten.de"; + github = "mpscholten"; + name = "Marc Scholten"; + }; + mpsyco = { + email = "fr.st-amour@gmail.com"; + github = "fstamour"; + name = "Francis St-Amour"; + }; + mrVanDalo = { + email = "contact@ingolf-wagner.de"; + github = "mrVanDalo"; + name = "Ingolf Wanger"; + }; + msackman = { + email = "matthew@wellquite.org"; + name = "Matthew Sackman"; + }; + mschristiansen = { + email = "mikkel@rheosystems.com"; + github = "mschristiansen"; + name = "Mikkel Christiansen"; + }; + mstarzyk = { + email = "mstarzyk@gmail.com"; + github = "mstarzyk"; + name = "Maciek Starzyk"; + }; + msteen = { + email = "emailmatthijs@gmail.com"; + github = "msteen"; + name = "Matthijs Steen"; + }; + mt-caret = { + email = "mtakeda.enigsol@gmail.com"; + github = "mt-caret"; + name = "Masayuki Takeda"; + }; + mtreskin = { + email = "zerthurd@gmail.com"; + github = "Zert"; + name = "Max Treskin"; + }; + mudri = { + email = "lamudri@gmail.com"; + github = "laMudri"; + name = "James Wood"; + }; + muflax = { + email = "mail@muflax.com"; + github = "muflax"; + name = "Stefan Dorn"; + }; + myrl = { + email = "myrl.0xf@gmail.com"; + github = "myrl"; + name = "Myrl Hex"; + }; + nadrieril = { + email = "nadrieril@gmail.com"; + github = "nadrieril"; + name = "Nadrieril Feneanar"; + }; + namore = { + email = "namor@hemio.de"; + github = "namore"; + name = "Roman Naumann"; + }; + nand0p = { + email = "nando@hex7.com"; + github = "nand0p"; + name = "Fernando Jose Pando"; + }; + nathan-gs = { + email = "nathan@nathan.gs"; + github = "nathan-gs"; + name = "Nathan Bijnens"; + }; + nckx = { + email = "github@tobias.gr"; + github = "nckx"; + name = "Tobias Geerinckx-Rice"; + }; + ndowens = { + email = "ndowens04@gmail.com"; + github = "ndowens"; + name = "Nathan Owens"; + }; + neeasade = { + email = "nathanisom27@gmail.com"; + github = "neeasade"; + name = "Nathan Isom"; + }; + nequissimus = { + email = "tim@nequissimus.com"; + github = "nequissimus"; + name = "Tim Steinbach"; + }; + nfjinjing = { + email = "nfjinjing@gmail.com"; + github = "nfjinjing"; + name = "Jinjing Wang"; + }; + nh2 = { + email = "mail@nh2.me"; + github = "nh2"; + name = "Niklas Hambüchen"; + }; + nhooyr = { + email = "anmol@aubble.com"; + github = "nhooyr"; + name = "Anmol Sethi"; + }; + nickhu = { + email = "me@nickhu.co.uk"; + github = "nickhu"; + name = "Nick Hu"; + }; + nicknovitski = { + email = "nixpkgs@nicknovitski.com"; + github = "nicknovitski"; + name = "Nick Novitski"; + }; + nico202 = { + email = "anothersms@gmail.com"; + github = "nico202"; + name = "Nicolò Balzarotti"; + }; + ninjatrappeur = { + email = "felix@alternativebit.fr"; + github = "ninjatrappeur"; + name = "Félix Baylac-Jacqué"; + }; + nipav = { + email = "niko.pavlinek@gmail.com"; + github = "nipav"; + name = "Niko Pavlinek"; + }; + nixy = { + email = "nixy@nixy.moe"; + github = "nixy"; + name = "Andrew R. M."; + }; + nmattia = { + email = "nicolas@nmattia.com"; + github = "nmattia"; + name = "Nicolas Mattia"; + }; + nocoolnametom = { + email = "nocoolnametom@gmail.com"; + github = "nocoolnametom"; + name = "Tom Doggett"; + }; + notthemessiah = { + email = "brian.cohen.88@gmail.com"; + github = "notthemessiah"; + name = "Brian Cohen"; + }; + np = { + email = "np.nix@nicolaspouillard.fr"; + github = "np"; + name = "Nicolas Pouillard"; + }; + nslqqq = { + email = "nslqqq@gmail.com"; + name = "Nikita Mikhailov"; + }; + nthorne = { + email = "notrupertthorne@gmail.com"; + github = "nthorne"; + name = "Niklas Thörne"; + }; + nyarly = { + email = "nyarly@gmail.com"; + github = "nyarly"; + name = "Judson Lester"; + }; + obadz = { + email = "obadz-nixos@obadz.com"; + github = "obadz"; + name = "obadz"; + }; + ocharles = { + email = "ollie@ocharles.org.uk"; + github = "ocharles"; + name = "Oliver Charles"; + }; + odi = { + email = "oliver.dunkl@gmail.com"; + github = "odi"; + name = "Oliver Dunkl"; + }; + offline = { + email = "jakahudoklin@gmail.com"; + github = "offlinehacker"; + name = "Jaka Hudoklin"; + }; + oida = { + email = "oida@posteo.de"; + github = "oida"; + name = "oida"; + }; + okasu = { + email = "oka.sux@gmail.com"; + name = "Okasu"; + }; + olcai = { + email = "dev@timan.info"; + github = "olcai"; + name = "Erik Timan"; + }; + olejorgenb = { + email = "olejorgenb@yahoo.no"; + github = "olejorgenb"; + name = "Ole Jørgen Brønner"; + }; + olynch = { + email = "owen@olynch.me"; + github = "olynch"; + name = "Owen Lynch"; + }; + orbekk = { + email = "kjetil.orbekk@gmail.com"; + github = "orbekk"; + name = "KJ Ørbekk"; + }; + orbitz = { + email = "mmatalka@gmail.com"; + github = "orbitz"; + name = "Malcolm Matalka"; + }; + orivej = { + email = "orivej@gmx.fr"; + github = "orivej"; + name = "Orivej Desh"; + }; + osener = { + email = "ozan@ozansener.com"; + github = "osener"; + name = "Ozan Sener"; + }; + otwieracz = { + email = "slawek@otwiera.cz"; + github = "otwieracz"; + name = "Slawomir Gonet"; + }; + oxij = { + email = "oxij@oxij.org"; + github = "oxij"; + name = "Jan Malakhovski"; + }; + pSub = { + email = "mail@pascal-wittmann.de"; + github = "pSub"; + name = "Pascal Wittmann"; + }; + paholg = { + email = "paho@paholg.com"; + github = "paholg"; + name = "Paho Lurie-Gregg"; + }; + pakhfn = { + email = "pakhfn@gmail.com"; + github = "pakhfn"; + name = "Fedor Pakhomov"; + }; + panaeon = { + email = "vitalii.voloshyn@gmail.com"; + github = "panaeon"; + name = "Vitalii Voloshyn"; + }; + paperdigits = { + email = "mica@silentumbrella.com"; + github = "paperdigits"; + name = "Mica Semrick"; + }; + paraseba = { + email = "paraseba@gmail.com"; + github = "paraseba"; + name = "Sebastian Galkin"; + }; + pashev = { + email = "pashev.igor@gmail.com"; + github = "ip1981"; + name = "Igor Pashev"; + }; + patternspandemic = { + email = "patternspandemic@live.com"; + github = "patternspandemic"; + name = "Brad Christensen"; + }; + pawelpacana = { + email = "pawel.pacana@gmail.com"; + github = "pawelpacana"; + name = "Paweł Pacana"; + }; + pbogdan = { + email = "ppbogdan@gmail.com"; + github = "pbogdan"; + name = "Piotr Bogdan"; + }; + pcarrier = { + email = "pc@rrier.ca"; + github = "pcarrier"; + name = "Pierre Carrier"; + }; + periklis = { + email = null; + github = "periklis"; + name = "theopompos@gmail.com"; + }; + pesterhazy = { + email = "pesterhazy@gmail.com"; + github = "pesterhazy"; + name = "Paulus Esterhazy"; + }; + peterhoeg = { + email = "peter@hoeg.com"; + github = "peterhoeg"; + name = "Peter Hoeg"; + }; + peterromfeldhk = { + email = "peter.romfeld.hk@gmail.com"; + github = "peterromfeldhk"; + name = "Peter Romfeld"; + }; + peti = { + email = "simons@cryp.to"; + github = "peti"; + name = "Peter Simons"; + }; + philandstuff = { + email = "philip.g.potter@gmail.com"; + github = "philandstuff"; + name = "Philip Potter"; + }; + phile314 = { + email = "nix@314.ch"; + github = "phile314"; + name = "Philipp Hausmann"; + }; + phreedom = { + email = "phreedom@yandex.ru"; + github = "phreedom"; + name = "Evgeny Egorochkin"; + }; + phunehehe = { + email = "phunehehe@gmail.com"; + github = "phunehehe"; + name = "Hoang Xuan Phu"; + }; + pierrechevalier83 = { + email = "pierrechevalier83@gmail.com"; + github = "pierrechevalier83"; + name = "Pierre Chevalier"; + }; + pierrer = { + email = "pierrer@pi3r.be"; + github = "pierrer"; + name = "Pierre Radermecker"; + }; + pierron = { + email = "nixos@nbp.name"; + github = "nbp"; + name = "Nicolas B. Pierron"; + }; + piotr = { + email = "ppietrasa@gmail.com"; + name = "Piotr Pietraszkiewicz"; + }; + pjbarnoy = { + email = "pjbarnoy@gmail.com"; + github = "pjbarnoy"; + name = "Perry Barnoy"; + }; + pjones = { + email = "pjones@devalot.com"; + github = "pjones"; + name = "Peter Jones"; + }; + pkmx = { + email = "pkmx.tw@gmail.com"; + github = "pkmx"; + name = "Chih-Mao Chen"; + }; + plcplc = { + email = "plcplc@gmail.com"; + github = "plcplc"; + name = "Philip Lykke Carlsen"; + }; + plumps = { + email = "maks.bronsky@web.de"; + github = "plumps"; + name = "Maksim Bronsky"; + }; + pmahoney = { + email = "pat@polycrystal.org"; + github = "pmahoney"; + name = "Patrick Mahoney"; + }; + pmeunier = { + email = "pierre-etienne.meunier@inria.fr"; + github = "P-E-Meunier"; + name = "Pierre-Étienne Meunier"; + }; + pmiddend = { + email = "pmidden@secure.mailbox.org"; + github = "pmiddend"; + name = "Philipp Middendorf"; + }; + pneumaticat = { + email = "kevin@potatofrom.space"; + github = "pneumaticat"; + name = "Kevin Liu"; + }; + polyrod = { + email = "dc1mdp@gmail.com"; + github = "polyrod"; + name = "Maurizio Di Pietro"; + }; + pradeepchhetri = { + email = "pradeep.chhetri89@gmail.com"; + github = "pradeepchhetri"; + name = "Pradeep Chhetri"; + }; + prikhi = { + email = "pavan.rikhi@gmail.com"; + github = "prikhi"; + name = "Pavan Rikhi"; + }; + primeos = { + email = "dev.primeos@gmail.com"; + github = "primeos"; + name = "Michael Weiss"; + }; + proglodyte = { + email = "proglodyte23@gmail.com"; + github = "proglodyte"; + name = "Proglodyte"; + }; + pshendry = { + email = "paul@pshendry.com"; + github = "pshendry"; + name = "Paul Hendry"; + }; + psibi = { + email = "sibi@psibi.in"; + github = "psibi"; + name = "Sibi"; + }; + pstn = { + email = "philipp@xndr.de"; + name = "Philipp Steinpaß"; + }; + puffnfresh = { + email = "brian@brianmckenna.org"; + github = "puffnfresh"; + name = "Brian McKenna"; + }; + pxc = { + email = "patrick.callahan@latitudeengineering.com"; + name = "Patrick Callahan"; + }; + qknight = { + email = "js@lastlog.de"; + github = "qknight"; + name = "Joachim Schiele"; + }; + ragge = { + email = "r.dahlen@gmail.com"; + github = "ragnard"; + name = "Ragnar Dahlen"; + }; + ralith = { + email = "ben.e.saunders@gmail.com"; + github = "ralith"; + name = "Benjamin Saunders"; + }; + ramkromberg = { + email = "ramkromberg@mail.com"; + github = "ramkromberg"; + name = "Ram Kromberg"; + }; + rardiol = { + email = "ricardo.ardissone@gmail.com"; + github = "rardiol"; + name = "Ricardo Ardissone"; + }; + rasendubi = { + email = "rasen.dubi@gmail.com"; + github = "rasendubi"; + name = "Alexey Shmalko"; + }; + raskin = { + email = "7c6f434c@mail.ru"; + github = "7c6f434c"; + name = "Michael Raskin"; + }; + ravloony = { + email = "ravloony@gmail.com"; + name = "Tom Macdonald"; + }; + razvan = { + email = "razvan.panda@gmail.com"; + github = "razvan-panda"; + name = "Răzvan Flavius Panda"; + }; + rbasso = { + email = "rbasso@sharpgeeks.net"; + github = "rbasso"; + name = "Rafael Basso"; + }; + redbaron = { + email = "ivanov.maxim@gmail.com"; + github = "redbaron"; + name = "Maxim Ivanov"; + }; + redvers = { + email = "red@infect.me"; + github = "redvers"; + name = "Redvers Davies"; + }; + refnil = { + email = "broemartino@gmail.com"; + github = "refnil"; + name = "Martin Lavoie"; + }; + regnat = { + email = "regnat@regnat.ovh"; + github = "regnat"; + name = "Théophane Hufschmitt"; + }; + relrod = { + email = "ricky@elrod.me"; + github = "relrod"; + name = "Ricky Elrod"; + }; + renzo = { + email = "renzocarbonara@gmail.com"; + github = "k0001"; + name = "Renzo Carbonara"; + }; + retrry = { + email = "retrry@gmail.com"; + github = "retrry"; + name = "Tadas Barzdžius"; + }; + rht = { + email = "rhtbot@protonmail.com"; + github = "rht"; + name = "rht"; + }; + richardipsum = { + email = "richardipsum@fastmail.co.uk"; + github = "richardipsum"; + name = "Richard Ipsum"; + }; + rick68 = { + email = "rick68@gmail.com"; + github = "rick68"; + name = "Wei-Ming Yang"; + }; + rickynils = { + email = "rickynils@gmail.com"; + github = "rickynils"; + name = "Rickard Nilsson"; + }; + ris = { + email = "code@humanleg.org.uk"; + github = "risicle"; + name = "Robert Scott"; + }; + rlupton20 = { + email = "richard.lupton@gmail.com"; + github = "rlupton20"; + name = "Richard Lupton"; + }; + rnhmjoj = { + email = "micheleguerinirocco@me.com"; + github = "rnhmjoj"; + name = "Michele Guerini Rocco"; + }; + rob = { + email = "rob.vermaas@gmail.com"; + github = "rbvermaa"; + name = "Rob Vermaas"; + }; + robberer = { + email = "robberer@freakmail.de"; + github = "robberer"; + name = "Longrin Wischnewski"; + }; + robbinch = { + email = "robbinch33@gmail.com"; + github = "robbinch"; + name = "Robbin C."; + }; + roberth = { + email = "nixpkgs@roberthensing.nl"; + github = "roberth"; + name = "Robert Hensing"; + }; + robertodr = { + email = "roberto.diremigio@gmail.com"; + github = "robertodr"; + name = "Roberto Di Remigio"; + }; + robgssp = { + email = "robgssp@gmail.com"; + github = "robgssp"; + name = "Rob Glossop"; + }; + roblabla = { + email = "robinlambertz+dev@gmail.com"; + github = "roblabla"; + name = "Robin Lambertz"; + }; + roconnor = { + email = "roconnor@theorem.ca"; + github = "roconnor"; + name = "Russell O'Connor"; + }; + romildo = { + email = "malaquias@gmail.com"; + github = "romildo"; + name = "José Romildo Malaquias"; + }; + rongcuid = { + email = "rongcuid@outlook.com"; + github = "rongcuid"; + name = "Rongcui Dong"; + }; + rszibele = { + email = "richard@szibele.com"; + github = "rszibele"; + name = "Richard Szibele"; + }; + rtreffer = { + email = "treffer+nixos@measite.de"; + github = "rtreffer"; + name = "Rene Treffer"; + }; + rushmorem = { + email = "rushmore@webenchanter.com"; + github = "rushmorem"; + name = "Rushmore Mushambi"; + }; + rvl = { + email = "dev+nix@rodney.id.au"; + github = "rvl"; + name = "Rodney Lorrimar"; + }; + rvlander = { + email = "rvlander@gaetanandre.eu"; + github = "rvlander"; + name = "Gaëtan André"; + }; + rvolosatovs = { + email = "rvolosatovs@riseup.net"; + github = "rvolosatovs"; + name = "Roman Volosatovs"; + }; + ryanartecona = { + email = "ryanartecona@gmail.com"; + github = "ryanartecona"; + name = "Ryan Artecona"; + }; + ryansydnor = { + email = "ryan.t.sydnor@gmail.com"; + github = "ryansydnor"; + name = "Ryan Sydnor"; + }; + ryantm = { + email = "ryan@ryantm.com"; + github = "ryantm"; + name = "Ryan Mulligan"; + }; + ryantrinkle = { + email = "ryan.trinkle@gmail.com"; + github = "ryantrinkle"; + name = "Ryan Trinkle"; + }; + rybern = { + email = "ryan.bernstein@columbia.edu"; + github = "rybern"; + name = "Ryan Bernstein"; + }; + rycee = { + email = "robert@rycee.net"; + github = "rycee"; + name = "Robert Helgesson"; + }; + ryneeverett = { + email = "ryneeverett@gmail.com"; + github = "ryneeverett"; + name = "Ryne Everett"; + }; + rzetterberg = { + email = "richard.zetterberg@gmail.com"; + github = "rzetterberg"; + name = "Richard Zetterberg"; + }; + s1lvester = { + email = "s1lvester@bockhacker.me"; + github = "s1lvester"; + name = "Markus Silvester"; + }; + samdroid-apps = { + email = "sam@sam.today"; + github = "samdroid-apps"; + name = "Sam Parkinson"; + }; + samueldr = { + email = "samuel@dionne-riel.com"; + github = "samueldr"; + name = "Samuel Dionne-Riel"; + }; + samuelrivas = { + email = "samuelrivas@gmail.com"; + github = "samuelrivas"; + name = "Samuel Rivas"; + }; + sander = { + email = "s.vanderburg@tudelft.nl"; + github = "svanderburg"; + name = "Sander van der Burg"; + }; + sargon = { + email = "danielehlers@mindeye.net"; + github = "sargon"; + name = "Daniel Ehlers"; + }; + sauyon = { + email = "s@uyon.co"; + github = "sauyon"; + name = "Sauyon Lee"; + }; + schmitthenner = { + email = "development@schmitthenner.eu"; + github = "fkz"; + name = "Fabian Schmitthenner"; + }; + schneefux = { + email = "schneefux+nixos_pkg@schneefux.xyz"; + github = "schneefux"; + name = "schneefux"; + }; + schristo = { + email = "schristopher@konputa.com"; + name = "Scott Christopher"; + }; + scode = { + email = "peter.schuller@infidyne.com"; + github = "scode"; + name = "Peter Schuller"; + }; + scolobb = { + email = "sivanov@colimite.fr"; + github = "scolobb"; + name = "Sergiu Ivanov"; + }; + sdll = { + email = "sasha.delly@gmail.com"; + github = "sdll"; + name = "Sasha Illarionov"; + }; + sellout = { + email = "greg@technomadic.org"; + github = "sellout"; + name = "Greg Pfeil"; + }; + sepi = { + email = "raffael@mancini.lu"; + github = "sepi"; + name = "Raffael Mancini"; + }; + seppeljordan = { + email = "sebastian.jordan.mail@googlemail.com"; + github = "seppeljordan"; + name = "Sebastian Jordan"; + }; + sfrijters = { + email = "sfrijters@gmail.com"; + github = "sfrijters"; + name = "Stefan Frijters"; + }; + shanemikel = { + email = "shanemikel1@gmail.com"; + github = "shanemikel"; + name = "Shane Pearlman"; + }; + shawndellysse = { + email = "sdellysse@gmail.com"; + github = "shawndellysse"; + name = "Shawn Dellysse"; + }; + sheenobu = { + email = "sheena.artrip@gmail.com"; + github = "sheenobu"; + name = "Sheena Artrip"; + }; + sheganinans = { + email = "sheganinans@gmail.com"; + github = "sheganinans"; + name = "Aistis Raulinaitis"; + }; + shell = { + email = "cam.turn@gmail.com"; + github = "VShell"; + name = "Shell Turner"; + }; + shlevy = { + email = "shea@shealevy.com"; + github = "shlevy"; + name = "Shea Levy"; + }; + siddharthist = { + email = "langston.barrett@gmail.com"; + github = "siddharthist"; + name = "Langston Barrett"; + }; + sifmelcara = { + email = "ming@culpring.com"; + github = "sifmelcara"; + name = "Ming Chuan"; + }; + sigma = { + email = "yann.hodique@gmail.com"; + github = "sigma"; + name = "Yann Hodique"; + }; + simonvandel = { + email = "simon.vandel@gmail.com"; + github = "simonvandel"; + name = "Simon Vandel Sillesen"; + }; + sivteck = { + email = "sivaram1992@gmail.com"; + github = "sivteck"; + name = "Sivaram Balakrishnan"; + }; + sjagoe = { + email = "simon@simonjagoe.com"; + github = "sjagoe"; + name = "Simon Jagoe"; + }; + sjmackenzie = { + email = "setori88@gmail.com"; + github = "sjmackenzie"; + name = "Stewart Mackenzie"; + }; + sjourdois = { + email = "sjourdois@gmail.com"; + name = "Stéphane ‘kwisatz’ Jourdois"; + }; + skeidel = { + email = "svenkeidel@gmail.com"; + github = "svenkeidel"; + name = "Sven Keidel"; + }; + skrzyp = { + email = "jot.skrzyp@gmail.com"; + name = "Jakub Skrzypnik"; + }; + sleexyz = { + email = "freshdried@gmail.com"; + github = "sleexyz"; + name = "Sean Lee"; + }; + smironov = { + email = "grrwlf@gmail.com"; + github = "grwlf"; + name = "Sergey Mironov"; + }; + snyh = { + email = "snyh@snyh.org"; + github = "snyh"; + name = "Xia Bin"; + }; + solson = { + email = "scott@solson.me"; + github = "solson"; + name = "Scott Olson"; + }; + sorki = { + email = "srk@48.io"; + github = "sorki"; + name = "Richard Marko"; + }; + sorpaas = { + email = "hi@that.world"; + github = "sorpaas"; + name = "Wei Tang"; + }; + spacefrogg = { + email = "spacefrogg-nixos@meterriblecrew.net"; + github = "spacefrogg"; + name = "Michael Raitza"; + }; + spencerjanssen = { + email = "spencerjanssen@gmail.com"; + github = "spencerjanssen"; + name = "Spencer Janssen"; + }; + spinus = { + email = "tomasz.czyz@gmail.com"; + github = "spinus"; + name = "Tomasz Czyż"; + }; + sprock = { + email = "rmason@mun.ca"; + github = "sprock"; + name = "Roger Mason"; + }; + spwhitt = { + email = "sw@swhitt.me"; + github = "spwhitt"; + name = "Spencer Whitt"; + }; + srhb = { + email = "sbrofeldt@gmail.com"; + github = "srhb"; + name = "Sarah Brofeldt"; + }; + stephenmw = { + email = "stephen@q5comm.com"; + github = "stephenmw"; + name = "Stephen Weinberg"; + }; + sternenseemann = { + email = "post@lukasepple.de"; + github = "sternenseemann"; + name = "Lukas Epple"; + }; + stesie = { + email = "stesie@brokenpipe.de"; + github = "stesie"; + name = "Stefan Siegl"; + }; + steveej = { + email = "mail@stefanjunker.de"; + github = "steveej"; + name = "Stefan Junker"; + }; + stumoss = { + email = "samoss@gmail.com"; + github = "stumoss"; + name = "Stuart Moss"; + }; + suvash = { + email = "suvash+nixpkgs@gmail.com"; + github = "suvash"; + name = "Suvash Thapaliya"; + }; + svsdep = { + email = "svsdep@gmail.com"; + github = "svsdep"; + name = "Vasyl Solovei"; + }; + swarren83 = { + email = "shawn.w.warren@gmail.com"; + github = "swarren83"; + name = "Shawn Warren"; + }; + swflint = { + email = "swflint@flintfam.org"; + github = "swflint"; + name = "Samuel W. Flint"; + }; + swistak35 = { + email = "me@swistak35.com"; + github = "swistak35"; + name = "Rafał Łasocha"; + }; + symphorien = { + email = "symphorien_nixpkgs@xlumurb.eu"; + github = "symphorien"; + name = "Guillaume Girol"; + }; + szczyp = { + email = "qb@szczyp.com"; + github = "szczyp"; + name = "Szczyp"; + }; + sztupi = { + email = "attila.sztupak@gmail.com"; + github = "sztupi"; + name = "Attila Sztupak"; + }; + tadfisher = { + email = "tadfisher@gmail.com"; + github = "tadfisher"; + name = "Tad Fisher"; + }; + taeer = { + email = "taeer@necsi.edu"; + github = "Radvendii"; + name = "Taeer Bar-Yam"; + }; + tailhook = { + email = "paul@colomiets.name"; + github = "tailhook"; + name = "Paul Colomiets"; + }; + taketwo = { + email = "alexandrov88@gmail.com"; + github = "taketwo"; + name = "Sergey Alexandrov"; + }; + takikawa = { + email = "asumu@igalia.com"; + github = "takikawa"; + name = "Asumu Takikawa"; + }; + taktoa = { + email = "taktoa@gmail.com"; + github = "taktoa"; + name = "Remy Goldschmidt"; + }; + taku0 = { + email = "mxxouy6x3m_github@tatapa.org"; + github = "taku0"; + name = "Takuo Yonezawa"; + }; + tari = { + email = "peter@taricorp.net"; + github = "tari"; + name = "Peter Marheine"; + }; + tavyc = { + email = "octavian.cerna@gmail.com"; + github = "tavyc"; + name = "Octavian Cerna"; + }; + teh = { + email = "tehunger@gmail.com"; + github = "teh"; + name = "Tom Hunger"; + }; + telotortium = { + email = "rirelan@gmail.com"; + github = "telotortium"; + name = "Robert Irelan"; + }; + teozkr = { + email = "teo@nullable.se"; + github = "teozkr"; + name = "Teo Klestrup Röijezon"; + }; + teto = { + email = "mcoudron@hotmail.com"; + github = "teto"; + name = "Matthieu Coudron"; + }; + tex = { + email = "milan.svoboda@centrum.cz"; + github = "tex"; + name = "Milan Svoboda"; + }; + thall = { + email = "niclas.thall@gmail.com"; + github = "thall"; + name = "Niclas Thall"; + }; + thammers = { + email = "jawr@gmx.de"; + github = "tobias-hammerschmidt"; + name = "Tobias Hammerschmidt"; + }; + thanegill = { + email = "me@thanegill.com"; + github = "thanegill"; + name = "Thane Gill"; + }; + the-kenny = { + email = "moritz@tarn-vedra.de"; + github = "the-kenny"; + name = "Moritz Ulrich"; + }; + theuni = { + email = "ct@flyingcircus.io"; + github = "ctheune"; + name = "Christian Theune"; + }; + thoughtpolice = { + email = "aseipp@pobox.com"; + github = "thoughtpolice"; + name = "Austin Seipp"; + }; + thpham = { + email = "thomas.pham@ithings.ch"; + github = "thpham"; + name = "Thomas Pham"; + }; + tilpner = { + email = "till@hoeppner.ws"; + github = "tilpner"; + name = "Till Höppner"; + }; + timbertson = { + email = "tim@gfxmonk.net"; + github = "timbertson"; + name = "Tim Cuthbertson"; + }; + timokau = { + email = "timokau@zoho.com"; + github = "timokau"; + name = "Timo Kaufmann"; + }; + timor = { + email = "timor.dd@googlemail.com"; + github = "timor"; + name = "timor"; + }; + tiramiseb = { + email = "sebastien@maccagnoni.eu"; + github = "tiramiseb"; + name = "Sébastien Maccagnoni"; + }; + titanous = { + email = "jonathan@titanous.com"; + github = "titanous"; + name = "Jonathan Rudenberg"; + }; + tnias = { + email = "phil@grmr.de"; + github = "tnias"; + name = "Philipp Bartsch"; + }; + tohl = { + email = "tom@logand.com"; + github = "tohl"; + name = "Tomas Hlavaty"; + }; + tokudan = { + email = "git@danielfrank.net"; + github = "tokudan"; + name = "Daniel Frank"; + }; + tomberek = { + email = "tomberek@gmail.com"; + github = "tomberek"; + name = "Thomas Bereknyei"; + }; + tomsmeets = { + email = "tom@tsmeets.nl"; + github = "tomsmeets"; + name = "Tom Smeets"; + }; + travisbhartwell = { + email = "nafai@travishartwell.net"; + github = "travisbhartwell"; + name = "Travis B. Hartwell"; + }; + treemo = { + email = "matthieu.chevrier@treemo.fr"; + github = "treemo"; + name = "Matthieu Chevrier"; + }; + trevorj = { + email = "nix@trevor.joynson.io"; + github = "akatrevorjay"; + name = "Trevor Joynson"; + }; + trino = { + email = "muehlhans.hubert@ekodia.de"; + github = "hmuehlhans"; + name = "Hubert Mühlhans"; + }; + troydm = { + email = "d.geurkov@gmail.com"; + github = "troydm"; + name = "Dmitry Geurkov"; + }; + tstrobel = { + email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; + name = "Thomas Strobel"; + }; + ttuegel = { + email = "ttuegel@mailbox.org"; + github = "ttuegel"; + name = "Thomas Tuegel"; + }; + tv = { + email = "tv@shackspace.de"; + github = "4z3"; + name = "Tomislav Viljetić"; + }; + tvestelind = { + email = "tomas.vestelind@fripost.org"; + github = "tvestelind"; + name = "Tomas Vestelind"; + }; + tvorog = { + email = "marszaripov@gmail.com"; + github = "tvorog"; + name = "Marsel Zaripov"; + }; + tweber = { + email = "tw+nixpkgs@360vier.de"; + github = "thorstenweber83"; + name = "Thorsten Weber"; + }; + twey = { + email = "twey@twey.co.uk"; + github = "twey"; + name = "James ‘Twey’ Kay"; + }; + unode = { + email = "alves.rjc@gmail.com"; + github = "unode"; + name = "Renato Alves"; + }; + uralbash = { + email = "root@uralbash.ru"; + github = "uralbash"; + name = "Svintsov Dmitry"; + }; + utdemir = { + email = "me@utdemir.com"; + github = "utdemir"; + name = "Utku Demir"; + }; + uwap = { + email = "me@uwap.name"; + github = "uwap"; + name = "uwap"; + }; + va1entin = { + email = "github@valentinsblog.com"; + github = "va1entin"; + name = "Valentin Heidelberger"; + }; + vaibhavsagar = { + email = "vaibhavsagar@gmail.com"; + github = "vaibhavsagar"; + name = "Vaibhav Sagar"; + }; + valeriangalliat = { + email = "val@codejam.info"; + github = "valeriangalliat"; + name = "Valérian Galliat"; + }; + vandenoever = { + email = "jos@vandenoever.info"; + github = "vandenoever"; + name = "Jos van den Oever"; + }; + vanschelven = { + email = "klaas@vanschelven.com"; + github = "vanschelven"; + name = "Klaas van Schelven"; + }; + vanzef = { + email = "vanzef@gmail.com"; + github = "vanzef"; + name = "Ivan Solyankin"; + }; + varunpatro = { + email = "varun.kumar.patro@gmail.com"; + github = "varunpatro"; + name = "Varun Patro"; + }; + vbgl = { + email = "Vincent.Laporte@gmail.com"; + github = "vbgl"; + name = "Vincent Laporte"; + }; + vbmithr = { + email = "vb@luminar.eu.org"; + github = "vbmithr"; + name = "Vincent Bernardoff"; + }; + vcunat = { + email = "vcunat@gmail.com"; + github = "vcunat"; + name = "Vladimír Čunát"; + }; + vdemeester = { + email = "vincent@sbr.pm"; + github = "vdemeester"; + name = "Vincent Demeester"; + }; + velovix = { + email = "xaviosx@gmail.com"; + github = "velovix"; + name = "Tyler Compton"; + }; + veprbl = { + email = "veprbl@gmail.com"; + github = "veprbl"; + name = "Dmitry Kalinkin"; + }; + vidbina = { + email = "vid@bina.me"; + github = "vidbina"; + name = "David Asabina"; + }; + vifino = { + email = "vifino@tty.sh"; + github = "vifino"; + name = "Adrian Pistol"; + }; + vinymeuh = { + email = "vinymeuh@gmail.com"; + github = "vinymeuh"; + name = "VinyMeuh"; + }; + viric = { + email = "viric@viric.name"; + github = "viric"; + name = "Lluís Batlle i Rossell"; + }; + vizanto = { + email = "danny@prime.vc"; + github = "vizanto"; + name = "Danny Wilson"; + }; + vklquevs = { + email = "vklquevs@gmail.com"; + github = "vklquevs"; + name = "vklquevs"; + }; + vlstill = { + email = "xstill@fi.muni.cz"; + github = "vlstill"; + name = "Vladimír Štill"; + }; + vmandela = { + email = "venkat.mandela@gmail.com"; + github = "vmandela"; + name = "Venkateswara Rao Mandela"; + }; + vmchale = { + email = "tmchale@wisc.edu"; + github = "vmchale"; + name = "Vanessa McHale"; + }; + volhovm = { + email = "volhovm.cs@gmail.com"; + github = "volhovm"; + name = "Mikhail Volkhov"; + }; + volth = { + email = "jaroslavas@volth.com"; + github = "volth"; + name = "Jaroslavas Pocepko"; + }; + vozz = { + email = "oliver.huntuk@gmail.com"; + name = "Oliver Hunt"; + }; + vrthra = { + email = "rahul@gopinath.org"; + github = "vrthra"; + name = "Rahul Gopinath"; + }; + vyp = { + email = "elisp.vim@gmail.com"; + github = "vyp"; + name = "vyp"; + }; + wedens = { + email = "kirill.wedens@gmail.com"; + name = "wedens"; + }; + willibutz = { + email = "willibutz@posteo.de"; + github = "willibutz"; + name = "Willi Butz"; + }; + willtim = { + email = "tim.williams.public@gmail.com"; + name = "Tim Philip Williams"; + }; + winden = { + email = "windenntw@gmail.com"; + name = "Antonio Vargas Gonzalez"; + }; + wizeman = { + email = "rcorreia@wizy.org"; + github = "wizeman"; + name = "Ricardo M. Correia"; + }; + wjlroe = { + email = "willroe@gmail.com"; + github = "wjlroe"; + name = "William Roe"; + }; + wkennington = { + email = "william@wkennington.com"; + github = "wkennington"; + name = "William A. Kennington III"; + }; + wmertens = { + email = "Wout.Mertens@gmail.com"; + github = "wmertens"; + name = "Wout Mertens"; + }; + woffs = { + email = "github@woffs.de"; + github = "woffs"; + name = "Frank Doepper"; + }; + womfoo = { + email = "kranium@gikos.net"; + github = "womfoo"; + name = "Kranium Gikos Mendoza"; + }; + wscott = { + email = "wsc9tt@gmail.com"; + github = "wscott"; + name = "Wayne Scott"; + }; + wyvie = { + email = "elijahrum@gmail.com"; + github = "wyvie"; + name = "Elijah Rum"; + }; + xaverdh = { + email = "hoe.dom@gmx.de"; + github = "xaverdh"; + name = "Dominik Xaver Hörl"; + }; + xeji = { + email = "xeji@cat3.de"; + github = "xeji"; + name = "xeji"; + }; + xnaveira = { + email = "xnaveira@gmail.com"; + github = "xnaveira"; + name = "Xavier Naveira"; + }; + xnwdd = { + email = "nwdd+nixos@no.team"; + github = "xnwdd"; + name = "Guillermo NWDD"; + }; + xurei = { + email = "olivier.bourdoux@gmail.com"; + github = "xurei"; + name = "Olivier Bourdoux"; + }; + xvapx = { + email = "marti.serra.coscollano@gmail.com"; + github = "xvapx"; + name = "Marti Serra"; + }; + xwvvvvwx = { + email = "davidterry@posteo.de"; + github = "xwvvvvwx"; + name = "David Terry"; + }; + xzfc = { + email = "xzfcpw@gmail.com"; + github = "xzfc"; + name = "Albert Safin"; + }; + y0no = { + email = "y0no@y0no.fr"; + github = "y0no"; + name = "Yoann Ono"; + }; + yarr = { + email = "savraz@gmail.com"; + github = "Eternity-Yarr"; + name = "Dmitry V."; + }; + yegortimoshenko = { + email = "yegortimoshenko@gmail.com"; + github = "yegortimoshenko"; + name = "Yegor Timoshenko"; + }; + yesbox = { + email = "jesper.geertsen.jonsson@gmail.com"; + github = "yesbox"; + name = "Jesper Geertsen Jonsson"; + }; + ylwghst = { + email = "ylwghst@onionmail.info"; + github = "ylwghst"; + name = "Burim Augustin Berisa"; + }; + yochai = { + email = "yochai@titat.info"; + github = "yochai"; + name = "Yochai"; + }; + yorickvp = { + email = "yorickvanpelt@gmail.com"; + github = "yorickvp"; + name = "Yorick van Pelt"; + }; + yrashk = { + email = "yrashk@gmail.com"; + github = "yrashk"; + name = "Yurii Rashkovskii"; + }; + yuriaisaka = { + email = "yuri.aisaka+nix@gmail.com"; + github = "yuriaisaka"; + name = "Yuri Aisaka"; + }; + yurrriq = { + email = "eric@ericb.me"; + github = "yurrriq"; + name = "Eric Bailey"; + }; + z77z = { + email = "maggesi@math.unifi.it"; + github = "maggesi"; + name = "Marco Maggesi"; + }; + zagy = { + email = "cz@flyingcircus.io"; + github = "zagy"; + name = "Christian Zagrodnick"; + }; + zalakain = { + email = "contact@unaizalakain.info"; + github = "umazalakain"; + name = "Unai Zalakain"; + }; + zarelit = { + email = "david@zarel.net"; + github = "zarelit"; + name = "David Costa"; + }; + zauberpony = { + email = "elmar@athmer.org"; + github = "zauberpony"; + name = "Elmar Athmer"; + }; + zef = { + email = "zef@zef.me"; + name = "Zef Hemel"; + }; + zimbatm = { + email = "zimbatm@zimbatm.com"; + github = "zimbatm"; + name = "zimbatm"; + }; + zohl = { + email = "zohl@fmap.me"; + github = "zohl"; + name = "Al Zohali"; + }; + zoomulator = { + email = "zoomulator@gmail.com"; + github = "zoomulator"; + name = "Kim Simmons"; + }; + zraexy = { + email = "zraexy@gmail.com"; + github = "zraexy"; + name = "David Mell"; + }; + zx2c4 = { + email = "Jason@zx2c4.com"; + github = "zx2c4"; + name = "Jason A. Donenfeld"; + }; + zzamboni = { + email = "diego@zzamboni.org"; + github = "zzamboni"; + name = "Diego Zamboni"; + }; +} diff --git a/lib/maintainers.nix b/lib/maintainers.nix deleted file mode 100644 index 0cc8fe522a2155569b1ba75796f4518c879ffc4b..0000000000000000000000000000000000000000 --- a/lib/maintainers.nix +++ /dev/null @@ -1,799 +0,0 @@ -{ ...}: -/* List of NixOS maintainers. The format is: - - handle = "Real Name "; - - where is preferred to be your GitHub username (so it's easy - to ping a package @), and is your real name, not - a pseudonym. Please keep the list alphabetically sorted. */ -{ - a1russell = "Adam Russell "; - aaronschif = "Aaron Schif "; - abaldeau = "Andreas Baldeau "; - abbradar = "Nikolay Amiantov "; - abigailbuccaneer = "Abigail Bunyan "; - aboseley = "Adam Boseley "; - abuibrahim = "Ruslan Babayev "; - acowley = "Anthony Cowley "; - adelbertc = "Adelbert Chang "; - adev = "Adrien Devresse "; - adisbladis = "Adam Hose "; - Adjective-Object = "Maxwell Huang-Hobbs "; - adnelson = "Allen Nelson "; - adolfogc = "Adolfo E. García Castro "; - aespinosa = "Allan Espinosa "; - aflatter = "Alexander Flatter "; - afldcr = "James Alexander Feldman-Crough "; - aforemny = "Alexander Foremny "; - afranchuk = "Alex Franchuk "; - aherrmann = "Andreas Herrmann "; - ahmedtd = "Taahir Ahmed "; - aij = "Ivan Jager "; - ajgrf = "Alex Griffin "; - ak = "Alexander Kjeldaas "; - akaWolf = "Artjom Vejsel "; - akc = "Anders Claesson "; - alexvorobiev = "Alex Vorobiev "; - dezgeg = "Tuomas Tynkkynen "; - dfordivam = "Divam "; - dfoxfranke = "Daniel Fox Franke "; - dgonyeo = "Derek Gonyeo "; - dipinhora = "Dipin Hora "; - disassembler = "Samuel Leathers "; - dizfer = "David Izquierdo "; - dmalikov = "Dmitry Malikov "; - DmitryTsygankov = "Dmitry Tsygankov "; - dmjio = "David Johnson "; - dochang = "Desmond O. Chang "; - domenkozar = "Domen Kozar "; - dotlambda = "Robert Schütz "; - doublec = "Chris Double "; - dpaetzel = "David Pätzel "; - dpflug = "David Pflug "; - drets = "Dmytro Rets "; - drewkett = "Andrew Burkett "; - dsferruzza = "David Sferruzza "; - dtzWill = "Will Dietz "; - dupgit = "Olivier Delhomme "; - dywedir = "Vladyslav M. "; - dzabraev = "Maksim Dzabraev "; - e-user = "Alexander Kahl "; - earldouglas = "James Earl Douglas "; - ebzzry = "Rommel Martinez "; - edanaher = "Evan Danaher "; - edef = "edef "; - ederoyd46 = "Matthew Brown "; - eduarrrd = "Eduard Bachmakov "; - edwtjo = "Edward Tjörnhammar "; - eelco = "Eelco Dolstra "; - ehegnes = "Eric Hegnes "; - ehmry = "Emery Hemingway "; - eikek = "Eike Kettner "; - ekleog = "Leo Gaspard "; - elasticdog = "Aaron Bull Schaefer "; - eleanor = "Dejan Lukan "; - elijahcaine = "Elijah Caine "; - elitak = "Eric Litak "; - ellis = "Ellis Whitehead "; - enzime = "Michael Hoang "; - eperuffo = "Emanuele Peruffo "; - epitrochoid = "Mabry Cervin "; - eqyiel = "Ruben Maher "; - ericbmerritt = "Eric Merritt "; - ericsagnes = "Eric Sagnes "; - ericson2314 = "John Ericson "; - erictapen = "Justin Humm "; - erikryb = "Erik Rybakken "; - ertes = "Ertugrul Söylemez "; - ethercrow = "Dmitry Ivanov "; - etu = "Elis Hirwing "; - exfalso = "Andras Slemmer <0slemi0@gmail.com>"; - exi = "Reno Reckling "; - exlevan = "Alexey Levan "; - expipiplus1 = "Joe Hermaszewski "; - fadenb = "Tristan Helmich "; - falsifian = "James Cook "; - fare = "Francois-Rene Rideau "; - f-breidenstein = "Felix Breidenstein "; - fgaz = "Francesco Gazzetta "; - FireyFly = "Jonas Höglund "; - flokli = "Florian Klink "; - florianjacob = "Florian Jacob "; - flosse = "Markus Kohlhase "; - fluffynukeit = "Daniel Austin "; - fmthoma = "Franz Thoma "; - forkk = "Andrew Okin "; - fornever = "Friedrich von Never "; - fpletz = "Franz Pletz "; - fps = "Florian Paul Schmidt "; - fridh = "Frederik Rietdijk "; - frlan = "Frank Lanitz "; - fro_ozen = "fro_ozen "; - ftrvxmtrx = "Siarhei Zirukin "; - funfunctor = "Edward O'Callaghan "; - fuuzetsu = "Mateusz Kowalczyk "; - fuzzy-id = "Thomas Bach "; - fxfactorial = "Edgar Aroutiounian "; - gabesoft = "Gabriel Adomnicai "; - gal_bolle = "Florent Becker "; - garbas = "Rok Garbas "; - garrison = "Jim Garrison "; - gavin = "Gavin Rogers "; - gebner = "Gabriel Ebner "; - geistesk = "Alvar Penning "; - genesis = "Ronan Bignaux "; - georgewhewell = "George Whewell "; - gilligan = "Tobias Pflug "; - giogadi = "Luis G. Torres "; - gleber = "Gleb Peregud "; - glenns = "Glenn Searby "; - globin = "Robin Gloster "; - gnidorah = "Alex Ivanov "; - goibhniu = "Cillian de Róiste "; - Gonzih = "Max Gonzih "; - goodrone = "Andrew Trachenko "; - gpyh = "Yacine Hmito "; - grahamc = "Graham Christensen "; - grburst = "Julius Elias "; - gridaphobe = "Eric Seidel "; - guibert = "David Guibert "; - guibou = "Guillaume Bouchard "; - guillaumekoenig = "Guillaume Koenig "; - guyonvarch = "Joris Guyonvarch "; - hakuch = "Jesse Haber-Kucharsky "; - hamhut1066 = "Hamish Hutchings "; - havvy = "Ryan Scheel "; - hbunke = "Hendrik Bunke "; - hce = "Hans-Christian Esperer "; - hectorj = "Hector Jusforgues "; - hedning = "Tor Hedin Brønner "; - heel = "Sergii Paryzhskyi "; - henrytill = "Henry Till "; - hhm = "hhm "; - hinton = "Tom Hinton "; - hodapp = "Chris Hodapp "; - hrdinka = "Christoph Hrdinka "; - htr = "Hugo Tavares Reis "; - hyphon81 = "Masato Yonekawa "; - iand675 = "Ian Duncan "; - ianwookim = "Ian-Woo Kim "; - iblech = "Ingo Blechschmidt "; - igsha = "Igor Sharonov "; - ikervagyok = "Balázs Lengyel "; - ilya-kolpakov = "Ilya Kolpakov "; - infinisil = "Silvan Mosberger "; - ironpinguin = "Michele Catalano "; - ivan-tkatchev = "Ivan Tkatchev "; - ixmatus = "Parnell Springmeyer "; - izorkin = "Yurii Izorkin "; - ixxie = "Matan Bendix Shenhav "; - j-keck = "Jürgen Keck "; - jagajaga = "Arseniy Seroka "; - jammerful = "jammerful "; - jansol = "Jan Solanti "; - javaguirre = "Javier Aguirre "; - jb55 = "William Casarin "; - jbedo = "Justin Bedő "; - jcumming = "Jack Cummings "; - jdagilliland = "Jason Gilliland "; - jefdaj = "Jeffrey David Johnson "; - jensbin = "Jens Binkert "; - jerith666 = "Matt McHenry "; - jfb = "James Felix Black "; - jfrankenau = "Johannes Frankenau "; - jgeerds = "Jascha Geerds "; - jgertm = "Tim Jaeger "; - jgillich = "Jakob Gillich "; - jhhuh = "Ji-Haeng Huh "; - jirkamarsik = "Jirka Marsik "; - jlesquembre = "José Luis Lafuente "; - jluttine = "Jaakko Luttinen "; - Jo = "Joachim Ernst <0x4A6F@shackspace.de>"; - joachifm = "Joachim Fasting "; - joamaki = "Jussi Maki "; - joelmo = "Joel Moberg "; - joelteon = "Joel Taylor "; - johbo = "Johannes Bornhold "; - johnazoidberg = "Daniel Schäfer "; - johnmh = "John M. Harris, Jr. "; - johnramsden = "John Ramsden "; - joko = "Ioannis Koutras "; - jonafato = "Jon Banafato "; - joncojonathan = "Jonathan Haddock "; - jpdoyle = "Joe Doyle "; - jpierre03 = "Jean-Pierre PRUNARET "; - jpotier = "Martin Potier "; - jraygauthier = "Raymond Gauthier "; - jtojnar = "Jan Tojnar "; - juliendehos = "Julien Dehos "; - jwiegley = "John Wiegley "; - jwilberding = "Jordan Wilberding "; - jyp = "Jean-Philippe Bernardy "; - jzellner = "Jeff Zellner "; - kaiha = "Kai Harries "; - kamilchm = "Kamil Chmielewski "; - kampfschlaefer = "Arnold Krille "; - karolchmist = "karolchmist "; - kentjames = "James Kent final.isAndroid; + final; } diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index f39bfff13decbe55099b7b77de7ccb6c4679d5e8..20294a28a1107de027952d9ecc42a4eb30e70412 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -9,7 +9,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" - "mips64el-linux" + "mipsel-linux" "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index bd68ee9460e775852efba00584037abf483d0932..848737700b0bc5fdd45605be3679acb33f79eeb4 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -38,6 +38,13 @@ rec { platform = platforms.aarch64-multiplatform; }; + aarch64-android-prebuilt = rec { + config = "aarch64-unknown-linux-android"; + arch = "aarch64"; + platform = platforms.aarch64-multiplatform; + useAndroidPrebuilt = true; + }; + scaleway-c1 = armv7l-hf-multiplatform // rec { platform = platforms.scaleway-c1; inherit (platform.gcc) fpu; @@ -51,7 +58,7 @@ rec { }; fuloongminipc = rec { - config = "mips64el-unknown-linux-gnu"; + config = "mipsel-unknown-linux-gnu"; arch = "mips"; float = "hard"; platform = platforms.fuloong2f_n32; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 0fce5254dcb47fadb13cab5320b27f5a6c387915..ab220af46e303d583817643ee31575b0f743cf29 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -34,7 +34,15 @@ rec { Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; }; + Android = [ { abi = abis.android; } { abi = abis.androideabi; } ]; Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + + Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; }) + [ "x86" "arm" "aarch64" "mips" ]; + Efi = map (family: { cpu.family = family; }) + [ "x86" "arm" "aarch64" ]; + Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) + [ "x86" "arm" "aarch64" "mips" ]; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 95759b93ae08066f4edc4d62c96bb096043fe445..03d052f5f19221a106e6ade41ea27a6b6cffa468 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -75,7 +75,10 @@ rec { aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; - mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; @@ -173,6 +176,7 @@ rec { types.abi = enum (attrValues abis); abis = setTypes types.openAbi { + android = {}; cygnus = {}; gnu = {}; msvc = {}; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 9350a16017dd4bf8de1d1e5ceeff32e5b2c2efff..f39e890fbf1c968cfcfb5a95df1fdf05f623a83f 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -561,6 +561,6 @@ rec { "armv6l-linux" = raspberrypi; "armv7l-linux" = armv7l-hf-multiplatform; "aarch64-linux" = aarch64-multiplatform; - "mips64el-linux" = fuloong2f_n32; + "mipsel-linux" = fuloong2f_n32; }.${system} or pcBase; } diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 523fd3feb3b0cd5b3eed6f13bf94e789f537cd26..ffdd8ae929c86819057261f3bdd376ac80701e4f 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -16,7 +16,7 @@ in with lib.systems.doubles; lib.runTests { arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]); i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]); - mips = assertTrue (mseteq mips [ "mips64el-linux" ]); + mips = assertTrue (mseteq mips [ "mipsel-linux" ]); x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]); cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); @@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests { freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */)); illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); - linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]); + linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]); netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]); unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); diff --git a/lib/versions.nix b/lib/versions.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f7f98ff5e1e1cdafb1a463ce96a7159c4742be1 --- /dev/null +++ b/lib/versions.nix @@ -0,0 +1,47 @@ +/* Version string functions. */ +{ lib }: + +let + + splitVersion = builtins.splitVersion or (lib.splitString "."); + +in + +rec { + + /* Get the major version string from a string. + + Example: + major "1.2.3" + => "1" + */ + major = v: builtins.elemAt (splitVersion v) 0; + + /* Get the minor version string from a string. + + Example: + minor "1.2.3" + => "2" + */ + minor = v: builtins.elemAt (splitVersion v) 1; + + /* Get the patch version string from a string. + + Example: + patch "1.2.3" + => "3" + */ + patch = v: builtins.elemAt (splitVersion v) 2; + + /* Get string of the first two parts (major and minor) + of a version string. + + Example: + majorMinor "1.2.3" + => "1.2" + */ + majorMinor = v: + builtins.concatStringsSep "." + (lib.take 2 (splitVersion v)); + +} diff --git a/maintainers/scripts/check-maintainer-github-handles.sh b/maintainers/scripts/check-maintainer-github-handles.sh new file mode 100755 index 0000000000000000000000000000000000000000..879a2e452cb334483ac7b53011b8bdda189e306e --- /dev/null +++ b/maintainers/scripts/check-maintainer-github-handles.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq parallel + +# Example how to work with the `lib.maintainers` attrset. +# Can be used to check whether all user handles are still valid. + +set -e + +# nixpkgs='' +# if [ -n "$1" ]; then + +function checkCommits { + local user="$1" + local tmp=$(mktemp) + curl --silent -w "%{http_code}" \ + "https://github.com/NixOS/nixpkgs/commits?author=$user" \ + > "$tmp" + # the last line of tmp contains the http status + local status=$(tail -n1 "$tmp") + local ret= + case $status in + 200) if <"$tmp" grep -i "no commits found" > /dev/null; then + ret=1 + else + ret=0 + fi + ;; + # because of github’s hard request limits, this can take some time + 429) sleep 2 + printf "." + checkCommits "$user" + ret=$? + ;; + *) printf "BAD STATUS: $(tail -n1 $tmp) for %s\n" "$user"; ret=1 + ret=1 + ;; + esac + rm "$tmp" + return $ret +} +export -f checkCommits + +function checkUser { + local user="$1" + local status= + status="$(curl --silent --head "https://github.com/${user}" | grep Status)" + # checks whether a user handle can be found on github + if [[ "$status" =~ 404 ]]; then + printf "%s\t\t\t\t%s\n" "$status" "$user" + # checks whether the user handle has any nixpkgs commits + elif checkCommits "$user"; then + printf "OK!\t\t\t\t%s\n" "$user" + else + printf "No Commits!\t\t\t%s\n" "$user" + fi +} +export -f checkUser + +# output the maintainers set as json +# and filter out the github username of each maintainer (if it exists) +# then check some at the same time +nix-instantiate -A lib.maintainers --eval --strict --json \ + | jq -r '.[]|.github|select(.)' \ + | parallel -j5 checkUser + +# parallel -j100 checkUser ::: "eelco" "profpatsch" "Profpatsch" "a" diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh deleted file mode 100755 index d44bda53f8d68fd5b912d653ffffed408f69aa36..0000000000000000000000000000000000000000 --- a/maintainers/scripts/gnome.sh +++ /dev/null @@ -1,192 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail - -GNOME_FTP=ftp.gnome.org/pub/GNOME/sources - -# projects that don't follow the GNOME major versioning, or that we don't want to -# programmatically update -NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap" - -usage() { - echo "Usage: $0 || [major.minor]" >&2 - exit 0 -} - -if [ "$#" -lt 1 ]; then - usage -fi - -GNOME_TOP=pkgs/desktops/gnome-3 - -action=$1 - -# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have -# any conversations with sysadmin. Somehow lftp works. -if [ "$FTP_CLIENT" = "lftp" ]; then - ls_ftp() { - lftp -c "open $1; cls" - } -else - ls_ftp() { - curl -s -l "$1"/ - } -fi - -find_project() { - exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@" -} - -show_project() { - local project=$1 - local majorVersion=$2 - local version= - - if [ -z "$majorVersion" ]; then - echo "Looking for available versions..." >&2 - local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n) - if [ "$?" -ne 0 ]; then - echo "Project $project not found" >&2 - return 1 - fi - - echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 - echo -en "Choose one of them: " >&2 - read majorVersion - fi - - if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then - # not a major version - version=$majorVersion - majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) - fi - - local FTPDIR=${GNOME_FTP}/${project}/${majorVersion} - - #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` - # gnome's LATEST-IS is broken. Do not trust it. - - if [ -z "$version" ]; then - local files=$(ls_ftp "${FTPDIR}") - declare -A versions - - for f in $files; do - case $f in - (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): - ;; - ($project-*.*.9*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - echo "Ignored unstable version ${tmp}" >&2 - ;; - ($project-*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - versions[${tmp}]=1 - ;; - (*): - echo "UNKNOWN FILE $f" >&2 - ;; - esac - done - echo "Found versions ${!versions[@]}" >&2 - version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1) - if [ -z "$version" ]; then - echo "No version available for major $majorVersion" >&2 - return 1 - fi - - echo "Latest version is: ${version}" >&2 - fi - - local name=${project}-${version} - echo "Fetching .sha256 file" >&2 - local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum) - - if [ "$?" -ne "0" ]; then - echo "Version not found" >&2 - return 1 - fi - - extensions=( "xz" "bz2" "gz" ) - echo "Choosing archive extension (known are ${extensions[@]})..." >&2 - for ext in ${extensions[@]}; do - if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then - ext_pref=$ext - sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ ) - break - fi - done - echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 - - echo "# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = \"${project}-${version}\"; - - src = fetchurl { - url = mirror://gnome/sources/${project}/${majorVersion}/${project}-${version}.tar.${ext_pref}; - sha256 = \"${sha256}\"; - }; -}" - - return 0 -} - -update_project() { - local project=$1 - local majorVersion=$2 - - # find project in nixpkgs tree - projectPath=$(find_project -name "$project" -print) - if [ -z "$projectPath" ]; then - echo "Project $project not found under $GNOME_TOP" - exit 1 - fi - - src=$(show_project "$project" "$majorVersion") - - if [ "$?" -eq "0" ]; then - echo "Updating $projectPath/src.nix" >&2 - echo -e "$src" > "$projectPath"/src.nix - fi - - return 0 -} - -if [ "$action" = "update-all" ]; then - majorVersion=$2 - if [ -z "$majorVersion" ]; then - echo "No major version specified" >&2 - usage - fi - - # find projects - projects=$(find_project -exec basename '{}' \;) - for project in $projects; do - if echo "$NO_GNOME_MAJOR"|grep -q $project; then - echo "Skipping $project" - else - echo "= Updating $project to $majorVersion" >&2 - update_project "$project" "$majorVersion" - echo >&2 - fi - done -else - project=$2 - majorVersion=$3 - - if [ -z "$project" ]; then - echo "No project specified, exiting" >&2 - usage - fi - - if [ "$action" = show ]; then - show_project "$project" "$majorVersion" - elif [ "$action" = update ]; then - update_project "$project" "$majorVersion" - else - echo "Unknown action $action" >&2 - usage - fi -fi diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 2035950da3e33175f06dd85dbb80f1eef9da6978..7c54821f66cb3347a6dd5aa6d499d8e2ef38ab34 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,5 +1,6 @@ { package ? null , maintainer ? null +, path ? null }: # TODO: add assert statements @@ -9,22 +10,24 @@ let pkgs = import ./../../default.nix { }; packagesWith = cond: return: set: - pkgs.lib.flatten - (pkgs.lib.mapAttrsToList - (name: pkg: - let - result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg - then [(return name pkg)] - else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false - then packagesWith cond return pkg + pkgs.lib.unique + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [(return name pkg)] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + then packagesWith cond return pkg + else [] + ); + in + if result.success then result.value else [] - ); - in - if result.success then result.value - else [] + ) + set ) - set ); packagesWithUpdateScriptAndMaintainer = maintainer': @@ -47,6 +50,14 @@ let (name: pkg: pkg) pkgs; + packagesWithUpdateScript = path: + let + attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs; + in + packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) + (name: pkg: pkg) + attrSet; + packageByName = name: let package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs; @@ -63,6 +74,8 @@ let [ (packageByName package) ] else if maintainer != null then packagesWithUpdateScriptAndMaintainer maintainer + else if path != null then + packagesWithUpdateScript path else builtins.throw "No arguments provided.\n\n${helpText}"; @@ -76,7 +89,11 @@ let % nix-shell maintainers/scripts/update.nix --argstr package garbas - to run update script for specific package. + to run update script for specific package, or + + % nix-shell maintainers/scripts/update.nix --argstr path gnome3 + + to run update script for all package under an attribute path. ''; runUpdateScript = package: '' diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml index 20c8d51815ad3da2ad5f73bc06e340869a2a63b6..16bc8125d9ff48ccdf46d6a782d5ca99f29cb812 100644 --- a/nixos/doc/manual/development/testing-installer.xml +++ b/nixos/doc/manual/development/testing-installer.xml @@ -11,15 +11,17 @@ tedious, so here is a quick way to see if the installer works properly: -$ nix-build -A config.system.build.nixos-install # mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install # ./result/bin/nixos-install To start a login shell in the new NixOS installation in /mnt: -# ./result/bin/nixos-install --chroot +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml new file mode 100644 index 0000000000000000000000000000000000000000..556238988274890cfc8796106ec3af212fcd6ee4 --- /dev/null +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -0,0 +1,297 @@ + +
+ + Installing from another Linux distribution + + + Because Nix (the package manager) & Nixpkgs (the Nix packages + collection) can both be installed on any (most?) Linux distributions, + they can be used to install NixOS in various creative ways. You can, + for instance: + + + + Install NixOS on another partition, from your existing + Linux distribution (without the use of a USB or optical + device!) + + Install NixOS on the same partition (in place!), from + your existing non-NixOS Linux distribution using + NIXOS_LUSTRATE. + + Install NixOS on your hard drive from the Live CD of + any Linux distribution. + + + The first steps to all these are the same: + + + + Install the Nix package manager: + + Short version: + + +$ bash <(curl https://nixos.org/nix/install) +$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell + + More details in the + Nix manual + + + + Switch to the NixOS channel: + + If you've just installed Nix on a non-NixOS distribution, you + will be on the nixpkgs channel by + default. + + +$ nix-channel --list +nixpkgs https://nixos.org/channels/nixpkgs-unstable + + As that channel gets released without running the NixOS + tests, it will be safer to use the nixos-* + channels instead: + + +$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs + + You may want to throw in a nix-channel + --update for good measure. + + + + Install the NixOS installation tools: + + You'll need nixos-generate-config and + nixos-install and we'll throw in some man + pages and nixos-enter just in case you want + to chroot into your NixOS partition. They are installed by + default on NixOS, but you don't have NixOS yet.. + + $ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" + + + + The following 5 steps are only for installing NixOS to + another partition. For installing NixOS in place using + NIXOS_LUSTRATE, skip ahead. + + Prepare your target partition: + + At this point it is time to prepare your target partition. + Please refer to the partitioning, file-system creation, and + mounting steps of + + If you're about to install NixOS in place using + NIXOS_LUSTRATE there is nothing to do for + this step. + + + + Generate your NixOS configuration: + + $ sudo `which nixos-generate-config` --root /mnt + + You'll probably want to edit the configuration files. Refer + to the nixos-generate-config step in for more information. + + Consider setting up the NixOS bootloader to give you the + ability to boot on your existing Linux partition. For instance, + if you're using GRUB and your existing distribution is running + Ubuntu, you may want to add something like this to your + configuration.nix: + + +boot.loader.grub.extraEntries = '' + menuentry "Ubuntu" { + search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e + configfile "($ubuntu)/boot/grub/grub.cfg" + } +''; + + (You can find the appropriate UUID for your partition in + /dev/disk/by-uuid) + + + + Create the nixbld group and user on your + original distribution: + + +$ sudo groupadd -g 30000 nixbld +$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld + + + + Download/build/install NixOS: + + Once you complete this step, you might no longer be + able to boot on existing systems without the help of a + rescue USB drive or similar. + + $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + + Again, please refer to the nixos-install + step in for more + information. + + That should be it for installation to another partition! + + + + Optionally, you may want to clean up your non-NixOS distribution: + + +$ sudo userdel nixbld +$ sudo groupdel nixbld + + If you do not wish to keep the Nix package mananager + installed either, run something like sudo rm -rv + ~/.nix-* /nix and remove the line that the Nix + installer added to your ~/.profile. + + + + The following steps are only for installing NixOS in + place using + NIXOS_LUSTRATE: + + Generate your NixOS configuration: + + $ sudo `which nixos-generate-config` --root / + + Note that this will place the generated configuration files + in /etc/nixos. You'll probably want to edit + the configuration files. Refer to the + nixos-generate-config step in for more information. + + You'll likely want to set a root password for your first boot + using the configuration files because you won't have a chance + to enter a password until after you reboot. You can initalize + the root password to an empty one with this line: (and of course + don't forget to set one once you've rebooted or to lock the + account with sudo passwd -l root if you use + sudo) + + users.extraUsers.root.initialHashedPassword = ""; + + + + Build the NixOS closure and install it in the + system profile: + + $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system + + + + Change ownership of the /nix tree to root + (since your Nix install was probably single user): + + $ sudo chown -R 0.0 /nix + + + + Set up the /etc/NIXOS and + /etc/NIXOS_LUSTRATE files: + + /etc/NIXOS officializes that this is now a + NixOS partition (the bootup scripts require its presence). + + /etc/NIXOS_LUSTRATE tells the NixOS bootup + scripts to move everything that's in the + root partition to /old-root. This will move + your existing distribution out of the way in the very early + stages of the NixOS bootup. There are exceptions (we do need to + keep NixOS there after all), so the NixOS lustrate process will + not touch: + + + The /nix + directory + + The /boot + directory + + Any file or directory listed in + /etc/NIXOS_LUSTRATE (one per + line) + + + Let's create the files: + + +$ sudo touch /etc/NIXOS +$ sudo touch /etc/NIXOS_LUSTRATE + + Let's also make sure the NixOS configuration files are kept + once we reboot on NixOS: + + +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + + + + Finally, move the /boot directory of your + current distribution out of the way (the lustrate process will + take care of the rest once you reboot, but this one must be + moved out now because NixOS needs to install its own boot + files: + + Once you complete this step, your current + distribution will no longer be bootable! If you didn't get + all the NixOS configuration right, especially those + settings pertaining to boot loading and root partition, + NixOS may not be bootable either. Have a USB rescue device + ready in case this happens. + + +$ sudo mv -v /boot /boot.bak && + sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + + Cross your fingers, reboot, hopefully you should get a NixOS + prompt! + + + If for some reason you want to revert to the old + distribution, you'll need to boot on a USB rescue disk and do + something along these lines: + + +# mkdir root +# mount /dev/sdaX root +# mkdir root/nixos-root +# mv -v root/* root/nixos-root/ +# mv -v root/nixos-root/old-root/* root/ +# mv -v root/boot.bak root/boot # We had renamed this by hand earlier +# umount root +# reboot + + This may work as is or you might also need to reinstall the + boot loader + + And of course, if you're happy with NixOS and no longer need + the old distribution: + + sudo rm -rf /old-root + + + + It's also worth noting that this whole process can be + automated. This is especially useful for Cloud VMs, where + provider do not provide NixOS. For instance, nixos-infect + uses the lustrate process to convert Digital Ocean droplets to + NixOS from other distributions automatically. + + +
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 2a5d1fc3ce8db3e3eb80c0e4ec7bf08b4b172417..e20b6574b72543c2f982297246bf992c3c0e5ea9 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -401,5 +401,6 @@ drive (here /dev/sda). + diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml new file mode 100644 index 0000000000000000000000000000000000000000..a2fbe07961db622b98f539ac8c66668e176b60a3 --- /dev/null +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -0,0 +1,119 @@ + + + + nixos-enter + 8 + NixOS + + + + + nixos-enter + run a command in a NixOS chroot environment + + + + + nixos-enter + + + root + + + + system + + + + shell-command + + + + + + + arguments + + + + + +Description + +This command runs a command in a NixOS chroot environment, that +is, in a filesystem hierarchy previously prepared using +nixos-install. + + + +Options + +This command accepts the following options: + + + + + + + The path to the NixOS system you want to enter. It defaults to /mnt. + + + + + + + The NixOS system configuration to use. It defaults to + /nix/var/nix/profiles/system. You can enter + a previous NixOS configuration by specifying a path such as + /nix/var/nix/profiles/system-106-link. + + + + + + + + The bash command to execute. + + + + + + + Interpret the remaining arguments as the program + name and arguments to be invoked. The program is not executed in a + shell. + + + + + + + + +Examples + +Start an interactive shell in the NixOS installation in +/mnt: + + +# nixos-enter /mnt + + +Run a shell command: + + +# nixos-enter -c 'ls -l /; cat /proc/mounts' + + +Run a non-shell command: + + +# nixos-enter -- cat /proc/mounts + + + + + diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 15c603256ca713f1aedb2d5696a7275a2fdb2363..c9887146989b19af935fa8cdb53a3e635ec3ae75 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -26,8 +26,8 @@ root - - closure + + path @@ -118,7 +118,7 @@ it. - + If this option is provided, nixos-install will install the specified closure rather than attempt to build one from /mnt/etc/nixos/configuration.nix. diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index e945e0e62639301f69a620e2fea16b8a942a748b..80a8458fbfec499831d67874239e7d1a16eb1d7a 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -15,7 +15,7 @@ - 2007-2015 + 2007-2018 Eelco Dolstra @@ -25,6 +25,7 @@ + diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index caf52195ead7ebfb86fd38d5d3f6eafaf727abfe..b755245a69fbbedfba04168467883028cb10cf93 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -18,6 +18,25 @@ has the following highlights: + + + Nix now defaults to 2.0; see its + release notes. + + + + + + Linux kernel defaults to the 4.14 branch (it was 4.9). + + + + + + GCC defaults to 7.x (it was 6.x). + + + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes @@ -181,7 +200,7 @@ following incompatible changes: - lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. TODO: actually remove it before branching 18.03 off. + lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. @@ -244,6 +263,65 @@ following incompatible changes: here. + + + The Piwik analytics software was renamed to Matomo: + + + The package pkgs.piwik was renamed to pkgs.matomo. + + + The service services.piwik was renamed to services.matomo. + + + + The data directory /var/lib/piwik was renamed to /var/lib/matomo. + All files will be moved automatically on first startup, but you might need to adjust your backup scripts. + + + + + The default for the nginx configuration changed from + piwik.${config.networking.hostName} to + matomo.${config.networking.hostName}.${config.networking.domain} + if is set, + matomo.${config.networking.hostName} if it is not set. + If you change your , remember you'll need to update the + trustedHosts[] array in /var/lib/matomo/config/config.ini.php + as well. + + + + + The piwik user was renamed to matomo. + The service will adjust ownership automatically for files in the data directory. + If you use unix socket authentication, remember to give the new matomo user + access to the database and to change the username to matomo + in the [database] section of /var/lib/matomo/config/config.ini.php. + + + + + If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, + but this is neither enforced nor required. + + + + + + + + nodejs-4_x is end-of-life. + nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. + + + + + The pump.io NixOS module was removed. + It is now maintained as an + external module. + + @@ -378,6 +456,13 @@ following incompatible changes: and stopJob provide an optional $user argument for that purpose. + + + Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions package. + + diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index b7a38760dd3a4882c38a8484008d37a093bc58d1..ebfb09db7b7e4e91f869d1d952f7b08a37ed4a6c 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -51,7 +51,7 @@ with lib; let format' = format; in let - format = if (format' == "qcow2-compressed") then "qcow2" else format'; + format = if format' == "qcow2-compressed" then "qcow2" else format'; compress = optionalString (format' == "qcow2-compressed") "-c"; @@ -84,6 +84,7 @@ let format' = format; in let nixpkgs = cleanSource pkgs.path; + # FIXME: merge with channel.nix / make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' mkdir -p $out cp -prd ${nixpkgs} $out/nixos @@ -95,13 +96,16 @@ let format' = format; in let echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix ''; - metaClosure = pkgs.writeText "meta" '' - ${config.system.build.toplevel} - ${config.nix.package.out} - ${channelSources} - ''; - - prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath; + binPath = with pkgs; makeBinPath ( + [ rsync + utillinux + parted + e2fsprogs + lkl + config.system.build.nixos-install + config.system.build.nixos-enter + nix + ] ++ stdenv.initialPath); # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate # image building logic. The comment right below this now appears in 4 different places in nixpkgs :) @@ -109,8 +113,10 @@ let format' = format; in let sources = map (x: x.source) contents; targets = map (x: x.target) contents; + closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; }; + prepareImage = '' - export PATH=${makeBinPath prepareImageInputs} + export PATH=${binPath} # Yes, mkfs.ext4 takes different units in different contexts. Fun. sectorsToKilobytes() { @@ -168,11 +174,15 @@ let format' = format; in let fi done - # TODO: Nix really likes to chown things it creates to its current user... - fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure + export HOME=$TMPDIR + + # Provide a Nix database so that nixos-install can copy closures. + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration - # fakeroot seems to always give the owner write permissions, which we do not want - find $root/nix/store -mindepth 1 -maxdepth 1 -type f -o -type d | xargs chmod -R a-w + echo "running nixos-install..." + nixos-install --root $root --no-bootloader --no-root-passwd \ + --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" echo "copying staging root to image..." cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / @@ -181,7 +191,6 @@ in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { preVM = prepareImage; buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ]; - exportReferencesGraph = [ "closure" metaClosure ]; postVM = '' ${if format == "raw" then '' mv $diskImage $out/${filename} @@ -194,6 +203,8 @@ in pkgs.vmTools.runInLinuxVM ( memSize = 1024; } '' + export PATH=${binPath}:$PATH + rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} # Some tools assume these exist @@ -218,15 +229,8 @@ in pkgs.vmTools.runInLinuxVM ( cp ${configFile} /mnt/etc/nixos/configuration.nix ''} - mount --rbind /dev $mountPoint/dev - mount --rbind /proc $mountPoint/proc - mount --rbind /sys $mountPoint/sys - # Set up core system link, GRUB, etc. - NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - # TODO: figure out if I should activate, but for now I won't - # chroot $mountPoint /nix/var/nix/profiles/system/activate + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images rm -f $mountPoint/etc/machine-id diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 75be70dbcb2bfffea29d8ef284ff857fdb073618..c6bafd48f9dbd80a8d56fd233a368f1788af06d1 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, pathsFromGraph, xorriso, syslinux +{ stdenv, perl, closureInfo, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -48,9 +48,9 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [perl xorriso syslinux]; + buildInputs = [ xorriso syslinux ]; - inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable; + inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; # !!! should use XML. sources = map (x: x.source) contents; @@ -61,6 +61,5 @@ stdenv.mkDerivation { symlinks = map (x: x.symlink) storeContents; # For obtaining the closure of `storeContents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents; + closureInfo = closureInfo { rootPaths = map (x: x.object) storeContents; }; } diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index c623436f6c5b91bf836b1757d5e0e3c81b0096e3..45cdef1ef4df5933e4ae10d057bf341d92ad6db2 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -72,16 +72,15 @@ done # Add the closures of the top-level store objects. -storePaths=$(perl $pathsFromGraph closure-*) -for i in $storePaths; do +for i in $(< $closureInfo/store-paths); do addPath "${i:1}" "$i" done # Also include a manifest of the closures in a format suitable for # nix-store --load-db. -if [ -n "$object" ]; then - printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration +if [[ ${#objects[*]} != 0 ]]; then + cp $closureInfo/registration nix-path-registration addPath "nix-path-registration" "nix-path-registration" fi diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 9d47a3222cc27ac689120c483a1cfa47462d7084..7ab84e47f53b592ef70e5c598a126ece66c0a299 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -1,4 +1,4 @@ -{ stdenv, squashfsTools, perl, pathsFromGraph +{ stdenv, squashfsTools, closureInfo , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. @@ -8,50 +8,18 @@ stdenv.mkDerivation { name = "squashfs.img"; - nativeBuildInputs = [perl squashfsTools]; - - # For obtaining the closure of `storeContents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storeContents; + nativeBuildInputs = [ squashfsTools ]; buildCommand = '' - # Add the closures of the top-level store objects. - storePaths=$(perl ${pathsFromGraph} closure-*) - - # If a Hydra slave happens to have store paths with bad permissions/mtime, - # abort now so that they don't end up in ISO images in the channel. - # https://github.com/NixOS/nixpkgs/issues/32242 - hasBadPaths="" - for path in $storePaths; do - if [ -h "$path" ]; then - continue - fi - - mtime=$(stat -c %Y "$path") - mode=$(stat -c %a "$path") - - if [ "$mtime" != 1 ]; then - echo "Store path '$path' has an invalid mtime." - hasBadPaths=1 - fi - if [ "$mode" != 444 ] && [ "$mode" != 555 ]; then - echo "Store path '$path' has invalid permissions ($mode)." - hasBadPaths=1 - fi - done - - if [ -n "$hasBadPaths" ]; then - echo "You have bad paths in your store, please fix them." - exit 1 - fi + closureInfo=${closureInfo { rootPaths = storeContents; }} # Also include a manifest of the closures in a format suitable # for nix-store --load-db. - printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration + cp $closureInfo/registration nix-path-registration # Generate the squashfs image. - mksquashfs nix-path-registration $storePaths $out \ + mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100% ''; } diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index e1c4d0d602afba9b028a149259fd69430ecbb9c0..d8980944adc06395dc3c9602abf2440f68f18e97 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -28,13 +28,13 @@ with lib; nixpkgs.config.packageOverrides = pkgs: { dbus = pkgs.dbus.override { x11Support = false; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; - networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; }; + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; + networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; }; + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; + networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; pinentry = pkgs.pinentry_ncurses; }; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c1102d5581010a5127d4439fe359f276629e6811..11e969b760e03b19047e759a9993b7483f557a84 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -529,6 +529,9 @@ in { system.activationScripts.users = stringAfter [ "stdio" ] '' + install -m 0700 -d /root + install -m 0755 -d /home + ${pkgs.perl}/bin/perl -w \ -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \ -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \ diff --git a/nixos/modules/hardware/digitalbitbox.nix b/nixos/modules/hardware/digitalbitbox.nix new file mode 100644 index 0000000000000000000000000000000000000000..0888cfbef2a81fd480734387e9cb62de44239291 --- /dev/null +++ b/nixos/modules/hardware/digitalbitbox.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.digitalbitbox; +in + +{ + options.hardware.digitalbitbox = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for Digital Bitbox devices. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.digitalbitbox; + defaultText = "pkgs.digitalbitbox"; + description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index c2c36f02a1436a56d2bbbfa29508a025bd7fbb86..d9646704e6f60f49d3630121445fcb64bba8e890 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -34,10 +34,17 @@ in { options = { hardware.opengl.enable = mkOption { - description = "Whether this configuration requires OpenGL."; + description = '' + Whether to enable OpenGL drivers. This is needed to enable + OpenGL support in X11 systems, as well as for Wayland compositors + like sway, way-cooler and Weston. It is enabled by default + by the corresponding modules, so you do not usually have to + set it yourself, only if there is no module for your wayland + compositor of choice. See services.xserver.enable, + programs.sway.enable, and programs.way-cooler.enable. + ''; type = types.bool; default = false; - internal = true; }; hardware.opengl.driSupport = mkOption { diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 5725938465f5debbc06dab1dd05db3b0b689c0b7..4c4e69d60d9c701aae370a39f9def061f66fcf18 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -69,7 +69,7 @@ with lib; in '' mkdir -p /root/Desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop + cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop chmod a+rx /root/Desktop/gnome-terminal.desktop cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop chmod a+rx /root/Desktop/gparted.desktop diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 811449e9fe7ed8ca57370549d4b5fa3b30c90e2d..e7cbf415a22335770594a0abe2ab7e4cd98dddb9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -331,8 +331,7 @@ in config.system.build.toplevel.drvPath; # Create the squashfs image that contains the Nix store. - system.build.squashfsStore = import ../../../lib/make-squashfs.nix { - inherit (pkgs) stdenv squashfsTools perl pathsFromGraph; + system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix { storeContents = config.isoImage.storeContents; }; @@ -383,11 +382,8 @@ in boot.loader.timeout = 10; # Create the ISO image. - system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ - inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; - + system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({ inherit (config.isoImage) isoName compressImage volumeID contents; - bootable = true; bootImage = "/isolinux/isolinux.bin"; } // optionalAttrs config.isoImage.makeUsbBootable { diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 52239b6191264b3d6733a8aaef1539b811405a94..a4eda3c52dcee2d6a9a2e17f3768ac751b5d787a 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -67,7 +67,7 @@ with lib; # Create the squashfs image that contains the Nix store. system.build.squashfsStore = import ../../../lib/make-squashfs.nix { - inherit (pkgs) stdenv squashfsTools perl pathsFromGraph; + inherit (pkgs) stdenv squashfsTools closureInfo; storeContents = config.netboot.storeContents; }; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 131c779b1ab1c31d4747961cfe228d5fa481cce6..4774cf39c03043d4ea5d5f58561c923c8e6585a7 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16"; - i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16"; - aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16"; - x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16"; + x86_64-linux = "/nix/store/6p2gambjac7xdkd2a7w1dsxdk1q5cq4d-nix-2.0"; + i686-linux = "/nix/store/zznnaijjk3nwx0cmpczxsvngmqzhl7r4-nix-2.0"; + aarch64-linux = "/nix/store/ci96w9kxfkmlc7x2vwqiz4da0r6abxnq-nix-2.0"; + x86_64-darwin = "/nix/store/xmi4fylvx4qc79ji9v5q3zfy9vfdy4sv-nix-2.0"; } diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh new file mode 100644 index 0000000000000000000000000000000000000000..6793911896123e5fa3d55f6cbde09975f5cf4521 --- /dev/null +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -0,0 +1,60 @@ +#! @shell@ + +set -e + +# Re-exec ourselves in a private mount namespace so that our bind +# mounts get cleaned up automatically. +if [ -z "$NIXOS_ENTER_REEXEC" ]; then + export NIXOS_ENTER_REEXEC=1 + if [ "$(id -u)" != 0 ]; then + extraFlags="-r" + fi + exec unshare --fork --mount --uts --mount-proc --pid $extraFlags -- "$0" "$@" +else + mount --make-rprivate / +fi + +mountPoint=/mnt +system=/nix/var/nix/profiles/system +command=($system/sw/bin/bash "--login") + +while [ "$#" -gt 0 ]; do + i="$1"; shift 1 + case "$i" in + --root) + mountPoint="$1"; shift 1 + ;; + --system) + system="$1"; shift 1 + ;; + --help) + exec man nixos-enter + exit 1 + ;; + --command|-c) + command=($system/sw/bin/bash "-c" "$1") + shift 1 + ;; + --) + command=("$@") + break + ;; + *) + echo "$0: unknown option \`$i'" + exit 1 + ;; + esac +done + +if [[ ! -e $mountPoint/etc/NIXOS ]]; then + echo "$0: '$mountPoint' is not a NixOS installation" >&2 + exit 126 +fi + +mkdir -m 0755 -p "$mountPoint/dev" +mount --rbind /dev "$mountPoint/dev" + +# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. +LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true + +exec chroot "$mountPoint" "${command[@]}" diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index f994d5b4bde1120f6bc4e3659ecd874519ff27d7..22c1e0fe9a34b64769ebd4dc8dac65fd2a931859 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -1,35 +1,23 @@ #! @shell@ -# - make Nix store etc. -# - copy closure of Nix to target device -# - register validity -# - with a chroot to the target device: -# * nix-env -p /nix/var/nix/profiles/system -i -# * install the boot loader +set -e +shopt -s nullglob + +export PATH=@path@:$PATH # Ensure a consistent umask. umask 0022 -# Re-exec ourselves in a private mount namespace so that our bind -# mounts get cleaned up automatically. -if [ "$(id -u)" = 0 ]; then - if [ -z "$NIXOS_INSTALL_REEXEC" ]; then - export NIXOS_INSTALL_REEXEC=1 - exec unshare --mount --uts -- "$0" "$@" - else - mount --make-rprivate / - fi -fi - # Parse the command line for the -I flag extraBuildFlags=() -chrootCommand=(/run/current-system/sw/bin/bash) -buildUsersGroup="nixbld" + +mountPoint=/mnt +channelPath= while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - --max-jobs|-j|--cores|-I) + --max-jobs|-j|--cores|-I|--substituters) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; @@ -41,9 +29,11 @@ while [ "$#" -gt 0 ]; do --root) mountPoint="$1"; shift 1 ;; - --closure) - closure="$1"; shift 1 - buildUsersGroup="" + --system|--closure) + system="$1"; shift 1 + ;; + --channel) + channelPath="$1"; shift 1 ;; --no-channel-copy) noChannelCopy=1 @@ -57,17 +47,13 @@ while [ "$#" -gt 0 ]; do --show-trace) extraBuildFlags+=("$i") ;; - --chroot) - runChroot=1 - if [[ "$@" != "" ]]; then - chrootCommand=("$@") - fi - break - ;; --help) exec man nixos-install exit 1 ;; + --debug) + set -x + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -75,132 +61,83 @@ while [ "$#" -gt 0 ]; do esac done -set -e -shopt -s nullglob - -if test -z "$mountPoint"; then - mountPoint=/mnt -fi - if ! test -e "$mountPoint"; then echo "mount point $mountPoint doesn't exist" exit 1 fi # Get the path of the NixOS configuration file. -if test -z "$NIXOS_CONFIG"; then - NIXOS_CONFIG=/etc/nixos/configuration.nix +if [[ -z $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix fi -if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then - echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist" +if [[ ${NIXOS_CONFIG:0:1} != / ]]; then + echo "$0: \$NIXOS_CONFIG is not an absolute path" exit 1 fi - -# Builds will use users that are members of this group -extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup") - -# Inherit binary caches from the host -# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... -binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')" -extraBuildFlags+=(--option "binary-caches" "$binary_caches") - -# We only need nixpkgs in the path if we don't already have a system closure to install -if [[ -z "$closure" ]]; then - nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" - export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" -fi -unset NIXOS_CONFIG - -# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're -# running with --chroot. TODO: --chroot should just be split into a separate tool. -mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" - -# Set up some bind mounts we'll want regardless of chroot or not -mount --rbind /dev "$mountPoint/dev" -mount --rbind /proc "$mountPoint/proc" -mount --rbind /sys "$mountPoint/sys" - -# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too) -# and we just want to run a command in the context of a $mountPoint that we're assuming has already been -# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and -# exec the requested command, skipping the rest of the installation procedure. -if [ -n "$runChroot" ]; then - mount -t tmpfs -o "mode=0755" none $mountPoint/run - rm -rf $mountPoint/var/run - ln -s /run $mountPoint/var/run - for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done - for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done - - if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then - echo "$0: installation not finished; cannot chroot into installation directory" - exit 1 - fi - ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system - exec chroot $mountPoint "${chrootCommand[@]}" +if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then + echo "configuration file $NIXOS_CONFIG doesn't exist" + exit 1 fi -# A place to drop temporary closures +# A place to drop temporary stuff. trap "rm -rf $tmpdir" EXIT tmpdir="$(mktemp -d)" -# Build a closure (on the host; we then copy it into the guest) -function closure() { - nix-build "${extraBuildFlags[@]}" --no-out-link -E "with import {}; runCommand \"closure\" { exportReferencesGraph = [ \"x\" (buildEnv { name = \"env\"; paths = [ ($1) stdenv ]; }) ]; } \"cp x \$out\"" -} - -system_closure="$tmpdir/system.closure" -# Use a FIFO for piping nix-store --export into nix-store --import, saving disk -# I/O and space. nix-store --import is run by nixos-prepare-root. -mkfifo $system_closure - -if [ -z "$closure" ]; then - expr="(import {}).system" - system_root="$(nix-build -E "$expr")" - system_closure="$(closure "$expr")" -else - system_root=$closure - # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure - # to the filesytem we're preparing. Also delete it on exit! - # Run in background to avoid blocking while trying to write to the FIFO - # $system_closure refers to - nix-store --export $(nix-store -qR $closure) > $system_closure & -fi - -channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" -channel_closure="$tmpdir/channel.closure" -nix-store --export $channel_root > $channel_closure - -# Populate the target root directory with the basics -@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure" - -# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead -chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store +sub="auto?trusted=1" +# Build the system configuration in the target filesystem. +if [[ -z $system ]]; then + echo "building the configuration in $NIXOS_CONFIG..." + outLink="$tmpdir/system" + nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + -f '' system -I "nixos-config=$NIXOS_CONFIG" + system=$(readlink -f $outLink) +fi +# Set the system profile to point to the configuration. TODO: combine +# this with the previous step once we have a nix-env replacement with +# a progress bar. +nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + -p $mountPoint/nix/var/nix/profiles/system --set "$system" + +# Copy the NixOS/Nixpkgs sources to the target as the initial contents +# of the NixOS channel. +if [[ -z $noChannelCopy ]]; then + if [[ -z $channelPath ]]; then + channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" + fi + if [[ -n $channelPath ]]; then + echo "copying channel..." + mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root + nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ + -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet + install -m 0700 -d $mountPoint/root/.nix-defexpr + ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels + fi +fi -# Grub needs an mtab. -ln -sfn /proc/mounts $mountPoint/etc/mtab +# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. +mkdir -m 0755 -p "$mountPoint/etc" +touch "$mountPoint/etc/NIXOS" # Switch to the new system configuration. This will install Grub with # a menu default pointing at the kernel/initrd/etc of the new # configuration. -echo "finalising the installation..." -if [ -z "$noBootLoader" ]; then - NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint \ - /nix/var/nix/profiles/system/bin/switch-to-configuration boot +if [[ -z $noBootLoader ]]; then + echo "installing the boot loader..." + # Grub needs an mtab. + ln -sfn /proc/mounts $mountPoint/etc/mtab + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot fi -# Run the activation script. -chroot $mountPoint /nix/var/nix/profiles/system/activate - - -# Ask the user to set a root password. -if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/bin/passwd ] && [ -t 0 ]; then - echo "setting root password..." - chroot $mountPoint /run/wrappers/bin/passwd +# Ask the user to set a root password, but only if the passwd command +# exists (i.e. when mutable user accounts are enabled). +if [[ -z $noRootPasswd ]] && [ -t 0 ]; then + nixos-enter --root "$mountPoint" -c '[[ -e /nix/var/nix/profiles/system/sw/bin/passwd ]] && echo "setting root password..." && /nix/var/nix/profiles/system/sw/bin/passwd' fi - echo "installation finished!" diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh deleted file mode 100644 index ed5af234fec966b869c299858abf9d47b855ac26..0000000000000000000000000000000000000000 --- a/nixos/modules/installer/tools/nixos-prepare-root.sh +++ /dev/null @@ -1,104 +0,0 @@ -#! @shell@ - -# This script's goal is to perform all "static" setup of a filesystem structure from pre-built store paths. Everything -# in here should run in a non-root context and inside a Nix builder. It's designed primarily to be called from image- -# building scripts and from nixos-install, but because it makes very few assumptions about the context in which it runs, -# it could be useful in other contexts as well. -# -# Current behavior: -# - set up basic filesystem structure -# - make Nix store etc. -# - copy Nix, system, channel, and misceallaneous closures to target Nix store -# - register validity of all paths in the target store -# - set up channel and system profiles - -# Ensure a consistent umask. -umask 0022 - -set -e - -mountPoint="$1" -channel="$2" -system="$3" -shift 3 -closures="$@" - -PATH="@coreutils@/bin:@nix@/bin:@perl@/bin:@utillinux@/bin:@rsync@/bin" - -if ! test -e "$mountPoint"; then - echo "mount point $mountPoint doesn't exist" - exit 1 -fi - -# Create a few of the standard directories in the target root directory. -install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home -install -m 01777 -d $mountPoint/tmp -install -m 0755 -d $mountPoint/tmp/root -install -m 0755 -d $mountPoint/var -install -m 0700 -d $mountPoint/root - -ln -sf /run $mountPoint/var/run - -# Create the necessary Nix directories on the target device -install -m 0755 -d \ - $mountPoint/nix/var/nix/gcroots \ - $mountPoint/nix/var/nix/temproots \ - $mountPoint/nix/var/nix/userpool \ - $mountPoint/nix/var/nix/profiles \ - $mountPoint/nix/var/nix/db \ - $mountPoint/nix/var/log/nix/drvs - -install -m 1775 -d $mountPoint/nix/store - -# All Nix operations below should operate on our target store, not /nix/store. -# N.B: this relies on Nix 1.12 or higher -export NIX_REMOTE=local?root=$mountPoint - -# Copy our closures to the Nix store on the target mount point, unless they're already there. -for i in $closures; do - # We support closures both in the format produced by `nix-store --export` and by `exportReferencesGraph`, - # mostly because there doesn't seem to be a single format that can be produced outside of a nix build and - # inside one. See https://github.com/NixOS/nix/issues/1242 for more discussion. - if [[ "$i" =~ \.closure$ ]]; then - echo "importing serialized closure $i to $mountPoint..." - nix-store --import < $i - else - # There has to be a better way to do this, right? - echo "copying closure $i to $mountPoint..." - for j in $(perl @pathsFromGraph@ $i); do - echo " $j... " - rsync -a $j $mountPoint/nix/store/ - done - - nix-store --option build-users-group root --register-validity < $i - fi -done - -# Create the required /bin/sh symlink; otherwise lots of things -# (notably the system() function) won't work. -if [ ! -x $mountPoint/@shell@ ]; then - echo "Error: @shell@ wasn't included in the closure" >&2 - exit 1 -fi -install -m 0755 -d $mountPoint/bin -ln -sf @shell@ $mountPoint/bin/sh - -echo "setting the system closure to '$system'..." -nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set "$system" - -ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system - -# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel. -install -m 0755 -d $mountPoint/nix/var/nix/profiles -install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user -install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root - -if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then - echo "copying channel..." - nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet -fi -install -m 0700 -d $mountPoint/root/.nix-defexpr -ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels - -# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. -touch $mountPoint/etc/NIXOS diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index eab5f1147667f2c784d0cf8ae549c20e95442230..beac9e29d59cf9978670db567ebb9440d1323736 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,7 +1,9 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, pkgs, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, ... }: + +with lib; let cfg = config.installer; @@ -16,28 +18,11 @@ let src = ./nixos-build-vms/nixos-build-vms.sh; }; - nixos-prepare-root = makeProg { - name = "nixos-prepare-root"; - src = ./nixos-prepare-root.sh; - - nix = pkgs.nixUnstable; - inherit (pkgs) perl pathsFromGraph rsync utillinux coreutils; - }; - nixos-install = makeProg { name = "nixos-install"; src = ./nixos-install.sh; - - inherit (pkgs) perl pathsFromGraph rsync; nix = config.nix.package.out; - cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - root_uid = config.ids.uids.root; - nixbld_gid = config.ids.gids.nixbld; - prepare_root = nixos-prepare-root; - - nixClosure = pkgs.runCommand "closure" - { exportReferencesGraph = ["refs" config.nix.package.out]; } - "cp refs $out"; + path = makeBinPath [ nixos-enter ]; }; nixos-rebuild = @@ -69,6 +54,11 @@ let inherit (config.system.nixos) version codeName revision; }; + nixos-enter = makeProg { + name = "nixos-enter"; + src = ./nixos-enter.sh; + }; + in { @@ -77,16 +67,16 @@ in environment.systemPackages = [ nixos-build-vms - nixos-prepare-root nixos-install nixos-rebuild nixos-generate-config nixos-option nixos-version + nixos-enter ]; system.build = { - inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild; + inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild nixos-enter; }; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c0c6a6ef924447d8ec77a64ff344db682bb14eaa..39a24cfecc537eb88ff8512cc6af2d46e3b1b51a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -233,7 +233,7 @@ calibre-server = 213; heapster = 214; bepasty = 215; - pumpio = 216; + # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; mathics = 218; ejabberd = 219; @@ -304,6 +304,7 @@ mighttpd2 = 285; hass = 286; monero = 287; + ceph = 288; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -513,7 +514,7 @@ xtreemfs = 212; calibre-server = 213; bepasty = 215; - pumpio = 216; + # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; mathics = 218; ejabberd = 219; @@ -576,6 +577,7 @@ mighttpd2 = 285; hass = 286; monero = 287; + ceph = 288; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 098fac7a0c2da3e88ea378e3b3ff0683cbd38141..e7f28c670bed92dd61b09fb32d2077a664e2aa2a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -31,6 +31,7 @@ ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/digitalbitbox.nix ./hardware/sensor/iio.nix ./hardware/ksm.nix ./hardware/mcelog.nix @@ -78,6 +79,7 @@ ./programs/command-not-found/command-not-found.nix ./programs/criu.nix ./programs/dconf.nix + ./programs/digitalbitbox/default.nix ./programs/environment.nix ./programs/fish.nix ./programs/freetds.nix @@ -109,6 +111,7 @@ ./programs/sway.nix ./programs/thefuck.nix ./programs/tmux.nix + ./programs/udevil.nix ./programs/venus.nix ./programs/vim.nix ./programs/way-cooler.nix @@ -436,6 +439,7 @@ ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix + ./services/network-filesystems/ceph.nix ./services/networking/amuled.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix @@ -637,8 +641,7 @@ ./services/web-apps/nixbot.nix ./services/web-apps/nexus.nix ./services/web-apps/pgpkeyserver-lite.nix - ./services/web-apps/piwik.nix - ./services/web-apps/pump.io.nix + ./services/web-apps/matomo.nix ./services/web-apps/restya-board.nix ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 506a6ee3eaa813840eb19ebb595ec71bf525f109..43f06c219f8242fbcab6195563877259c28861ee 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -72,7 +72,13 @@ with lib; # To speed up installation a little bit, include the complete # stdenv in the Nix store on the CD. - system.extraDependencies = with pkgs; [ stdenv stdenvNoCC busybox ]; + system.extraDependencies = with pkgs; + [ + stdenv + stdenvNoCC # for runCommand + busybox + jq # for closureInfo + ]; # Show all debug messages from the kernel but don't log refused packets # because we have the firewall enabled. This makes installs from the diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 1abdb4973a44b2416f4c2e2ce325929ff9f8abd2..1a62f04972df4e5cdeec9c6512bdc355e5a09dad 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -211,6 +211,9 @@ in "/share/bash-completion" ]; + environment.systemPackages = optional cfg.enableCompletion + pkgs.nix-bash-completions; + environment.shells = [ "/run/current-system/sw/bin/bash" "/var/run/current-system/sw/bin/bash" diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 27bfdf022e7d46b1ef9b99bd052fec63a7c9a359..b7d8a345e65c56b4d4d97aef275659ed7e64a81a 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -36,7 +36,7 @@ in "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; # https://github.com/NixOS/nixpkgs/pull/31891 #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7c727489c6c96f96b34c5be8806f4301b6e4c5d9 --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.digitalbitbox; +in + +{ + options.programs.digitalbitbox = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Installs the Digital Bitbox application and enables the complementary hardware module. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.digitalbitbox; + defaultText = "pkgs.digitalbitbox"; + description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + hardware.digitalbitbox = { + enable = true; + package = cfg.package; + }; + }; + + meta = { + doc = ./doc.xml; + maintainers = with stdenv.lib.maintainers; [ vidbina ]; + }; +} diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml new file mode 100644 index 0000000000000000000000000000000000000000..7acbc2fc4dde8b1ac163697502c2d143646de48a --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -0,0 +1,85 @@ + + + Digital Bitbox + + + Digital Bitbox is a hardware wallet and second-factor authenticator. + + + + The digitalbitbox programs module may be + installed by setting programs.digitalbitbox + to true in a manner similar to + + + programs.digitalbitbox.enable = true; + + + and bundles the digitalbitbox package (see ), which contains the + dbb-app and dbb-cli binaries, + along with the hardware module (see ) which sets up the + necessary udev rules to access the device. + + + + Enabling the digitalbitbox module is pretty much the easiest way to + get a Digital Bitbox device working on your system. + + + + For more information, see + . + + +
+ Package + + + The binaries, dbb-app (a GUI tool) and + dbb-cli (a CLI tool), are available through the + digitalbitbox package which could be installed + as follows: + + + environment.systemPackages = [ + pkgs.digitalbitbox + ]; + + +
+ + +
+ Hardware + + + The digitalbitbox hardware package enables the udev rules for + Digital Bitbox devices and may be installed as follows: + + + hardware.digitalbitbox.enable = true; + + + + + In order to alter the udev rules, one may provide different values for + the udevRule51 and udevRule52 + attributes by means of overriding as follows: + + + programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; + }; + + +
+ diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba5670f9dfe9dcb6b022913afc59e351f948d739 --- /dev/null +++ b/nixos/modules/programs/udevil.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.udevil; + +in { + options.programs.udevil.enable = mkEnableOption "udevil"; + + config = mkIf cfg.enable { + security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + }; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index da83baed37190cffa4fbbd06d2927ba9d44bf96a..489d7d8b9b50e3f5ebe212572fd89ed3ba44f998 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -148,6 +148,12 @@ with lib; # parsoid (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) + # piwik was renamed to matomo + (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ]) + (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ]) + (mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ]) + (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ]) + # tarsnap (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index f39f64033ca7d84bcdca2fc05df039812728ef02..e1cad03e66e22bfd160c152286749606190579a9 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -311,7 +311,7 @@ let ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring - ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")} + ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")} ${optionalString cfg.googleAuthenticator.enable "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} '') + '' @@ -384,7 +384,7 @@ let ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) - "session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"} + "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} ''); diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 0dd59e4fb4442b0bc728a7cab9735b1c89c0338f..54047a50caa6cd87a08724c308ec1ee577bb77ce 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -208,7 +208,7 @@ in { ''; postStart = '' - until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do sleep 1 done ''; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 5b73905035520ac5d9275752acf17d83b6db1587..21a131b90a8115f6277cf8ce3f63867b519189ae 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -133,7 +133,7 @@ in ''; example = [ "nextcloud" - "piwik" + "matomo" ]; }; @@ -289,10 +289,10 @@ in # Create initial databases if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" - ( echo "create database `${database.name}`;" + ( echo 'create database `${database.name}`;' ${optionalString (database ? "schema") '' - echo "use `${database.name}`;" + echo 'use `${database.name}`;' if [ -f "${database.schema}" ] then diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index e884098cb08d0fc5fe357f895b2f4744764faa95..a67c61eb99492cbcb857a4dcdcaa475535f25e1d 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -7,8 +7,10 @@ let cfg = config.services.openldap; openldap = pkgs.openldap; + dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" cfg.extraConfig; - + configOpts = if cfg.configDir == null then "-f ${configFile}" + else "-F ${cfg.configDir}"; in { @@ -81,6 +83,34 @@ in ''' ''; }; + + declarativeContents = mkOption { + type = with types; nullOr lines; + default = null; + description = '' + Declarative contents for the LDAP database, in LDIF format. + + Note a few facts when using it. First, the database + must be stored in the directory defined by + dataDir. Second, all dataDir will be erased + when starting the LDAP server. Third, modifications to the database + are not prevented, they are just dropped on the next reboot of the + server. Finally, performance-wise the database and indexes are rebuilt + on each server startup, so this will slow down server startup, + especially with large databases. + ''; + example = '' + dn: dc=example,dc=org + objectClass: domain + dc: example + + dn: ou=users,dc=example,dc=org + objectClass = organizationalUnit + ou: users + + # ... + ''; + }; }; }; @@ -88,7 +118,7 @@ in ###### implementation - config = mkIf config.services.openldap.enable { + config = mkIf cfg.enable { environment.systemPackages = [ openldap ]; @@ -98,11 +128,21 @@ in after = [ "network.target" ]; preStart = '' mkdir -p /var/run/slapd - chown -R ${cfg.user}:${cfg.group} /var/run/slapd - mkdir -p ${cfg.dataDir} - chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} + chown -R "${cfg.user}:${cfg.group}" /var/run/slapd + ${optionalString (cfg.declarativeContents != null) '' + rm -Rf "${cfg.dataDir}" + ''} + mkdir -p "${cfg.dataDir}" + ${optionalString (cfg.declarativeContents != null) '' + ${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile} + ''} + chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}" ''; - serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}"; + serviceConfig.ExecStart = + "${openldap.out}/libexec/slapd -d 0 " + + "-u '${cfg.user}' -g '${cfg.group}' " + + "-h '${concatStringsSep " " cfg.urlList}' " + + "${configOpts}"; }; users.extraUsers.openldap = diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 9e382241348b9f225db68cd2af72baed820ed190..cca98c43dc7a2da31f6e157362a054603d9c77cb 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -30,9 +30,9 @@ with lib; config = mkMerge [ (mkIf config.services.gnome3.at-spi2-core.enable { - environment.systemPackages = [ pkgs.at_spi2_core ]; - services.dbus.packages = [ pkgs.at_spi2_core ]; - systemd.packages = [ pkgs.at_spi2_core ]; + environment.systemPackages = [ pkgs.at-spi2-core ]; + services.dbus.packages = [ pkgs.at-spi2-core ]; + systemd.packages = [ pkgs.at-spi2-core ]; }) (mkIf (!config.services.gnome3.at-spi2-core.enable) { diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index 86a47488d8658235216594299a185e85fce54e58..7e312a1b81eb3ee39fde9608e69e419b5c2089a2 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.evolution-data-server.enable { - environment.systemPackages = [ pkgs.gnome3.evolution_data_server ]; + environment.systemPackages = [ pkgs.gnome3.evolution-data-server ]; - services.dbus.packages = [ pkgs.gnome3.evolution_data_server ]; + services.dbus.packages = [ pkgs.gnome3.evolution-data-server ]; - systemd.packages = [ pkgs.gnome3.evolution_data_server ]; + systemd.packages = [ pkgs.gnome3.evolution-data-server ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 2a68af5a7dd891e993fcfe522bccae419d313cd1..aa1165ab3bba63b7987ef7c1f130f7a3a28414b0 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -31,9 +31,9 @@ with lib; config = mkIf config.services.gnome3.gnome-keyring.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_keyring ]; + environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ]; + services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 0da4aca73ecb92bbb4e0ebdc9e69e4138d2f7058..4286251357f7eafb5538c67874e77fd4eb105d80 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.gnome3.gnome-online-accounts.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ]; + environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ]; - services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ]; + services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix index 3ac767bfa00d1c0f0a4ca5bfeab668651a0fabfc..fd14efee5f2ea610440e81fcd1770bf72ad65079 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.gnome-terminal-server.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_terminal ]; + environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome3.gnome_terminal ]; + services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; - systemd.packages = [ pkgs.gnome3.gnome_terminal ]; + systemd.packages = [ pkgs.gnome3.gnome-terminal ]; }; diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index 2554f3a1666fc9dd20cb8ce364b7cb3beb503eb2..f5401c180984f376633a15033c2e0e48e21aa61e 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.telepathy.enable { - environment.systemPackages = [ pkgs.telepathy_mission_control ]; + environment.systemPackages = [ pkgs.telepathy-mission-control ]; - services.dbus.packages = [ pkgs.telepathy_mission_control ]; + services.dbus.packages = [ pkgs.telepathy-mission-control ]; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e96645c79c77269650fefeadd9a74606c3a05fc5..39d23610b064450555ac1866cd9ce38f990e19a3 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -32,11 +32,17 @@ in description = "Whether to enable Disnix"; }; + enableMultiUser = mkOption { + type = types.bool; + default = true; + description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; + }; + useWebServiceInterface = mkOption { default = false; description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; }; - + package = mkOption { type = types.path; description = "The Disnix package"; @@ -52,7 +58,7 @@ in config = mkIf cfg.enable { dysnomia.enable = true; - + environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; services.dbus.enable = true; @@ -71,7 +77,7 @@ in }; systemd.services = { - disnix = { + disnix = mkIf cfg.enableMultiUser { description = "Disnix server"; wants = [ "dysnomia.target" ]; wantedBy = [ "multi-user.target" ]; @@ -92,7 +98,7 @@ in } // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); - + serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index a169b0f2c78412a8e998dd4b6cffb449e4a9f401..72b70b28c80f5870ea138ce31e4aa63854401275 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -33,9 +33,9 @@ let sh = pkgs.stdenv.shell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; inherit binshDeps; } '' + pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } '' ${optionalString (!isNix20) '' - extraPaths=$(for i in $(cat binshDeps); do if test -d $i; then echo $i; fi; done) + extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) ''} cat > $out < cfg.mon.daemons != []; + message = "have to set id of atleast one MON if you're going to enable Monitor"; + } + { assertion = cfg.mds.enable == true -> cfg.mds.daemons != []; + message = "have to set id of atleast one MDS if you're going to enable Metadata Service"; + } + { assertion = cfg.osd.enable == true -> cfg.osd.daemons != []; + message = "have to set id of atleast one OSD if you're going to enable OSD"; + } + { assertion = cfg.mgr.enable == true -> cfg.mgr.daemons != []; + message = "have to set id of atleast one MGR if you're going to enable MGR"; + } + ]; + + warnings = optional (cfg.global.monInitialMembers == null) + ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function''; + + environment.etc."ceph/ceph.conf".text = let + # Translate camelCaseOptions to the expected camel case option for ceph.conf + translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global; + # Merge the extraConfig set for mgr daemons, as mgr don't have their own section + globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig; + # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf + globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig); + totalConfig = { + "global" = globalConfig; + } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; } + // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; } + // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; } + // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; + in + generators.toINI {} totalConfig; + + users.extraUsers = singleton { + name = "ceph"; + uid = config.ids.uids.ceph; + description = "Ceph daemon user"; + }; + + users.extraGroups = singleton { + name = "ceph"; + gid = config.ids.gids.ceph; + }; + + systemd.services = let + services = [] + ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; }) + ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) + ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; }) + ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { }) + ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); + in + mkMerge services; + + systemd.targets = let + targets = [ + { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; } + ] ++ optional cfg.mon.enable (generateTargetFile "mon") + ++ optional cfg.mds.enable (generateTargetFile "mds") + ++ optional cfg.osd.enable (generateTargetFile "osd") + ++ optional cfg.rgw.enable (generateTargetFile "rgw") + ++ optional cfg.mgr.enable (generateTargetFile "mgr"); + in + mkMerge targets; + + systemd.tmpfiles.rules = [ + "d /run/ceph 0770 ceph ceph -" + ]; + }; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 62afbf32c2f6105c800ccc9cbf0ae7b6839625af..f83fb7a6d5dcfa9e979bc150b4fa23a7439c582a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -133,10 +133,10 @@ in { basePackages = mkOption { type = types.attrsOf types.package; default = { inherit networkmanager modemmanager wpa_supplicant - networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_fortisslvpn - networkmanager_pptp networkmanager_l2tp - networkmanager_iodine; }; + networkmanager-openvpn networkmanager-vpnc + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-pptp networkmanager-l2tp + networkmanager-iodine; }; internal = true; }; @@ -273,28 +273,28 @@ in { { source = configFile; target = "NetworkManager/NetworkManager.conf"; } - { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; + { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; target = "NetworkManager/VPN/nm-openvpn-service.name"; } - { source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; + { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; target = "NetworkManager/VPN/nm-vpnc-service.name"; } - { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; + { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name"; } - { source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; + { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; + { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } - { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name"; } - { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; + { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) @@ -335,6 +335,7 @@ in { preStart = '' mkdir -m 700 -p /etc/NetworkManager/system-connections + mkdir -m 700 -p /etc/ipsec.d mkdir -m 755 -p ${stateDirs} ''; }; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 3a3f64221c422291c733e6a63bb7b5182dfffdcc..707d24b9220f7e31257e4f002de28d7ffb39d24d 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -32,13 +32,13 @@ let ${caConf} ''; - strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' + strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { ${if managePlugins then "load_modular = no" else ""} ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} plugins { stroke { - secrets_file = ${ipsecSecrets secrets} + secrets_file = ${secretsFile} } } } @@ -135,7 +135,18 @@ in }; }; - config = with cfg; mkIf enable { + + config = with cfg; + let + secretsFile = ipsecSecrets cfg.secrets; + in + mkIf enable + { + + # here we should use the default strongswan ipsec.secrets and + # append to it (default one is empty so not a pb for now) + environment.etc."ipsec.secrets".source = secretsFile; + systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; @@ -143,11 +154,15 @@ in wants = [ "keys.target" ]; after = [ "network-online.target" "keys.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; }; + STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; }; + preStart = '' + # with 'nopeerdns' setting, ppp writes into this folder + mkdir -m 700 -p /etc/ppp + ''; }; }; } diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index dcdc203bdc623868cfa8ffdc9de0af25464b22b3..e485c073cbddff28a53a9ba7159872d3fe5b32cb 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -16,12 +16,6 @@ in { available on http://127.0.0.1:8384/. ''; - useInotify = mkOption { - type = types.bool; - default = false; - description = "Provide syncthing-inotify as a service."; - }; - systemService = mkOption { type = types.bool; default = true; @@ -90,6 +84,12 @@ in { }; }; + imports = [ + (mkRemovedOptionModule ["services" "syncthing" "useInotify"] '' + This option was removed because syncthing now has the inotify functionality included under the name "fswatcher". + It can be enabled on a per-folder basis through the webinterface. + '') + ]; ###### implementation @@ -100,8 +100,7 @@ in { allowedUDPPorts = [ 21027 ]; }; - systemd.packages = [ pkgs.syncthing ] - ++ lib.optional cfg.useInotify pkgs.syncthing-inotify; + systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { extraUsers."${defaultUser}" = @@ -125,7 +124,6 @@ in { STNOUPGRADE = "yes"; inherit (cfg) all_proxy; } // config.networking.proxy.envVars; - wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; @@ -141,20 +139,6 @@ in { syncthing-resume = { wantedBy = [ "suspend.target" ]; }; - - syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) { - description = "Syncthing Inotify File Watcher service"; - after = [ "network.target" "syncthing.service" ]; - requires = [ "syncthing.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - SuccessExitStatus = "2"; - RestartForceExitStatus = "3"; - Restart = "on-failure"; - User = cfg.user; - ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0"; - }; - }; }; }; } diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 4e685e633354d617ad6d06a9bd0373159a0f60db..5d469cabe2cbf7f476ebf4781f0d34e30e4149ca 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -192,7 +192,7 @@ in { serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}''; + ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}''; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml similarity index 58% rename from nixos/modules/services/web-apps/piwik-doc.xml rename to nixos/modules/services/web-apps/matomo-doc.xml index a393a182d36a946340cf75ecd7d2487d37d91fcc..456aae6cc366283ab08d131cbc4436b20791f54c 100644 --- a/nixos/modules/services/web-apps/piwik-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -2,16 +2,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="module-services-piwik"> + xml:id="module-services-matomo"> - Piwik + Matomo - Piwik is a real-time web analytics application. - This module configures php-fpm as backend for piwik, optionally configuring an nginx vhost as well. + Matomo is a real-time web analytics application. + This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. - An automatic setup is not suported by piwik, so you need to configure piwik itself in the browser-based piwik setup. + An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. @@ -19,7 +19,7 @@ Database Setup - You also need to configure a MariaDB or MySQL database and -user for piwik yourself, + You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: @@ -27,20 +27,20 @@ # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; - CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket; - GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + CREATE DATABASE matomo; + CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; + GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; # For MySQL INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; - CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket; - GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + CREATE DATABASE matomo; + CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; + GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - Then fill in piwik as database user and database name, and leave the password field blank. - This authentication works by allowing only the piwik unix user to authenticate as the - piwik database user (without needing a password), but no other users. + Then fill in matomo as database user and database name, and leave the password field blank. + This authentication works by allowing only the matomo unix user to authenticate as the + matomo database user (without needing a password), but no other users. For more information on passwordless login, see . @@ -55,9 +55,9 @@ Backup You only need to take backups of your MySQL database and the - /var/lib/piwik/config/config.ini.php file. - Use a user in the piwik group or root to access the file. - For more information, see . + /var/lib/matomo/config/config.ini.php file. + Use a user in the matomo group or root to access the file. + For more information, see . @@ -67,14 +67,14 @@ - Piwik's file integrity check will warn you. + Matomo's file integrity check will warn you. This is due to the patches necessary for NixOS, you can safely ignore this. - Piwik will warn you that the JavaScript tracker is not writable. + Matomo will warn you that the JavaScript tracker is not writable. This is because it's located in the read-only nix store. You can safely ignore this, unless you need a plugin that needs JavaScript tracker access. @@ -88,7 +88,7 @@ You can use other web servers by forwarding calls for index.php and - piwik.php to the /run/phpfpm-piwik.sock fastcgi unix socket. + piwik.php to the /run/phpfpm-matomo.sock fastcgi unix socket. You can use the nginx configuration in the module code as a reference to what else should be configured. diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/matomo.nix similarity index 73% rename from nixos/modules/services/web-apps/piwik.nix rename to nixos/modules/services/web-apps/matomo.nix index ce86c6873dd408272e9b9efb8c653b4d1f8d6d9b..ef6ac9698e219b21ba9b954183f85ac2033c6692 100644 --- a/nixos/modules/services/web-apps/piwik.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -1,10 +1,11 @@ { config, lib, pkgs, services, ... }: with lib; let - cfg = config.services.piwik; + cfg = config.services.matomo; - user = "piwik"; + user = "matomo"; dataDir = "/var/lib/${user}"; + deprecatedDataDir = "/var/lib/piwik"; pool = user; # it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770, @@ -13,17 +14,22 @@ let phpExecutionUnit = "phpfpm-${pool}"; databaseService = "mysql.service"; + fqdn = + let + join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + in join config.networking.hostName config.networking.domain; + in { options = { - services.piwik = { + services.matomo = { # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963 - # piwik issue for automatic piwik setup: https://github.com/piwik/piwik/issues/10257 - # TODO: find a nice way to do this when more NixOS MySQL and / or piwik automatic setup stuff is implemented. + # matomo issue for automatic matomo setup: https://github.com/matomo-org/matomo/issues/10257 + # TODO: find a nice way to do this when more NixOS MySQL and / or matomo automatic setup stuff is implemented. enable = mkOption { type = types.bool; default = false; description = '' - Enable piwik web analytics with php-fpm backend. + Enable matomo web analytics with php-fpm backend. Either the nginx option or the webServerUser option is mandatory. ''; }; @@ -32,8 +38,9 @@ in { type = types.nullOr types.str; default = null; example = "lighttpd"; + # TODO: piwik.php might get renamed to matomo.php in future releases description = '' - Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for piwik if the nginx + Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx option is not used. Either this option or the nginx option is mandatory. If you want to use another webserver than nginx, you need to set this to that server's user and pass fastcgi requests to `index.php` and `piwik.php` to this socket. @@ -55,7 +62,7 @@ in { catch_workers_output = yes ''; description = '' - Settings for phpfpm's process manager. You might need to change this depending on the load for piwik. + Settings for phpfpm's process manager. You might need to change this depending on the load for matomo. ''; }; @@ -65,7 +72,7 @@ in { (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { # enable encryption by default, - # as sensitive login and piwik data should not be transmitted in clear text. + # as sensitive login and matomo data should not be transmitted in clear text. options.forceSSL.default = true; options.enableACME.default = true; } @@ -73,15 +80,19 @@ in { ); default = null; example = { - serverName = "stats.$\{config.networking.hostName\}"; + serverAliases = [ + "matomo.$\{config.networking.domain\}" + "stats.$\{config.networking.domain\}" + ]; enableACME = false; }; description = '' - With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik. + With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo. Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. - If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active, - and certificates are acquired via ACME. + If enabled, then by default, the is + ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}, + SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; }; @@ -90,12 +101,12 @@ in { config = mkIf cfg.enable { warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [ - "If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed." + "If services.matomo.nginx is set, services.matomo.nginx.webServerUser is ignored and should be removed." ]; assertions = [ { assertion = cfg.nginx != null || cfg.webServerUser != null; - message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory"; + message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; }]; users.extraUsers.${user} = { @@ -106,19 +117,20 @@ in { }; users.extraGroups.${user} = {}; - systemd.services.piwik_setup_update = { - # everything needs to set up and up to date before piwik php files are executed + systemd.services.matomo_setup_update = { + # everything needs to set up and up to date before matomo php files are executed requiredBy = [ "${phpExecutionUnit}.service" ]; before = [ "${phpExecutionUnit}.service" ]; # the update part of the script can only work if the database is already up and running requires = [ databaseService ]; after = [ databaseService ]; - path = [ pkgs.piwik ]; + path = [ pkgs.matomo ]; serviceConfig = { Type = "oneshot"; User = user; # hide especially config.ini.php from other UMask = "0007"; + # TODO: might get renamed to MATOMO_USER_PATH in future versions Environment = "PIWIK_USER_PATH=${dataDir}"; # chown + chmod in preStart needs root PermissionsStartOnly = true; @@ -127,27 +139,32 @@ in { # e.g. after restoring from backup or moving from another system. # Note that ${dataDir}/config/config.ini.php might contain the MySQL password. preStart = '' + # migrate data from piwik to matomo folder + if [ -d ${deprecatedDataDir} ]; then + echo "Migrating from ${deprecatedDataDir} to ${dataDir}" + mv -T ${deprecatedDataDir} ${dataDir} + fi chown -R ${user}:${user} ${dataDir} chmod -R ug+rwX,o-rwx ${dataDir} ''; script = '' - # Use User-Private Group scheme to protect piwik data, but allow administration / backup via piwik group + # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group # Copy config folder chmod g+s "${dataDir}" - cp -r "${pkgs.piwik}/config" "${dataDir}/" + cp -r "${pkgs.matomo}/config" "${dataDir}/" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done if test -f "${dataDir}/config/config.ini.php"; then # then execute possibly pending database upgrade - piwik-console core:update --yes + matomo-console core:update --yes fi ''; }; systemd.services.${phpExecutionUnit} = { - # stop phpfpm on package upgrade, do database upgrade via piwik_setup_update, and then restart - restartTriggers = [ pkgs.piwik ]; + # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart + restartTriggers = [ pkgs.matomo ]; # stop config.ini.php from getting written with read permission for others serviceConfig.UMask = "0007"; }; @@ -175,14 +192,14 @@ in { # References: # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html # https://github.com/perusio/piwik-nginx - "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx { - # don't allow to override the root easily, as it will almost certainly break piwik. + "${user}.${fqdn}" = mkMerge [ cfg.nginx { + # don't allow to override the root easily, as it will almost certainly break matomo. # disadvantage: not shown as default in docs. - root = mkForce "${pkgs.piwik}/share"; + root = mkForce "${pkgs.matomo}/share"; # define locations here instead of as the submodule option's default # so that they can easily be extended with additional locations if required - # without needing to redefine the piwik ones. + # without needing to redefine the matomo ones. # disadvantage: not shown as default in docs. locations."/" = { index = "index.php"; @@ -191,6 +208,7 @@ in { locations."= /index.php".extraConfig = '' fastcgi_pass unix:${phpSocket}; ''; + # TODO: might get renamed to matomo.php in future versions # allow piwik.php for tracking locations."= /piwik.php".extraConfig = '' fastcgi_pass unix:${phpSocket}; @@ -212,6 +230,7 @@ in { locations."= /robots.txt".extraConfig = '' return 200 "User-agent: *\nDisallow: /\n"; ''; + # TODO: might get renamed to matomo.js in future versions # let browsers cache piwik.js locations."= /piwik.js".extraConfig = '' expires 1M; @@ -221,7 +240,7 @@ in { }; meta = { - doc = ./piwik-doc.xml; + doc = ./matomo-doc.xml; maintainers = with stdenv.lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/web-apps/pump.io-configure.js b/nixos/modules/services/web-apps/pump.io-configure.js deleted file mode 100644 index 1fbf346a34c4262512ea871c33f06871477ced2c..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/pump.io-configure.js +++ /dev/null @@ -1,23 +0,0 @@ -var fs = require('fs'); - -var opts = JSON.parse(fs.readFileSync("/dev/stdin").toString()); -var config = opts.config; - -var readSecret = function(filename) { - return fs.readFileSync(filename).toString().trim(); -}; - -if (opts.secretFile) { - config.secret = readSecret(opts.secretFile); -} -if (opts.dbPasswordFile) { - config.params.dbpass = readSecret(opts.dbPasswordFile); -} -if (opts.smtpPasswordFile) { - config.smtppass = readSecret(opts.smtpPasswordFile); -} -if (opts.spamClientSecretFile) { - config.spamclientsecret = readSecret(opts.opts.spamClientSecretFile); -} - -fs.writeFileSync(opts.outputFile, JSON.stringify(config)); diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix deleted file mode 100644 index 27ae685163676a35ce789b6b5ed324a21e1b860e..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/pump.io.nix +++ /dev/null @@ -1,438 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.pumpio; - dataDir = "/var/lib/pump.io"; - runDir = "/run/pump.io"; - user = "pumpio"; - - optionalSet = condition: value: if condition then value else {}; - - configScript = ./pump.io-configure.js; - configOptions = { - outputFile = "${runDir}/config.json"; - config = - (optionalSet (cfg.driver != "disk") { - driver = cfg.driver; - }) // - { - params = (optionalSet (cfg.driver == "disk") { dir = dataDir; }) // - (optionalSet (cfg.driver == "mongodb" || cfg.driver == "redis") { - host = cfg.dbHost; - port = cfg.dbPort; - dbname = cfg.dbName; - dbuser = cfg.dbUser; - dbpass = cfg.dbPassword; - }) // - (optionalSet (cfg.driver == "memcached") { - host = cfg.dbHost; - port = cfg.dbPort; - }) // cfg.driverParams; - secret = cfg.secret; - - address = cfg.address; - port = cfg.port; - - noweb = false; - urlPort = cfg.urlPort; - hostname = cfg.hostname; - favicon = cfg.favicon; - - site = cfg.site; - owner = cfg.owner; - ownerURL = cfg.ownerURL; - - key = cfg.sslKey; - cert = cfg.sslCert; - bounce = false; - - spamhost = cfg.spamHost; - spamclientid = cfg.spamClientId; - spamclientsecret = cfg.spamClientSecret; - - requireEmail = cfg.requireEmail; - smtpserver = cfg.smtpHost; - smtpport = cfg.smtpPort; - smtpuser = cfg.smtpUser; - smtppass = cfg.smtpPassword; - smtpusessl = cfg.smtpUseSSL; - smtpfrom = cfg.smtpFrom; - - nologger = false; - enableUploads = cfg.enableUploads; - datadir = dataDir; - debugClient = false; - firehose = cfg.firehose; - disableRegistration = cfg.disableRegistration; - - inherit (cfg) secretFile dbPasswordFile smtpPasswordFile spamClientSecretFile; - } // - (optionalSet (cfg.port < 1024) { - serverUser = user; # have pump.io listen then drop privileges - }) // cfg.extraConfig; -}; in { - options = { - - services.pumpio = { - - enable = mkEnableOption "Pump.io social streams server"; - - secret = mkOption { - type = types.nullOr types.str; - default = null; - example = "my dog has fleas"; - description = '' - A session-generating secret, server-wide password. Warning: - this is stored in cleartext in the Nix store! - ''; - }; - - secretFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-secret"; - description = '' - A file containing the session-generating secret, - server-wide password. - ''; - }; - - site = mkOption { - type = types.str; - example = "Awesome Sauce"; - description = "Name of the server"; - }; - - owner = mkOption { - type = types.str; - default = ""; - example = "Awesome Inc."; - description = "Name of owning entity, if you want to link to it."; - }; - - ownerURL = mkOption { - type = types.str; - default = ""; - example = "https://pump.io"; - description = "URL of owning entity, if you want to link to it."; - }; - - address = mkOption { - type = types.str; - default = "localhost"; - description = '' - Web server listen address. - ''; - }; - - port = mkOption { - type = types.int; - default = 31337; - description = '' - Port to listen on. Defaults to 31337, which is suitable for - running behind a reverse proxy. For a standalone server, - use 443. - ''; - }; - - hostname = mkOption { - type = types.nullOr types.str; - default = "localhost"; - description = '' - The hostname of the server, used for generating - URLs. Defaults to "localhost" which doesn't do much for you. - ''; - }; - - urlPort = mkOption { - type = types.int; - default = 443; - description = '' - Port to use for generating URLs. This basically has to be - either 80 or 443 because the host-meta and Webfinger - protocols don't make any provision for HTTP/HTTPS servers - running on other ports. - ''; - }; - - favicon = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Local filesystem path to the favicon.ico file to use. This - will be served as "/favicon.ico" by the server. - ''; - }; - - enableUploads = mkOption { - type = types.bool; - default = true; - description = '' - If you want to disable file uploads, set this to false. Uploaded files will be stored - in ${dataDir}/uploads. - ''; - }; - - sslKey = mkOption { - type = types.path; - example = "${dataDir}/myserver.key"; - default = ""; - description = '' - The path to the server certificate private key. The - certificate is required, but it can be self-signed. - ''; - }; - - sslCert = mkOption { - type = types.path; - example = "${dataDir}/myserver.crt"; - default = ""; - description = '' - The path to the server certificate. The certificate is - required, but it can be self-signed. - ''; - }; - - firehose = mkOption { - type = types.str; - default = "ofirehose.com"; - description = '' - Firehose host running the ofirehose software. Defaults to - "ofirehose.com". Public notices will be ping this firehose - server and from there go out to search engines and the - world. If you want to disconnect from the public web, set - this to something falsy. - ''; - }; - - disableRegistration = mkOption { - type = types.bool; - default = false; - description = '' - Disables registering new users on the site through the Web - or the API. - ''; - }; - - requireEmail = mkOption { - type = types.bool; - default = false; - description = "Require an e-mail address to register."; - }; - - extraConfig = mkOption { - default = { }; - description = '' - Extra configuration options which are serialized to json and added - to the pump.io.json config file. - ''; - }; - - driver = mkOption { - type = types.enum [ "mongodb" "disk" "lrucache" "memcached" "redis" ]; - default = "mongodb"; - description = "Type of database. Corresponds to a nodejs databank driver."; - }; - - driverParams = mkOption { - default = { }; - description = "Extra parameters for the driver."; - }; - - dbHost = mkOption { - type = types.str; - default = "localhost"; - description = "The database host to connect to."; - }; - - dbPort = mkOption { - type = types.int; - default = 27017; - description = "The port that the database is listening on."; - }; - - dbName = mkOption { - type = types.str; - default = "pumpio"; - description = "The name of the database to use."; - }; - - dbUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The username. Defaults to null, meaning no authentication. - ''; - }; - - dbPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The password corresponding to dbUser. Warning: this is - stored in cleartext in the Nix store! - ''; - }; - - dbPasswordFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-dbpassword"; - description = '' - A file containing the password corresponding to dbUser. - ''; - }; - - smtpHost = mkOption { - type = types.nullOr types.str; - default = null; - example = "localhost"; - description = '' - Server to use for sending transactional email. If it's not - set up, no email is sent and features like password recovery - and email notification won't work. - ''; - }; - - smtpPort = mkOption { - type = types.int; - default = 25; - description = '' - Port to connect to on SMTP server. - ''; - }; - - smtpUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Username to use to connect to SMTP server. Might not be - necessary for some servers. - ''; - }; - - smtpPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Password to use to connect to SMTP server. Might not be - necessary for some servers. Warning: this is stored in - cleartext in the Nix store! - ''; - }; - - smtpPasswordFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-smtppassword"; - description = '' - A file containing the password used to connect to SMTP - server. Might not be necessary for some servers. - ''; - }; - - - smtpUseSSL = mkOption { - type = types.bool; - default = false; - description = '' - Only use SSL with the SMTP server. By default, a SSL - connection is negotiated using TLS. You may need to change - the smtpPort value if you set this. - ''; - }; - - smtpFrom = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Email address to use in the "From:" header of outgoing - notifications. Defaults to 'no-reply@' plus the site - hostname. - ''; - }; - - spamHost = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Host running activityspam software to use to test updates - for spam. - ''; - }; - spamClientId = mkOption { - type = types.nullOr types.str; - default = null; - description = "OAuth pair for spam server."; - }; - spamClientSecret = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - OAuth pair for spam server. Warning: this is - stored in cleartext in the Nix store! - ''; - }; - spamClientSecretFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-spamclientsecret"; - description = '' - A file containing the OAuth key for the spam server. - ''; - }; - }; - - }; - - config = mkIf cfg.enable { - warnings = let warn = k: optional (cfg.${k} != null) - "config.services.pumpio.${k} is insecure. Use ${k}File instead."; - in concatMap warn [ "secret" "dbPassword" "smtpPassword" "spamClientSecret" ]; - - assertions = [ - { assertion = !(isNull cfg.secret && isNull cfg.secretFile); - message = "pump.io needs a secretFile configured"; - } - ]; - - systemd.services."pump.io" = - { description = "Pump.io - stream server that does most of what people really want from a social network"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - mkdir -p ${dataDir}/uploads - mkdir -p ${runDir} - chown pumpio:pumpio ${dataDir}/uploads ${runDir} - chmod 770 ${dataDir}/uploads ${runDir} - - ${pkgs.nodejs}/bin/node ${configScript} <= 1000 quiet - auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth ${optionalString config.security.pam.enableEcryptfs "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -213,7 +213,7 @@ in "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; gdm-password.text = '' @@ -221,7 +221,7 @@ in auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth ${optionalString config.security.pam.enableEcryptfs "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -240,7 +240,7 @@ in "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; gdm-autologin.text = '' diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 35b715b98fcd0375d538954347b90b79b30d23a5..2a71d23386072902efe8150a80c2e4042a4df5d2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome_themes_standard; - defaultText = "pkgs.gnome3.gnome_themes_standard"; + default = pkgs.gnome3.gnome-themes-standard; + defaultText = "pkgs.gnome3.gnome-themes-standard"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index b5e936830918da2dc6e92481f7528eed3d010a5d..9d30155a72348d9c24b3dc1ee492ae0559f03fea 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -9,6 +9,10 @@ let xEnv = config.systemd.services."display-manager".environment; cfg = dmcfg.lightdm; + dmDefault = xcfg.desktopManager.default; + wmDefault = xcfg.windowManager.default; + hasDefaultUserSession = dmDefault != "none" || wmDefault != "none"; + inherit (pkgs) stdenv lightdm writeScript writeText; # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup @@ -54,14 +58,13 @@ let autologin-user-timeout = ${toString cfg.autoLogin.timeout} autologin-session = ${defaultSessionName} ''} + ${optionalString hasDefaultUserSession '' + user-session=${defaultSessionName} + ''} ${cfg.extraSeatDefaults} ''; - defaultSessionName = - let - dm = xcfg.desktopManager.default; - wm = xcfg.windowManager.default; - in dm + optionalString (wm != "none") ("+" + wm); + defaultSessionName = dmDefault + optionalString (wmDefault != "none") ("+" + wmDefault); in { # Note: the order in which lightdm greeter modules are imported @@ -179,6 +182,14 @@ in default session: ${defaultSessionName} is not valid. ''; } + { assertion = hasDefaultUserSession -> elem defaultSessionName dmcfg.session.names; + message = '' + services.xserver.desktopManager.default and + services.xserver.windowMananger.default are not set to valid + values. The current default session: ${defaultSessionName} + is not valid. + ''; + } { assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0); message = '' LightDM can only run without greeter if automatic login is enabled and the timeout for it diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index c2ac731d433d1feb0f37cbadd9203ca033a99809..8c9b35fe524f74d2a65a72a48d9974662cc83ab6 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -117,14 +117,7 @@ in config = { - system.activationScripts.stdio = - '' - # Needed by some programs. - ln -sfn /proc/self/fd /dev/fd - ln -sfn /proc/self/fd/0 /dev/stdin - ln -sfn /proc/self/fd/1 /dev/stdout - ln -sfn /proc/self/fd/2 /dev/stderr - ''; + system.activationScripts.stdio = ""; # obsolete system.activationScripts.var = '' diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index cdeff48459486e58607ffa58c332a1fde62b0495..8b3dc2d90eb333abbd7362a8a1a230ff5b50a897 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -118,7 +118,7 @@ in echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} + dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} ''; boot.initrd.secrets = diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index eefee5a479e7231d6fca6ce98589035c70d60443..54dfb53fd30ffba7c716ca46a89a86e31225cc6d 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,7 +5,7 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; '' + openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; '' # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { @@ -43,8 +43,17 @@ let open_normally() { echo luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \ ${optionalString (header != null) "--header=${header}"} \ - ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"} \ > /.luksopen_args + ${optionalString (keyFile != null) '' + ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"} + echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ + >> /.luksopen_args + ${optionalString fallbackToPassword '' + else + echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" + fi + ''} + ''} cryptsetup-askpass rm /.luksopen_args } @@ -228,10 +237,6 @@ in [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" - # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged - # remove once 'modprobe --show-depends xts' shows ecb as a dependency - "ecb" - (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' @@ -328,6 +333,16 @@ in ''; }; + fallbackToPassword = mkOption { + default = false; + type = types.bool; + description = '' + Whether to fallback to interactive passphrase prompt if the keyfile + cannot be found. This will prevent unattended boot should the keyfile + go missing. + ''; + }; + yubikey = mkOption { default = null; description = '' @@ -441,7 +456,10 @@ in # Some modules that may be needed for mounting anything ciphered # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] - ++ luks.cryptoModules; + ++ luks.cryptoModules + # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged + # remove once 'modprobe --show-depends xts' shows ecb as a dependency + ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []); # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index b915a98d5375b01e2c590d742967087fe2842683..dee0ab470c992f94367a221b1e446bc8d9af04b8 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -54,7 +54,7 @@ with lib; environment.systemPackages = [ pkgs.kmod ]; - system.activationScripts.modprobe = + system.activationScripts.modprobe = stringAfter ["specialfs"] '' # Allow the kernel to find our wrapped modprobe (which searches # in the right location in the Nix store for kernel modules). diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 46aed44bf10fc8796c0cb8fec486e48ab3d7be60..9d2c580d62a7d955fec691063611362a02efa8c4 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -82,7 +82,6 @@ ln -s /proc/mounts /etc/mtab mkdir -m 01777 -p /tmp mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \ /run/lock /home /bin # for the /bin/sh symlink -install -m 0700 -d /root # Miscellaneous boot time cleanup. diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index fc0409e9ec770353a0837f9eb29c151c79d4c984..36ca7f356d442f1c8de177242e17090aee4738a3 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -3,9 +3,7 @@ with lib; let - - prl-tools = config.boot.kernelPackages.prl-tools; - + prl-tools = config.hardware.parallels.package; in { @@ -22,6 +20,26 @@ in ''; }; + autoMountShares = mkOption { + type = types.bool; + default = true; + description = '' + Control prlfsmountd service. When this service is running, shares can not be manually + mounted through `mount -t prl_fs ...` as this service will remount and trample any set options. + Recommended to enable for simple file sharing, but extended share use such as for code should + disable this to manually mount shares. + ''; + }; + + package = mkOption { + type = types.package; + default = config.boot.kernelPackages.prl-tools; + defaultText = "config.boot.kernelPackages.prl-tools"; + example = literalExample "config.boot.kernelPackages.prl-tools"; + description = '' + Defines which package to use for prl-tools. Override to change the version. + ''; + }; }; }; @@ -67,7 +85,7 @@ in }; }; - systemd.services.prlfsmountd = { + systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { description = "Parallels Shared Folders Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = rec { diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 2b532c70763fa95ca9e17df12219c2653b434cec..4bfb9a423f7d526457bf153903a09ae414dbf5ba 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -50,6 +50,10 @@ in rec { separateBoot simple; }; + boot = { + inherit (nixos'.tests.boot) + biosCdrom; + }; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index 3f6766ad59b84ccb7eabe284c36b762db260125d..1db2da511441fd2d1e961662aed7c64933fba65d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,7 +228,9 @@ in rec { tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.borgbackup = callTest tests/borgbackup.nix {}; + tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; + tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {}; tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; @@ -272,6 +274,7 @@ in rec { tests.hibernate = callTest tests/hibernate.nix {}; tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; + tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; tests.i3wm = callTest tests/i3wm.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; tests.installer = callSubTests tests/installer.nix {}; @@ -318,10 +321,12 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; tests.nghttpx = callTest tests/nghttpx.nix { }; + tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { }; tests.novacomd = callTestOnTheseSystems ["x86_64-linux"] tests/novacomd.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; + tests.openldap = callTest tests/openldap.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = callTestOnTheseSystems ["x86_64-linux"] tests/panamax.nix {}; @@ -336,7 +341,6 @@ in rec { tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; tests.proxy = callTest tests/proxy.nix {}; - tests.pumpio = callTest tests/pump.io.nix {}; # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.rabbitmq = callTest tests/rabbitmq.nix {}; @@ -352,6 +356,7 @@ in rec { tests.snapper = callTest tests/snapper.nix {}; tests.statsd = callTest tests/statsd.nix {}; tests.sudo = callTest tests/sudo.nix {}; + tests.systemd = callTest tests/systemd.nix {}; tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; @@ -361,6 +366,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; + tests.xrdp = callTest tests/xrdp.nix {}; tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index fc52cd09f2095da4c93832d667cba4ab9265fd4d..301d9d0f817f84fb760844c6682aeb50f7cf1b4d 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -24,6 +24,12 @@ let my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' }); $machine->start; $machine->waitForUnit("multi-user.target"); + $machine->succeed("nix verify -r --no-trust /run/current-system"); + + # Test whether the channel got installed correctly. + $machine->succeed("nix-instantiate --dry-run '' -A hello"); + $machine->succeed("nix-env --dry-run -iA nixos.procps"); + $machine->shutdown; ''; }; diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix new file mode 100644 index 0000000000000000000000000000000000000000..b9993062c079adcd4e7e303e851a86f30b78ccca --- /dev/null +++ b/nixos/tests/ceph.nix @@ -0,0 +1,140 @@ +import ./make-test.nix ({pkgs, ...}: rec { + name = "All-in-one-basic-ceph-cluster"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lejonet ]; + }; + + nodes = { + aio = { config, pkgs, ... }: { + virtualisation = { + emptyDiskImages = [ 20480 20480 ]; + vlans = [ 1 ]; + }; + + networking = { + firewall.allowPing = true; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + xfsprogs + ]; + nixpkgs.config.packageOverrides = super: { + ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; }); + }; + + boot.kernelModules = [ "xfs" ]; + + services.ceph.enable = true; + services.ceph.global = { + fsid = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monInitialMembers = "aio"; + monHost = "192.168.1.1"; + }; + + services.ceph.mon = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.mgr = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.osd = { + enable = true; + daemons = [ "0" "1" ]; + }; + }; + }; + + testScript = { nodes, ... }: '' + startAll; + + $aio->waitForUnit("network.target"); + + # Create the ceph-related directories + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/mgr/ceph-aio/", + "mkdir -p /var/lib/ceph/mon/ceph-aio/", + "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/", + "chown ceph:ceph -R /var/lib/ceph/" + ); + + # Bootstrap ceph-mon daemon + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd", + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "touch /var/lib/ceph/mon/ceph-aio/done", + "systemctl start ceph-mon-aio" + ); + $aio->waitForUnit("ceph-mon-aio"); + + # Can't check ceph status until a mon is up + $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); + + # Start the ceph-mgr daemon, it has no deps and hardly any setup + $aio->mustSucceed( + "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring", + "systemctl start ceph-mgr-aio" + ); + $aio->waitForUnit("ceph-mgr-aio"); + $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'"); + + # Bootstrap both OSDs + $aio->mustSucceed( + "mkfs.xfs /dev/vdb", + "mkfs.xfs /dev/vdc", + "mount /dev/vdb /var/lib/ceph/osd/ceph-0", + "mount /dev/vdc /var/lib/ceph/osd/ceph-1", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==", + "echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -", + "echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -" + ); + + # Initialize the OSDs with regular filestore + $aio->mustSucceed( + "ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9", + "ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5", + "chown -R ceph:ceph /var/lib/ceph/osd", + "systemctl start ceph-osd-0", + "systemctl start ceph-osd-1" + ); + + $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'"); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + + $aio->mustSucceed( + "ceph osd pool create aio-test 100 100", + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool rename aio-test aio-other-test", + "ceph osd pool ls | grep 'aio-other-test'", + "ceph -s | grep '1 pools, 100 pgs'", + "ceph osd getcrushmap -o crush", + "crushtool -d crush -o decrushed", + "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush", + "crushtool -c modcrush -o recrushed", + "ceph osd setcrushmap -i recrushed", + "ceph osd pool set aio-other-test size 2" + ); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + $aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'"); + $aio->mustFail( + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it" + ); + ''; +}) diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4f30f01e403224460d727e85813ce424ce3aa930 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/default.nix @@ -0,0 +1,15 @@ +import ../make-test.nix ({ pkgs, ...} : { + name = "test-hocker-fetchdocker"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ixmatus ]; + }; + + machine = import ./machine.nix; + + testScript = '' + startAll; + + $machine->waitForUnit("sockets.target"); + $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest"); + ''; +}) diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixos/tests/hocker-fetchdocker/hello-world-container.nix new file mode 100644 index 0000000000000000000000000000000000000000..a127875264e95f94617f00c28427244ef3fc2626 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/hello-world-container.nix @@ -0,0 +1,19 @@ +{ fetchDockerConfig, fetchDockerLayer, fetchdocker }: +fetchdocker rec { + name = "hello-world"; + registry = "https://registry-1.docker.io/v2/"; + repository = "library"; + imageName = "hello-world"; + tag = "latest"; + imageConfig = fetchDockerConfig { + inherit tag registry repository imageName; + sha256 = "1ivbd23hyindkahzfw4kahgzi6ibzz2ablmgsz6340vc6qr1gagj"; + }; + imageLayers = let + layer0 = fetchDockerLayer { + inherit registry repository imageName; + layerDigest = "ca4f61b1923c10e9eb81228bd46bee1dfba02b9c7dac1844527a734752688ede"; + sha256 = "1plfd194fwvsa921ib3xkhms1yqxxrmx92r2h7myj41wjaqn2kya"; + }; + in [ layer0 ]; + } diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix new file mode 100644 index 0000000000000000000000000000000000000000..12c58a01224322add8698a305eda5cbf8d5c09d0 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -0,0 +1,26 @@ +{ config, pkgs, ... }: +{ nixpkgs.config.packageOverrides = pkgs': { + hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; + }; + + virtualisation.docker = { + enable = true; + package = pkgs.docker; + }; + + systemd.services.docker-load-fetchdocker-image = { + description = "Docker load hello-world-container"; + wantedBy = [ "multi-user.target" ]; + wants = [ "docker.service" "local-fs.target" ]; + after = [ "docker.service" "local-fs.target" ]; + + script = '' + ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load + ''; + + serviceConfig = { + Type = "oneshot"; + }; + }; +} + diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 637cbb45709d65350c40ba02b88b439f94a030b2..c12919540a30c49282def657782a57c800811b48 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -145,7 +145,7 @@ let # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon) $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2"); - # We need to a writable nix-store on next boot. + # We need a writable Nix store on next boot. $machine->copyFileFromHost( "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); @@ -195,8 +195,7 @@ let }; nodes = { - # The configuration of the machine used to run "nixos-install". It - # also has a web server that simulates cache.nixos.org. + # The configuration of the machine used to run "nixos-install". machine = { config, lib, pkgs, ... }: @@ -208,7 +207,6 @@ let virtualisation.diskSize = 8 * 1024; virtualisation.memorySize = 1024; - virtualisation.writableStore = true; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is @@ -245,6 +243,11 @@ let ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; nix.binaryCaches = mkForce [ ]; + nix.extraOptions = + '' + hashed-mirrors = + connect-timeout = 1 + ''; }; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 6de17518214c68e812b9987a1ba8a57bd70297cc..4fd9466dc5027a06e157a81506475dd491ae33f9 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,11 +1,13 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test.nix ({ pkgs, ...} : rec { name = "misc"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco chaoflow ]; }; + foo = pkgs.writeText "foo" "Hello World"; + machine = { config, lib, pkgs, ... }: with lib; @@ -27,10 +29,17 @@ import ./make-test.nix ({ pkgs, ...} : { security.sudo = { enable = true; wheelNeedsPassword = false; }; boot.kernel.sysctl."vm.swappiness" = 1; boot.kernelParams = [ "vsyscall=emulate" ]; + system.extraDependencies = [ foo ]; }; testScript = '' + subtest "nix-db", sub { + my $json = $machine->succeed("nix path-info --json ${foo}"); + $json =~ /"narHash":"sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5"/ or die "narHash not set"; + $json =~ /"narSize":128/ or die "narSize not set"; + }; + subtest "nixos-version", sub { $machine->succeed("[ `nixos-version | wc -w` = 2 ]"); }; diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa366d8612d723e101e3baaf1afb73dbd21ca8f0 --- /dev/null +++ b/nixos/tests/nix-ssh-serve.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; + ssh-config = builtins.toFile "ssh.conf" '' + UserKnownHostsFile=/dev/null + StrictHostKeyChecking=no + ''; +in + { name = "nix-ssh-serve"; + meta.maintainers = [ lib.maintainers.shlevy ]; + nodes = + { server.nix.sshServe = + { enable = true; + keys = [ snakeOilPublicKey ]; + protocol = "ssh-ng"; + }; + server.nix.package = pkgs.nixUnstable; + client.nix.package = pkgs.nixUnstable; + }; + testScript = '' + startAll; + + $client->succeed("mkdir -m 700 /root/.ssh"); + $client->copyFileFromHost("${ssh-config}", "/root/.ssh/config"); + $client->succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa"); + $client->succeed("chmod 600 /root/.ssh/id_ecdsa"); + + $client->succeed("nix-store --add /etc/machine-id > mach-id-path"); + + $server->waitForUnit("sshd"); + + $client->fail("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + # Currently due to shared store this is a noop :( + $client->succeed("nix copy --to ssh-ng://nix-ssh\@server \$(cat mach-id-path)"); + $client->succeed("nix-store --realise \$(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh\@server"); + $client->succeed("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + ''; + } +) diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix new file mode 100644 index 0000000000000000000000000000000000000000..1178701c609e94aebd5159545064fecb47f967c4 --- /dev/null +++ b/nixos/tests/openldap.nix @@ -0,0 +1,35 @@ +import ./make-test.nix { + name = "dovecot"; + + machine = { pkgs, ... }: { + services.openldap = { + enable = true; + extraConfig = '' + include ${pkgs.openldap}/etc/schema/core.schema + include ${pkgs.openldap}/etc/schema/cosine.schema + include ${pkgs.openldap}/etc/schema/inetorgperson.schema + include ${pkgs.openldap}/etc/schema/nis.schema + database bdb + suffix dc=example + directory /var/db/openldap + rootdn cn=root,dc=example + rootpw notapassword + ''; + declarativeContents = '' + dn: dc=example + objectClass: domain + dc: example + + dn: ou=users,dc=example + objectClass: organizationalUnit + ou: users + ''; + }; + }; + + testScript = '' + $machine->succeed('systemctl status openldap.service'); + $machine->waitForUnit('openldap.service'); + $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"'); + ''; +} diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 2915449968897da557a4557008ef397fd5b55852..b2d254e9d9d942cfee5ef5270dd20788dcad03f7 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -1,20 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: -let - snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' - -----BEGIN EC PRIVATE KEY----- - MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 - AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN - r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== - -----END EC PRIVATE KEY----- - ''; - - snakeOilPublicKey = pkgs.lib.concatStrings [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" - "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" - "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" - ]; - +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; in { name = "openssh"; meta = with pkgs.stdenv.lib.maintainers; { diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix deleted file mode 100644 index 0991ed3fce1fdc0ba26458f376b8db53fbbc2256..0000000000000000000000000000000000000000 --- a/nixos/tests/pump.io.nix +++ /dev/null @@ -1,89 +0,0 @@ -# This test runs pump.io with mongodb, listing on port 443. - -import ./make-test.nix ({ pkgs, ...} : let - snakeOilKey = '' - -----BEGIN PRIVATE KEY----- - MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqVemio78R41Tz - MnR2zFD/wFT0iScOpFkuytNmuPf28FLaa9wSBWmuAGbEi7wBIfw8/bUqFBTQp2G1 - m1cmcCKxhmvvOkGs89eM131s1lW/bXU3zYso4e7724kHwU65jRlQs6cFWIlmW7V5 - 3HQobP05dy+zPpujPPSlOQ0qYViR1s+RgZI8r0wS2ZDsliNtQwBLJSIvX6XVnXLo - F/HmF4/ySJ9pL2AxQXCwZE8SfCzHpArs9COIqTaAuwB79kxWSFQJewmab74BXiM6 - 9FMCtHON24Pl7OR9sRJHH8rMEzUumppmUeCNEzABjzQQ7svR18cmbzRWetp0tT9Y - 7rj6URHHAgMBAAECggEAGmbCldDnlrAzxJY3cwpsK5f2EwkHIr/aiuQpLCzTUlUh - onVBYRGxtaSeSSyXcV2BKTrxz5nZOBYZkPqI4Y5T8kwxgpz2/QW2jUABUtNN6yPe - HU4gma+bSTJX5PnTZ/M0z0tpQezdLx5b3I2M+48ZGMUegZvcp8qU6N8U6VK5VbFD - DMTGL4b+Kc9HScRkCJjU3FfQcqf9Ml5w9jzHSeHImYEDrG0nX8N8EImRCBXbgxCl - 5XT1h6LFUGdr+N6n2w56+6l8OZZVmwj1NdF6NJybUQl4Y7b0niA+5czzjRt/YUjZ - HW0fXmx3XlbYGWYdMdS+VaIW6pkUpm8kZkqjngqLwQKBgQDfhbFQmg9lsJQ8/dQZ - WzRNsozHKWkQiZbW5sXBWygJbAB3Hc8gvQkuZe9TVyF99cznRj6ro6pGZjP0rTdY - 3ACTL+ygRArcIR6VsJCIr6nPvBLpOoNb8TQeKPmHC2gnSP9zaT/K2lldYISKNaYQ - 0seB2gvZhIgMgWtZtmb3jdgl9wKBgQDDFdknXgvFgB+y96//9wTu2WWuE5yQ5yB7 - utAcHNO9rx5X1tJqxymYh+iE8HUN25By+96SpNMQFI+0wNGVB00YWNBKtyepimWN - EUCojTy+MIXIjrLcvviEePsI4TPWYf8XtZeiYtcczYrt/wPQUYaDb8LBRfpIfmhr - rCGW93s+sQKBgEDOKTeeQyKPjJsWWL01RTfVsZ04s155FcOeyu0heb0plAT1Ho12 - YUgTg8zc8Tfs4QiYxCjNXdvlW+Dvq6FWv8/s0CUzNRbXf1+U/oKys4AoHi+CqH0q - tJqd9KKjuwHQ10dl13n/znMVPbg4j7pG8lMCnfblxvAhQbeT+8yAUo/HAoGBAL3t - /n4KXNGK3NHDvXEp0H6t3wWsiEi3DPQJO+Wy1x8caCFCv5c/kaqz3tfWt0+njSm1 - N8tzdx13tzVWaHV8Jz3l8dxcFtxEJnxB6L5wy0urOAS7kT3DG3b1xgmuH2a//7fY - jumE60NahcER/2eIh7pdS7IZbAO6NfVmH0m4Zh/xAoGAbquh60sAfLC/1O2/4Xom - PHS7z2+TNpwu4ou3nspxfigNQcTWzzzTVFLnaTPg+HKbLRXSWysjssmmj5u3lCyc - S2M9xuhApa9CrN/udz4gEojRVsTla/gyLifIZ3CtTn2QEQiIJEMxM+59KAlkgUBo - 9BeZ03xTaEZfhVZ9bEN30Ak= - -----END PRIVATE KEY----- - ''; - - snakeOilCert = '' - -----BEGIN CERTIFICATE----- - MIICvjCCAaagAwIBAgIJANhA6+PPhomZMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV - BAMMDGIwOTM0YWMwYWZkNTAeFw0xNTExMzAxNzQ3MzVaFw0yNTExMjcxNzQ3MzVa - MBcxFTATBgNVBAMMDGIwOTM0YWMwYWZkNTCCASIwDQYJKoZIhvcNAQEBBQADggEP - ADCCAQoCggEBAKpV6aKjvxHjVPMydHbMUP/AVPSJJw6kWS7K02a49/bwUtpr3BIF - aa4AZsSLvAEh/Dz9tSoUFNCnYbWbVyZwIrGGa+86Qazz14zXfWzWVb9tdTfNiyjh - 7vvbiQfBTrmNGVCzpwVYiWZbtXncdChs/Tl3L7M+m6M89KU5DSphWJHWz5GBkjyv - TBLZkOyWI21DAEslIi9fpdWdcugX8eYXj/JIn2kvYDFBcLBkTxJ8LMekCuz0I4ip - NoC7AHv2TFZIVAl7CZpvvgFeIzr0UwK0c43bg+Xs5H2xEkcfyswTNS6ammZR4I0T - MAGPNBDuy9HXxyZvNFZ62nS1P1juuPpREccCAwEAAaMNMAswCQYDVR0TBAIwADAN - BgkqhkiG9w0BAQsFAAOCAQEAd2w9rxi6qF9WV8L3rHnTE7uu0ldtdgJlCASx6ouj - TleOnjfEg+kH8r8UbmRV5vsTDn1Qp5JGDYxfytRUQwLb1zTLde0xotx37E3LY8Wr - sD6Al4t8sHywB/hc5dy29TgG0iyG8LKZrkwytLvDZ814W3OwpN2rpEz6pdizdHNn - jsoDEngZiDHvLjIyE0cDkFXkeYMGXOnBUeOcu4nfu4C5eKs3nXGGAcNDbDRIuLoE - BZExUBY+YSs6JBvh5tvRqLVW0Dz0akEcjb/jhwS2LmDip8Pdoxx4Q1jPKEu38zrr - Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w== - -----END CERTIFICATE----- - ''; -in { - name = "pumpio"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ rvl ]; - }; - - nodes = { - one = - { config, pkgs, ... }: - { - services = { - pumpio = { - port = 443; - enable = true; - sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; - sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; - secretFile = pkgs.writeText "secretFile" "test123"; - site = "test"; - }; - mongodb.enable = true; - mongodb.extraConfig = '' - storage.journal.enabled: false - ''; - }; - systemd.services.mongodb.unitConfig.Before = "pump.io.service"; - systemd.services."pump.io".unitConfig.Requires = "mongodb.service"; - }; - }; - - testScript = '' - startAll; - - $one->waitForUnit("pump.io.service"); - $one->waitUntilSucceeds("curl -k https://localhost"); - ''; -}) diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix new file mode 100644 index 0000000000000000000000000000000000000000..07d422196efa70f598d21d5a7010d37691d88890 --- /dev/null +++ b/nixos/tests/ssh-keys.nix @@ -0,0 +1,15 @@ +pkgs: +{ snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' + -----BEGIN EC PRIVATE KEY----- + MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 + AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN + r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== + -----END EC PRIVATE KEY----- + ''; + + snakeOilPublicKey = pkgs.lib.concatStrings [ + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" + "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" + ]; +} diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix new file mode 100644 index 0000000000000000000000000000000000000000..2df6f341c4efe8976eb6e127089ee0002cfc242b --- /dev/null +++ b/nixos/tests/systemd.nix @@ -0,0 +1,66 @@ +import ./make-test.nix { + name = "systemd"; + + machine = { lib, ... }: { + imports = [ common/user-account.nix common/x11.nix ]; + + virtualisation.emptyDiskImages = [ 512 ]; + + fileSystems = lib.mkVMOverride { + "/test-x-initrd-mount" = { + device = "/dev/vdb"; + fsType = "ext2"; + autoFormat = true; + noCheck = true; + options = [ "x-initrd.mount" ]; + }; + }; + + systemd.extraConfig = "DefaultEnvironment=\"XXX_SYSTEM=foo\""; + systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\""; + services.journald.extraConfig = "Storage=volatile"; + services.xserver.displayManager.auto.user = "alice"; + + systemd.services.testservice1 = { + description = "Test Service 1"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_SYSTEM" = foo ]; then + touch /system_conf_read + fi + ''; + }; + + systemd.user.services.testservice2 = { + description = "Test Service 2"; + wantedBy = [ "default.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_USER" = bar ]; then + touch "$HOME/user_conf_read" + fi + ''; + }; + }; + + testScript = '' + $machine->waitForX; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35415 + subtest "configuration files are recognized by systemd", sub { + $machine->succeed('test -e /system_conf_read'); + $machine->succeed('test -e /home/alice/user_conf_read'); + $machine->succeed('test -z $(ls -1 /var/log/journal)'); + }; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35268 + subtest "file system with x-initrd.mount is not unmounted", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + # If the file system was unmounted during the shutdown the file system + # has a last mount time, because the file system wasn't checked. + $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); + }; + ''; +} diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 63c45b3ba07fe7d35ba99bbfa536ca7a885d7239..0acd616eeaffcf73763447c82de317ca1bacd3fd 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil"; + sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment. + platforms = platforms.linux; }; } diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index ff0f2407cfec2ee6c22a3852738dbbacb4bbb7a6..b2f2a457a99d6861ea560c949968468c259c78bb 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -2,26 +2,26 @@ , openssl, db48, boost, zlib, miniupnpc , qrencode, glib, protobuf, yasm, libevent , utillinux -, enable_Upnp ? false +, enable_Upnp ? false , disable_Wallet ? false , disable_Daemon ? false }: with stdenv.lib; stdenv.mkDerivation rec { name = "dashpay-${version}"; - version = "0.12.1.3"; + version = "0.12.2.3"; src = fetchFromGitHub { owner = "dashpay"; repo= "dash"; rev = "v${version}"; - sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj"; + sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ glib openssl db48 yasm boost zlib libevent + buildInputs = [ glib openssl db48 yasm boost zlib libevent miniupnpc protobuf qrencode utillinux ]; - + configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ] ++ optional enable_Upnp "--enable-upnp-default" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { with instant transactions. It allows you to keep your finances private as you make transactions without waits, similar to cash. ''; - homepage = http://dashpay.io; + homepage = https://www.dash.org; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a8c4a7f1021d1cc33202a21c042823d4c75252c --- /dev/null +++ b/pkgs/applications/altcoins/dcrd.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: + +buildGoPackage rec { + name = "dcrd-${version}"; + version = "1.1.2"; + rev = "refs/tags/v${version}"; + goPackagePath = "github.com/decred/dcrd"; + + buildInputs = [ go git dep cacert ]; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0xcynipdn9zmmralxj0hjrwyanvhkwfj2b1vvjk5zfc95s2xc1q9"; + }; + + preBuild = '' + export CWD=$(pwd) + cd go/src/github.com/decred/dcrd + dep ensure + go install . ./cmd/... + cd $CWD + ''; + + meta = { + homepage = "https://decred.org"; + description = "Decred daemon in Go (golang)"; + license = with lib.licenses; [ isc ]; + }; +} diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa6e8a0315e75dcc559c6bf5102dab7cbd38ada9 --- /dev/null +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: + +buildGoPackage rec { + name = "dcrwallet-${version}"; + version = "1.1.2"; + rev = "refs/tags/v${version}"; + goPackagePath = "github.com/decred/dcrwallet"; + + buildInputs = [ go git dep cacert ]; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "058im4vmcmxcl5ir14h17wik5lagp2ay0p8qc3r99qmpfwvvz39x"; + }; + + preBuild = '' + export CWD=$(pwd) + cd go/src/github.com/decred/dcrwallet + dep ensure + ''; + + buildPhase = '' + runHook preBuild + go build + ''; + + installPhase = '' + mkdir -pv $bin/bin + cp -v dcrwallet $bin/bin + ''; + + + meta = { + homepage = "https://decred.org"; + description = "Decred daemon in Go (golang)"; + license = with lib.licenses; [ isc ]; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 37df75ae110e08d2fe6fd30bd139e73e268e1685..a4caf8d4ef5d45a970fd7c5e536918963d361c21 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,11 +1,11 @@ -{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { aeon = callPackage ./aeon { }; - bitcoin = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; @@ -26,6 +26,9 @@ rec { dashpay = callPackage ./dashpay.nix { }; + dcrd = callPackage ./dcrd.nix { }; + dcrwallet = callPackage ./dcrwallet.nix { }; + dero = callPackage ./dero.nix { }; dogecoin = callPackage ./dogecoin.nix { withGui = true; }; @@ -56,9 +59,6 @@ rec { hevm = (haskellPackages.callPackage ./hevm.nix {}); - primecoin = callPackage ./primecoin.nix { withGui = true; }; - primecoind = callPackage ./primecoin.nix { withGui = false; }; - stellar-core = callPackage ./stellar-core.nix { }; sumokoin = callPackage ./sumokoin.nix { }; diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix index f3e24b6c015b9830f4168a5fe6c6f3a04967c049..33b60c453218d2ba21469e26ed7ec4f5354fa2b5 100644 --- a/pkgs/applications/altcoins/dero.nix +++ b/pkgs/applications/altcoins/dero.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dero-${version}"; - version = "0.11.3"; + version = "0.11.5"; src = fetchFromGitHub { owner = "deroproject"; repo = "dero"; rev = "v${version}"; - sha256 = "0cv4yg2lkmkdhlc3753gnbg1nzldk2kxwdyizwhvanq3ycqban4b"; + sha256 = "1i45z67rkmra968yi89j9mkwv7kdn1hq1761mnl2642pg7v3zvbd"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index e8fb1c49828eef8e64835018445fb9b2191d76cd..81b4cb52948f4abcb9e2e783e28a30134c8011ec 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "1.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "ethabi"; - rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; - sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; + rev = "v${version}"; + sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p"; }; - cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy"; + cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz"; cargoBuildFlags = ["--features cli"]; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix deleted file mode 100644 index f79d54d0ce268f1755e91df6202343bd4a190379..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/primecoin.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode -, withGui }: - -with stdenv.lib; -stdenv.mkDerivation rec{ - - name = "primecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.8.6"; - - src = fetchurl { - url = "https://github.com/primecoin/primecoin/archive/v${version}.tar.gz"; - sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3"; - }; - - qmakeFlags = ["USE_UPNP=-"]; - makeFlags = ["USE_UPNP=-"]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl db48 boost zlib utillinux protobuf ] - ++ optionals withGui [ qt4 qmake4Hook qrencode ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - preBuild = "unset AR;" - + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); - - installPhase = - if withGui - then "install -D bitcoin-qt $out/bin/primecoin-qt" - else "install -D bitcoind $out/bin/primecoind"; - - # `make build/version.o`: - # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. - enableParallelBuilding = false; - - meta = { - description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; - longDescription= '' - Primecoin is an innovative cryptocurrency, a form of digital - currency secured by cryptography and issued through a - decentralized mining market. Derived from Satoshi Nakamoto's - Bitcoin, Primecoin introduces an unique form of proof-of-work - based on prime numbers. - - The innovative prime proof-of-work in Primecoin not only - provides security and minting to the network, but also generates - a special form of prime number chains of interest to mathematical - research. Thus primecoin network is energy-multiuse, compared to - bitcoin. - ''; - homepage = http://primecoin.io/; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index 40fbf2ceb6a7bff54e055a0cdd0ad637b2645ef4..334ec9277e1b527d796bb6ae7a72cde8ce300a32 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1lbr7i3rznfp3h03y7pc094r0m992lbzr926rnr0xxbyp755wvm4"; + sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk"; }; nativeBuildInputs = [makeWrapper]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index ad12609429f5e4eb9e68f45c3bd25bbad9154bfb..d09a10a15b2c98d87f28cc151cbbd509972cddb8 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -28,6 +28,6 @@ in stdenv.mkDerivation rec { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index a22866dc031abd399578ce589c4dfbd93bae457b..32ae107ed9cb9d26e296b47b2f41f9e12d6ca268 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { name = "aacgain-1.9.0"; @@ -12,7 +12,19 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postPatch = '' + ( + cd mp4v2 + patch -p0 < ${fetchpatch { + name = "fix_missing_ptr_deref.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7"; + sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9"; + }} + ) + ''; + configurePhase = '' + runHook preConfigure cd mp4v2 ./configure @@ -21,9 +33,11 @@ stdenv.mkDerivation { cd .. ./configure + runHook postConfigure ''; buildPhase = '' + runHook preBuild cd mp4v2 make libmp4v2.la @@ -32,18 +46,18 @@ stdenv.mkDerivation { cd .. make + runHook postBuild ''; installPhase = '' - strip -s aacgain/aacgain - install -vD aacgain/aacgain "$out/bin/aacgain" + install -D aacgain/aacgain "$out/bin/aacgain" ''; - meta = { + meta = with stdenv.lib; { description = "ReplayGain for AAC files"; homepage = https://github.com/mulx/aacgain; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index afb3c8342731bd83a991585adca3b259208273be..a99fb80df7236070649806a55ae5eb05d3dfedbb 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, - libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify, libsoup, avahi, taglib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 expat intltool libgcrypt libunique gnutls - libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib ]; meta = { diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 99d6357e9216c4f3185f6fee00ab63367f388b4e..bb0615df25b86c52fb343485f239c51a486a0cf2 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.8"; + version = "2.9.2"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index e5e8640b4fd925ce9cfc9d085e5eeb64d23c4594..6890b53f407d17c07fddcd0bb8e206bdcb2857db 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib +, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b +, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , neon, faad2, lame, libnotify, libsidplayfp }: @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus-glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 - libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 + libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 lame libnotify libsidplayfp diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 353865e8ec0476d7750247ad93dd0db37ac451f6..8910fdc1b0a8e6997220f91c4f18cc0980d4fee8 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -3,7 +3,7 @@ gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, - libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug, + libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack @@ -46,7 +46,7 @@ mkDerivation { # Plugin dependencies alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb - libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli + libcdio libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 100bb1c54fd1e09e0afb2fea757f0e9e06809652..b0c47972e3856c40177a70f57c9a8b7104f15adc 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z"; + sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index affddd90784cfe02649618d5d40d1e69aa1ae2a4..92a33035c827af9ef2696f6ac0d5a30dea50fdd6 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: @@ -24,6 +24,11 @@ let # Required so as to avoid adding libspotify as a build dependency (as it is # unfree and thus would prevent us from having a free package). ./clementine-spotify-blob-remove-from-build.patch + (fetchpatch { + # Fix w/gcc7 + url = "https://github.com/clementine-player/Clementine/pull/5630.patch"; + sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4"; + }) ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ea0bce368a1ad8a1c65060a2e71be37ee1a38d87..be70443fd4dfa5656eb1795c08ff0c370922377f 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -30,7 +30,7 @@ assert gtk2Support || gtk3Support; assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; +assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] + ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac diff --git a/pkgs/applications/audio/deadbeef/plugins/opus.nix b/pkgs/applications/audio/deadbeef/plugins/opus.nix new file mode 100644 index 0000000000000000000000000000000000000000..55db00c15bf63836ed3f9cca88839aae03ccead1 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/opus.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }: + +stdenv.mkDerivation rec { + name = "deadbeef-opus-plugin-${version}"; + version = "0.8"; + + src = fetchFromBitbucket { + owner = "Lithopsian"; + repo = "deadbeef-opus"; + rev = "v${version}"; + sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${opusfile}/include/opus" + ]; + + buildInputs = [ deadbeef opusfile libopus libogg openssl ]; + + meta = with stdenv.lib; { + description = "Ogg Opus decoder plugin for the DeaDBeeF music player"; + homepage = https://bitbucket.org/Lithopsian/deadbeef-opus; + license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2 + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 6ed6d1ee86a08df19a3b8558126b9b1933bb3399..4ceafa1e52e89b7b1fb3490761a4debe37e42cbd 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg"; + sha256 = "0fwxrfyp15a4m77mzz4mwj36mhdrj646whlrkvcys33p2w75f8cq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index f9c9dc2faef05fb6eba7de5fa40a9d6bd508b85e..1ca2570fd4bdd18dc49339f2de7b6ece6bb5148a 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,35 +1,37 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome3 +, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas +, gnome3, wrapGAppsHook }: -stdenv.mkDerivation rec { - name = "easytag-${version}"; - majorVersion = "2.4"; - version = "${majorVersion}.3"; +let + pname = "easytag"; + version = "2.4.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw"; }; - preFixup = '' - wrapProgram $out/bin/easytag \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" - ''; - NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) + gsettings-desktop-schemas gnome3.defaultIconTheme ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "View and edit tags for various audio files"; - homepage = http://projects.gnome.org/easytag/; + homepage = https://wiki.gnome.org/Apps/EasyTAG; license = licenses.gpl2Plus; maintainers = with maintainers; [ fuuzetsu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index ab28c43f66cf9b0f4525b1ebff20ed429046b6ed..cc453347aea4cbca6e01228de6ca3cb9be17641f 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "2.1.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz"; + sha256 = "0l0xbzpy4nnr08z7gqvb4ngrjwzpspa382cbcrpkya3nd40987kr"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 50689886fdd2e557ee947055df196d1f75c6a692..789ee35f260ea899b901045a96227fb61110fe0f 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd"; + sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 2d63245fef6388b8f34ccb6d589e3bb8b5de511c..42285ba4bf862af5d0a2a0641ea2f22bb32f0f5e 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 4bd57e15fe5fd1cf24a13f15a9870cc235c72013..c2adc58f9ce564d99c780ad701f42ad52923c844 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook +, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup - libunique libmpd libSM libICE sqlite hicolor_icon_theme + libunique libmpd libSM libICE sqlite hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 8c2987352fbb7d271bfb9a70548c829ce54dfda1..d111502651ed2a14abaa1e56ed9de798213c7826 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig , gcc , python3 -, gsettings_desktop_schemas -, desktop_file_utils +, gsettings-desktop-schemas +, desktop-file-utils , glib , gtk3 , intltool , libsoup -, json_glib +, json-glib , wrapGAppsHook , meson , ninja @@ -44,15 +44,15 @@ in stdenv.mkDerivation rec { glib intltool libsoup - json_glib + json-glib gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - desktop_file_utils - gsettings_desktop_schemas + desktop-file-utils + gsettings-desktop-schemas ] ++ gst_plugins; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 7ebdce7835275610aed2ca487d9907a173ea6064..39cd1a444fa8fced7e92105bde5860f142f9e978 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, - libvorbis, hicolor_icon_theme, gdk_pixbuf }: + libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome.gdl gnome.defaultIconTheme - hicolor_icon_theme ]; + hicolor-icon-theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gtkpod" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index dcb61119ae76a04324508257937036e363a57da0..bcb301687089eadb777606b6e33020da234862f7 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 +, avahi, bluez, boost, eigen, fftw, glib, glib-networking +, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom , wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf + avahi bluez boost eigen fftw glib glibmm glib-networking.out + gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index b5197af64092909ca390b49832d2c952486a4718..24421b527e166666e5856060b5fd39319e03da11 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.4.2"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "0gka4na583015jyqva18g85q7vnkjdk0iji2jp88di3kpvqhf1sw"; + sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index d6ba094f45843f6c16d542f11b102eb460c25163..d16107e4c292a1c8daf93c78199da6c55fa6814c 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -2,12 +2,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.2"; + version = "0.9.3"; name = "meterbridge-${version}"; src = fetchurl { url = "http://plugin.org.uk/meterbridge/${name}.tar.gz"; - sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k"; + sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz"; }; patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 219b04b4ec41eb1674732d11e2ca9b67aae68552..cb99f9b5dbe50a49cd3d954635023054dce27a92 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -1,23 +1,26 @@ { stdenv, pythonPackages, mopidy, mopidy-local-images }: pythonPackages.buildPythonApplication rec { - name = "mopidy-iris-${version}"; - version = "3.12.4"; + pname = "Mopidy-Iris"; + version = "3.14.0"; src = pythonPackages.fetchPypi { - inherit version; - pname = "Mopidy-Iris"; - sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87"; + inherit pname version; + sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb"; }; propagatedBuildInputs = [ mopidy mopidy-local-images - pythonPackages.configobj - pythonPackages.pylast - pythonPackages.spotipy - pythonPackages.raven - ]; + ] ++ (with pythonPackages; [ + configobj + pylast + spotipy + raven + ]); + + # no tests implemented + doCheck = false; meta = with stdenv.lib; { homepage = https://github.com/jaedb/Iris; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix index c8afd4c6290f8dbfb0ae7ebc3727601145ea2e99..3754bf763b20dcdda96d40d8c058e37861b1e345 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, pythonPackages, mopidy, glibcLocales }: +{ stdenv, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "mopidy-moped-${version}"; - version = "0.6.0"; + pname = "Mopidy-Moped"; + version = "0.7.1"; - src = fetchurl { - url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; - sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; }; LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ mopidy ]; + # no tests implemented doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 0cb076556c7085af19980d009f9698730f690be6..d55e711cf330259ac0d7d499bb5e375042231b50 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-mopify-${version}"; + pname = "Mopidy-Mopify"; + version = "1.6.1"; - version = "1.5.17"; - - src = fetchurl { - url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "1qi7f5i87ygn486gxc84njl22y84xrwabpz58y5a1hw7z1lp7l8s"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; + # no tests implemented doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 8541ec6e272766e3ed62f89998d58f5d0c269a14..ad280d382d02f0005c9cc109be5b9893f5b250a5 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook -, gst_all_1, glib_networking, gobjectIntrospection +, gst_all_1, glib-networking, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { @@ -18,12 +18,12 @@ pythonPackages.buildPythonApplication rec { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib_networking gobjectIntrospection + glib-networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests dbus-python - ]; + gst-python pygobject3 pykka tornado requests + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests doCheck = false; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 96b3533a6f5cac8a9f59666e9430c5a3ab01183d..ed7a4e786f07e1c0fe047fa12451cffbf0a34551 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ stdenv, fetchFromGitHub, ncurses, libvorbis }: stdenv.mkDerivation rec { version = "3.2.6"; @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + libvorbis + ]; buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 3561deb1c73666d2ee4cadf4591aa414cb503562..779374aaa08018f7f20d798dccdc402b36825e83 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0dyrllxgd74nknixjcz6n7m4gw70v246s8z1qss7zfl5yllhb712"; + sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index fa25a474c1dfaff21c4d6bb626142abdf266e97f..3e159c843843b966a57010d52dd6f09888d031cb 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "pamixer-${version}"; - version = "1.3"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz"; - sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx"; + sha256 = "1lsvb4xk1dq762w9c0jn7xvj3v1lzppql9mj1b55fhzdypbrkm6x"; }; buildInputs = [ boost libpulseaudio ]; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 58054070760bd79f75e22fc8c589ede34036e6c1..fe9ed12390a5bc73a0f8770ad2fab8abf85fb5ed 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus_glib, GConf, gconfmm, intltool }: +, dbus-glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { name = "paprefs-0.9.10"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ]; + buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 91a270a698e6e51ab8e080f1d3e81aaad85a036d..8425b48166e67fcb10811b2d59d423aef8ea4a15 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkgconfig, python2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 + alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 69db9d74ee3449f061fd04cb47b25626b651838f..d113b8a49b31305526b60787127f0df243dd6aee 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra_gtk3, makeWrapper, gnome3 }: +, libcanberra-gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 66f68c066c8891a82146cbe22260174902c3a1e4..677c60399e52169d3dee633f30dcb04a6c1073db 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,7 @@ { stdenv, python2Packages, fetchurl, gettext, chromaprint }: let - version = "1.4"; + version = "1.4.2"; pythonPackages = python2Packages; in pythonPackages.buildPythonApplication { name = "picard-${version}"; @@ -9,7 +9,7 @@ in pythonPackages.buildPythonApplication { src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; - sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6"; + sha256 = "0d12k40d9fbcn801gp5zdsgvjdrh4g97vda3ga16rmmvfwwfxbgh"; }; buildInputs = [ gettext ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 2bb2960afbf10ac5f9b84aed0cba488a95a309c4..94b240ebb0285f78ec7f22d016291d99e2c879f9 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "5.4.17"; + version = "6.0.37"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx"; + sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq"; }; configurePhase = '' diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 1e76e769937bba3164a251c99614bdf9c25757d8..7f5191a02c20831c11cecb5df9a8d55f50abac7f 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt4, alsaLib }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; name = "qmidiroute-${version}"; src = fetchurl { url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; - sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 88db09fac86b80fba5f8a3009508a4165690abdd..60c8f90b6d15029e59beccc20820628ff1225a97 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -11,7 +11,7 @@ , dbus , glibmm , gnome3 -, hicolor_icon_theme +, hicolor-icon-theme , libappindicator-gtk3 , libnotify , libxdg_basedir @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release wxGTK diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 534fd2f0edb12f5c6b064ec7db6b2453d49254b7..a23324c7fdacda9a7f786336ac81f817b4e6310c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -7,36 +7,35 @@ , libsoup , gnome3 , tdb -, json_glib +, json-glib , itstool , wrapGAppsHook , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "${major}.${minor}"; - major = "3.2"; - minor = "1"; - + pname = "rhythmbox"; + version = "3.4.2"; in stdenv.mkDerivation rec { - name = "rhythmbox-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/rhythmbox/${major}/${name}.tar.xz"; - sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + intltool perl perlPackages.XMLParser + itstool + wrapGAppsHook + ]; + buildInputs = [ python3 - perl - perlPackages.XMLParser - - intltool libsoup tdb - json_glib - itstool + json-glib gtk3 gnome3.libpeas @@ -45,12 +44,17 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base - - wrapGAppsHook ] ++ gst_plugins; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Rhythmbox; description = "A music playing application for GNOME"; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 5966d4253f51a6d64c251c5fe1d787554fd7a093..d881afa7f5f056ad15be1d51af2aa1d58cf6942e 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { - version = "17.04"; + version = "17.12.1"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq"; + sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg"; }; patchPhase = '' diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index a8a368054966fb16397a948db777a85aaccf47d9..c2c24c29a13e1128a44797e3fce27f6191555d16 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1gscwybsbaqbnylmgf2baf71cm2g7a0pd11rqmk3cz9hi3lyjric"; + sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 1932ec3d93bc0ec35b0658f7c1f1c408e50b32f7..3fe8ecfe54687c492612c2a3e5ee9fc90d4806f6 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-17.8"; + name = "snd-18.1"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf"; + sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index e91c08c30b77f3559cf0d071f797ba9b79f293eb..1afb36571bd910de625f7cdd43221a22ee6aa51b 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,8 +19,8 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + gnome3.gnome-themes-standard gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas ]; postPatch = '' @@ -28,7 +28,7 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gobjectIntrospection gtk3 pygobject3 diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index cbcdc0ecccd77815ce17b074a2a5007f966bb79d..c68f2cd4a35fa0f763ab7b855c44d75bbba1d03b 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero -, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , makeWrapper }: let @@ -16,8 +16,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 - gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes + buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3 + gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" done diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 35c5dff271066b2bb5898f009cc451253abc8bb0..9ac0c49ebc319eea377cecdffd15216f8c40d0eb 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.70.399.g5ffabd56-26"; + version = "1.0.69.336.g7edcc575-39"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; + sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 8385e1cc5a4d3ee01a3a613d8d8608e0aec410eb..651e56d0e8e37ec66985f3c64bd2abeaf0b1fe47 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0mvrqk6jy7h2wg442ixwm49w7x15rs4066c2ljrz4kvxlzp5z69i"; + sha256 = "141ah1gnv5r2k846v5ay15q9q90h01p74240a56vlxqh20z43g92"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 2203586c26e91c74a95562f3209b87ad8581b8c0..4140c5da5a459c196b4bb4536c8304fe2cee76a1 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -4,12 +4,12 @@ , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs4 ? null -, enableTelepathy ? false, telepathy_qt ? null +, enableTelepathy ? false, telepathy-qt ? null }: assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs4 != null; -assert enableTelepathy -> telepathy_qt != null; +assert enableTelepathy -> telepathy-qt != null; stdenv.mkDerivation rec { name = "tomahawk-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs4 - ++ stdenv.lib.optional enableTelepathy telepathy_qt; + ++ stdenv.lib.optional enableTelepathy telepathy-qt; postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 7382e84fa073956596412b3fad54ba1a5f8d4cf6..e46ffec39795871a37a13eb526cbac6df993af2a 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook -, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror -, appstream-glib, desktop_file_utils, duplicity +, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror +, appstream-glib, desktop-file-utils, duplicity }: stdenv.mkDerivation rec { @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala_0_38 gettext intltool itstool - appstream-glib desktop_file_utils libxml2 wrapGAppsHook + appstream-glib desktop-file-utils libxml2 wrapGAppsHook ]; buildInputs = [ libnotify gnome3.libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus - at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror ]; propagatedUserEnvPkgs = [ duplicity ]; diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 13740dd9dfdb22ed1478f18be4e34a6470906333..486a52ef6672e90cb1bf658f4ea9805f0d556dda 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor_icon_theme, makeWrapper +, hicolor-icon-theme, makeWrapper , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported , exo }: @@ -9,14 +9,14 @@ let ver_branch = "2.0"; - version = "2.0.3"; + version = "2.0.4"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "0c6v2myzqj8nzpcqyvbab7c66kwgcshw2chn5r6dhm7xrx19bcrx"; + sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 1c9c5bc78ef2579f84a532872f82845857cab91f..c7e1dfe27364b546731b14bd6e022105a968de92 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 6a5bc3e7b0f8ee8e516c2a7f6d35bdc9bee9a24d..23e4449ee2ebd315152cbb64b5524823ec5e2baf 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 +, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2 , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11 libXrender libXtst makeWrapper zlib ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index fef508bdf1e50719f439534e4e3e914bf05606ff..c69686a0967d4159711b7b4a21fd28ff7de89d02 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas +, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas , webkitgtk24x-gtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage @@ -15,7 +15,7 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2 + jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2 makeWrapper; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 4f82696efd580cb9f2c2d4f671f6c866caa15518..5d850614e9513a296c9d238395f4b4090006b014 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -409,11 +409,11 @@ rec { jsonedit = buildEclipsePlugin rec { name = "jsonedit-${version}"; - version = "1.0.1"; + version = "1.0.2"; srcFeature = fetchurl { url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; - sha256 = "19221409wzcsrlm2fqf6mrxzb5ip1x6y5ba8anw788p7aaz1w30k"; + sha256 = "0zh9ihvaji2v4d4980va8p1c38x5dn2mcw74qmqkwxlz4nglpsr0"; }; srcPlugins = @@ -425,13 +425,13 @@ rec { }; in map fetch [ - { n = "core"; h = "05ipjbh9yz97zhqaqq6cja3zz44n0dn40ms13qnlgf4bxyaf0f6w"; } - { n = "editor"; h = "1i71rh2fd5hsx6gygnafz2gjz4hlb0ckazxn0maxmnlx4p5apjql"; } - { n = "folding"; h = "13p8vqdna23ln82w1jgchm59375f1ky0p2b1v7jih55yfhw1ymam"; } - { n = "model"; h = "0llswhsd58f0rjb9canjncavq4z7q8zidn26yl5gradbbz580p6w"; } - { n = "outline"; h = "1rs8g0iv2kklbl7j0p6nr26m6ii89yyr9bpi05mh21xva40pzkl5"; } - { n = "preferences"; h = "0vs074ahhiba7if43ryf9m8xd81sqj9grppy0pzcnkkdkbk870n0"; } - { n = "text"; h = "0nqpzjw8hhvh9jlpldpmcmg83a170wjdabgsvjq207j12jkvfiqq"; } + { n = "core"; h = "0zc1jpda6sviazsgvvig8zk2zmz0ac1mch5qs8lbcbdmrpq732ni"; } + { n = "editor"; h = "06k2mx7ka0bn0i8dfbv89jna9kmy8wnlwkg9yp1n1pgqmr01944s"; } + { n = "folding"; h = "1525blyhrl495vz5r98dyfws6kcgnhmyf9qgm5vkplhb27474yca"; } + { n = "model"; h = "0rnnkdl3hrp0sxchfzfad97ya5swsw56wfb5zvjwffbby4vln8fd"; } + { n = "outline"; h = "06bday90a7sdpv4idp69m2831z3r99q248n2avw2npc3gzkfy3kl"; } + { n = "preferences"; h = "1d9pcnq6j5p2smkfldb9dw8gdw5nqlmpcy9kh5n34jcyzf37cdac"; } + { n = "text"; h = "0r3g2qhnhl6misi0rrmw152gw0nb7zlcjy7019qvprn9mhwn1n84"; } ]; propagatedBuildInputs = [ antlr-runtime_4_5 ]; @@ -509,16 +509,16 @@ rec { spotbugs = buildEclipsePlugin rec { name = "spotbugs-${version}"; - version = "3.1.1.r201712011030-903b7a0"; + version = "3.1.2.r201802250230-59118d9"; srcFeature = fetchurl { url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "12z5dbs10h5k567wbmwz1w4pnidmqsls52qcfdb3zlgr0rqvz072"; + sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4"; }; srcPlugin = fetchurl { url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "0dnkp2alymvyyql7g8w79i27b3c64inhdvpxx1v014ng9liv54xb"; + sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9ed028234a5187245e8e1e71799c18ece79d049a..ac50e829100a4a6881dfc07df8f03ceb353417b9 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -400,10 +400,10 @@ }) {}; company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.5.tar"; - sha256 = "1x9c5dw884rv0lvl24ggzdxp2k484w543azdiw55bw01635pg531"; + url = "https://elpa.gnu.org/packages/company-0.9.6.tar"; + sha256 = "0w1jqhs87g0sqhv2iw6a5i8f4yjkrc65fb3h6vyv11sb8kfnhda7"; }; packageRequires = [ emacs ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.5.4"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.5.4.tar"; - sha256 = "1k0makrk3p6hknpnr3kbiszqzw3rpw18gnx2m8scr9vv0wif4qmk"; + url = "https://elpa.gnu.org/packages/el-search-1.6.tar"; + sha256 = "18pv2l6rl8f9x0yjn4iyf6g94c0ly5mizqg0vxr3m420bkbyk95h"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -861,10 +861,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.16.tar"; - sha256 = "0c4w5k9lzqj8yzhdqipdb4fs7ld2qklc6s137104jnfdvmrwcv2i"; + url = "https://elpa.gnu.org/packages/exwm-0.17.tar"; + sha256 = "03vgrrrc1d3xr9ydl1ydvmqnvpnzg858dzdky2nd65h9ssyp2f5f"; }; packageRequires = [ xelb ]; meta = { @@ -2400,10 +2400,10 @@ xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.12.tar"; - sha256 = "0i9n0f3ibj4a5pwcsvwrah9m0fz32m0x6a9wsmjn3li20v8pcb81"; + url = "https://elpa.gnu.org/packages/xelb-0.13.tar"; + sha256 = "0sfygy6ihjwszhn6a81fz2yn70rr7vpygl7z49vz4rsd8s0fdgjc"; }; packageRequires = [ cl-generic emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 0bfdb6c11ce629e23d9b908f52e34a6d777ca7c1..a24cb9e4910ba2ba6d107f082c407e469ac41fbd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -740,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e0b857aa3d24b9efd1cf2ddc70c38b86a6dae75d"; - sha256 = "0jvhzyq8d779hx3xbizcqmkbsvxqsyy8m423ksmjlh3afwvq4n6g"; + rev = "56a18467de4bc1cf408a1910458e1819102312dd"; + sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20180222.224"; + version = "20180222.2209"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e0b857aa3d24b9efd1cf2ddc70c38b86a6dae75d"; - sha256 = "0jvhzyq8d779hx3xbizcqmkbsvxqsyy8m423ksmjlh3afwvq4n6g"; + rev = "56a18467de4bc1cf408a1910458e1819102312dd"; + sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; - sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1009,12 +1009,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20180101.1328"; + version = "20180224.2244"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "43d224546a2a557857294a8e3d13c4fe63508e03"; - sha256 = "0cw4br2nx4fa9jsal6b9gavffqjrhq2xgf87szi61dkgi2gacf7y"; + rev = "177e0f9a60ddca62cc44c2395b075cb230b26f4d"; + sha256 = "1rjxpjanyxfrx4dfsag6g647flxvw75vf0jh6y6y0w2jdiih919i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1076,8 +1076,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3"; - sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r"; + rev = "7b436a0d9e896463d00afbeb7e49a59cc6670e9c"; + sha256 = "0ma5hq0v4kczf7mn1wkqj9pxjy47wryd697gg37l4sszl6ylcs9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1176,12 +1176,12 @@ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "adafruit-wisdom"; - version = "20180208.2316"; + version = "20180224.1652"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "a63ca24cad86dd0953c6062bacf7ea70866a8776"; - sha256 = "0ca0igkx4lr8d7cayz3b52mzfck018sk5hjf348bafi6y1p04pwz"; + rev = "aafc01726f1b3160321d40160298a0e1b054b382"; + sha256 = "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -1323,12 +1323,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20180102.1441"; + version = "20180225.240"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "d00aa65ec2da6944f1ed81da440ad7a9024cfbf0"; - sha256 = "1cjchz7dq42ha6wrn21jqbmf333rg73bz4ppsnd9kz6vqnkgnya0"; + rev = "77b4f50c5372bf219da496567b2b867261f0d354"; + sha256 = "0kwp6bb8fwv76x9r35rz4mvwica1fsappp82rjr1xlhnwwdsc120"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1493,8 +1493,8 @@ src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7"; - sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz"; + rev = "38ec1faf4a9cbeb2944b517ec30d999022082bc1"; + sha256 = "1hqr1phkm4mxzfszzraqljb32mpin1h1r26al9bazrsq2azmd5a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1678,12 +1678,12 @@ all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-ivy"; - version = "20170508.25"; + version = "20180225.630"; src = fetchFromGitHub { owner = "asok"; repo = "all-the-icons-ivy"; - rev = "5357bccddfd30580d5859f3794248efb86a8a054"; - sha256 = "1n6c7vglxkib4irjjafiwdz6cifbb20229n2fpnxkv57hmdarivr"; + rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4"; + sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; @@ -2589,12 +2589,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20180220.1237"; + version = "20180223.1526"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "d4ce0e01081ce5ce3fea533ef2e3a78795255350"; - sha256 = "0byg86719jv9fgdvjb49pwfg7y98vfj1jssp8mfdnmswdwmyyf02"; + rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7"; + sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2886,8 +2886,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "15bcbf6beae65d7606f0655711159ca56f050c6b"; - sha256 = "14y3jr636hn9p699ypd3kas6750kpz0lk4xchb0y44b94splczqb"; + rev = "7279cc6bdba7bfcb53ca8f5471631ae8dc3918b3"; + sha256 = "1nmi2ykwbswj6qv2s38518nijmlhjd2jvhabybqs8smc152g58sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -4062,8 +4062,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "990cc94d708c923f761be083b3a57f6f844566c8"; - sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g"; + rev = "b133564cc438870d9b5505c8104611c8998fd0d5"; + sha256 = "19xqs4hyd5wkh0vd3xfbfwhf8fhq5lbzrafx4fbvai24dhjn5rhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4299,8 +4299,8 @@ src = fetchFromGitHub { owner = "ccann"; repo = "badger-theme"; - rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4"; - sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1"; + rev = "493d672d5a5478976da7d5ca752008cc7837c57f"; + sha256 = "0mrn3sl1xq19k6v4mw98zqgs11fidnarvidmxayx805k21pana6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/298e43769c6cd855526d847e8e3b237912360777/recipes/badger-theme"; @@ -4505,12 +4505,12 @@ bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bazel-mode"; - version = "20171226.1551"; + version = "20180222.2253"; src = fetchFromGitHub { owner = "codesuki"; repo = "bazel-mode"; - rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25"; - sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66"; + rev = "b7aa14516feaed40ee4910eafa81db719de0fe56"; + sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; @@ -5469,12 +5469,12 @@ bmx-mode = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "bmx-mode"; - version = "20180219.247"; + version = "20180226.256"; src = fetchFromGitHub { owner = "josteink"; repo = "bmx-mode"; - rev = "e0081608162b69090bcd3580adcae111a1c7fb19"; - sha256 = "1aygwyxrqp2l698vndcvghbp3gah56gv7az85nbj4n16cm438ifc"; + rev = "2093e7041006aa8c142c151bb597af061419aa43"; + sha256 = "12h8h44ni8g6nzh9i2h9w4lmvkca3fxp8cybikln7x4hcnplkfj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode"; @@ -6033,22 +6033,22 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: + buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "20160811.713"; + version = "20180223.2341"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; - sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; + rev = "443f74c1186ee91dab42812e864e7ad095f45b9a"; + sha256 = "18ii9gd7hbfcibj7fpx9b9bz3cbpdhvy4z143hmlh3ywj2mjdfii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; name = "buffer-flip"; }; - packageRequires = [ key-chord ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/buffer-flip"; license = lib.licenses.free; @@ -6392,12 +6392,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20180216.614"; + version = "20180223.937"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "85aebcd6aa38dabc9eb16fdfb836144693ac5b84"; - sha256 = "168yrcanig12xcf9gsq0ynynfh0bfsgpr4r2wwsa9k36sdp2bbld"; + rev = "8d27bb99463bc230a76dee96378dd337622988f5"; + sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6623,12 +6623,12 @@ cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cakecrumbs"; - version = "20180127.456"; + version = "20180222.1845"; src = fetchFromGitHub { owner = "kuanyui"; repo = "cakecrumbs.el"; - rev = "b7bfcc46aed139abc1d30f700076f82584084f3f"; - sha256 = "1jl196qfgmn87kzkzhrqliarp9cmvl9c4ka2v20knw6ca2ymzbp9"; + rev = "76cfbfacfaa9d2128fc9218338a0ba2bb47349ab"; + sha256 = "18ni6krymzm1af2vmw2n82s0ifny6pn1p0qifn3646xx4p210a4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs"; @@ -6809,22 +6809,22 @@ license = lib.licenses.free; }; }) {}; - call-graph = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, tree-mode }: + call-graph = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: melpaBuild { pname = "call-graph"; - version = "20180222.208"; + version = "20180226.156"; src = fetchFromGitHub { owner = "beacoder"; repo = "call-graph"; - rev = "10f6153156ace869e6b4c1f8f51799eab5f6be5c"; - sha256 = "022l13yv3lavxccs06v29dl85l5vmdmp5xnxd3sw3jzvw3n5faa2"; + rev = "bdbd5130476b8ad5606e694f4310678a90bab9c2"; + sha256 = "1a7fcpdnmjmc151d4vma9wng1m9mw102sw8qx02h61gqsg6ia8bc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; name = "call-graph"; }; - packageRequires = [ emacs hierarchy tree-mode ]; + packageRequires = [ emacs hierarchy ivy tree-mode ]; meta = { homepage = "https://melpa.org/#/call-graph"; license = lib.licenses.free; @@ -6879,8 +6879,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "2d6ed01bd89099e93b3a8dd7cad941156f70bce5"; - sha256 = "08ml8whr8ncrign73xb1zaa4m9zgm4nlx2qqh0qfpm8j0hn9a5vj"; + rev = "70eb179b20d401b2fad43d3ddfd2752fc7925ab1"; + sha256 = "1l0qfkm9jz4yx5rpwr8bxcjpn1z1mm4zi0na6b21zbsspbmpv912"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7504,12 +7504,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20180215.2335"; + version = "20180223.644"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "71dff335ee593ff1db9e7cafd5edb6c80d709f74"; - sha256 = "070vjgwv1nrg0i4fby4g28h0sxw9pkhd9ym8vpx9g1236351d4r7"; + rev = "8194c3ade7ba73f6ddfea7dec55f77b5b6fdbcab"; + sha256 = "0rsx9gqkxxkk597liyghw0sjrvmfid4j1kbmz5ff8irm259g7psy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7571,8 +7571,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d"; - sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3"; + rev = "82f0422179737bcb9f93481aebaf1071d54fc859"; + sha256 = "1r5nymx7yj4l4wjhsx6gxvh9rqx322x5n54cqg71mssxiwccpdv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7970,8 +7970,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "38ae9418c8870766a744feaa5fce3749e0c34748"; - sha256 = "0jsfl06zq87zkiz9jysqig4wkxwjgydvxn3zvlb7jsmi2qznq6jv"; + rev = "88f4fcf1d39a13ff336657b2cc4161ebb9d955d6"; + sha256 = "13yl09chl8j5n3mlwb25ipxgi4a3cfs8822lahkisjv42n62f234"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8155,12 +8155,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20180105.1158"; + version = "20180223.929"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; - sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; + rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd"; + sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8243,8 +8243,8 @@ src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "dee259662042ea4f7f339fd95970bb504e440cca"; - sha256 = "1a02yz62xlaz1acqpvrlmwv5syflyfrdpwlmi26ih3kd2hl6p5sl"; + rev = "e2facf890156ad57a122ed5e79e5a40cc03c8cae"; + sha256 = "09pq0zf5im6kkjwyzdz3np3b4dd5va3as1syygvjnl5dlh6gkjcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; @@ -8885,8 +8885,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "a08ede979bd0c57906c8ebf4120192f8202ce0d8"; - sha256 = "0yqj3h52gxfywa0ky0q1aakk3n2qjaj3rgs2sjvb9ljgg1vlz7mz"; + rev = "25613b9fa46e6433f987e9e9f47533db3a0939f3"; + sha256 = "1pnyx2niscm7bs2n48xxlxdfavxvb40vl0sm0j5m8vp9ybl11g4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8986,12 +8986,12 @@ cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobalt"; - version = "20180218.2342"; + version = "20180222.1938"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.el"; - rev = "ab92a6c5b173f06fafc92fe30864f7c254d19ed0"; - sha256 = "0lpm3pm3xkf2hz73m7hqlll3s43r8qd427g440y9fsmc9sj0q5iz"; + rev = "b542c4172ef41bb1d50e1b1dc712acf50c2392d5"; + sha256 = "1614m2m19wa6awvaz8akakbm2kbvj55s2lh7k3lgysaw007wbi1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt"; @@ -9658,12 +9658,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180221.354"; + version = "20180225.1741"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "c96626f35c3a7886b49c34d5f2986c991dda29be"; - sha256 = "0g80rgzw9cxa7ziiwgcrfnw75gakiw0869n6j23wzxmckccqyh7x"; + rev = "a64d52ca033208cda34f2fb7d0a2f951cce8bd29"; + sha256 = "1n44f9kbmp95nbsyp4g60d6pi044vxy2ccai9lgkjm3wlg7xdzrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -10050,12 +10050,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20180216.857"; + version = "20180225.1359"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "4443a7fb06ae0f701cc9f661fcd889b71cd67da0"; - sha256 = "1yihx3qv8hbsfmcsyl0j4l5hgn4nx1191rkfxrj41wwbnbjkhs9l"; + rev = "76ef585c70d2a3206c2eadf24ba61e59124c3a16"; + sha256 = "0zs9cblnbkxa0dxw4lyllmybqizxcdx96gv8jlhx20nrjpi78piw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -10411,8 +10411,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e0b857aa3d24b9efd1cf2ddc70c38b86a6dae75d"; - sha256 = "0jvhzyq8d779hx3xbizcqmkbsvxqsyy8m423ksmjlh3afwvq4n6g"; + rev = "56a18467de4bc1cf408a1910458e1819102312dd"; + sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10564,8 +10564,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; - sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -11211,12 +11211,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180221.1013"; + version = "20180225.744"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b656f818efd797422886bec455d3cc15a9816c87"; - sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11274,12 +11274,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20180214.2057"; + version = "20180222.2023"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "250ba92bd4b38c5c5e9cc72fd0f57db2d5f62d6d"; - sha256 = "05g2fx6i9gb7y0prlslff31f2rl78pyy21k4dkhb0cz84dz546zb"; + rev = "9d70490b551503aac22241c8089a46e55dd3deba"; + sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11610,12 +11610,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180221.1057"; + version = "20180226.428"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "49f0a893b00c23c6b568865fbb3ad96b3e7bc63d"; - sha256 = "1ympaq2f8k2f7frhv1nfl63alfv16zfh1pgpyghccklmqcndf22i"; + rev = "0b70a10869581a682ade3730442881250304a331"; + sha256 = "01jf77m3d8ydrnjms62c6zn2xwfcs3wadk7wcc73qrsqz99i81ba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -12118,8 +12118,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "84053d1c023721706ac5cbecf152e2cc71080518"; - sha256 = "1v5ya14ayj719x98swbrv7spsa5rzcxzzh1k18fpal7mqmzvy6jz"; + rev = "7f3c7a7cfe60f98da46e6958bec62bac4675ccd2"; + sha256 = "096523m3spfqw72zp2rzcf1b54997yzs7qxwvr3awhicah1z6mv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -12328,8 +12328,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "d2faf26420ac16c4056f6eda067b845d33e102cd"; - sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09"; + rev = "df449180d28691c9bdbef7bcb25aee75b2af50ca"; + sha256 = "1bni88xdm69m4pq79wq2wb3n50c955amimvlbc63xs1ik3ih52q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -12370,8 +12370,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "cf12b08972616c824c11b0035716fa930ca34dc9"; - sha256 = "1yqnj22b7alma31pdxvxc3yz2rafhjii89fiwv47ykdjjm6fs200"; + rev = "cf70c10744aec43df0708f5ee3d692d378fc31f1"; + sha256 = "03ka1lnw4qdg5lzlimdg8w1gynmbf66wvr7iplgszf752cg1q01i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12534,12 +12534,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180219.650"; + version = "20180224.1246"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "f8f811d61aecb08cb0189b7f9b6de9bafd61fa27"; - sha256 = "05y0gglaizq3ggd8l34iikaik7dwj6kh1a6vq932mg96bmfk55gx"; + rev = "33c8c4afac616e6de30111f8a7f11d572496a838"; + sha256 = "0zv6vqzw299ydgwxiky8b2nlb8cyzzw9zsx44ixaqqf73f63bv1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -13105,8 +13105,8 @@ src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "c097d532de13cb69b0fc390afa6d806d0db97588"; - sha256 = "1zfn4rkv9n96li0pbxn6c22ljwhg7gyih1srymrk482r2zfhkja6"; + rev = "ff7f8a4f1225cbdf141c86172104e67a4cf58c86"; + sha256 = "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -15031,12 +15031,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20180107.925"; + version = "20180222.717"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "5a6e407ee9c6035245749ee1f249aed16d651728"; - sha256 = "0gl2rbx649yc4rbljmhdqsa17hnv24lpj5y8fxdh27gnjqksg2zq"; + rev = "ec2b07255e273639ff76303778661f81c5b74000"; + sha256 = "0nlf3rw9xa9hggqkw6nxfswbqlnsgbliz9z652kp7c9hfikfmcsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15732,12 +15732,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180214.2106"; + version = "20180225.1541"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "3b172e2adc374cb8f96adb7c9cf76f0e10c8f79c"; - sha256 = "0fd7zarm7xlfw02anjcbnqhkd20nrf1fnw26cmbxsrw23xx9skdz"; + rev = "65b9a3aea2bb212cc83d2f9414d0897331278000"; + sha256 = "14g99l038f29wh66ybfi99nvk1niqkk613j0rz7hkw9l0y912m2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16172,12 +16172,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20180103.1855"; + version = "20180225.2153"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "abf4dfcddacfc90ee39aad3c9e2e4615fb74c6a1"; - sha256 = "1kxkqpf0xq6w1g8qvy32hjqy42mz17c36wrkqqwdbxhbq7d5ckyw"; + rev = "336fb8ec510c10596d65bfd50f65b59e2f7711e9"; + sha256 = "1bkd3q8lr9admpipad1vi42gvs1sv7l7rzgi6dhl799zq1691kd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16281,8 +16281,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "3a7a9a66efed30416e2013da80fed2f79b91def1"; - sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a"; + rev = "b7e5f2c730036197cfa7d819006b91b4dcc2efba"; + sha256 = "0zbcx5ksf02kv7vavdnixblb8xk3zipwp5nrlyxyshmksw7qg3wh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -16802,12 +16802,12 @@ editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-charset-extras"; - version = "20170712.108"; + version = "20180222.2057"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-charset-extras-el"; - rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85"; - sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx"; + rev = "ddf60923c6f4841cb593b2ea04c9c710a01d262f"; + sha256 = "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; @@ -17060,12 +17060,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20180214.1442"; + version = "20180226.416"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "b130d4b3fe15b2a8859baa7e0d2c9d203219d0ce"; - sha256 = "0frl3cb8qjgc96bn2j7ndr34xylbfmz4bl9kl29spqwqn163i385"; + rev = "7a52ebca3527d891ecb7e8a3e46785b271717acc"; + sha256 = "01ifzww8gs4qy9yrhhf5dm0s3ifrlppknvllkajfp6lh9hc7q4cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17179,8 +17179,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "63fa39d86deba5d03ac8f7f9a103e94d6c80739d"; - sha256 = "15jxnkvgk700qi79d8jj96ss2mb7yfsgzhi0mama4dp5gancps27"; + rev = "129789cef476279a7840647a5bf39aa5cd2bc2f6"; + sha256 = "0b20s3bc92jwi4xl2fralj0ffdj1zvagbmnsp2dw5cj94dhm33p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17469,12 +17469,12 @@ elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }: melpaBuild { pname = "elcontext"; - version = "20180204.138"; + version = "20180225.2211"; src = fetchFromGitHub { owner = "rollacaster"; repo = "elcontext"; - rev = "c223476b62a55b80f6b85b2e016d3ec0d7ec9875"; - sha256 = "1ynwgr1g421liyfyfli2cgfdqx3gijm4z9hd0cmhndfwalrb1xq6"; + rev = "d34e68f0580cc3d3eda8c85fc446c71094fc52fc"; + sha256 = "05z0xfy9s0iqzvy63bnfhdpqc04yikwairb8b00k9xkspd3sdfdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext"; @@ -17658,12 +17658,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20180219.1340"; + version = "20180222.746"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "fc49bee1f7ca74dd160111173aad35b1af304494"; - sha256 = "0l678rznj3gkmfb1np7m0140cnqjb8hil50kn5m3pqh7m5q0w5a1"; + rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; + sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17753,8 +17753,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "fc49bee1f7ca74dd160111173aad35b1af304494"; - sha256 = "0l678rznj3gkmfb1np7m0140cnqjb8hil50kn5m3pqh7m5q0w5a1"; + rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; + sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17854,12 +17854,12 @@ elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-lint"; - version = "20180218.1247"; + version = "20180224.1242"; src = fetchFromGitHub { owner = "gonewest818"; repo = "elisp-lint"; - rev = "a8342bc7e756f1df72b8a6c10d6eaa1658f54eee"; - sha256 = "0yw5rchnyb5vvr4gnrym2ngbfyld5ngchhbak99g49gcgvv5mx79"; + rev = "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39"; + sha256 = "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; @@ -18211,12 +18211,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180218.1254"; + version = "20180223.1119"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "04c8c6cbdde2858defd9a1ba53f06f433ede63df"; - sha256 = "09y1ik86wf9ssrriq8jc1idqqzxvnzasl5qfy8x915m0730mjdxr"; + rev = "0c51b0d3aede3e3e3d2107ea86d133c669220948"; + sha256 = "1404r7al2rndy2nqfgdm2iw37mn2dr9hb51fr5f0l0w34mhfhyji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -20047,8 +20047,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "4c21bcd5bd08d67f00471455f9489867cc1766fc"; - sha256 = "1imzh9rhixv2ws7mxaxs2lsbla5k4yzzz61c21sjgqw078b278k4"; + rev = "1c7938bc9539f1c06b5493ced9f265e05a4824af"; + sha256 = "0vrrxh4ngbmsr2iaw5hqr0xf43vnbqghql2sm9ffm0zh6snd4kag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20298,8 +20298,8 @@ src = fetchFromGitHub { owner = "dieggsy"; repo = "esh-autosuggest"; - rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610"; - sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q"; + rev = "2fd996c1a29b21e60854a3c90d7d4fc3d5b0aded"; + sha256 = "1vkbyhkvvj5h63ybxg795m61c4157jm2v01y9m98jm4pxysmls7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; @@ -20777,12 +20777,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170923.1328"; + version = "20180226.254"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "a589005a9a888537deef94d6fe38a9b8790c97c7"; - sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv"; + rev = "d4db4f3023afff4321cd3f99be75ad44e77cd0b0"; + sha256 = "1z8ban35vrkibr07awfg6z4cy79irjiz6hchcyid94l6iifbwf0y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -21029,12 +21029,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20180126.1159"; + version = "20180222.1032"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; - sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; + rev = "3bf198796b2d135776143eac854e8d855cd94475"; + sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -21176,12 +21176,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180219.140"; + version = "20180226.21"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "7f0988479ac6c8620ffa0e33ab1cb1acf08738ff"; - sha256 = "1nj752rpv1rmqga5vr8jghq3y0gb0831r18z1k01kfdahb2n25vk"; + rev = "7adf05cf25b022197c0542920ddc65acdae1703e"; + sha256 = "1cxsi0aqm2fd344q6nlahhg0q2bf4k6gagi6sxsvjlhwvb80skxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -22083,8 +22083,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2"; - sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz"; + rev = "2af81ab3ac64e4b0515a157a672d8cb89f0172b9"; + sha256 = "00bcz353cc82wpk5cai5ni99z2la4gwm0k1fvanysx1amg8vxvfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -22167,8 +22167,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; - sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; + rev = "3bf198796b2d135776143eac854e8d855cd94475"; + sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22457,12 +22457,12 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20170508.4"; + version = "20180224.1916"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb"; - sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95"; + rev = "885b3de9bb6365771dd09f5267f6ff843d5109e8"; + sha256 = "0x5a0v4z5hgvi7biwbsbxw9l8in0gxwrz77g9vffz9djvlr70r1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -22687,12 +22687,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20180222.327"; + version = "20180225.1531"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "5978c89e384d1edf4ef170733c0941004882ec4a"; - sha256 = "114k71dyhzljqcllq4pcxnq3lclr2w9rzrmf3ph987x8rf07657r"; + rev = "d26d719d95b3b3296e113d89ef36972312610f4e"; + sha256 = "0n0b7gxamizmkm2gz1ghyg36i7wvy5ims63nzjgwhbrc3ifig6cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -23406,12 +23406,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180222.437"; + version = "20180224.2103"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "ad7d8e3e72ca5044602af060ab2a39c8bbaa0c7b"; - sha256 = "04p9fv4rv5m9ll6dfbffq46wl3inzayjnrfr3v0wdnppyvpl411c"; + rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e"; + sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23704,8 +23704,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "e053fcc641f1f835f2fdb71143e095c1889b8233"; - sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j"; + rev = "37bc0734a2e71d66245ee3960879577e5ef906bb"; + sha256 = "04k4wqsdbwxbq5a4dxvr3mqqsa5y3c0238llh2wig1r763ligm3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23746,8 +23746,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde"; - sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i"; + rev = "8e66b6a7b599c6c5098490e83ef4e69acf307603"; + sha256 = "1p8hz66fyzivvwwya0br3v7dx0fqna9jw9291zgshvhxbin867fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -24084,12 +24084,12 @@ flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flower"; - version = "20180219.1131"; + version = "20180222.1112"; src = fetchFromGitHub { owner = "PositiveTechnologies"; repo = "flower"; - rev = "f6341389d7ed0bcfb5ee8f75ab073b7cb6e5591c"; - sha256 = "0sqx7jalnsamvx2xhg7bgq6gwxs7a7iisvkix25m0rhk7zaqc1za"; + rev = "6a9ba9f25daecfb994b8d71afbf9ab0cc9de5349"; + sha256 = "1i95nqbcqm0gld74g5r42wwpsgdlv8fjalr8kgcn09wzg4glpvrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; @@ -24189,12 +24189,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180221.1302"; + version = "20180224.1046"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "1c167a2d7c8110079c626e7e06c730b80fc09dee"; - sha256 = "077h8gciwn0ryvc4i2277mg3mlf6ws9xnidr7dln0010cs9dkdgx"; + rev = "b0edfef87457a13118450969696a68505cce936d"; + sha256 = "146v50nl2a4ryd7p9lpavah01idlsjg3ff1pb0bnblprrs9sg0fw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24336,12 +24336,12 @@ flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-analyzer"; - version = "20180215.345"; + version = "20180225.2039"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-clang-analyzer"; - rev = "b4cb26dd2341f8da8c04c17c9a7c3199306cea15"; - sha256 = "1zvamzf86zfrj1yj3lfcz9cp6l9436d77m5k3dciykrdayw3ligw"; + rev = "adc9e7663bafcc9b740c09b691898413627e74ab"; + sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; @@ -25474,8 +25474,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; - sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25495,8 +25495,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "c5838f51d41e1330ec69b46e09f25f9764be1d2a"; - sha256 = "1app3vcv1myabj8wmla5dpifh63c21bmljqvvykz8a9d7hagq3gc"; + rev = "962f18603c45e3f9a84d059886c7d13178cbf31e"; + sha256 = "0c3lnfj1z27q1pyhfzwxh26ska1wvcnmqmdzpc6zps72prjfdknd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -26188,8 +26188,8 @@ src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; - rev = "9579e5c736cb890195464fabf51df113313de88d"; - sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7"; + rev = "8a772395f4ccc59d883712ab53a92a17c1d9a429"; + sha256 = "00w87qa7r8rigmpv58vpjwpn9x13sv7db5m6z4cqh76qkgkghgqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet"; @@ -26499,12 +26499,12 @@ flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-lazy"; - version = "20141222.652"; + version = "20180224.1306"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "flyspell-lazy"; - rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10"; - sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm"; + rev = "3ebf68cc9eb10c972a2de8d7861cbabbbce69570"; + sha256 = "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy"; @@ -26709,12 +26709,12 @@ fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-this"; - version = "20150601.342"; + version = "20180224.40"; src = fetchFromGitHub { owner = "magnars"; repo = "fold-this.el"; - rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a"; - sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn"; + rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b"; + sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this"; @@ -26856,12 +26856,12 @@ foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "foreign-regexp"; - version = "20160318.907"; + version = "20180224.321"; src = fetchFromGitHub { owner = "k-talo"; repo = "foreign-regexp.el"; - rev = "e368c4dbd3b7a95a14cbc3c25617b5f1bc5a7fb4"; - sha256 = "1459hy5kgp0dkzy1jab41aibixgmrk9lk6ysn1801spd8gwph371"; + rev = "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa"; + sha256 = "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05514013948a520cf0dcaf1dc2ef2300dd55e98/recipes/foreign-regexp"; @@ -27313,12 +27313,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20180207.1149"; + version = "20180224.1411"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "0d7fdb92b5bcca4195ead0f6d2a1e58a2c0a4f9c"; - sha256 = "0mr2iqkzmx0lpakgp7i76w1bqv1zqsipcd9lg1f0jg7wzvwsrmif"; + rev = "f1030159af4a5998a8ea751a20fc8bd6598952da"; + sha256 = "18zy8nmbi6a79rs6n3d8qrm52640fxmg6s9xfflhkr5pprbwi8fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27443,8 +27443,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "e0c57994431a7b6aba4c9be11feb95b626feb3f4"; - sha256 = "1znvd30bfn7hsldsim7ynwsd4s79dr188vljbx3g4wi3wyd0fia5"; + rev = "bb36b2c074449955649907449fa84bd3336528ce"; + sha256 = "1ji4bnwqpbhldjpnkdfvd05y8bv0nc0g52iza1q4azcw4qqdkwql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -28109,12 +28109,12 @@ gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gif-screencast"; - version = "20180213.2"; + version = "20180226.212"; src = fetchFromGitHub { owner = "Ambrevar"; repo = "emacs-gif-screencast"; - rev = "ab832e7976102adc0f0aae0d531eb077bac8c228"; - sha256 = "146bi1k86kxkrb73p6xrif942lqzqc54fmnygv6nw66fnih045jg"; + rev = "08eebb7e9dc583b02b86d2b62f25b7b8ff8bbd9e"; + sha256 = "1j3bp4ahwk6jdanqspqxhf6jvk78mad6zhn7ym88561hv4gq3ngk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast"; @@ -28323,8 +28323,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "a50ae25e10601ada0730caf4bbb2064053c3428f"; - sha256 = "11niwd86y0i078yxws7giyv6as59ndfiwia8298qja6a3hqkgvfp"; + rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81"; + sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -29961,8 +29961,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "ead987a65e5c7e053cf9633f9eac1f734f6b4fe3"; - sha256 = "1sq6865rfhsg6q29gl8msfr9vcgp65ji4nqdh0m8i8f3gxy87amn"; + rev = "3ea3fa98a8104b2c8f8a7bffaebc7e54dddf99e1"; + sha256 = "0d2xxvk44i3m4zirl9rzp6dfkf85kssw2kk8wv7h2rqgc3cxi38z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -31209,8 +31209,8 @@ src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "89077fdb98ab1e77459c7839decdf21b87f4341b"; - sha256 = "11id6gp6mz97sm2izz6y47n3sphlibdb6nzvbkcxl7l7av53wxg7"; + rev = "309c60c974eb5af4554e0675d4285baa77d89e54"; + sha256 = "0gz5f17654bbjwydznpcy6aqzxbv2infbb4wd8zawf9dmb0wxc3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -31607,8 +31607,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00"; - sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63"; + rev = "6909022bccb7e5c26d1c4e5fa20cbc6b65c62d69"; + sha256 = "0s5y84ih5hy6m5krmbgbr027xzhw0vybha0pdi0njjyggagirgxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -31628,8 +31628,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "7a97d039489ff23b3362b543dea1007357e2ada9"; - sha256 = "1rqj7yypsd25h4x9lx6vkqchq70fwnjs4dpivd7n105h41pz3kiv"; + rev = "b981467f557498de46101ddfcbdfd025e7ec1f8c"; + sha256 = "17vvz8gawih8rksbcn3ndyjqhxaczmjzqm42b1y51j9lky5hmsw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -31812,12 +31812,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180221.555"; + version = "20180226.417"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "d4a23dd3ca15ed96f219bf213f90012e761b79ee"; - sha256 = "1qaa360kw830gg6c678psgl3w8ga4drjzcw9x8wlwrncidv0ijm4"; + rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35"; + sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -32043,12 +32043,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20180216.333"; + version = "20180222.630"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "bb73c3dd28e70c3996cbee5ef32933a4904eaa22"; - sha256 = "0hq558j3qls3fcf35zy0s8qw9rvx66z0a08s5rkwzzy4nn39rwzh"; + rev = "9002522af7ea199a1453326746ffccbd934d290f"; + sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -32442,12 +32442,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180222.224"; + version = "20180226.417"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "d4a23dd3ca15ed96f219bf213f90012e761b79ee"; - sha256 = "1qaa360kw830gg6c678psgl3w8ga4drjzcw9x8wlwrncidv0ijm4"; + rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35"; + sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -34420,8 +34420,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; - sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -35067,12 +35067,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20171226.2035"; + version = "20180223.1944"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "07c2366d1bdc25e09bebf429050bc0e8a7bb7aa8"; - sha256 = "0xj8jj2mnn2vasiaq7dhx3rd5knqll518ap23wfihnn96cba2rrh"; + rev = "ff21ab2d95e13666f36a243989ffea2027842191"; + sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -36178,11 +36178,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20180213.604"; + version = "20180225.205"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; - rev = "2b5849007c14e4339ad2dc29db2d0bfe78c545f9"; - sha256 = "14v4gy1y8882ybdn9lkzqqs6w9vx6fpkxliw5nqvh758ipgphy24"; + rev = "b932fa603f074049637907d35594f73c3fba45d0"; + sha256 = "189j3061g2s1286434x3zyh6xyjycfrd2sqxx655biicy1xxyk52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; @@ -36994,12 +36994,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20180221.1438"; + version = "20180222.1504"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "d3493021f4d825c7a7cf57a9b34bd262e4ff9927"; - sha256 = "0dsgi4zhwklcgxg4ypvi71r5mgxy3gmc02d6n87x9a2llvjk6xyf"; + rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4"; + sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -37313,8 +37313,8 @@ src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "d3493021f4d825c7a7cf57a9b34bd262e4ff9927"; - sha256 = "0dsgi4zhwklcgxg4ypvi71r5mgxy3gmc02d6n87x9a2llvjk6xyf"; + rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4"; + sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; @@ -37999,12 +37999,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180218.343"; + version = "20180223.1717"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "be3e2e7c5ec9302cf1a7d5e39defc2ecc78bd9de"; - sha256 = "0zgf6ikap9h0rc3f2ify8a5rlkk34lv4a5xzarw3nlnnvvhp521s"; + rev = "f420c8a4d27c7c2dfea2ebee230d4d1b632a4e3f"; + sha256 = "06l1mqawpaypxmb8mx7l65nzms7amr2wjz2xyhhx2czg7wdhg7sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -39111,12 +39111,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180220.938"; + version = "20180225.744"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b656f818efd797422886bec455d3cc15a9816c87"; - sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -39132,12 +39132,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20180124.338"; + version = "20180222.630"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "bb73c3dd28e70c3996cbee5ef32933a4904eaa22"; - sha256 = "0hq558j3qls3fcf35zy0s8qw9rvx66z0a08s5rkwzzy4nn39rwzh"; + rev = "9002522af7ea199a1453326746ffccbd934d290f"; + sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -39262,8 +39262,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b656f818efd797422886bec455d3cc15a9816c87"; - sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39384,12 +39384,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20180129.2051"; + version = "20180225.1752"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "d5ce9e90003eeac54654d5ce1f19da55448b05f2"; - sha256 = "1jjlrz6af7mkdfg66qsrx6q879l4vxjsljl0fbkld77i9fnm005a"; + rev = "7fc9859802e264afeadb464aa8945f508727e8fa"; + sha256 = "0lw2ywk47cbgdc37m41hm1rin3r79j5w1qrb45mixdw3l5b1vsv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -39409,8 +39409,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; - sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -41226,12 +41226,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180220.631"; + version = "20180223.1702"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; - sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; + rev = "bf301134df90159a8657fe772365fd9c82de977b"; + sha256 = "0gm96xxa2zvmn442cjzqsqhjw6r8fsrxqacphwa19lvmm9csv3wj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41629,8 +41629,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "d21aa7a12f1a76d47249db36eb9825242df9d512"; - sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg"; + rev = "0ba8f44efe60058ef66b10a059fd30489b42546f"; + sha256 = "09y6905ig6qphfwjk1xn79sv4qxx75gnrmnwd9i80ig3lfp8ps2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -41734,8 +41734,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "cd592c1e8050c811be131f151cdd3c9b29a60001"; - sha256 = "0jdwli3xilgk4n33hnfsmrlq74r05y73ymjwhygln7g8i0knhgmq"; + rev = "9f64f5e24240cbf7e2cd34315d08131fd31ec822"; + sha256 = "0liyqkwv94wz623ihz5kyzfagdi08qp3q0q2hcvavjyk3j8ih6ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41814,12 +41814,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20180213.635"; + version = "20180223.1905"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "f16490c4b960017b3f36cb3df96d9ea605a7c127"; - sha256 = "0q0qmh8yr8iagsaqgd23gia3fh5lb0lprylki1hiw1x8jn6i68yz"; + rev = "aa8c8bb8e64f1f61fadeb4e93973b14dfe19e4a9"; + sha256 = "1gsaw4yfv68ilf0z130rf13300lnz1fdgi2x8rm8hc0q0dlsp1a6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -42317,12 +42317,12 @@ latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-preview-pane"; - version = "20180219.1002"; + version = "20180222.951"; src = fetchFromGitHub { owner = "jsinglet"; repo = "latex-preview-pane"; - rev = "474d7aa9d62df3d733d9a9088127c6e0d9fc5831"; - sha256 = "06q67rvv7y4b510v97n8x93ay8zl4y8il5czb9ssw0zhmbi3fvhq"; + rev = "e7dbe0df3ca938128ab394cdf04f3e40eb5b139e"; + sha256 = "1i8mc2qdyyg04rm946vqmmw021c4v8aq7yvxsgl53mfbx9snm3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane"; @@ -42485,12 +42485,12 @@ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lcr"; - version = "20180202.112"; + version = "20180224.1243"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "071d23ee5453741a8724d7f8bfa7f5c20612a29d"; - sha256 = "05gvij9lgs9hh04wnxb90zx9ncsdjyp36fjbmrqrq07xbkxaw82a"; + rev = "6caa2bac7056dcf42c4cb88a1d5fbe1c9d71a9b4"; + sha256 = "0xvl0dqxwim6nmm6f9ddyp0r6j1n719zlgm2a3f49dskhnkn798z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; @@ -42569,12 +42569,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180219.2149"; + version = "20180224.1936"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "1e953bb33d6a534d5c29cecc832e12fbbe4c7395"; - sha256 = "0bk9dqg14i05l2yz7lk7vpi14cgz6n4daxfw7a5lvqxa0ms836s3"; + rev = "3a10229bc1c12f36c9432ec3b459069a07f05498"; + sha256 = "1x0jg0vysab8592882pgbszrshr85ss66s8fsa6mhh61plxd0fw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -44128,12 +44128,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180222.508"; + version = "20180224.246"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "5b2bd6cb90900f37f5c2c96164287c100ced9589"; - sha256 = "05nl13079j6zknwgzzyzrsin99cfhrim20sipdawbdgf5a3bn81f"; + rev = "14d5626f905d2929e4358cbea3e0106b9f3c0454"; + sha256 = "00py4qp1rivr54h033cjnipx7011cqac49v9x86zn2g2hfclhy7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -44233,12 +44233,12 @@ lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180219.455"; + version = "20180224.2300"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "ab286490315d4b120bf8e148d57740d626b5fcd4"; - sha256 = "0rfhvjwl0z6xc7kqh0lgygw29n9z09408wwqqsaivss1q1zqqahi"; + rev = "7d73049dc2cf703550decdea42e35920efe7339f"; + sha256 = "0cah4azsgks5qq8iv3g8dv0l18wkc4lca9xr7g79p2vl4z34sgps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; @@ -44590,12 +44590,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180221.1834"; + version = "20180224.1651"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "a50ae25e10601ada0730caf4bbb2064053c3428f"; - sha256 = "11niwd86y0i078yxws7giyv6as59ndfiwia8298qja6a3hqkgvfp"; + rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81"; + sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -44935,12 +44935,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180217.601"; + version = "20180225.529"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "252a4a0c854c307a618ec3fb767d6439c335f8d7"; - sha256 = "173ipqalbk40600d0g76sxb4vxy7ailidyp4p5a3rln1manay1lf"; + rev = "8d8d136ae4c380f004354675519f4016c735d78c"; + sha256 = "1dnz8rz78wfvpjz652hs4jh90pkkgiak4vp9fzf2kx1j4c9skp97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -45271,12 +45271,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20180207.2320"; + version = "20180223.2121"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "36fed6ea0ae45b36ef5618d5bd29f4a43c0e2c6d"; - sha256 = "1qsygc90sclk5r1qxsiszi72sg6ryhiw39vf99ixi0pxayljk8px"; + rev = "a07d1cd310f59b28125717620dff5cd3ff674ab1"; + sha256 = "1rpn1c66yi6rdn7f2dgdspbwgdyidvpdwshh52dydgwy4z08lpfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -46862,8 +46862,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f"; - sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw"; + rev = "e860009ce531ee05d2902309db5f804326596b45"; + sha256 = "1l0jh657ndypi9n7dxac8hqc61fxp9c10li3w23c1r9pad4zisy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -47009,8 +47009,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069"; - sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf"; + rev = "297d5e66628bbd788f8673656ab5f2da29f7c40b"; + sha256 = "1agb500fc3cmhfq423bii7mz83hwnfas5xs6c1qjv3d89v7wxp69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -50467,12 +50467,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20180113.929"; + version = "20180224.153"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "75b84cb1ca09dfa84113fa0790e182299b72244c"; - sha256 = "05yhrivsxf8qvnhvsdb5kdq1a881l5c7d3apz1sk2mdxw89vcv7k"; + rev = "7147455230841744fb5b95dcbe03320313a77124"; + sha256 = "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -51820,12 +51820,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180221.444"; + version = "20180223.1455"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "10b558fc01192515d0a54bfbc2198e626508615c"; - sha256 = "0mcc67nln443j45i81v9r7gi0a25qpm3pjg3cz3sli5yr68sy0rp"; + rev = "22eacef9fd0e66508888016b5d33b6ce85727573"; + sha256 = "16mz2vv3p4x1x400ylx5321svpczsydzkkb93j21cmk3b6a1jibg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52680,12 +52680,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180212.1437"; + version = "20180225.1352"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "2aa588ff38ce1e612ab7d2457f44f1c9db7bdc18"; - sha256 = "105j7jkrfl853mfhgv4jhp053v6cj6ii7s3a7vpvjiy8hlqsf5j0"; + rev = "6ef0f4d1ee13a91da837a940f7c6633e4f5d8d65"; + sha256 = "06c35lmy2852n1ss7ry2x1m05s7indb3x5zy6lii64bmqcqr1w7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52834,12 +52834,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20180102.2349"; + version = "20180225.206"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "645f451df82fb5ebdf42b2c208711d307781062d"; - sha256 = "1iq90f821iycqs1qff1m2vjl1czri01c484gcnn50wnf7mdfynhk"; + rev = "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c"; + sha256 = "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; @@ -53092,12 +53092,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20180220.805"; + version = "20180224.1445"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "090138c45c5cbee62f3da19a63b9d7c6106761f3"; - sha256 = "0hq4cg6vxk7wkb213lbp83x9wp7s8jfn6x5dzskisc1ga9i4nkjb"; + rev = "8e469035a73e3658d818d1665bcfdfb108d7ae41"; + sha256 = "1ff901w7qrlgqzxn0cfnw3a6nqs3nip6vja11ikj9lykrh1pkf44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -53317,8 +53317,8 @@ src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; - rev = "fedddd20384de9919ba8e0b08344ff9356508805"; - sha256 = "0hkr5m795srmx8vzqaa4rhrnnm7qyxnadj5wlkdgsa8c3vcjl5gc"; + rev = "095335063b306871970f981898a220f62ad0ae4e"; + sha256 = "0p4xmlhv9xsa111yrgmfl5laznmj9ijpsifqcxmplrf5ckzqbdkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; @@ -54393,12 +54393,12 @@ overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; - version = "20170207.2241"; + version = "20180225.2219"; src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "6be1f2a4df1b7a20298865b85502ee89e327898d"; - sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb"; + rev = "02d49f582e80e36b4334c9187801c5ecfb027789"; + sha256 = "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; @@ -54561,12 +54561,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180221.1031"; + version = "20180222.1537"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "99da80afdc6a7d72351f8e2ed43c404e922b18f2"; - sha256 = "0lmjbc4rkj3gdv9pzay5izpkmdq1fy53rvl9pl4xan522qi8iglq"; + rev = "d53acbb3f8557583a1a03e92ec7626ccc63f5264"; + sha256 = "0p0a0qfsfg548bymvy57frj9yg5bzbp9r70l31p86q2x3dyjgiyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -55401,12 +55401,12 @@ paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "paperless"; - version = "20170213.503"; + version = "20180224.445"; src = fetchFromGitHub { owner = "atgreen"; repo = "paperless"; - rev = "4e8c5d147db5c8ef0a3914e95b4030b28d29c6bb"; - sha256 = "1lnxbn6mwbpfsn8qf8rdn1v7f00jjsk0h1bn4syvzik37x51f2hh"; + rev = "b3b6c05da393f6b1292a3d5937bc4499baabd0b6"; + sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless"; @@ -57060,8 +57060,8 @@ src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "372284777949e3a645ab236f6036112b07bcc1ca"; - sha256 = "1h0c32z41yrrf47wdfv5jnz65jpykxqlhh8ah5yzc20yw289wbms"; + rev = "e9e1b5806c169a8c7a7881530dcd2e9a52ab5fe8"; + sha256 = "1d2isgf17sg7n7vg6dif88yn31yxxgargvllys8azl48x0y40hh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57791,12 +57791,12 @@ playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "playground"; - version = "20180207.1011"; + version = "20180224.2325"; src = fetchFromGitHub { owner = "akirak"; repo = "emacs-playground"; - rev = "7e9452ddecc9560ed79cc13af4fe5046996549bb"; - sha256 = "1fbcyds94g0dllr2iq1mf6mxq6300160063zj8r4p3gp3h370sgf"; + rev = "5b8d9eb5ea48313e2b33ed3a390d7a2e04d9dda8"; + sha256 = "1v83mkg4573iy6rjnvi5hshbgp98jhyj2c2swz7p4vfcdcak8j2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; @@ -58196,12 +58196,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20171214.727"; + version = "20180224.946"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "000dd3800829c469a072e788a272edca24313ee2"; - sha256 = "1rhc1n4r3yjlrxxj1mkziflb475z7gqcqm2r7r7b667f8k1b5wg4"; + rev = "458ff63f640ba741959670fca0e439374d2d840a"; + sha256 = "0vg38cccjfkn2w7a7fxks26x4v27bhxkpz7nfnq1scw88z9hl1sh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -58532,11 +58532,11 @@ posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "posframe"; - version = "20180212.1717"; + version = "20180225.2325"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "c1abab14827b06296d631d7b9ebdb035a77c21f0"; + rev = "489620f6bd1ca5a6363d4ab9176b6eeb753e7f3b"; sha256 = "1p1khm0mcjq6acjh08z5gaw24hns6sg7p1iy8x6zf63c8kyfq2ls"; }; recipeFile = fetchurl { @@ -59627,8 +59627,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "177108aa8a6e6a0e947c90308f6ebb3d1203bb0c"; - sha256 = "0m0lxjdg6kh4amsgnigjjkxwv24vw23xqls18hyfqwlyjc0gmv3n"; + rev = "a6037c5230c0ccb6531f80cef909dbfe37257884"; + sha256 = "1847pbxsh2xwfj7vm1hvf88prwni5k2jbswilply034f1648r9ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -60681,12 +60681,12 @@ python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: melpaBuild { pname = "python-pytest"; - version = "20180220.210"; + version = "20180226.305"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-python-pytest"; - rev = "af1bf11a1d1ddd176e65ab25b6a01191f8752778"; - sha256 = "1hn8ix5xrfj0yhb3hxsc53gmvp9iyvi50rz6g96aarbshbwkg7my"; + rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe"; + sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; @@ -60793,12 +60793,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20180126.303"; + version = "20180223.22"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; - sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; + rev = "71eec02c25006737444dec7dfd004285f6cff6a8"; + sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -62168,8 +62168,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "61081e703a5454d426adca1fa2d63acd8d7bbc15"; - sha256 = "0q5zb7da4sjd2v9h1nfcmd1mhd3rm5m1idzklf7x1kwnrwapg5m0"; + rev = "fcc5b73e2139529e4c0c8b8639cab6bb51dd2b74"; + sha256 = "0kvh84k9k11xpnvs0kpk4q9nhfjrilwnhlzqmimd51pp7jqz5gff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -62376,13 +62376,13 @@ pname = "related"; version = "20161002.2310"; src = fetchgit { - url = "https://bitbucket.org/lyude/related"; - rev = "73420e62700c2fdf6d9f96a9179b8618864c19ae"; - sha256 = "0pp96vybmfyjh78qlx2qri70w1kj19a84hba00kzrma3l5q6sfpb"; + url = "https://bitbucket.org/julien-montmartin/related"; + rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; + sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a39b2fd835f6911e3dd2b42987f65d5bbea36091/recipes/related"; - sha256 = "098rd8rvlx9shbh05zdw7lnrawfkbk4cfan1i963h994538sda1w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related"; + sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f"; name = "related"; }; packageRequires = [ cl-lib ]; @@ -62629,8 +62629,8 @@ src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6"; - sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84"; + rev = "699d5aa9204c07905db4574406f771c69aa5752c"; + sha256 = "15q8lsld2k8yd8wqrn0hsnj8xvmwj9zgpbrqzjda452jdqsznfcm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -63381,12 +63381,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20180130.942"; + version = "20180224.1134"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; - sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -63423,12 +63423,12 @@ rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubik"; - version = "20180213.327"; + version = "20180222.1214"; src = fetchFromGitHub { owner = "Kurvivor19"; repo = "rubik-mode"; - rev = "a93481c990867a70281d1325aab746e5337a17ad"; - sha256 = "1qfjm95ag2hcxzspgm1cg7m0sqgrdy12ddj11wqfff4dccs5f0v3"; + rev = "c8dab1726463dbc9042a0b00186e4a8df02eb868"; + sha256 = "13razzmk70h5sd69ms0a3ljr285zcad0wnrqkfxbgi5rnppqlkh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; @@ -64288,8 +64288,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "04373916379177adabc29d11bcf0ef40eafd15ac"; - sha256 = "07rdx8ydg5v758smkpip4bz3slijcz7ipxir6f6d6b5cmckrqg6i"; + rev = "21f67de6389234d00a2dde437616063a6479402b"; + sha256 = "1vn3i5gvyn8nn5sfd8lm9csgl1v4m6n59mkif6c6h37h04232dqn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -65668,12 +65668,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20180108.1712"; + version = "20180201.2145"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "92be3a5bf5940826882bb6e17a85952a6b4eb537"; - sha256 = "1n3020y18brpi7d286s3qia8fp4nbws16224nqga18hcx00zzdna"; + rev = "4b9664bab3794379af42d549d9540735c16b5a25"; + sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -66088,12 +66088,12 @@ simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-call-tree"; - version = "20171223.1037"; + version = "20180224.1256"; src = fetchFromGitHub { owner = "vapniks"; repo = "simple-call-tree"; - rev = "51cbb9baac4a71c9e2759b3dbbd48829b7b0ea79"; - sha256 = "16blbycmqgkkvx1pqyld7jbb37wpwjh1y8kcd23ckdd9pr8qccfs"; + rev = "20059eb5549408def76aeb03d0d20839903dedef"; + sha256 = "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree"; @@ -66130,12 +66130,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20161103.1219"; + version = "20180224.1801"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "61b39d02313fa51a1dd7326fe24871666c64a077"; - sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz"; + rev = "ad74cb621e04838f8725ab7dc8716f0f38c90413"; + sha256 = "1g3pb0n5j0s4q85zgjqnw1idvpvq3kwrakv8d6if7xb066v21ng9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -66428,8 +66428,8 @@ src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "02ee1d7339e48c64946041f6f4e09447c3f53e82"; - sha256 = "0grx95xxf314m2k35m1kf20l2pwc6j11ibvrngx4pis7wqwjas3h"; + rev = "61dfcaeb4f560406c188390797448747eef1e90d"; + sha256 = "0pmkjdq1dlbsjpfcgnmxrkj7iggwzw1b0qpyvldwp6h8xlnkca54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -67897,8 +67897,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; - sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; + rev = "a480c887b53cb007b7b099c5ffcab89b9e59d7bc"; + sha256 = "1gf5fsrjigzxabd9k47lb98y3wdjwpw02x9ldnjzrgxfjfbxgqm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -68404,12 +68404,12 @@ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { pname = "spiral"; - version = "20180125.900"; + version = "20180223.340"; src = fetchFromGitHub { owner = "unrepl"; repo = "spiral"; - rev = "8e9707af9d6d61d8ec54edc98b958f1c829e98dd"; - sha256 = "1p91k6xvy0w11p08nbk1b9x33ck6kxz4khgsc39wlhyv02rhqqi0"; + rev = "907b9792467139a942ba7b07ca0276b90770baf9"; + sha256 = "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; @@ -68824,12 +68824,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20171109.1549"; + version = "20180224.251"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "7824d5f8baf2c97856f5bc7b1ef88befbb1978f3"; - sha256 = "1jqb6d83saliq11q9zkq0ndgpxgyfqjk41srwwnpg66nq031zdxq"; + rev = "e4596accfc29f34388b701c1dd5ebffcb8c70154"; + sha256 = "1jcfhxm2px19b9yy53napj4d22v8s1q76gy68c47yimkbabhmzir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -68845,12 +68845,12 @@ ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20180221.2207"; + version = "20180222.2157"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "c07b006416daeebf12fdc9e62aaeceda4fd20ca7"; - sha256 = "0s954cjkk7s7rc2c7ppygbva6vvz84yrl9h38nzbpd3y2jhpfych"; + rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930"; + sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -69122,8 +69122,8 @@ src = fetchFromGitHub { owner = "ctmarinas"; repo = "stgit"; - rev = "df9fb86e74c30134e63eaaa9370e03ad6a90816d"; - sha256 = "11vqnscs6g5pajq0g7cr7r6vbcvh2f3215q2a6ziq9hv96kzkm69"; + rev = "416a4569ccd644718b694d4c587b313f357c6f4d"; + sha256 = "19d8r0l0bqzwkbzd90symq65w2ay30k5bc2xrgdqpawiqz2sx7qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; @@ -69869,27 +69869,6 @@ license = lib.licenses.free; }; }) {}; - swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "swbuff"; - version = "20041012.18"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "swbuff"; - rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028"; - sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; - sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; - name = "swbuff"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/swbuff"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -69956,12 +69935,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180213.819"; + version = "20180225.744"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b656f818efd797422886bec455d3cc15a9816c87"; - sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -70016,22 +69995,22 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + switch-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170718.1932"; + version = "20180222.1731"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "67113287ba61ce1951363a49f54148743dcea51e"; - sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m"; + rev = "680182240012c2ad8fb35479f915e653315b4803"; + sha256 = "0fkz29spgfbx7d1hi1xm71wa1glk448v7gidqgrdylsmbzwkj1y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; name = "switch-window"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/switch-window"; license = lib.licenses.free; @@ -70693,8 +70672,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "23ab76bf7cdefe2e1f7e9551d61d4c49dddaf63a"; - sha256 = "1c25nya8yfd6dsgln8580bbbahdvja1q9fi287q89f1a4i9i7sh2"; + rev = "f10b81de14a71c6cb682a46d1a5012daba321e9b"; + sha256 = "0iwhxikv81i45q6q31yhbij2fli1g7vsbnv5bsaf1rshbwjla3k6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -72409,8 +72388,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; - sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; + rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd"; + sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -72468,12 +72447,12 @@ tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tramp-term"; - version = "20141104.1345"; + version = "20180223.727"; src = fetchFromGitHub { owner = "randymorris"; repo = "tramp-term.el"; - rev = "983ed67ee65d26a51c641f306fa6b921ec83eeaf"; - sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip"; + rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a"; + sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term"; @@ -73205,8 +73184,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "41309d8a64a992f532753093742c15d413c446b5"; - sha256 = "1fqaf4n236l4qzy4ac370laysb9jnj98769nri6qkirsfzk6hcgd"; + rev = "45dc6ba44fd5f2aece9da4a0e88effb947fe6c0e"; + sha256 = "1q3gva57r7g9iqvkfi90zih97dq37ds2vfbjisqxzh43vab8hsjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -74055,8 +74034,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "d6e873cafc40291f0fe27ac9fffb1051c0ab448d"; - sha256 = "05w76h4hlhr7i6z68s45w241hxg5gh49qh7ipbi53dr2sm8d7v54"; + rev = "262539ae26f5e0729d6ef59009e6339a1ec21e94"; + sha256 = "0f6m9nfvy7vgpnzra8xrb0bpgnhgi93iif4d1mswylwvj3805s6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -74727,8 +74706,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "1469c953bc20d21d87ce5d92def767e551cda07c"; - sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl"; + rev = "c904cd3e8515e76fb836615305e174369211f6df"; + sha256 = "1kwd6f2qi3p41kryd8z01lkiw7ikpgywgpfy9zbjyb5x6z2hn35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -74954,12 +74933,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20161106.125"; + version = "20180223.556"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "e3b27f4f179002984643895292bb207c3e221a5c"; - sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; + rev = "24e38a20951dfad6e3e985c7cc6286c1e271da5f"; + sha256 = "00anpbnf0h6iikhpqz4mss507j41xwvv27svw41kpgcwsnrmrqwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode"; @@ -75101,12 +75080,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20180116.135"; + version = "20180221.2059"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "92be3a5bf5940826882bb6e17a85952a6b4eb537"; - sha256 = "1n3020y18brpi7d286s3qia8fp4nbws16224nqga18hcx00zzdna"; + rev = "4b9664bab3794379af42d549d9540735c16b5a25"; + sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -75478,12 +75457,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180220.906"; + version = "20180224.733"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "eea5179afd9822775a580844f46a8e8c09753681"; - sha256 = "1gp2n5illnpmza7wj45abydapx1hhkpcmx79rmzlqcrm8rz6wfj9"; + rev = "c6d5cab4fc30ff9ca8b55a2a37d3ae3f7f540859"; + sha256 = "03vb5aqyvqzxxw5zafp0hgc5vs7c74917p4r4ki9dp2qwvh82ziq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -75856,12 +75835,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20180131.606"; + version = "20180225.1951"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "fce520f8af727bd33861f8d0f7655c01ea84ad85"; - sha256 = "1sgaln0d6rslvln4bvznkp401sizngwp6ypscp4gn95ygq2aam39"; + rev = "0f80d0f95cbf133f52f64578d6a152e7e48ceb0e"; + sha256 = "0bljzvggx1dzjl904bryny9pdg7xcncnqqzmvymgc3i6j70c0v2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -76968,12 +76947,12 @@ x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x509-mode"; - version = "20170909.632"; + version = "20180225.2330"; src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2"; - sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p"; + rev = "33cddc0fe18652ba707308e907b255ead60e2850"; + sha256 = "05b7ifmjiy5rw0ywyjknf46garsyfaxrrdzn4rjwrw1crf8f804r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; @@ -77031,12 +77010,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20180221.1746"; + version = "20180225.1515"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "81adab6b7ef1c35e839b2438809200c12382b079"; - sha256 = "00rrb01jccdm65ag8c9ryw8mfh2hz21nh9jf6jpxb4f8y3yxf2q6"; + rev = "cf1cce0ddc3cba18ccd506b04d8278189fbd92c2"; + sha256 = "0wdfdjcq0yrj2g995879y5ymjb5z1pv38vxvniclifg478qym5yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -78064,8 +78043,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; - sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; + rev = "4ab835c5ee90a1dbc31c4275a563a9e741a78c6a"; + sha256 = "119i1p1rj329yh7d5a1wizrwhbvnildzzhl2bv50vkswg9nvg3na"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -78080,11 +78059,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20180122.1744"; + version = "20180223.2345"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "b1896ef49747"; - sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; + rev = "af4601ee3c6a"; + sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; @@ -78362,12 +78341,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20180123.59"; + version = "20180222.1757"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "4b3e541721f52dbfa307e2cab3cd682e25987fdd"; - sha256 = "0x3b3dbkgpf9py7z3bf9629q3vqi303xp2hy7vi2qdfrnqn0600q"; + rev = "3a9ae671d01d9828b3e2935c80e8796cd3c1d77b"; + sha256 = "1kfwnwnnax22dlkc42rlw7lrdlpjxmh70sjnrrljpvi238scn5b2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -78802,11 +78781,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20180220.2131"; + version = "20180224.2212"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "63926bbaffde"; - sha256 = "00y7qskqic6lxv7n8rghfkj792iqxaz4rfgyhl5zyhmi77xj7y0d"; + rev = "e2e34c061ff5"; + sha256 = "00rj8lgp5b856csvlrin1vwas1109nmywbrnpny4qck4yghv6zqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -78889,8 +78868,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b"; - sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx"; + rev = "db8d9e660ad18a15159779efe34d7a98ef0df535"; + sha256 = "1wlzlhabq75iqrhg9p2xx8l7rnfzpcjjflxmgyhaxhq188bwrqk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index af69ebd66678cbc57477ae061b0b702fe38aabfd..294414f15ee12b8fe9f25aebc59085353b48811a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -3247,22 +3247,22 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: + buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "1.2"; + version = "2.0"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; - sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; + rev = "868aa9e04438d57746e0b1f5a13bcb9b64061c05"; + sha256 = "0b069g89b34s76ds3axmpiwl924fjd1jh6z6fdw5x0h0lj20pa87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; name = "buffer-flip"; }; - packageRequires = [ key-chord ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/buffer-flip"; license = lib.licenses.free; @@ -3502,12 +3502,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.9"; + version = "1.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "18a887957b0e22d3cc8873796bd27f06b2493a03"; - sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay"; + rev = "8d27bb99463bc230a76dee96378dd337622988f5"; + sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -5087,12 +5087,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "7cc0901489dff3d73ddc845ae060f938ecb85615"; - sha256 = "1kqj0nvnp8k7kg9fskl9g6z4pn1ik2a3lnvs01r1cxi1b5ixqjmk"; + rev = "4711695af3df93f1bbceee165c505fea5bfc49ac"; + sha256 = "0x8zwq88k85ikzr0klm6nfa6i1wbykzfa790cg9cmi7wrsywimm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -6059,12 +6059,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "80038731a5be72310ae499173ee793f36ac148b1"; - sha256 = "0psvdrxwlzhl8hxzvvdjc25xmk4v5v7ili5d0r78lrsq0k17nrg8"; + rev = "9d70490b551503aac22241c8089a46e55dd3deba"; + sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -8103,12 +8103,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "a87d3d9cf8d4d8cb6f108004e425f9a557683b75"; - sha256 = "0dia1xc8mng9bg987cpnhr2lciw4qbqsvzs4ayakrqfl2g3ny2qn"; + rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27"; + sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -12457,12 +12457,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "ad7d8e3e72ca5044602af060ab2a39c8bbaa0c7b"; - sha256 = "04p9fv4rv5m9ll6dfbffq46wl3inzayjnrfr3v0wdnppyvpl411c"; + rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e"; + sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -14333,12 +14333,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "e2878da13e7b87a824ebd6c842e9f552369b220c"; - sha256 = "091c8scwdxfrg710d1rkqad6l2y8hiw8f5jg4ayvrjm7d0s29hsa"; + rev = "ee20f7a3bcb86b661a38480acf853c1da2db6d26"; + sha256 = "0y7ji7p3blgzbwsz434346g835hzjs896hd7jli1ig0b9b0l43my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -15640,27 +15640,6 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "glab"; - version = "1.1.1"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "glab"; - rev = "5ced0214622450930bcea105b9aac785c594609d"; - sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; - sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; - name = "glab"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/glab"; - license = lib.licenses.free; - }; - }) {}; gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: melpaBuild { pname = "gmail-message-mode"; @@ -17310,12 +17289,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.8"; + version = "2.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; - sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; + rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; + sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17646,12 +17625,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.8"; + version = "2.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; - sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; + rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; + sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31108,12 +31087,12 @@ python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: melpaBuild { pname = "python-pytest"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-python-pytest"; - rev = "440f65ff4859fe45ae411dead032d74a2eb1d035"; - sha256 = "1di8jdvaknr4vx2a68hr4pb040lbfjw2ckzfgmzv527ln5ndww6b"; + rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe"; + sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; @@ -31178,12 +31157,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; - sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; + rev = "71eec02c25006737444dec7dfd004285f6cff6a8"; + sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -35043,22 +35022,22 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "ab4b80e206163b09a021f7de157e8bd4ae66358b"; - sha256 = "1c8hk7xwwlgkdw5xjcznpmajv904v2vs8mrcnmlay99r2qj3p2yx"; + rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930"; + sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ssh-deploy"; license = lib.licenses.free; @@ -35504,27 +35483,6 @@ license = lib.licenses.free; }; }) {}; - swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "swbuff"; - version = "3.3"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "swbuff"; - rev = "8d5b2bec12503509554f9dd83b97c198b259db2b"; - sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; - sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; - name = "swbuff"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/swbuff"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -39523,8 +39481,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "b1896ef49747"; - sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; + rev = "af4601ee3c6a"; + sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; @@ -39925,4 +39883,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index afd25bb3cfe80a48a7e2a5240c50f5dbcd6ff478..f6349089be1e4828a157cb984dff6eca639daa60 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180219"; + version = "20180226"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180219.tar"; - sha256 = "0yqyvkcal74jmpj6zl7xkcn85hdw2qpqjisb4dbdsr4312g45f3d"; + url = "https://orgmode.org/elpa/org-20180226.tar"; + sha256 = "0jqvry6gah1bwnryha4asynj13jyds3qim0xcy7s01rxk99m2ziy"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180219"; + version = "20180226"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180219.tar"; - sha256 = "1y7c2prbxpka0j32jam4fbfpslsh9h5049xbxfqymih456j8q7s2"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180226.tar"; + sha256 = "034wp70hcqnpidji5k1k80mj35iyyy098nbvc2sl7i2aca4m03zc"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index f87cc72f2f2b4570d6c124afcba31ca8e0ee925a..ba243629cc3e320bfd506d53d5f45056483037ad 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,8 +4,8 @@ , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null +, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 9288d293b9166f2cd3fd2377b179398e271a2627..23478758efe5773e9d47ea97d2d57c888643fc9c 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.32"; + version = "1.33"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d"; + sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index a7ac367f048acc9b72dc9065377ddde9a3252d6e..7715de153981d9ad241fa0fec77e8f6151ebcc3d 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip }: +, coreutils, gnugrep, which, git, python, unzip, libsecret +}: { name, product, version, src, wmClass, jdk, meta } @ attrs: @@ -65,7 +66,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib + stdenv.cc.cc.lib libsecret ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 3d623d3f3bda0c0da5e637a7dd408abda735a260..c24866671f9bae326d8e035dc01c9c365e51eb96 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, +{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { openssl libxml2 gnome3.gtksourceview - at_spi2_core + at-spi2-core pcre epoxy boost diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 1a164ec08de973a39e31abe1db9616d22730e77e..41d1a6262ed594a3263b3ffc597d930f7fb84e84 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -3,7 +3,7 @@ , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info +, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info , libksysguard, konsole, llvmPackages, makeWrapper }: @@ -34,7 +34,7 @@ mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons + kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons ]; postInstall = '' diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 74a83c1278afdf0cefb5fbab53919e4487ea08d5..c5f8278f649d9f66818a79bb2c95d3d83a853473 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index f4bdee830e199ffc79f6de19385c00878d58a292..d0367d7c3051dab8966d35a69600750d17efee32 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mg-${version}"; - version = "20170828"; + version = "20171014"; src = fetchurl { url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; - sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z"; + sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 53ea9741c03ca831b79c35ef779a08cee5adf10b..e8e529b63abcf657ae4b679fdb38a581e0ba3ffc 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, fetchNuGet -, autoconf, automake, pkgconfig, shared_mime_info, intltool +, autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake shared_mime_info intltool + autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip dotnetPackages.NUnit dotnetPackages.NUnitRunners diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index eef1746ff380b39750f9b9b62fd3c8edac755970..0db93f78781d00db140bf11dc6f6c679783d3efd 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vis-${version}"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk"; + sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k"; repo = "vis"; owner = "martanne"; }; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index d689254f2c85e46c4162fc10b0b12fb8055e035e..c2a09a507cc5b86922a129f86680db88020564f7 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.15"; + name = "qgis-2.18.16"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b"; + sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e9932b93fbe04e2289ab8b360b976ab50e07a0be..14659d796fc322ef638258acb5904ea2483ebe00 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook -, cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib +{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook +, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; - nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt - libsoup graphicsmagick json_glib openjpeg lua pugixml + libsoup graphicsmagick json-glib openjpeg lua pugixml colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 478e9d2b45304c7abc082eef45c853974d81ccc0..61e177be6093c4beb1adc1efdb8ee32567ef22d5 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.23"; + version = "2.25"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"; + sha256 = "102rwi30n09l8rih6kv6bb7lhv3djklgzill4p2zag0h700yqfq6"; }; outputs = [ "out" "man" "doc" ]; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; - preBuild = '' - makeFlags="PREFIX=$out exif=1" - ''; + makeFlags = [ + "PREFIX=$(out)" "exif=1" + ] ++ optional stdenv.isDarwin "verscmp=0"; postBuild = '' pushd man diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index afad1e6c3af07cdaf7fa6fa97a116917be7c3712..09d1a86db8e3e2148fa22987c8962e15ce05c9d8 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : +{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } : let version = "2.2"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; }; - nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; + nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 8815ed4180307686b02b2445b8fe883a265c5ebc..d034f5d64d9384165a9079cc60b8889e07b04285 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool -, gtk3, lcms2, exiv2, libchamplain, clutter_gtk, ffmpegthumbnailer, fbida +, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; buildInputs = [ - gtk3 lcms2 exiv2 libchamplain clutter_gtk ffmpegthumbnailer fbida + gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; postInstall = '' diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index d01286e15a649e906d28a2aaefccaf9e725566b5..dea3fd4e3c613a06424d992d7c4b3bc8683c48f1 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, - pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: + pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: stdenv.mkDerivation rec { name = "giv-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; - buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ]; meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 6dcf8223777a0c5d90111ced8b88740c88ca679e..c1f15904818ff42916d6d8227be1815abdaaaa15 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook -, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - barcode gtk3 gtk_doc gnome3.yelp_tools - gnome3.gnome_common gnome3.gsettings_desktop_schemas + barcode gtk3 gtk-doc gnome3.yelp-tools + gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 161e891512490293f71c208a4b4899b047e95575..03489db933c16121d98d43b0f86c6a0366864326 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, - libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison, - flex, hicolor_icon_theme, wrapGAppsHook }: + libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison, + flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = with gnome3; - [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf + [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain - librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ]; + librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ]; enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/gthumb; description = "Image browser and viewer for GNOME"; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 82741665161fa27cd3c70d309cd3dc3c508d11c3..8107ed8aa4497a5a9c11b56508fb3fce4ad1a3e4 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "hugin-2017.0.0"; + name = "hugin-2018.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46"; + sha256 = "1jv5wpqbq49fhbl5g521g1qxhdm1rm7acxd18fr3n3n5d830vbyk"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 791cd7be2d09b5f7527b5e6aa9c364c873c47352..1f7e779e88ab8d987d0d3569c7fe10cb8cbcca7a 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; meta = with lib; { - description = "A free an open source painting application"; + description = "A free and open source painting application"; homepage = https://krita.org/; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 4b5c4517deab300688642bd10510430d69b849c5..4dc1e89116ed4d17a74e2f440cb891bd595a5318 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "17.07"; + version = "18.02"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "1j361pvxywi4nb2alhnnd4qpqrpg6503gbi17cadcdi434gbqbsd"; + sha256 = "0rb4kjyrr9ry85cfpbk52l19vvwn7lrh2kmj2lwq531smnygn5m3"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index ac0060ec7f8e5916d411bef285a3dadefdbd8292..8c3a8bc894b368687bee473072d51b21801ac8e8 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -4,7 +4,7 @@ , makeWrapper , pkgconfig , wrapGAppsHook -, gsettings_desktop_schemas +, gsettings-desktop-schemas , qtbase , qttools @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libraw libtiff quazip - gsettings_desktop_schemas]; + gsettings-desktop-schemas]; cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index b4402c7d1043382ccc3c461be895213537828933..a52515ed1a35a7723c964bb0a94cc911280bbb57 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.7.17"; + version = "1.8.8"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0vx2pndgyfbnziwn36aylvq4jd889dvibzhw9ajzkm378l43lly9"; + sha256 = "1jn4ph7giwxr65xxbm59i03wywnmxkqnpvqp0kcajl4k48vq3wkr"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 5743f0c1bcb618b60f8b67d3fffda201beff32c8..9964bec67814355adb86178bf9bb217746b99706 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun + lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f26d5a9884afb2f54d009844f7b67484ccbead2 --- /dev/null +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem +, cmake, libjpeg, libpng, libtiff, boost +, qtbase, qttools }: + +stdenv.mkDerivation rec { + name = "scantailor-advanced-${version}"; + version = "1.0.12"; + + src = fetchFromGitHub { + owner = "4lex4"; + repo = "scantailor-advanced"; + rev = "v${version}"; + sha256 = "0i80jzky7l8wdv0wqdx48x1q0wmj72hhm0050pd43q80pj5r78a0"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ libjpeg libpng libtiff boost qtbase ]; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done + ''; + + desktopItem = makeDesktopItem { + name = "scantailor-advanced"; + exec = "scantailor %f"; + icon = "scantailor"; + comment = meta.description; + desktopName = "Scan Tailor Advanced"; + genericName = "Scan Processing Software"; + mimeType = "image/png;image/tif;image/jpeg;"; + categories = "Graphics;"; + startupNotify = "true"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/4lex4/scantailor-advanced; + description = "Interactive post-processing tool for scanned pages"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jfrankenau ]; + platforms = platforms.gnu; + }; +} diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index b23ddbf9d78bc013c3f38e58abfc9dbac31b1459..bba6a189b8f0c0dffda4e8d211f9afa27018b160 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,30 +1,30 @@ { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib +, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook , itstool, libgdata }: # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -stdenv.mkDerivation rec { - version = "${major}.${minor}"; - major = "0.27"; - minor = "2"; - name = "shotwell-${version}"; +let + pname = "shotwell"; + version = "0.27.4"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "0bxc15gk2306fvxg6bg1s6c706yd89i66ldng0z102mcfi98warb"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0g2vphhpxrljpy9sryfsgaayix807i1i9plj9bay72dk0zphqab2"; }; nativeBuildInputs = [ - meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook + meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook ]; buildInputs = [ - gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk + gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas - libraw json_glib glib gdk_pixbuf librsvg gnome3.rest + libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas + libraw json-glib glib gdk_pixbuf librsvg gnome3.rest gnome3.gcr gnome3.defaultIconTheme libgdata ]; @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; homepage = https://wiki.gnome.org/Apps/Shotwell; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 68597a23ca650996dffeea2aa94db098b8b0bd69..7f118b6adc9a45c62641c898a7b3a95acc63a7f7 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif, conf ? null }: +{ stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "sxiv-${version}"; - version = "1.3.2"; + version = "24"; src = fetchFromGitHub { owner = "muennich"; repo = "sxiv"; rev = "v${version}"; - sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h"; + sha256 = "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d"; }; postUnpack = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ libX11 imlib2 giflib libexif ]; + buildInputs = [ libXft imlib2 giflib libexif ]; postInstall = '' mkdir -p $out/share/applications/ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index e951f3a7a9379e41c6b305a3cb1bc0266ae5c19f..c655cadef400866abaac7a92ecd504cd04e4510d 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms -, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: +, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}: stdenv.mkDerivation rec { name = "viewnior-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext - shared_mime_info glib gdk_pixbuf perl + shared-mime-info glib gdk_pixbuf perl ]; preFixup = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 38f63bdb38362a7219da1e81146cbc7cfd9c9df5..538931c1040ef8f917962a4ea519a417171b0fab 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor_icon_theme, defaultIconTheme +, hicolor-icon-theme, defaultIconTheme # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 52a17f5cbeb94ff13fddb321f32770fd6f4a49d2..0ed958b4e770d3dd8b50fa5dc82fb86d624effb0 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: @@ -10,7 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index da7cd2e8d79d6ea7a146d1de42001cf201683c6a..cba0b1e59e3adb88435105650ddff01a82eacb77 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -12,7 +12,7 @@ mkDerivation { maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n kiconthemes kio kwindowsystem qttools diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index b032de8487943c09e21869b9634f1c8e35db615f..89bc171d295375f3858aef545a39b865332c874a 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,5 +1,5 @@ { mkDerivation, lib -, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info +, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info , qtwebkit , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis @@ -28,7 +28,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz3 shared_mime_info + ffmpeg libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 17d7da7b702c537715ad29909f38f7ce138dec47..b5eca47d6c0eb5791786b3d9b7a486898633d6cd 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -21,7 +21,7 @@ , kplotting , ktextwidgets , mlt -, shared_mime_info +, shared-mime-info , libv4l , kfilemetadata , ffmpeg @@ -62,7 +62,7 @@ mkDerivation { qtquickcontrols qtscript qtwebkit - shared_mime_info + shared-mime-info libv4l ffmpeg ]; diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 3230efd82017e5777516e825d53fca3487121ba8..b3cfed91dd45c73342ec7dbe75294db36cfa5582 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - shared_mime_info, + shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, @@ -14,7 +14,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 8abb58b46b27caeaf59c9ac9d19c6cdd1bdcdf3b..13585848317b90aa1de030f8ce6433e1ca256921 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info, + mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index 9f3d5e2ea0190870dafc898982caf5ddb6c615e4..f380315cce903a8aac28e840e00784cd8f4839a7 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, shared_mime_info, + extra-cmake-modules, kdoctools, shared-mime-info, akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 1217c29032b40f6162c8bc983eb4de89c935ffa7..e0e80b05ebcec67e1cc080a0b65ad1496da3c790 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,7 +1,7 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebkit -, krunner, shared_mime_info, kparts, knewstuff +, krunner, shared-mime-info, kparts, knewstuff , gpsd, perl }: @@ -10,7 +10,7 @@ mkDerivation { meta.license = with lib.licenses; [ lgpl21 gpl3 ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts + qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts knewstuff gpsd ]; } diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 422968be35a53fd749212701ad800876169f5f47..0ac8ddebc75d704a3381fb2d72ab880f5e161c2f 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared_mime_info + shared-mime-info }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { maintainers = with lib.maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; - buildInputs = [ shared_mime_info ]; + buildInputs = [ shared-mime-info ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 karchive kcrash diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 56fc11a20e12b9f49cfd72ffa5ad0f6444bc234b..18f47b7652f8a503c12b5881480057323e9f9832 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -44,13 +44,13 @@ let libPath = lib.makeLibraryPath [ ]; in stdenv.mkDerivation rec { pname = "airtame"; - version = "3.0.1"; + version = "3.1.1"; name = "${pname}-${version}"; longName = "${pname}-application"; src = fetchurl { url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz"; - sha256 = "1z5v9dwcvcmz190acm89kr4mngirha1v2jpvfzvisi0vidl2ba60"; + sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 0f629aace4563ee9da7e314c864369239b3780a3..6907ce8776451c173d544c223eb2653d6059eb2d 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -30,18 +30,18 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2018-01-31"; + version = "2018-03-04"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0jc8haijd6f8r5fqiknrvqnwc9q4cp93852lr2p7zak7dv29v45p"; + sha256 = "0pxnc6r75c7rwnsqc0idi4a60arpgchl1i8yppibhv0px5w11mwa"; fetchSubmodules = true; }; - cargoSha256 = "0023jpc6krilmp5wzbbwapxafsi6m1k13mvjh4zlvls1nyyhk808"; + cargoSha256 = "0q2yy9cldng8znkmhysgrwi43z2x7a8nb1bnxpy9z170q8ds0m0j"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index cfd4d6b32de35c5e13c144e0eabc76e4ee5126fe..f69152820e43e48e8dd11e88d382d98526146496 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib gtk2 wordnet ]; + buildInputs = [ dbus-glib gtk2 wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7391652fa8ea6aae74c5c82081b37cbea91b5da3..8133bf1c7634184f896d22cf8d528d41917688c8 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.79"; + name = "blender-2.79a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9"; + sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc"; }; buildInputs = diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index d9ea487a83bb6974caf3269ce028162848f9256c..4477cbbcc06a9d6300eac131550b67046af76154 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; + buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index b9a160564a5de64a084a67b684873682078cfc16..edb10a0f6671774a3e1ee948951835c9087192de 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm"; + sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; buildInputs = [ qtbase qtquickcontrols ]; @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = "https://github.com/Ultimaker/Cura"; + homepage = https://github.com/Ultimaker/Cura; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 575889ad2c6f031df75c7cff9ecb25e148f7e28b..c3a19e6551a230e78b642c775b5a2ef46f5239de 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy"; + sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = "https://github.com/Ultimaker/CuraEngine"; + homepage = https://github.com/Ultimaker/CuraEngine; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 4a7c4d7ec3049d40d98b22982f9cc66e97d6e0b2..1ea45c3574a5a29de0d9e3995f5d3cc9a85a80ed 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "devilspie2-${version}"; - version = "0.42"; + version = "0.43"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i"; + sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fbd9d47633a1e0412a590d7c2953c6a904c1c06a --- /dev/null +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -0,0 +1,140 @@ +{ stdenv +, autoreconfHook +, curl +, fetchFromGitHub +, git +, libevent +, libtool +, libqrencode +, libudev +, libusb +, makeWrapper +, pkgconfig +, qtbase +, qttools +, qtwebsockets +, qtmultimedia +, udevRule51 ? '' +, SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402" +, '' +, udevRule52 ? '' +, KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n" +, '' +, writeText +}: + +# Enabling the digitalbitbox program +# +# programs.digitalbitbox.enable = true; +# +# will install the digitalbitbox package and enable the corresponding hardware +# module and is by far the easiest way to get started with the Digital Bitbox on +# NixOS. + +# In case you install the package only, please be aware that you may need to +# apply some udev rules to allow the application to identify and access your +# wallet. In a nixos-configuration, one may accomplish this by enabling the +# digitalbitbox hardware module +# +# hardware.digitalbitbox.enable = true; +# +# or by adding the digitalbitbox package to system.udev.packages +# +# system.udev.packages = [ pkgs.digitalbitbox ]; + +# See https://digitalbitbox.com/start_linux for more information. +let + copyUdevRuleToOutput = name: rule: + "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; +in stdenv.mkDerivation rec { + name = "digitalbitbox-${version}"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "digitalbitbox"; + repo = "dbb-app"; + rev = "v${version}"; + sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1"; + }; + + nativeBuildInputs = with stdenv.lib; [ + autoreconfHook + curl + git + makeWrapper + pkgconfig + qttools + ]; + + buildInputs = with stdenv.lib; [ + libevent + libtool + libudev + libusb + libqrencode + + qtbase + qtwebsockets + qtmultimedia + ]; + + LUPDATE="${qttools.dev}/bin/lupdate"; + LRELEASE="${qttools.dev}/bin/lrelease"; + MOC="${qtbase.dev}/bin/moc"; + QTDIR="${qtbase.dev}"; + RCC="${qtbase.dev}/bin/rcc"; + UIC="${qtbase.dev}/bin/uic"; + + configureFlags = [ + "--enable-libusb" + ]; + + hardeningDisable = [ + "format" + ]; + + postInstall = '' + mkdir -p "$out/lib" + cp src/libbtc/.libs/*.so* $out/lib + cp src/libbtc/src/secp256k1/.libs/*.so* $out/lib + cp src/hidapi/libusb/.libs/*.so* $out/lib + cp src/univalue/.libs/*.so* $out/lib + + # [RPATH][patchelf] Avoid forbidden reference error + rm -rf $PWD + + wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib" + wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib" + + # Provide udev rules as documented in https://digitalbitbox.com/start_linux + mkdir -p "$out/etc/udev/rules.d" + ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} + ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} + ''; + + meta = with stdenv.lib; { + description = "A QT based application for the Digital Bitbox hardware wallet"; + longDescription = '' + Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. + + This package will only install the dbb-app and dbb-cli, however; in order for these applications to identify and access Digital Bitbox devices, one may want to enable the digitalbitbox hardware module by adding + + hardware.digitalbitbox.enable = true; + + to the configuration which is equivalent to adding this package to the udev.packages list. + + + The easiest way to use the digitalbitbox package in NixOS is by adding + + programs.digitalbitbox.enable = true; + + to the configuration which installs the package and enables the hardware module. + ''; + homepage = "https://digitalbitbox.com/"; + license = licenses.mit; + maintainers = with maintainers; [ + vidbina + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 1393af67bf8c539f0225493cf6fe9660d7de03fb..bd7fbe863163150fc2935357dff5284d551d8444 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,22 +1,23 @@ -{ stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: +{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-1.1"; + name = "doomseeker-${version}"; + version = "2018-03-03"; - src = fetchurl { - url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h"; + src = fetchFromBitbucket { + owner = "Doomseeker"; + repo = "doomseeker"; + rev = "072110a8fe0643c4a72461e7768560813bb0a62b"; + sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p"; }; - buildInputs = [ qt4 zlib bzip2 ]; + patches = [ ./fix_paths.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake qttools pkgconfig ]; - patchPhase = '' - substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/doomseeker/fix_paths.patch b/pkgs/applications/misc/doomseeker/fix_paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..08654c2384cb3b9f94733f1f646b75b3a207f3ae --- /dev/null +++ b/pkgs/applications/misc/doomseeker/fix_paths.patch @@ -0,0 +1,40 @@ +diff -ru3 source-old/src/core/datapaths.cpp source-new/src/core/datapaths.cpp +--- source-old/src/core/datapaths.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ source-new/src/core/datapaths.cpp 2018-03-04 00:10:25.247262567 +0300 +@@ -335,7 +335,7 @@ + paths.append(workingDirectory()); + paths.append("./"); + #ifndef Q_OS_WIN32 +- paths.append(INSTALL_PREFIX "/" INSTALL_LIBDIR "/doomseeker/"); ++ paths.append(INSTALL_PREFIX "/lib/doomseeker/"); + #endif + paths = uniquePaths(paths); + return Strings::combineManyPaths(paths, "engines/"); +diff -ru3 source-old/src/core/pathfinder/pathfinder.cpp source-new/src/core/pathfinder/pathfinder.cpp +--- source-old/src/core/pathfinder/pathfinder.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ source-new/src/core/pathfinder/pathfinder.cpp 2018-03-04 00:09:34.862556976 +0300 +@@ -128,9 +128,7 @@ + << DataPaths::programFilesDirectory(DataPaths::x64) + << DataPaths::programFilesDirectory(DataPaths::x86); + #else +- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin" +- << "/usr/games/" << "/usr/local/games/" +- << "/usr/share/games/" << gDefaultDataPaths->workingDirectory() << "."; ++ paths << gDefaultDataPaths->workingDirectory() << "."; + #endif + QStringList pathsCopy(paths); + foreach (const QString &path, pathsCopy) +diff -ru3 source-old/src/core/pathfinder/wadpathfinder.cpp source-new/src/core/pathfinder/wadpathfinder.cpp +--- source-old/src/core/pathfinder/wadpathfinder.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ source-new/src/core/pathfinder/wadpathfinder.cpp 2018-03-04 00:09:56.822865339 +0300 +@@ -84,10 +84,6 @@ + QStringList defaultPaths() + { + QStringList paths; +- #ifdef Q_OS_UNIX +- paths << "/usr/local/share/games/doom/" +- << "/usr/share/games/doom/"; +- #endif + return paths; + } + }; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index ee16ba24ed46fcedecc63f6b77cb690c30eaada7..93e5d297ffb3012d42f803ae61eecb47e4878d95 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc -, keybinder3, clutter_gtk, libnotify +, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc +, keybinder3, clutter-gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive }: @@ -19,8 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify + vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee + gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 8c63c856578118f29f0ba7b464cfe267130e444a..be853e4213bc771ec48262e30189153e759b7e49 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, + pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { file intltool vala_0_34 - gnome3.yelp_tools + gnome3.yelp-tools wrapGAppsHook # For setup hook gobjectIntrospection @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - json_glib + json-glib sqlite itstool librsvg diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 939b38ca29f76bed62306427042b651105ce9e13..f05514f3fc58a7cc8457184d4f4000ccfe570454 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.38.2"; + version = "1.39.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv"; + sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 509a54881cce7c9b8685f286865b81751f024a22..d4f2a056a9f6ce765011e1b22355d75a6a66ac96 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, - intltool, libstartup_notification, gtk_doc, wrapGAppsHook + intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk_doc wrapGAppsHook + pkgconfig intltool gtk-doc wrapGAppsHook ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index dfe61b57b43ddde280d96b67a70792e84619b71f..776a10b7e0c5863d0bb8e09617f3ee74adbc7835 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings_desktop_schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook }: let version = "1.3.10"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; + buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 46278f42e7bb0bc5684f9cb9f16d9cf6708290a5..77e7b592f6470a1f3bb6a82be1715d28c44736bc 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.11"; + name = "gphoto2-2.5.15"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r"; + sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index a7485c4ee6815ca17bb9aa196a2d5331fc52b38f..1810d6d5c476aa5de0e4f6c7b5a8977e405db076 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig - shared_mime_info # For update-mime-database - desktop_file_utils # For update-desktop-database + shared-mime-info # For update-mime-database + desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 8b66b23df01a3993692b264f17fe21551dde7e73..ace91bfafffdf8273e1e4799f15a92ec56924421 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, - pango, gsettings_desktop_schemas, + pango, gsettings-desktop-schemas, # Optional packages: enableOSM ? true, osm-gps-map }: diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 21a551bd63146cce538ac60b7852032587f73ac3..0a2a17fc8fa0ecdb3769e4957ade2ddacde40551 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -17,7 +17,7 @@ with lib; let inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ]; + inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ]; pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a04bd7194f2f50e3d1401676ef1f90104da5f7f --- /dev/null +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }: + +rustPlatform.buildRustPackage rec { + name = "gutenberg-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Keats"; + repo = "gutenberg"; + rev = "v${version}"; + sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + }; + + cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; + + postInstall = '' + install -D -m 444 completions/gutenberg.bash \ + -t $out/share/bash-completion/completions + install -D -m 444 completions/_gutenberg \ + -t $out/share/zsh/site-functions + install -D -m 444 completions/gutenberg.fish \ + -t $out/share/fish/vendor_completions.d + ''; + + meta = with stdenv.lib; { + description = "An opinionated static site generator with everything built-in"; + homepage = https://www.getgutenberg.io; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 51a14fb20d0b0f86b8ae528ce11937d69210609a..105f7beb98fe3dc73014e06a6300f519a421e824 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils -, intltool, dbus_glib, gnome_python, dbus -, hicolor_icon_theme +{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils +, intltool, dbus-glib, gnome_python, dbus +, hicolor-icon-theme }: # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { }; buildInputs = [ - docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme + docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 972403a47544b4c6b8b48bf7eb94db1e2dd8280c..d18546cb36f8f1d2cf11e6f0fc7e8f2c5b92df14 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -14,7 +14,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.5) - ffi (1.9.21) + ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) html-pipeline (2.7.1) @@ -23,7 +23,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.2) + jekyll (3.7.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 32e90b07a2633ab27d39afabbe5cb5e92c65b026..b5b21dec438253811075c56ff51b949522fdb49f 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -53,10 +53,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "1.9.21"; + version = "1.9.23"; }; forwardable-extended = { source = { @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05f61rqwz1isci7by34zyz38ah2rv5b8i5h618cxcl97hwqps8n2"; + sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 418b4ea466ea75f533bd9df9774ddf335208cb07..ce3c318f678053bb1bab729ea383e569de594cfc 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -2,6 +2,8 @@ , withOptionalDependencies ? false }: +# Bundix: +# nix-shell -p bundix zlib bundlerEnv rec { name = pname + "-" + version; pname = "jekyll"; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 41f33c6e9ea73ebd82b6f41dbd4f0925f53c56b8..aba5e06e376944a6a4dbfbc2d7a6be0c38221302 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -10,7 +10,7 @@ gem "jemoji" # Optional dependencies: gem "coderay", "~> 1.1.0" gem "jekyll-coffeescript" -gem "jekyll-docs" +#gem "jekyll-docs" gem "jekyll-feed", "~> 0.9" gem "jekyll-gist" gem "jekyll-paginate" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index d070ad66f65c2c690027708f52e1376864066317..190f1d66479df93e4e9f093061e52aa4b6f6f519 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -25,7 +25,7 @@ GEM faraday (0.14.0) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.9.21) + ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) html-pipeline (2.7.1) @@ -34,7 +34,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.2) + jekyll (3.7.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -52,8 +52,6 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-docs (3.7.2) - jekyll (= 3.7.2) jekyll-feed (0.9.3) jekyll (~> 3.3) jekyll-gist (1.5.0) @@ -136,7 +134,6 @@ DEPENDENCIES jekyll jekyll-avatar jekyll-coffeescript - jekyll-docs jekyll-feed (~> 0.9) jekyll-gist jekyll-mentions diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index f41acb6619100f199a234d1e37deb3d94508b6f2..3a115f8a4b0ea110aa043c550ec29de7ef382161 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -112,10 +112,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "1.9.21"; + version = "1.9.23"; }; forwardable-extended = { source = { @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05f61rqwz1isci7by34zyz38ah2rv5b8i5h618cxcl97hwqps8n2"; + sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -186,15 +186,6 @@ }; version = "1.1.1"; }; - jekyll-docs = { - dependencies = ["jekyll"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dw8pvxr0q02rivc0n0v4w6151zi6s212xwl27iam6pjc8skbg9b"; - type = "gem"; - }; - version = "3.7.2"; - }; jekyll-feed = { dependencies = ["jekyll"]; source = { diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index b7b09816abd490ab7d228e40995429fd9142b04a..e87288d71287e2ceba850883ab36b219e7735c0e 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.8"; + version = "0.8.2"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "042nvix85a37aalc2rwg4yc2g3wyy6lym3c2ljj2xkl6c1b0c1r7"; + sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index b908941d2bc973ff4b013c5690da60630e0c3f46..b536dffb708ca09b2831bb5ab351fc2047526676 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13265"; + version = "13478"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0mmpxmf17lw1j1m1gfz2jrm3qj2416zgbwgcy7xbvn6qcd8k7dr5"; + sha256 = "1mc1zdcnlm14ky820cj61sid6aiq9k11kj6vzlqskvgqazc60xj4"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index bf1b77534ce681aed3b325754cc86958e02ce5f4..ba048761367cdd5bc8963f47b979ff6b29a8f102 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file:///linux.zip" in the - directory where you saved it. Note you need version 3.3. + Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in + the directory where you saved it. Note you need version 3.3. ''; name = "linux.zip"; sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; diff --git a/pkgs/applications/misc/keepassx/cmake.patch b/pkgs/applications/misc/keepassx/cmake.patch deleted file mode 100644 index 4ddf8b2e7e99a9f4a79de8cbed4508f9dc37156f..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/keepassx/cmake.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix "No known features for CXX compiler", see -https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at -https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,10 +20,10 @@ if(NOT CMAKE_BUILD_TYPE) - FORCE) - endif() - --project(KeePassXC) -- - cmake_minimum_required(VERSION 3.1.0) - -+project(KeePassXC) -+ - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - - # Support Visual Studio Code diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 2f08fbd5fc7ae231d522c139833c62adade54f54..6f2f31473eb474da5175ac0a2a9851b65ffaa8d6 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,28 +1,51 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, qttools -, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras -, withKeePassHTTP ? true + +, curl +, libargon2 +, libgcrypt +, libsodium +, zlib +, libmicrohttpd +, libXtst +, qtbase +, libgpgerror +, glibcLocales +, libyubikey +, yubikey-personalization +, libXi +, qtx11extras + +, withKeePassBrowser ? true +, withKeePassHTTP ? false +, withKeePassNetworking ? false +, withKeePassSSHAgent ? false }: with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0q913v2ka6p7jr7c4w9fq8aqh5v6nxqgcv9h7zllk5p0amsf8d80"; + sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f"; }; - patches = [ ./cmake.patch ./darwin.patch ]; + patches = [ ./darwin.patch ]; cmakeFlags = [ + "-DKEEPASSXC_BUILD_TYPE=Release" "-DWITH_GUI_TESTS=ON" "-DWITH_XC_AUTOTYPE=ON" "-DWITH_XC_YUBIKEY=ON" - ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); + ] + ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") + ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON") + ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") + ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; checkPhase = '' @@ -32,7 +55,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper qttools ]; - buildInputs = [ libgcrypt zlib qtbase libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; + buildInputs = [ + curl + glibcLocales + libXi + libXtst + libargon2 + libgcrypt + libgpgerror + libmicrohttpd + libsodium + libyubikey + qtbase + qtx11extras + yubikey-personalization + zlib + ]; postInstall = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch index 85fc49e363658cb289c5dd65188b4179988418cd..1edf0a573a31675ae04fcd0aa6f85de73500afa0 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -2,7 +2,7 @@ Remove the use of macdeployqt to avoid copying dependencies and reduce installation size from 90 MB to 9 MB. --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -188,8 +188,8 @@ else() +@@ -250,8 +250,8 @@ else() set(PROGNAME keepassxc) endif() @@ -10,43 +10,43 @@ reduce installation size from 90 MB to 9 MB. - set(CMAKE_INSTALL_PREFIX "/Applications") +if(APPLE AND WITH_APP_BUNDLE) + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + set(CMAKE_INSTALL_MANDIR "/usr/local/share/man") endif() - if(MINGW) -@@ -198,7 +198,7 @@ if(MINGW) +@@ -262,7 +262,7 @@ if(MINGW) set(PLUGIN_INSTALL_DIR ".") set(DATA_INSTALL_DIR "share") elseif(APPLE AND WITH_APP_BUNDLE) - set(CLI_INSTALL_DIR "/usr/local/bin") + set(CLI_INSTALL_DIR "../bin") + set(PROXY_INSTALL_DIR "/usr/local/bin") set(BIN_INSTALL_DIR ".") set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns") - set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5255186..0175983 100644 +index 69526967..38f7c5d4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -282,11 +282,6 @@ if(APPLE AND WITH_APP_BUNDLE) - if(NOT DEFINED QT_BINARY_DIR) - set(QT_BINARY_DIR "/usr/local/opt/qt5/bin" CACHE PATH "QT binary folder") - endif() +@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE) + set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") + include(CPack) + - add_custom_command(TARGET ${PROGNAME} - POST_BUILD -- COMMAND ${QT_BINARY_DIR}/macdeployqt ${PROGNAME}.app +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src - COMMENT "Deploying app bundle") endif() - if(MINGW) + install(TARGETS ${PROGNAME} diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt -index ac93de0..03d502e 100644 +index 08c53278..b833b692 100644 --- a/src/autotype/mac/CMakeLists.txt +++ b/src/autotype/mac/CMakeLists.txt -@@ -16,7 +16,6 @@ if(WITH_APP_BUNDLE) +@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE) add_custom_command(TARGET keepassx-autotype-cocoa POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} -- COMMAND ${QT_BINARY_DIR}/macdeployqt ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src COMMENT "Deploying autotype plugin") else() diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 9e955860bfc4cea2ce3ce99468e31bbb5ffa713c..17746563c569b4567968db8407aae6eeef7e8a69 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -2,7 +2,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.7.1"; + version = "0.8.0"; name = "kitty-${version}"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0c02xy5psb7v7xfncz4bflrbinifpcm1yn8hvh0zaf7p4vr837p7"; + sha256 = "12pj4js704r4f6idam3ljg7yllij9v158ayq6ym24zq18bv1nmbz"; }; buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ]; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8479c4e16ace59b96b74ff6a96b3e1eec86e50fe..699cb2fd09863897d9479676671ded985122a8ec 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib +, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index e2290105c9258d823efe8ce70fa9a84c3659151e..bb55fc2d4a8b7d38bb7602a23c3174a17ee99db5 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -8,7 +8,7 @@ , dbus , libwnck3 , keybinder3 -, hicolor_icon_theme +, hicolor-icon-theme , wrapGAppsHook }: @@ -28,7 +28,7 @@ buildPythonApplication rec { # For setup hook gobjectIntrospection ]; - buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; + buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; configurePhase = '' diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 2695ac1ef7d51d3977d675fbf1af4c39d3b6bd3d..5c21b404f348006c6c135dfef99f499f215bb4b0 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: -let version = "0.7.1"; in +let version = "0.7.3"; in mkDerivation { name = "latte-dock-${version}"; @@ -10,7 +10,7 @@ mkDerivation { owner = "psifidotos"; repo = "Latte-Dock"; rev = "v${version}"; - sha256 = "0vdmsjj1qqlzz26mznb56znv5x7akbvw65ybbzakclp4q1xrsrm2"; + sha256 = "110bal0dairsvgj624n5k0zabh2qfy9dk560a4wy7icxv0cjh7hg"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 837a221be946cde6cd877b8fda6da626182de2ca..959ed6b11babf63bc434244b0b43c4d839b00631 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -6,12 +6,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "26b"; + version = "2018-03-02"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "v${version}"; - sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj"; + rev = "0ab1fbbf142b6df6d6bae782e3af2ec50f32dec9"; + sha256 = "1h0hrmxwm7ripgp051788p8ad0q38dc9nvjx87mdwlkwk9qc0dis"; fetchSubmodules = false; }; @@ -21,7 +21,6 @@ in stdenv.mkDerivation rec { dontStrip = true; configurePhase = '' - sed -i -e 's+fz_set_use_document_css (state.ctx, usedoccss);+/* fz_set_use_document_css (state.ctx, usedoccss); */+' link.c sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index a514b0ff63ddcab485cc0d0a2751519908cd8336..0a2a051223acc18db4b0b56f453623c375b365c9 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte , libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs }: @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" + "--enable-gtk3" ]; nativeBuildInputs = [ @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs ]; - buildInputs = [ gtk2 vte ]; + buildInputs = [ gtk3 vte ]; patches = [ ./respect-xml-catalog-files-var.patch diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0167132db7897b7c8bf8f95c8291f39a592982f3..8451c783aac6b0ebe94b8acfe51630c22309c997 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK -, desktop_file_utils, libSM, imagemagick }: +, desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "17.10"; + version = "17.12"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c"; + sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM + buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 1317c0357923498e349a5070516d3ac1837c46fe..701e4b2e052d474fcde9a8449682a2d894d37bee 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.0"; + version = "3.8.4"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b"; + sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index e8c6c9f24300b649b54360971a1b5a617a9b05ed..76517f874642209246276cfa15258c355e563385 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo +, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo , mysql, libxml2, libctemplate, libmysqlconnectorcpp , vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome_keyring, file +, libXdmcp, libuuid, libzip, libgnome-keyring, file , pythonPackages, jre, autoconf, automake, libtool , boost, glibmm, libsigcxx, pangomm, libX11, openssl , proj, cairo, libglade @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf + libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl proj cairo cairo.dev makeWrapper libglade ] ; @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome_keyring}/bin" \ + --prefix PATH : "${gnome-keyring}/bin" \ --prefix PATH : "${python}/bin" \ --set PYTHONPATH $PYTHONPATH \ --run ' diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d651f9ef3b6680f2b59a1ad501197c5d97ca4c5f..ae1c178e5716a0e0c8fa2b9a6d7f86e5633d6a92 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "1yl4k39wkh2ins7fz585kc4cg6fagiswgqkh5g36db1bka3v1kn0"; + sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 2aa04ce83e536ae0b9e4a2a7a10f582e798fd715..8e8126192ddaf2fb9c97a3a16602a8a709b21612 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "notify-osd-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib libwnck3 libnotify dbus_glib makeWrapper - gnome3.gsettings_desktop_schemas + glib libwnck3 libnotify dbus-glib makeWrapper + gnome3.gsettings-desktop-schemas ]; configureFlags = "--libexecdir=$(out)/bin"; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index f1211851b4c673b394019c315eef9c25a74e8b79..69f74d66dd019ce3b2ef0e4471976b9fb14d3284 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -10,14 +10,16 @@ let sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf"; }; + version = "1.0"; + in stdenv.mkDerivation { - name = "nrsc5-20171129"; + name = "nrsc5-${version}"; src = fetchFromGitHub { owner = "theori-io"; repo = "nrsc5"; - rev = "f87beeed96f12ce6aa4789ac1d45761cec28d2db"; - sha256 = "03d5k59125qrjsm1naj9pd0nfzwi008l9n30p9q4g5abgqi5nc8v"; + rev = "v${version}"; + sha256 = "09zzh3h1zzf2lwrbz3i7rif2hw36d9ska8irvxaa9lz6xc1y68pg"; }; postUnpack = '' diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 499653b1435902f8230c7e1941641b6f347a92fd..9e460bf2611a41771ac202b3232b10b20bfa7a11 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ola-${version}"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; rev = version; - sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al"; + sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index a78b98a58cb3040a074b1359f4a3eade5ddfa677..d4847e4ce493e6022f4955ded00b512473df376d 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,21 +1,21 @@ { fetchurl , stdenv , aspellWithDicts -, at_spi2_core ? null +, at-spi2-core ? null , atspiSupport ? true , bash , glib , glibcLocales , gnome3 , gobjectIntrospection -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gtk3 , hunspell , hunspellDicts , hunspellWithDicts , intltool , isocodes -, libcanberra_gtk3 +, libcanberra-gtk3 , libudev , libxkbcommon , pkgconfig @@ -74,17 +74,17 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ bash gnome3.dconf - gsettings_desktop_schemas + gsettings-desktop-schemas gtk3 hunspell isocodes - libcanberra_gtk3 + libcanberra-gtk3 libudev libxkbcommon wrapGAppsHook xorg.libXtst xorg.libxkbfile - ] ++ stdenv.lib.optional atspiSupport at_spi2_core; + ] ++ stdenv.lib.optional atspiSupport at-spi2-core; nativeBuildInputs = [ glibcLocales diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 3420d6365b4bc46b0a0d2f6a16d6b1514b61a747..1c5fde9353aa073dd464ebd863247d5e53cfd6f7 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencpn-${version}"; - version = "4.2.0"; + version = "4.8.2"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3"; + sha256 = "0r6a279xhhf4jrmjb2xi5arxb4xd5wvqbs4hyyildlgpr1x7bd09"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a941a719f29b9ef956090512a46f6fdacb8fc3f --- /dev/null +++ b/pkgs/applications/misc/opentx/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub +, cmake, gcc-arm-embedded, python +, qt5, SDL, gmock +, dfu-util, avrdude +}: + +let + + version = "2.2.1"; + +in stdenv.mkDerivation { + + name = "opentx-${version}"; + + src = fetchFromGitHub { + owner = "opentx"; + repo = "opentx"; + rev = version; + sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = with qt5; [ + gcc-arm-embedded + python python.pkgs.pyqt4 + qtbase qtmultimedia qttranslations + SDL gmock + ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' + ''; + + cmakeFlags = [ + "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" + # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. + #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + ]; + + meta = with stdenv.lib; { + description = "OpenTX Companion transmitter support software"; + longDescription = '' + OpenTX Companion is used for many different tasks like loading OpenTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = https://open-tx.org/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ elitak ]; + }; + +} diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fc7fd95bbb9553bfed17cf025bbc04453aab5054..c9f00d48aeccae1c2b20b743b012777f2f327dd1 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,23 +1,23 @@ { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook -, intltool, yelp_tools, itstool, libxmlxx3 +, intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll -, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg -, xkbcomp, gsettings_desktop_schemas, liblouis +, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg +, xkbcomp, gsettings-desktop-schemas, liblouis , speechd, brltty, setproctitle, gst_all_1, gst-python }: with lib; let + pname = "orca"; version = "3.26.0"; - majorVersion = builtins.concatStringsSep "." (take 2 (splitString "." version)); in buildPythonApplication rec { - name = "orca-${version}"; + name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/orca/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7"; }; @@ -30,7 +30,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp_tools itstool + intltool yelp-tools itstool ]; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ in buildPythonApplication rec { ]; buildInputs = [ - python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas + python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; @@ -47,6 +47,12 @@ in buildPythonApplication rec { intltoolize ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { homepage = https://wiki.gnome.org/Projects/Orca; description = "Screen reader"; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 691f3188b08c59ff92f13a90d168eab1bebdc814..47be9dc8200ec954ea4e9e5d2bfc79c34d3be638 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp + gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e01956e36119f9cadb16cc966c64ae92c73a0fc6..e06f4407534b6fee8d2185c2d09f1685fb270c58 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn , wrapGAppsHook, makeWrapper, gettext , python3Packages, gtk3, poppler_gi -, gnome3, gsettings_desktop_schemas, shared_mime_info, +, gnome3, gsettings-desktop-schemas, shared-mime-info, }: python3Packages.buildPythonApplication rec { @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; buildInputs = [ - gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; doCheck = false; # no tests diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index ecc4c341a686707b2c9688b5d315b52680e6b540..5b4b043ef6673aa72c65e485216ef40c4ad7382d 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -14,13 +14,13 @@ in python2Packages.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy"; + sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581"; }; namePrefix = ""; @@ -35,8 +35,13 @@ python2Packages.buildPythonApplication rec { ./pytrainer-webkit.patch ]; + postPatch = '' + substituteInPlace ./setup.py \ + --replace "'mysqlclient'," "" + ''; + propagatedBuildInputs = with python2Packages; [ - dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate + dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2 ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; buildInputs = [ perl gpsbabel sqlite ]; diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch index 359e28c41c34f4ec9d1e15238f6a264e6c618aa1..761064077a98aaf65f1732565940f962aa1ade41 100644 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -1,7 +1,7 @@ -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py ---- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200 -@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase): +diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py +--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100 ++++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100 +@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase): self.assertEquals(self.activity.time, self.activity.duration) def test_activity_starttime(self): @@ -10,10 +10,10 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1 def test_activity_time_tuple(self): self.assertEquals(self.activity.time_tuple, (2, 3, 46)) -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py ---- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200 -@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase) +diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py +--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100 ++++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100 +@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase) self.fail() def test_workout_summary(self): @@ -22,9 +22,18 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrai try: current_path = os.path.dirname(os.path.abspath(__file__)) data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py ---- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200 +@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase) + self.fail() + + def test_summary_in_database(self): +- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] ++ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] + activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') + self.ddbb.session.add(activity) + self.ddbb.session.commit() +diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py +--- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 ++++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 @@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase def test_getDateTime(self): utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 763435da564db55cb40565bf7979ebfabb63f117..88628c63c9cee8753b6f4430a87a5cf3dfecce8f 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,7 +1,7 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null , qtbase, qtwebengine, qtwebkit , cmake -, syncthing, syncthing-inotify ? null +, syncthing , preferQWebView ? false , preferNative ? true }: @@ -34,7 +34,6 @@ mkDerivation rec { ${lib.optionalString stdenv.isLinux '' substituteInPlace includes/platforms/linux/posixUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ - --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \ --replace '"pgrep -x' '"${procps}/bin/pgrep -x' ''} diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 6ac27f145a93dc034ccc6d951e94f4e2b8b4c623..b13bc4cb7af24ce99e6ca7481fcdca5347eec9cb 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null; pythonPackages.buildPythonApplication rec { name = "ranger-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; rev = "v${version}"; - sha256= "0h3qz0sr21390xdshhlfisvscja33slv1plzcisg1wrdgwgyr5j6"; + sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; }; checkInputs = with pythonPackages; [ pytest ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index c0e481ae8788b8b855676c92751cbbe6399de0f2..b7ab092bbc040208726b1da22282a3b3c69daed5 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection -, gtk3, python, pygobject3, pyxdg, libdrm, libxcb }: +, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "redshift-${version}"; @@ -36,15 +36,14 @@ stdenv.mkDerivation rec { libdrm libxcb python + hicolor-icon-theme ]; pythonPath = [ pygobject3 pyxdg ]; preConfigure = "./bootstrap"; - postFixup = '' - wrapPythonPrograms - rm "$out/share/icons/hicolor/icon-theme.cache" - ''; + + postFixup = "wrapPythonPrograms"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1b1cfb48a281d0a96975588a840c2794ed789a0 --- /dev/null +++ b/pkgs/applications/misc/regextester/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitHub +, gettext +, libxml2 +, pkgconfig +, gtk3 +, granite +, gnome3 +, cmake +, ninja +, vala +, elementary-cmake-modules +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "regextester-${version}"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "artemanufrij"; + repo = "regextester"; + rev = version; + sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n"; + }; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + ninja + gettext + libxml2 + elementary-cmake-modules + ]; + buildInputs = [ + gtk3 + granite + gnome3.libgee + ]; + + meta = with stdenv.lib; { + description = "A desktop application to test regular expressions interactively"; + homepage = https://github.com/artemanufrij/regextester; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index cbf602b75dabd2f71e4d9a3e5824d60df4d49e51..1d0c7d28de6e4599a2fa49c97637724a8dccfcb1 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext -, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme +{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib - gdk_pixbuf gsettings_desktop_schemas gtk3 - hicolor_icon_theme vte ]; + makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + gdk_pixbuf gsettings-desktop-schemas gtk3 + hicolor-icon-theme vte ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..819c6c9391a986a0deb8bf781df874fb498121c6 --- /dev/null +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: +stdenv.mkDerivation rec { + + version = "2018-02-23"; + name = "rtl_433-${version}"; + + src = fetchFromGitHub { + owner = "merbanan"; + repo = "rtl_433"; + rev = "51d275c"; + sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libusb1 rtl-sdr ]; + + meta = with stdenv.lib; { + description = "Decode traffic from devices that broadcast on 433.9 MHz"; + homepage = https://github.com/merbanan/rtl_433; + license = licenses.gpl2; + maintainers = with maintainers; [ earldouglas ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 17798bb01e2d24637ab177fd960be02d9ebe09c0..7c74bb6cd45926ca246fa4e3caf6e0f6fbb241fb 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04"; + sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2c8753efcd745279e55ab809288d5a44ae9870f5 --- /dev/null +++ b/pkgs/applications/misc/sequeler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook +, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }: + + +let + version = "0.5.4"; + sqlGda = libgda.override { + mysqlSupport = true; + postgresSupport = true; + }; + +in stdenv.mkDerivation rec { + name = "sequeler-${version}"; + + src = fetchFromGitHub { + owner = "Alecaddd"; + repo = "sequeler"; + rev = "v${version}"; + sha256 = "05c7y6xdyq3h9bn90pbz03jhy9kabmgpxi4zz0i26q0qphljskbx"; + }; + + nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ]; + + buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ]; + + meta = with stdenv.lib; { + description = "Friendly SQL Client"; + longDescription = '' + Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you + to connect to your local and remote databases, write SQL in a handy text + editor with language recognition, and visualize SELECT results in a + Gtk.Grid Widget. + ''; + homepage = https://github.com/Alecaddd/sequeler; + license = licenses.gpl3; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7367c82070544f50d09ca4d2c579b212400230a8..7fbf11573c490ee2a0cd572cd1209a15f6aa1efd 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ buildCommand = let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 5fffa6681cb213cd8a7c92124afcf5525941a97d..1e4e72c4e4847fbaacdc9be80cebdb04a7fff40f 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils -, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: +{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils +, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "spacefm-${version}"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { postInstall = '' rm -f $out/etc/spacefm/spacefm.conf - ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf + ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 udev desktop_file_utils shared_mime_info intltool - wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks + gtk3 udev desktop-file-utils shared-mime-info intltool + wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 009eb488d7b4e77bf27e0c0082a480317ea6c896..68a192d78b8400a2589554f3813a596d77c0e84f 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: +, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: let @@ -36,7 +36,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' ant furniture textures help @@ -54,7 +54,7 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 37623caa1d4e1a3fb3706c9b66753a56afe1303d..6c4b32ca9aa6a62f69575963fbba31a2c051b0e5 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: +, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: let @@ -26,7 +26,7 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -43,7 +43,7 @@ let cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index cc267dceaf8b7283f8a26854bd32b3d1991bba13..a337b5eae996e873a49b253933892bdea802ead1 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection +, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection }: let @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { gobjectIntrospection ]; buildInputs = [ - glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist - hicolor_icon_theme + glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 7378950b189b4fb779b6c1298ca84136b7131341..d5b927bb536cd61c6fd732272c0caaaf1176cc1e 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; + sha256 = "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index f83ca1b25fef35ba220f4b9a6929be1d44093873..dc723336a9e93003178742caf4f5a70063e26193 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd +, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils + autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; preBuild = '' makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5") diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 05deac81af6f820b80d5d80b0e36191b46c1c9d4..838e26463cd0d09d6f4ebd4fbeadcacd95930c8c 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, hicolor_icon_theme, wrapGAppsHook +, libstartup_notification, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification hicolor_icon_theme ]; + libXdmcp libstartup_notification hicolor-icon-theme ]; postPatch = '' substituteInPlace CMakeLists.txt --replace /etc $out/etc diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index eebab6643a68bd905d2ed30b668f100420885f3a..6cf1f27a104b074e3c52b5a12508db3235788573 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.15"; + version = "1.4.17"; name = "tnef-${version}"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; rev = version; - sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj"; + sha256 = "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh"; }; doCheck = true; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 853cc51710533d6915206ca6a97de2fab8e01181..3810da40849b58e39f56ce356cc71dc018cd71c3 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.4"; + version = "0.9.6.6"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v" + version; - sha256 = "166zhic3k4z37vc8p1fnhc4xx7i7q0j30nr324frmp1mrnwrdib8"; + sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq"; }; phases = [ "buildPhase" "installPhase" "postFixup" ]; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 9f94b0aa48e9e64f4009434052db39ccced6c0a8..ea79e29ff020cebf8d70d6e2682bfc8e76947081 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg +, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg , udisks2, wrapGAppsHook , buildPythonApplication , docopt @@ -21,7 +21,7 @@ buildPythonApplication rec { buildInputs = [ asciidoc-full # For building man page. - hicolor_icon_theme + hicolor-icon-theme wrapGAppsHook librsvg # required for loading svg icons (udiskie uses svg icons) ]; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 78305675f17f61f85c73cda7a399afa3440c5489..6aba4e751503e8c9039ee366981c821b1358feb6 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv"; + sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f5c0e1fe1a3c319af46dd7ddf91a51aa01ace300 --- /dev/null +++ b/pkgs/applications/misc/valentina/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchhg +, qmake, qttools +, qtbase, qtsvg, qtxmlpatterns +, poppler_utils +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "valentina-${version}"; + version = "0.6.0.0a"; + + src = fetchhg { + url = "https://bitbucket.org/dismine/valentina"; + rev = "ccd68eba533a82aeb2dd3702124899a37c23ded5"; + sha256 = "1qmxm6pwwass2kpyg41nhkmyq0g74pyk517sq68dcgs6340ii7fs"; + }; + + postPatch = '' + substituteInPlace common.pri \ + --replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${getDev qtxmlpatterns}/include/QtXmlPatterns' \ + --replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${getDev qtsvg}/include/QtSvg' \ + --replace '$$[QT_INSTALL_HEADERS]/' '${getDev qtbase}/include/' \ + --replace '$$[QT_INSTALL_HEADERS]' '${getDev qtbase}' + substituteInPlace src/app/tape/tape.pro \ + --replace '$$[QT_INSTALL_BINS]/rcc' '${getDev qtbase}/bin/rcc' + substituteInPlace src/app/translations.pri \ + --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${getDev qttools}/bin/lrelease' + substituteInPlace src/app/valentina/mainwindowsnogui.cpp \ + --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"' + substituteInPlace src/app/valentina/dialogs/dialogsavelayout.h \ + --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"' + ''; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase qtsvg qtxmlpatterns poppler_utils ]; + + configurePhase = '' + qmake PREFIX=/ Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + ''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + postInstall = '' + mv $out/usr/share $out/ + rmdir $out/usr + + mkdir -p $out/share/man/man1 + gzip -9c dist/debian/valentina.1 > $out/share/man/man1/valentina.1.gz + gzip -9c dist/debian/tape.1 > $out/share/man/man1/tape.1.gz + + mkdir -p $out/share/mime/packages + cp dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml + cp dist/debian/valentina.mime $out/share/mime/packages/valentina + ''; + + enableParallelBuilding = true; + + meta = { + description = "An open source sewing pattern drafting software"; + homepage = https://valentinaproject.bitbucket.io/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 5af675a82acf7186c755ff21e55dfc0818b62f65..d090878f976878f6ff8a8e6bac2ef7700734a38f 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl -, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper +, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 27b2a8f7134fcf63c41abdb477f621a4a0143708..166811fb4ae37c7a845378ebab4e902255516588 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg -, dbus_glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { name = "volnoti-unstable-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 0d38f1b93e7364c65d92e18d10aa1c5463f2d6a2..968539336a9cb5cce992eac97001931ad3a140c4 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.8.5"; + version = "3.15.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; + sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index fbf68f317deed851dd3079590da6304297626e2d..0394fa83d4a43bd474be4109cfc14859fc41502b 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah , glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm -, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: +, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { name = "workrave-${version}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah glib glibmm gtkmm2 atk pango pangomm cairo cairomm - dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx + dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index a895c9b4537b956099937806c43b039f95b67fd0..bb7b22c40a26b13cd76f49cedb6fb13f423675e2 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -3,11 +3,11 @@ , intltool , docbook2x, docbook_xml_dtd_412, libxslt , sword, clucene_core, biblesync -, gnome_doc_utils +, gnome-doc-utils , libgsf, gconf , gtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid, icu +, dbus-glib, enchant, isocodes, libuuid, icu , wrapGAppsHook }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml - libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; + sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml + libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; prePatch = '' patchShebangs .; diff --git a/pkgs/applications/misc/xpdf/cmake_version.patch b/pkgs/applications/misc/xpdf/cmake_version.patch new file mode 100644 index 0000000000000000000000000000000000000000..59a51f7506d51d8d26477422d69930f5017b295c --- /dev/null +++ b/pkgs/applications/misc/xpdf/cmake_version.patch @@ -0,0 +1,15 @@ + +Fix "No known features for CXX compiler", see +https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at +https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # + #======================================================================== + +-cmake_minimum_required(VERSION 2.8.8) ++cmake_minimum_required(VERSION 3.1.0) + + project(xpdf) + diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index ef031c4b9f4de558cd51ad08287123c20db86a4d..3b05c9be451fd328a352207b5e2638fb7350fe2b 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null -, cmake, qtbase ? null +, cmake, qtbase ? null, qtsvg ? null, makeWrapper }: -assert enableGUI -> qtbase != null && freetype != null; +assert enableGUI -> qtbase != null && qtsvg != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -17,7 +17,12 @@ stdenv.mkDerivation { sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz"; }; - nativeBuildInputs = [ cmake ]; + # Fix "No known features for CXX compiler", see + # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at + # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html + patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; + + nativeBuildInputs = [ cmake makeWrapper ]; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"]; @@ -31,6 +36,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/xpdf \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} + ''; + meta = { homepage = http://www.foolabs.com/xpdf/; description = "Viewer for Portable Document Format (PDF) files"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a63f621e9beea7b8c7fcc385d6de113e23a23cb5..1291e5c4e917efa78b777b82d409c419faaaeb90 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which, nodejs, fetchurl, gnutar +{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus_glib +, glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -25,7 +25,7 @@ , enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null @@ -44,10 +44,14 @@ let # source tree. extraAttrs = buildFun base; - gentooPatch = name: sha256: fetchurl { + gentooPatch = name: sha256: fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; inherit sha256; }; + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; mkGnFlags = let @@ -125,10 +129,10 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus_glib + glib gtk2 gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage - ] ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -147,6 +151,8 @@ let ] ++ optionals (versionRange "64" "65") [ (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl") (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc") + # missing ninja dep https://github.com/NixOS/nixpkgs/issues/35296#issuecomment-368666833 + (githubPatch "b1e3cfd4f9bfe43a1e08c5670b51c8c80d3e6372" "17vih86rpsy282r8ikrf2q5gfjdwqzvyn8859i75xzvl8agyhbaa") ] ++ optionals (versionRange "65" "66") [ #(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8") #(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5") diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 42616147536907b31c63b9d1d739ed1ce0e7f885..1f6eb7c178fb435bd2428744cd3f1e1e479a866a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk3, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings-desktop-schemas # package customization , channel ? "stable" @@ -75,7 +75,7 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk3 + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.defaultIconTheme diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bc9105acc77f44e468296740614cc37c37d69788..bca9e1c9a1c112b2923faed8e5038e12bfc054fb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1ggj1a7v2n4v34kb8gx2hcswlayryr9g62zqlry26bwmvz6qzsx9"; - sha256bin64 = "1ah8088d8p674dj5bijk5maapmiq9iap1w2i81dl0hhpyqxx3h3i"; - version = "65.0.3325.73"; + sha256 = "1kdv6r3cmy7lqynnk4ylkn81x91wkv2k3hqh41sb50h65s7h9b3y"; + sha256bin64 = "18bralcc4frapglcfa5az3z8i74calrblf4zzavisvpkmnil7ypa"; + version = "65.0.3325.88"; }; dev = { - sha256 = "13klppyl6rbkd3ffp8y8d95l4mc72gmj45y34wynyfap6b4z1lmh"; - sha256bin64 = "0w1ipy858p9lbpcrjhs44kncgw7c5qv1929h0w65ybgsggjqh0gz"; - version = "66.0.3343.3"; + sha256 = "1ykg5c3bayv6pwz74dglxcmbsalz6p04c3r0y15xkw2iyv5jjcam"; + sha256bin64 = "1phw755ra3pckvhapm26amr6b3652k8f7sxanjyq118zkpga21w2"; + version = "66.0.3350.0"; }; stable = { - sha256 = "0mf4qjmrjnxs7mx9c5pymavmib7l2a2kxiy0kqk3mma1y90qnc7k"; - sha256bin64 = "0idij274g53lzvgz9h5xxi8l841vvvr78hp25ndbmpv4a2p1d83b"; - version = "64.0.3282.167"; + sha256 = "0q0q1whspmzyln04gxhgl3jd2vrgb4imh8r9qw6c06i3b63j3l2z"; + sha256bin64 = "1sq8mmdw32n00swm4q9q5q3vw6q5sp8yiaxag4rbzvxkfnr3vi4g"; + version = "64.0.3282.186"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 4da4c74d1c37ceb1927f58fef737986a50dc52fb..ded2b688815c3addd76d1ed32f0e367ecc0ef403 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, unzip, firefox, makeWrapper }: +{ stdenv, fetchgit, unzip, firefox-esr, makeWrapper }: stdenv.mkDerivation rec { pkgname = "conkeror"; - version = "1.0.3"; + version = "1.0.4"; name = "${pkgname}-${version}"; src = fetchgit { url = git://repo.or.cz/conkeror.git; rev = "refs/tags/${version}"; - sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd"; + sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8"; }; buildInputs = [ unzip makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/conkeror cp -r * $out/libexec/conkeror - makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \ + makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \ --add-flags "-app $out/libexec/conkeror/application.ini" ''; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 137b463a1e1d54cf4ae15245b05b9897ddbfd4f0..ec585e53fd23711019250f4dbb4fe76dc0f5127f 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls -, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: +, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }: stdenv.mkDerivation { name = "dwb-2016-03-21"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup + buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error @@ -19,10 +19,10 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index e41783ddf5ba1fe9893fa790965b4024ba82aa1f..d1741774d34799ea4af83fa2b8075139442346d7 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook -, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3 +, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3 , gtkspell3, libsecret, python36, python36Packages, webkitgtk }: stdenv.mkDerivation rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ git # required to download ad blocking DB - glib_networking - gsettings_desktop_schemas + glib-networking + gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 90aec9831930422b821a19fe91a074c38421af0a..de56a0605b86277a0be15790a00f0bafd21af9b8 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -2,17 +2,14 @@ , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: stdenv.mkDerivation rec { - # KDE hasn't made a release of falkon yet so we just track git for now which is - # based on the most recent release of qupzilla - # This wip version is 2.1.99 so we add the .1 - name = "falkon-${version}.1"; - version = "2.1.99"; + name = "falkon-${version}"; + version = "3.0.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; - rev = "dd3c570c41b4b3d0ad17202b78bf14cf1ac56495"; - sha256 = "07d40cpckaprj74mr06k3mfriwb471bdmq60smls34y62ss55q9d"; + rev = "v${version}"; + sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna"; }; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index bdf91cfc8df02104381faa9c06cb1e82727af552..224af61bfa47aa02baa4e7968a80107dc7cd9110 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b12"; + version = "59.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ach/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "184de450d6c46ea48d6743f379a093a9dd9b4777d17ef1c0b7768c73b2ddbf27e662b36cc43b24e202c0e685b1ad7230adfb7bd925fe6c50b3cdb176a3074666"; + sha512 = "3385d1c5540bd0066c90fb63b2f18105085092e1d89ae1a0badc9e00f8392f4dc20b65ac6a04f22239332ca1ccef0995df433d656d6b105be03c0129063e7198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/af/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "35604da3063a740fa5509e6bdf03f7e8ca465131372d4d1d21b627b6fed9fbf601368327868468fdc69fd0c927e0afc9610d8d8ab79b2a87fad4db0f4798ea26"; + sha512 = "1eaa00e379a4f3dbf162edb4a79b3642b8b16a882e6b106475ccbb962072e6148becde4c068f41cf3061741d30ad1cd72e5b04f587eb9ca9483e248e8366a522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/an/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4cdb596079877fa13820bf911a59b6ceaf89641e455269eb9964004388c3732f10f970d624d6fdbcba6d5ec59de884e6240f5215ed82c6859d6d17db7535fd0c"; + sha512 = "0cb52af20dcec4785865a479096d211213257ddf19b033a2d9b078727192be9b44eccbb548248e32f0f4a19348b5e8c5ebf27c8dc94f1872d5ebf3e369b74006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ar/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "63c3c317a6b65a31156ee45e9ccc47bfd3a0f3b75236abeb466a4bcb50eaf286e108d08d394d1e906a26bc8c21c9b53f11e26f969b4426a80b209756cabac1fd"; + sha512 = "099945735a3fe0470eb67f50fe1e2c92f49d7d34b5ca7a1c35167eee05aadf705dc6a3f4fdbeb78ff609c8892ecadd2cb32cf3a11cea6879f734220895172982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/as/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d5a283891d44c22bc6b7912e1b97c5b214a74feae278cddea2e79d59c652b77ce23fd26447b01d37628713613ba058041df56c8b6a1e6542a272b8f8be182b63"; + sha512 = "30efe149f3f941a19d47ed8ebf0eac53997397f550f56d79c548054df8e14cccd5b1b3d1728b5d9f347cb2e373eff2f2f9403c1741f70c43c958b7566d70a55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ast/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e049b0de5fd31f7176b4af0b7b07a30250f6f99d3e144e7bb5842087e0b9a57f158d41f3298d7f82b49f06c31490268d9f757b06c681de70f55cf7e7478e37ba"; + sha512 = "c962aef0f068f3dcc3c9fe82f670b3a2de132ad761144fa009d052622f6578bb42875e39fc311265709e87aac58fcf62e60b0f0d5f98f05193f385be7296b35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/az/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f6b732e6d089fdc2a005048a433170e382e2329c02bc3016a0f37a2100964d8aa2dcc9afc78b450658cdc18ae33060f0bd3f9d1d7b615b49e08a7b783e46575c"; + sha512 = "994d995198817480b0f4d198f5a6289d4a380a183b2e350054e6efe1d77ca3dad5c48ce8aeccf5e4813047fca9d856bd392614d7adfe49fac52cd950e05e0bdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/be/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6248b42724e454d74e16f650766c8b2c158f4664dac53111fb73e309b66a1d8def27a41ac799a5e3ba57ef8bef0b55996916d08f4647ed37816c6ef008d5f9c"; + sha512 = "48a60eb7e794fdb5f060f2bd0e359d22ee14ac5916819fada7bf939d07b31993dbfeaf58ce6906c40890c4b35e7edb47fa3f0b33f5d327d649ae5fe2417c5bcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bg/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "df8729f5f5e59e1b48b070970d72e6f7c86b5a8a8793aa5900648d44117d9495d98acfafffd89d1e4a20ed77c38f8ec82d7c12372278de2d06e57bcc05c34938"; + sha512 = "caa1de35213a8bc492bdec4b003b7b4b072f268f59ff0ccde04e69b64aefd18ee2ef3bc1fca698be4a38251fe76863f8b613279ac060644d3c84e3191977f2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bn-BD/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "613738ccb2dcca3d69f52d3a5d62ebb6f1348a9502395e528b8f2a3a2f3e4f88accadeb0db9d245384b09fc14bd9d82484ee50577609c26548daa10f1194afb8"; + sha512 = "466bf0e7394dffbac4f58736c51dcabfb1d9634baf73d28af3ccd270bc1267a51b5c31802d48fc225918f8b15fc4291eb5e959802804510f5967db298e6054ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bn-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "09182f21c3dc3471438f300b7ecf2ad5dc2c74655e44c1b18410882c927ac4a1d0be589203aed06c4bc5d9868f5edc229a10abd4b4423eb40999cf3329d9aa76"; + sha512 = "034d37ac4aa1fb38b1aa6181e291e16447a270d5c21196469cbba33be773364614e2d2cae415674588c460a107a06f30a8d8ee663a0c797c621f0d4618c1588f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/br/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "648b641def4697476534783279eb5c4375d6a9b5579854c1e55b8038faea5afbd8a0140e7ef65eed59cc593848f04dd8befa9591a4f23d149214beca8ab9f6b4"; + sha512 = "f38c6cc0fc8ab0d0c7504b427c88081b5d8d456510aa6c0a8e1a14b013d9a9502008c4397850fefe3dbfe28d0da57175b1d10824f6feabaacbd6c44a03ed283d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "a2f9cb0297b8b63c0d3249bed7b2f96b2c7814489f6fcfb846fa53ff06c62f93de6c11512d39f6963af24a7c56b5075c6d64d007ebbfc1bcf46308077f106642"; + sha512 = "e93729b7e94cddc446d035fb35dbfe74a7582bb553095a62b4809c965453a172654aac5268c3238d398a9f46260daf206126782d393938b4863a1efab2a7f78b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ca/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "b416568cc6adee4d23fd81ce2bd0446f7b53e7743bbde4039fdf3df928ffe303b3669fcf111b3d9e638c78920f7958c27635cf1c9beb260f1be0c76a35929f98"; + sha512 = "fbe2aea772370a83f78bc831d4ad447ba2bfb48b462a085e01aa44aaa517f69002b905523a3ecaf72ad04b41bc0bf0158042ae9d492410e6260bd180e8345699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/cak/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b3480e4983f79d9e92b9229875b05112ac3bd2424207ed93accddaa6e9b2cd1807fc0905d268d990c4c3b5738a5562a6135095173ed77d91ed02111b3c5e40e6"; + sha512 = "f272b29b440ed9dd3f520539537b3822f79ea274c9dd887f0bd7b352fd25d54850f8c3d3de77ba23d7498d789c90659c16b68df139c325c48cb5bd23b9dc6fc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/cs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "15fe628d7ae1e8ca6d003e1bb4ec26886f1560fcc12c0f329d4e75cdd002c42c60260f0638194eeb9920a9532c2be2439a4ad3917e66041ce24efba67f33b7e7"; + sha512 = "562a7feb664d7fbd1cf46a611cc47b275f730e35af4a5c6860aaec54a5ef3a9ea25b56152b7a6f8b0a239b6c30ba961d1f6584219659a1a35d3395aa9abeda7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/cy/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0e31334a51588f312d909254003127c083704ed608384014e1f96bedfe82ac0055850bdf86a2a2f1010463b666d9a2626b2d7a51c0a0036dbf10021515ba991a"; + sha512 = "811773221c9df7778afe17d31bce17a322247ebab55461b34fe3f984afec96ba44cd941a781915433ae54f5eefbe14c9e6fbaff6b690c69db3504c5fe3c1f678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/da/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "45bbcf37f662c09f6ce7c957a12200afa3ea5c2cc950be21e5ca5df1bc3d286d5ee63ab2dc8a60a2f8c8b3c83ec40f69fef8b5f77e928e65729cbb1869b49fac"; + sha512 = "6fc0b8a04ee1a03b8aa7647a409274d642827b284c9e19b11281369b6299b9f4e17cff942f297ffbdacf922cb47df35b5c572d1a33a6450d000d4c373ebc7c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/de/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d899808dad1ae7230d65ec45951bfba603a866b14d5b8a99833b8a2574ce89fd0dc62e290c215acca87f6eb56d529eb7f8235220dbb16d30b8e68663481ef79a"; + sha512 = "080b44995281ca69a92c039c8734b16b5a57c28df8b7b076f770f2d360d6945b5b9ff1c30c0e226a84a70ef5c76085ddc5b3b2790131e7797508854e261efa4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/dsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "afdb53d199b63cdd9d9b4e8c700a1780e5441b97391e6692fe4cc5258b1c2465671d7eb8185a4c471c3435f784c0c2587331cc12111edc09df4bcb4702567e07"; + sha512 = "0c37fc3850911499130612465980cb1642c4a7914cffd8d857c6b03e75737992f0e181646050057085a52d7d11654e57c0efacc195b3be377b7fbeadaacf77e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/el/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5a2f934d63ad7b5d8e58ac6754bf2cd27724680f2a0e35649893455ac87d2b489bb68a31066137d02a632270a17bcd5db2ff181eab311e4b8d7660c54043106d"; + sha512 = "e0e10ddd3f24686790d2d78b9509d1d4dd679588f6c0a9349b35c7d58aab0fc3f914cb139212faa993056997cf805ffb75ee334f8dad6a110b6912b199da3bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/en-GB/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "4a114c0d9ac7969698e251d6d700196d6c06576f2e2eb93939591b753c545967dd09a3ca454b80f953da1ed4509c1d489b5fecaa39632c5cc0bc23a3219147ef"; + sha512 = "989b1e7590520271a0e16c1fd02c4b0c85edd53d9d0f6c2dc6e2dcc71b24e53e5ddb58d081e41720bcb54dcdaa8c0b2f8183183adddd6e4da2257dfe71d978e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/en-US/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "353658f9869bcf554d8be108a501bfdb39010d1b8fbf9d8f703ad04441252bbb55952a21b48f313dd42577ee8263d9bf25aab997f6a01471b7f7c815d9dc5698"; + sha512 = "f8bd79f3a6e6b7439103699111fba9e5c1534ba643227fcfb07106fc7e6aa5ce8004b7fcfc58a825e73dcde769e9d19dbb35ac1169c587b66bed6a6805390b52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/en-ZA/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "d4b8c02d2b4e9299ada1dd993ff880975d6f74a2242875a50c3a7e15d8b5650592f3c855a395c6c43ad1159e7e3f2dbd1bc73b06d40e809b38c7d1dae3b0fa9d"; + sha512 = "b1eb3804b3f25984afc72756388f538c822d0056d6b6955e92f4eddd975bcefb2dfba22fd343171f3ed33f779c86c5f154928a7f2764242d3ce86530e57b8ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/eo/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2c7e4f878652efc1763195b2a0b2488afaa2fb0942f69c8cf58ad125b7f769f47433fee8e650b88cb41873b8a91326eefe24673199e929fa7351c4ccca854847"; + sha512 = "1ea4e0fa24012532cbbcce89b22e5c3131248ef72544bce2de97afc1c104c254a630104d4f2117bf01d217072983296718663e1108e96e86101369d6a66619a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-AR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f26ffa471288f1861919f2065018872a4098a4d4f79320beda47dd9450907283bd73569702e2f362c282c31c4de44e69f118441e4693d58b26ae543921c61586"; + sha512 = "151be2980e61df7e96b47f0d48553da52b54007999734322814f4a0fee269d8bba3831411b5731caa23619033ba80a4265eba02acc228db78ef4c1705e1a7615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-CL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7cbeeebc3bfe27a9752812e25de54080de1145cf9ba43ea994faeaa8f44b5d2036c1d831efda053eaaec6ab66b82f46d94aaf38b84ef48cec7a3525fa61a8a60"; + sha512 = "c7b46b7c7fd78cb9bdb5b2fc6e5b0ddb0bbc09bb6e28fbda12ca46b0a0fd8e35660c4d66aeb47fc3b70b725c39e6629f2a0f3a27a9d4991458e5952fc08e819c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-ES/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "107d892c92e721a4aa444f64684955f6e9e8f4252812127cd83ecb814397cb2aaf9d9d761238b073324d62ea71058c6955d50b5ab9e07422b8cb0bdb4024d325"; + sha512 = "2d79c84179d27e2dbf08637d6302c357438790fd3b02805a0722adb978187cbdde53a4a600c224d2c9c207142550efbc4ef5773218580615af31e0bc42e5ae32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-MX/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "9571f1d991377db96748671fc18b4e5b7e5cfae9bdaacc3e26add7a2008d3ee19eb2dcb891d7d12b21fcea9240f4c37d6327cbe4e568f145e1eef58eeaaec377"; + sha512 = "38a64984e500e18cb21529e23e803fd33de9ef910b367f39ceb416cb284f61d5bb2717d86bdf0ed74e2320fade42dde89b7a8d4de024ea7e9b9ff95474208e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/et/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "27a6a1be0b5396ae5dc389b6abe01f802ac869f86c4e2189943fa0a19a4305bdd66630046160500f4567b212c8fb516c7d29435e191222bdce5baf8f2705a5dc"; + sha512 = "940c57ebf1384150a96bc31c9d7bf900f38f020e42cbb4c9a58d563a95a64005aa5244de17acb9834ffb1d2f39cc9acd4b08e976cfe8e48ea9b3584d2ded1db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/eu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1ab7b7590cd46ced04f8585b559f5501132caa9be8a4333eddcd54656de3b8eeedda18407a2d7559cd1d5bee3943b0aa9bdb061320398cb0a138c0a8041f7700"; + sha512 = "770dc127e21e350873ad17a966c438a10a1eab8637adc11a368bfb3397a61d0411f17452a984aa0b7c62012adc75b193d49936de7775e1c380ad0e1d315f479c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fa/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "91c86796f3ef04fd5ab03cde6c9ea529126f3bbba7243108add72f63ae82d8208ab82cc431504b8b5e52215175d1c80098d7f306e5b76e4714d64629b8e23963"; + sha512 = "483bbed985b9f1987393e288894e41760f2a69ac7f71c38807ee099928d478d7599d86795462d638f83003b4bc5869a32e13df4ab73ad85219228bf2326aab93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ff/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "d7c9e05a86ba508546815a9df5931926c44dcfc9d66f941b97ae64321c284bbb9a896fa487c951892a43d2e31e76935f027d518d33e4521cb9eafd1570a3a144"; + sha512 = "70e3d235569a976c3f82f10117e2060bc366382f630cb94fdda89f7f30e2dfb1075393dda29a67a6a3e224d8c2baae0d3727132d4391b261b39819eaad7b7a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5b10dd3a99eb1eb766f1bed117aeaddb796eb2b92f858657105a08e30224d89b1e93a7622c7a273cb94ed5ffc9bffad67ced8f236e473dbd4c4fab8afd53d62e"; + sha512 = "6e72b77d296a2f4b8d404ca1302ff96ea39c846bf3d38b741acd6e327afab6c6e010980f15502fe5f69ddb0bae06041a343d588aa813f24176c34022a5371551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e656c62702b08d5162febd609b776c3dd7478ef6954eb40aeef7e296e76c3a218c493cc2312df9b8a94aa14faa09398f8f3da5bb01944eb17e2f47b5b66a6d4f"; + sha512 = "724271904d24b4d412e6246ce8ece8fed71c6fe3e272551d3040dea3e7326f00f2516d742cdff9751222a141a574624fad4d476bfdd942a572ebf590eea4b1d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fy-NL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "593afb200a7311a01e54387aad3a74427fc70f019edeb3358859a6c6b4e362584e434d0327c0c916d0e48bb8b7794ee63c87aeaee452cac1018d4b7e4c6e3568"; + sha512 = "73ed1f28ad9c8b5c9a94ed746b48fe5756c323ecfbc35165b1af8f957331564a8a46403b72ad1e7d0c9e955f88bddd75628bd491a20916d769e410fc7d06671f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ga-IE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "bd161023f59b54605b00dae8b3993b975b2c11068dbbdc63e8910997babf3bf614b339079a071f81e7c78e0d7ca3b4287fc485ce5418dc527694677e0595696a"; + sha512 = "da86d4603f6456d62a2668f86d5eb3b5cfb9bc9454fbea11cce135fa0e215713a73976a71e630c93a6f6235880a08ae036bab6026f64e12847dde3996a4e767b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gd/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "6823f7279281f9f5a5504998f2023895267685f85d9ce50c49f1813cfdfade3aa02d4613482daacc1df94cd497761d5b74c1f4d828a61f9098a543e03658dbbf"; + sha512 = "34904ec1e30394e06a14d2f5492fb2d08b66af587ee0823d7ddf6dd0c89407e784342c438f9f2fee85e7bb21888f4003c33c90be51a395d3b4d29050290cfd67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e6ab127d895b2e35c02ba51b6fce270d4a59f4c924c72ab57f3dbf8da264ddabd1ec8a151e568cfd467224381cd8f410ca17fdaa805ee40f82b18ed3ffec5980"; + sha512 = "485c67a32819bebca340240a53767ded9a4af9b8e89a9ddd98913ee2702b799551cae47a1be8ffc13cb3c61121ccc25def8527db622eee4f1f762c88e1517f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "fa3d2680daf98be9121737ecdb4f655001f018c3f40fba285bb7ca067b8b302faf9f1b10c663a4c3121a5f0ac3364f4f6e691906b73fc2f17a86f0c5cd5af48e"; + sha512 = "b1e6704fee7cf35bf24e94db3dac411e4627b88eb5b954d017bd69cc03d598058a4f6a649522e8e56c648fd649c0315ca62fcb77304175753dc0e71ede3848ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gu-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "08e19279d20308d16c489ebd3eafa3de12161f0d8cd627361afb52ce78e69e675c3c680ec971c301aaf501c6bd5394487dc5f320170e51649cd9319a349002cd"; + sha512 = "fb2163796be2756d7c3cb6993e2ce295162e1d407e7673989365848c82017280b3da615dcec32ec6170fd39edd7cac87f9998d54e91b365c7fb88431201c7feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/he/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5b0cae8dfc369fd4067b9f23385b15a15f61530226048f022e110f05b91f3a917b45a0230048d53a5697306d3dd7f3526e99080d0dcd54551c3ce81536789b3a"; + sha512 = "f902b115d29654c34f98e1acc15aa173c5881838f42734b5ccbccb388eadbc32167ee35aa07173e62290cd69bab0ec985293e49bcd951b407e9b568e1a126b4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hi-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5c895015536a84af378f37d875f875fc56eb33a295456b4df620e9ec6cad236b321712b411102aa5fd22f728f034e15674b2e1f38148e0a420f1baac41df2058"; + sha512 = "5cc246d4807ea49700784c4d4f0995eccac7120c9e3f3c38efa4ddc0835db21f53682ac1921864270079c3dcc39d60ebb5cde7c58dcea9f91f04b81ba2fc41d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "9aa00a0032cdae3eabd71306dc43b23b262f3db2305fee0f5f8539abfab75032703ef1477b8d7803a82c7e2284a090284b80ef8cb02f05af12821e46fe9e5650"; + sha512 = "3455463f7fad3c893a06b24df9a58a53ffa7f56845dca035b2eff9d98c67f1127ac74492dceb9277c01a47131d95f7b2dbfa23189420c6a3cbfc6c63e8fcd616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "a79bc454a796e8c71e2af466ed80238472aa78efcc7fb44aca6f226d3ed957541c38317cba6c6efa8d79465fb75390065e98b7a0ceda358fb92c8737594c6e85"; + sha512 = "aba2ea135d6114c0615677193641c91e4b047840e9dfa5d2f9eb461cde5d539aeae34179f50038424f82104bad8d31ff6fc0f39e6ec7092ba8f3526781284a19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3744d60fa83f925c26ac9bc8a49fd67e6be1200587c8f78e42bab46a0d4066104842c75ff0efc9f696f2e8c0aac8e7f1e8691d90fcb4d8b556dcce8c312f9b5d"; + sha512 = "05651119089ebe610586abde15515e9a6886fe546c7b2c1260d5c0c0b778448da5d7ffbe30e46d5f32d49ff0f050a97adddb608cbefdc6f2bdddd593b9e2ad28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hy-AM/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "82dc527dbd5222b0af3c20d23ab266224a4310771251b395928cc12133ff6e60372dae9b139f4552285fae2534d903eca67d7f08d3310ce7a0d0820101d6a32f"; + sha512 = "6d3b6f30e9450352dedd933c310a8c8ee6858410a653a75f4851743cbaf5fa9a35e8f9d65eb110afa02f6a7025266127d10db3326443289e235be012e34495e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ia/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "3827e28ee549145b415d0af774efdc9537460903fb9faea98f992205f2eb44f0c8ea490dfc003bfec21dd5d49d3a5a427896e02f4ffd4f9ca9375802aafda653"; + sha512 = "f14f8f554d18adc261a26c55e0c78af833992fdcb1c8c8bb8e4dcd65d8f731b36a663cf02513d7d12d979751aec62d8484a06d8403001e26b5aea304c34c9a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/id/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8ee5b84527595ad845cd2741828008d749a2722b893e21bdaa07a7639470fb0ed9166584a5bec7c87747810046f5bc2c944f6ef6f307f6287e21b76dcda0e7f8"; + sha512 = "ca3f9e284afc1836a73d8b6afee674daaf4f930f9128ad2aea052a8f0050b4b741726af21a5843ee8579c03b4b456e57f2f6f983f223aae8e2b7ee69231a82cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/is/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1f5be6804a68cb940ebd4570b6be3ca7ae3585d904595fad8969390310b14857c7ff037d988081c340ea0ee35f59dfe754706632fe3bc311c34055dedbe1735c"; + sha512 = "3356171a15ee94549cfb41eeb601b2f08e4cf286a0c3bdf02a55882df64b819e3159c2ded9601d2f23fc9b49b58cf4f4c53017c5344e9f246f53a5c3b1ed2799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/it/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "14c29109ded478c8a9953596ede874a012b219ab93ddea64a57e0f3f52e478b9ba94dab7448ac2be58efba7e8b0b4b1d5861cff973c05f6ee1aacdf3e4817fa0"; + sha512 = "b1bc75a9f2a4ab2923127514c4b31b679fb5ee5e58223f02cf4b3aae820ebccdc4d41b1d0bbd45ba5bf1dbccbbb2452e95e651417889e8d9acca3bff065630e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ja/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8fa121cac9131e18ca3fba9299059d14b6f5920e4ea5b28c22c320fe1d44caf99b14a6d1f05450fdf001aec0ff3a2cc1a81a2e26c67305abbc50e087b67d22a6"; + sha512 = "f8a8cd7a69367dbc5d19094c530cf3fa75dc996c2ddb6e91d82d788d778ae2d67e05a8e9371417dd618b62fbd1940ea1dd1231aa7e50e9fa0b633da41f9f9b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ka/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "193f11718b8ba0c44b1aab4ea2cae8427773c2e025fec49fa0a5e970a5d446ccbf6d75e0be9ece45d9cdc89199002f278b08dc1572ce5e38d74ef1df54b858fd"; + sha512 = "6bab5af80f51494e6bb6d1813f05c7defe6170964513438781ea8d72afcc90af90792480c61cbec4cc87909867e47364fcaafcaab9b87f75c845d5022d1d8878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/kab/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a92921bb74ba3776c825804e568d0256c102dc00495efa75d6c5f4d1daa1cc934a4ee448cb53f5f59aaf3a4d955bbd57e1a1c42950bf6e934516bdf67da33922"; + sha512 = "040e8a53f4f0d3ead182edf37afe9275b0e875c479fd2866f52945824d729c47e6af9162af8e67cc9d7540fed394c09c95b5003d61287a74736336a9a4632118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/kk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c98d590988cedbc2f3d357919c695eba3e3a13e728e2b66e24e6c174254ff3dcedcdcebc7baa2f71868709edf47712e8bf09155b620ea6f6737167d529fd62e2"; + sha512 = "3c34fc69be05029ac47810ccf2e64c358bea58abf5b8bde5e8af076fb87e7b36327fb4be565adea27b992e6c4bba14e678ddc3c71de127adfe0a048f11d33a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/km/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6c1b5180c712378657fcb1cd216405105b8d7c6bd1c20f0fce646c7923b1e512fa0b069095bf9b0920685c115069a00116b2ef5937743f12f15b0c035d5194a6"; + sha512 = "2e6d71df99893d69c29352d9a69176d7d3f2d5f47e95d95e6d65826c7bcbb4ebe855878fcf0c1a33fe4e3e749868f081ba58dd9265f130712dcac86d87fa5a2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/kn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4d5715b26b3b9d98c9db980e4eae9a77956d55cdbfb91129b04948b53b31777d0cfe235205e00fbc43f038415973d96a516d498b5dabe1a9b6d68cc08b7f0f03"; + sha512 = "b37754188e3f79a5968d5b2c64c6ec8ebe0afd3252260e33e1be639445377d4f36c3dd2bf3e278d14255bf5964def6a359aa17eb108e8402e35f47ebac460c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ko/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "5142cac908a577f73b749887cab98f4ada4ccdfb07aec8da620759f146a9b10f27c160375e01f9045cfc2f9f92d81b6376cbed0a63165161c4ce44825dd85cbf"; + sha512 = "1f069f59437cdc924e8eb34ce4af4c9de39e28733589f35f7ba7d1d40347164dc4bb8953160436bc5b2228f9c78d097d2c8c46a5e3295c10dd6585575939a133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/lij/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6c47b9d43a9504bdc6476a63a224e75946487c0617686bdf22cfd6f46777ac70d52e6e174dfa2d6f11295d5898a53855fe374f20cb80b3018ee747bb6f9248a2"; + sha512 = "4d4890e1aac3a606eeaaa4379f983d556643201ed209f67e1cad1a5c9518a362630a79e74805b37af9e7adf59523ed267f45537b890752cd59d7f10e1b07e189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/lt/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7b0fe2176d1595f06a5aa7d7d7ac029b9bcda6368299303746bcff5654ee852438a18fb57371ac1808a9ba9a5427b635c1e5861e29ee9ee512991d4d1f503fcf"; + sha512 = "8212468dd5c7ecd531bf6bc1f2ec83fe41074b0706f73359cf628312d5959ff04dcd13814f5a54b0c74b050cbd02343099ab654ed8f24bf315036f5da36a6b65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/lv/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "26b10d4062ea14e7e39440f6e90ee728bfae5b611df2759bd2d4b49c0e429316c276c7318ba252448465a811ace4d19aa241906af10618833b9fdf73d22461dc"; + sha512 = "456002cac8a82802af2b9a7277f57094bfa69fe03a511b3ab8aae9e74a4e02c90dba69b64f8e0277ce9b78fe254a5fceef31c4684028384655b97651c123b9d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/mai/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "f1791cc5a9af2ab2861dfb231d6b9bf123522c3502900223c14a30ff0b8e6ce29b633d0aaefeddc03a595cb3c9efb064bb66ac76eee2e786c98e233e934f2291"; + sha512 = "5307b74b03e68f95de62512edb1bbacd059b7906582bbca41bae83508ae6de12962ee2b27a7046b6eddd0b0521550ee04d77db07ee0d283e9c1f9fccda1ad1b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/mk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "aed91736e3fa428d87c47310a52a77590573e8a22b975d3fda049288e9f1cc27186005cec7c3aaf5ef26425556be5b1bc9c69e3e2930a28c976a4795a6262e47"; + sha512 = "693c0665ee15d3136b3bc2e10404f1504237b3cae9eb7e3f3869de641bb6a1b15311e94da778396bcde8d91589260eb08cccf4cb59446b343e39c15506183ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ml/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a171b03c683e01e3abde1a40447ce0c62d867d13f0bec08ff28ca3a45f7b908a0f02f047be7a638ea24c0717985ef5f50ba08caecf816152d351e188433599b3"; + sha512 = "5b57c7756477983f153f650cc0611f9e5d07bd53fc741ef489a32434ee5ba716fc4b1162af2b603e7049b08f737eabb4e91c9f90a3058d83ad1c68608f4713ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/mr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "0f1f6ea73c02f8d1ca84e3189f438b64949e720b8bbc207a52b50ceacc6548edfbe7c898aa9640908bc59f535863897fe51989b9a94e412f1414823cd998e283"; + sha512 = "8c1d7c5434f8fd7321a2140a938b3505d929c1469d93a08c0deddd20578269c6f6d13a2ee42803f753d19873150587b75924c708918f340e7925b7457a68b39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ms/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "596f543051dfcfcacffa31fc6717fa1c19c6adf54b1c774de54455569c8001f8c525042935bce98ee9db581f3a700e703a2e9cb11a238142abc5bf5c9408607a"; + sha512 = "cc35a754552dfe2e99004f0b72cdda5b82daebd8ec6eedbb00a9cf64a7f6c51d2c6f2b14b4777117d2cd4f8e585c7a3bb5d81b925c359a35f9873d3a9c5e4bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/my/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a349a3a6e753fc0990d22b39f449899a319949382c17e6b646d6a457fc0d04c5ad19bc0ac8ff67fba75eb2652f8304b57e6d9eeb1db5a25e50d529dc18c7eb72"; + sha512 = "1772df0d4931024a9256e1a2ec465f193d3351019e397a2708a35317d7a08ffadc4516ff6bbd1cf4efc4b03a4230b628ba2e6b0956763bbedda6bb055a810249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/nb-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "546e1679d62352c0d60bc17e6d34964760d41d2eca2578f0679adb613b809b09d1c1fbd88020d5a7a610e6915d60fe262b7d295f435141bdfcf06c0465c6de03"; + sha512 = "0f1c60c5e1db28d733093840c1823bc6509dd6bc18a6c514d977d59f03c82ad8a88e114f5ae18fc27d4071eebe3145b91e5a00885b666ee7ed8c1617493f0072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ne-NP/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b544710208aa30c371e319c16cefa3b1b838e7f481be3831441df4a5c687a2183c6a74c33305c8b75599bfea20f25c24031a7f367f8ef2432e9e0ae0584ee070"; + sha512 = "17382dd82ed6bd5e4e948c98b494cbd937654bfbfa834c8c8dd8b33d3f7f85fe1d54f4b1e1eb166b4c3e9798063d25abaa89076379ab3283ef73873145db6db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/nl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6372beca3997dc83140ba5f32a19f0d382d6cb92e2390bbd5d527dd58a381e1dfd698524a91f0cfae86519b673d67a23d7f92a9f56357c5fa25c42625a04a95f"; + sha512 = "45d50122bb98684d3542a3bd015ea906b4d5cd8998f7b1564548d93b567e947f899e554ab8b6bed72077247ca96c8a4df1bf4d85cbaa795a5bd84bed9b6b9af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/nn-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "a7f82fa0b25aa3430bf7a17789e3673c1bce5fd8ad3603368281ef358369511b69f2777faaf0e8dc4fd6921bfef729c2a4a0e7bab086741071ee75092482f852"; + sha512 = "99a97c7b3570e885003e2e93d641574fcb7aa3d9e96555eaf9baa6376bcb22b702d3bc100514c69cb0d9ef8d690d54afea9ad28f996dcb91cbe2a2f29807cf73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/or/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "cbdf8a7da8af33c46a6275d6fae9032f7b5dbb0cc5ae4cf05b1aa685273290a1443fb1c8598f07fb0c3669f894f1d6bcaa4824789e148a3d0671e5952c2f9fab"; + sha512 = "088fc29280127267909b0900db695db6d6ac51a223755c588e2d88703a07ec4ad5cd9c61e9b7c6f2d5456b15859409045a0f7efc869781994aea010522bf96e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pa-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f835dec2100872e719f238d3b44381277c097824342ede6a6a8fb45db808af15f805bbfca89fa5b927e70ecea347964a5ff1d80df7b718afe4d15a08142ea0e4"; + sha512 = "6cbb3780012e9e89767bcad23291f9935836904946b71d3c238478ae30f9c72d12a94b68aaee25079118528c1bfb81f58439c72483f57f49174f43556f50cdd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "111d4e7d15748bf6baf6272b5a916cc49e91b4649c69cf916b6cb3630a2d2faac8c711581381ce83476b5c174cdf3e67fd26733ddae32ffb2252518775c2c9bc"; + sha512 = "b02fd17e4432c75e10018a61c6d24e156658708bc127874c8f1a27a7b6cc3887feeacbba6047d723883f901666e6352127f8ce447651d78120ccba409470abce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pt-BR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a3df297b8b4c3357e6f2b3cd647317d45405211e01e661e271ebca2204ccfa1d2a69215172f57684b86f9e501560fbe368eeecfb52301bab0ab9fbb9e7f38ca8"; + sha512 = "e65860c40c362c36732d25f2eac9126d9ba5186343f2de91f33bbfab11d907a7c3968dd5f25664d8c5865c7824b5b754717b9f7a03eb231ba0008151ac7c19f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pt-PT/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c7c9d257113a2207599b3a3a7b8057cde53fffae826b569247fa8342d3a20b2cb8d72c61f0c891feb834d6c97eee35df4699774d4aba9082f4e850583f66aebe"; + sha512 = "847f71e52e133ca383cad419021657e5b17275f9c27468fe18dd34913665c770f4c9a059ea997684bf54dfb96a4ca6802f8e19b2c138410e55482b5762f3dd96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/rm/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "573b8ae64ab486336a1c32994903b56cfc363ebeee8945634f2e19ae4d8ba6b6a32c665aff5321a9d0562da0c511d2f3cec6c45a047da57f22e7956998116175"; + sha512 = "337005d811d838545cb6d978dc4cf20afd35aeead11e5adee65fbd0b792b11fd857abe9d49ed14d9efafb7e2e27cdf79110be0b61d6367294072378e27b778aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ro/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "45cf3681cfdf27b6c78a304679cccada5e69d98c025b9103d8f423adb85fcf6e4fdde2a79069429400d74bb8d0fea935d6b8e11cf6e8117260904da24f02b3be"; + sha512 = "9c6dff63e8cb8892ca5ebf6050ae8a1fc639923442b7bfc52be3496667b6043598a85ea94f51af8dff27b5ebb59352b4a8c6898066de0b7f49ccd600eff967ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ru/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "24927659e62aa45ab3eff8782831474803e0f7633465afbd1c10789848899f9fd0aac5c0dd518b5dca3a750bac63666be3d9ae2d330b9c778f56364b54cae57d"; + sha512 = "6b2fbaa5c4219288ab02cf376bc48393c6514d26a7c3c4d108b483eec6286101ca01f7399dbc62575fbaf21a4750fbd6b851bdf5cb3af1d5144b99f52e04a0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/si/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "14ccfa0532d25053bfff89c9f238d3ae8eb422c09bfc4537bfe2cdaa93c3609b4d90fc6d7f914c18a2f0a1d5d2ed357532cab104eab4bc73374f4a94b62623dc"; + sha512 = "a152768e04c2e7ee4a501a4a50dd72591f19c3d6b20ea1fb64090f61998ff1ef7d65cde0a39d60d4b594e120b8a65d4bde90c501b839c6a1b8fbd268f02750e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1f3129d3e20cbef798ad582ff23945eaa5036fcc902eda4bf1ab49b4da2e3922bcf94dbc5807e263d44e462f238b4151a1c35844e65f7bcda9e70dd13d6e966d"; + sha512 = "36a185b703c18e393dc581d494e90f58ebfa1326b434ad0e9e4cb6d0e44e51687d37db219d6000c7777a76372ce5dfc1428d945546887630206f2929508151e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3c22f9937187cb90261f6f7ebd80b9a3704d71cc77df5757a6d11d0858fdfd63b7c07c3dab67a7df7a3391ac727178fcb900d5429472f53598bd0bb1f9bd5348"; + sha512 = "1cb63ce3433f109eb9ffa795de2eb1b7c3dd52a66fb50b45e7e33f8150c034c06f928eb829dabdb7ffdf2d3e89f667e1d315aea566027ad51e288dc2d54046aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/son/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c63b6524e4330b66e99a12c7d76fffc5a7511612109573e8302fb3696cee63e133e1252e3933da74ebe501f842cfb67d3f5f99f2ef0529161f1c25c6e894d039"; + sha512 = "3d18c86a14c46a09669c9db111292006de1dd8ca8f26fbf0733b6478a3e93212301ceb0ef5824a250ed68b45ddb0fdeb29a0459fedcb1f3145f95974a0c0d39c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sq/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "260aaf5c239fd4f12d2259b7a2f15c70e7138c969dd25f19d3450a1f2b0de6db848222c599e1682690750aabe4f6921e1b2261daf97af066367440de76bee7f2"; + sha512 = "05d945d5dcd2e8554ad8c8508f468c16cb9573dc3ae3bcb7a0ae01e11aee1bccc40686e96dc51ef64a380d94f391b6984cc1232ebb47f3f0aeb46913fed31446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "86296ccd8648487df16bbd95605d31fcc74112566d979bcde062787f5d1569564096e1f699f439113a4f07358749101e91de007661e268fa8c03051a404454ab"; + sha512 = "c9e1ad67ff5e183c9b30f91110e52d8b546585f837dd5fc9c859fc589dee4e49e5da57e4ffa397c3152226217f83e0ab1375a4c36da88a4899b7ebfe99654fa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sv-SE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a92a29bad68d52428b444bd995258f8e72db5e36a427b75d2ae377f148412f8422f868e297332b8a4cd5f5d3bcae320e8c603d1e77fff2a75b9623385f939130"; + sha512 = "8cce3afd623efc0926f75e77f4db3914047755957f7aae01f67215caa1764f047a5af6eab1316d3b6562ad584d152d5cbec32858f9dd2c5403b8069efa555866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ta/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "41c2fabbfbe848f6bc6d6b725f8a119e7056fcd441c32034a3cbc7315ebe59d359c465cac35bf5007ad241ee2827f1a5db88fc691531aead659b49d0361cf9f7"; + sha512 = "0311bc2738f4e245f78e8e1abd15d7b480ebd6ada25e79c13e2110cee6c789f11326352eac41d0e1a32954045125888cabddfc811f29351e053d45787054442c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/te/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "aa02885b61dec800f814f8e5cc88e7bfe499bc8ec0af43aae515f023e8efc3065e22c2dd691abfbac4e405e7cf484e90462eea93685cf5f37877cb8a71fc1802"; + sha512 = "8e986b0741df57e59b5f211c7c3342d6cf7b2916b4591415afac7d747eb97c8dbfbdc3fc4b9fd0a834d16af97109476814919b3fbbd220d66db5e4ad01fa308b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/th/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "8e0908abef1dab7a41a57ad17073948ae597978b7a43a9d7ace3c08aad30c2919b6d4c64283cd08df1d084f55750438af0abf6732ca6bec9fa4a52ca2c983e01"; + sha512 = "6524b7b5801bedec93d7cd7da2a7b05bbb3352b7d28399507fe21b72d1c2979389c6d1e51dc968bb7f28d1d0f7f723c93e2970fce90d84b6f9bbe4dfd258a94f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/tr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "5fcb8cd6ca756e0d296be793a475d4baeed0e158ae8903ce689d42fa9befeb2a031e5873793ced82448578697af629c23b7f384e6cbfa735d5f3bee7ebad9ae3"; + sha512 = "fad0309059571ac100d92be735fbc307ee1359e1fdb9128166cbd2fddd4caa7543890f85875943d445b71b97d20de6845e7d17336839481ea7624064ef4bed2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/uk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "aa62685170ad9180ae0452ea046c269c4e3556b297fcf612b947999e77bc733a2abf18ae294bccd55116765a51f11c7c52341c80c4b51b757b20a77f411f09de"; + sha512 = "4769300bb43e9b88314e13a42d0ee760a86bac32fc5e3ada4dd03d33886a8f7c3b572c901a081f017ab0ce46d31f3bb97e8796d4699db0ef582ffc6a6e84fd9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ur/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e902346ff8d2048764f7e1eecaace445836e2c76afd412127c7d28021afb8fc433ff7459c0a3308eef8ede03f11d1eae6e34018eec7f06b38d5fceea1464f5c3"; + sha512 = "ecbe4eadfd031f28cdcf75443d67f14906d497e18037ab2c78e3ec81fd6e0228495ee725c29bf57b1b5d0abcbceff94e72e765dbf38110fc5ad4ecb9ab1873f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/uz/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e676a635eb2b0655bf8635f93eadca533fc992abd94378acda28a2d092b2610cd47e216b1a13a92b324aa17d410935681b7dff2217dc0ef51746539f3b99e4b9"; + sha512 = "ece335699ca00e0296445187a1a96ef6acf34985b8e8996ed0165f45e7648b9af62a4e242a78881e220d5ff1336833bf8025ae78fe6458fa90992a9a0bdb16ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/vi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "85f49ecdb39c7108163063fa604c31af0d41d2cd30cfd59eb4708a95dc051d4983706df5eff0f35fbc4e04ee8393a45ff8296851864fbfce74fb53fef9d2e01b"; + sha512 = "8fd030682e6d3eef3397d340814dae3d58dc0025b575dbc20c1d5d40ae97f48631ade63be12e03e9dfd8e84e5dc1585cc2cfa0d8a1cf958fee50006a7d1bf27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/xh/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "19340122eaac2421c266ba6393d76e125844b5a6e1cc813cb805292ecfebe65d11be1ac0e74e0c28c9e1bb968a8cca55b17fa28dc420cacdc0bcb72ac89898c4"; + sha512 = "55ebe55c84883ece28fb6b7771eae6ed47b0dcd5b90974110a7018f39d1ad690302be44a67d0d034ef7b77f985d10cba26d3fad714579aa3d293bd6f36fd0880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/zh-CN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "82968091db88b6897d3b4034ce24ca258f39c755adceada2b2e14342f9a3ab39c5ac074c9d46d139e2c85442029627c22f76fcd7bd7e76bd45d4fe300e26e5a9"; + sha512 = "fb1176a2c711ec34297a5ddf95a797c4dd5823ee9e898e78c804daa44c16ab78fc84addccd9d83f4171af5dff60302f69236fa92cc584e3985770d6bbe369e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/zh-TW/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "132a920853d159b9c4713c85ae9b428c4f2b5b461dbed4e48606d7da1d82e4a3dd34bfa710b360a64196ce6852533a3fc99fe06ebb9edd7876297849907a71bf"; + sha512 = "226d55ac9bb97fee285ef9fbbe54fee9746cb98a09d1e669761bda08ea6115f2cdd39e1eff0a087f8f46d94139e1906758a8bcdeb74c191c0f453f3705ceaeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ach/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "19f992b4c83bf0ccb81ab90bf3d988adf9dfd41aced30daec98f806a3b1a62a3bdd12db1e0fd36bbade9a6842aaf1b444a45b5cf283bec5e5c8361ee7aaf9524"; + sha512 = "9cf2e615fcc0014b5c40b4113c3be737f5ef7930515dd84a92b8a0d5d6cb90f29c7fe5cab3252cd895558ffb7a6735591ff6cfb8e8125a09455b2139d2d3cacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/af/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e2942bba0c1de9f11bb1020e3794502af1726958fe8427e7cb74c6c718ba5b58d4f7fd714284dc494b7c556b0006bad42d65ddbba171c4f5fbbadf71a44d438d"; + sha512 = "eafd8c098c6092829104ffd870f9803338628cf38cc0525de6beea95d182a8b0a46c9ffc3180798ca06d35bc7822bc18b551b57166d02a53c786299a85c41fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/an/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ec90a184eaddc5289d5fcc727eae31d4a4fe2c372fefa831cfc2fbefe3b38ac694bd879d9bb211e6ae69909332cdf8ceed4b151fb93d1ec098fddcd446825ae0"; + sha512 = "7b82271ede38e63c86d0d805c486183c52f0ef12b181a8cc57315fce353111497896e884f7eac873f140c25695af4a810fe8b7a7a070d9015f8cae3eef0b3a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ar/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9a0e84e6c48e7417cd626a16d0378f0c061970a7736aa4998e84e5bc64d25a25a04f32cad6a687831d0f0efa50184afa529c11418c4b07d27c5e22783a538b78"; + sha512 = "49749432076c90f63697b45fcc8714c6d98a6450ea8ee5d2f850c7a229f65277786784ba00e2ef14622c19a121805a7f07eab7e7dee02a213fd6d44cf10bc783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/as/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9e1f3cc4245a71dcbd0ce362cd6dff4c8f89b4477d7400dfba22d4dc35db71abc3524f13413ad6e524671dae2cf76e0bf6a37f70b3d5585f53c26f611f9101bc"; + sha512 = "b8c3d57dc6cc1c00d8edd37eb7c81eca0c2d8f5df318801b111630511968bcf5fd8afb0549cb3618577c95d121a181d4c8ab523a78857826141621ad5c7d26da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ast/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7c4fb873538c056145f770baeb5d9e3d33884142bf5079f57e1e5d9356a808c7a3aa9205831f8395b635c7083be92638e6778fcca1e34839fdd9c9a1495c11bb"; + sha512 = "a0b482b610d3d569f1a17d166bd86bb37fe57c1f7d8bad6164c40d509811cf706d818be6add0c3277531f0cf5a18e14eb8ae4a652abe9a45207f62de6f4074a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/az/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "137aa3791db9211d534e5886951dab5c93eecdfd86833b096441533feea5054a4a935f73a6fa16945b220e4be7d7f012bd822c41d69c0fb005c9f4f4fe3242f9"; + sha512 = "c1bc3350bdf7f9c16d9b3370d01661c369156e55bfdc7bce0a4a1c1d1b3e7764a691b257984696b021897d47b206f3b21dc692e4de9ab6aa3a47dc12ac2eb9d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/be/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "41fae12fcdcfa0dec5b9dc9edf3e2e48eae365b8941e7a9b5a18273f5b6355c406bd13a96598359e177310e87ee21994e61ceb01ef27cb138e0273395f084261"; + sha512 = "b228044ff1a1d581b00a25c3c33ae2059622f80900d0106af9da3a2b99722691e795bd83cdefd64f81ba17928fb74c3e9a79370871d7ea3c50c3747c1dd18046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bg/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bca20f5dac228af16ba0ada416f55dbdd3c9059f0b03c41d7577cf0f04e6f6c63f5d1de1124ebb8ff0de90c982c7b35a3d7d1285a846e01247e2eb2b9546d15e"; + sha512 = "b60e554d7233d14b6513b815289a81c06a54d9da30dd57f1d595d0210b6229229ae59b3523dc4e3ff4f12693e519898c507c506db65f3f76b3bd475ce6e33d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bn-BD/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "9ead51360fe4833fd7907819a6e11a88362f03a849cc597c345efecdb30f389e9f1479761282d63c0d279ee586396dc4b4c1a287ee72dbead3c6c0a6a69d7bf2"; + sha512 = "8a0ee21d78875b5ec34a30140fbfbdc9fe9480cf792d73652fa2479c7446115aa501562c4cab873aa3f45f20802941272596ee4edc91c2927cdac22a887915da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bn-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e17dc49e7736afd71aa231d93ad405cca548608054b92aec966950099d5cf0de1585cecba26ab757f6cad23650ef1ffa0119e210696cd0551997cfb429093b14"; + sha512 = "b38841e3b9d6b5ced6e8ab5dbc3510275f2cf0410fcb75ec86a99d31a06d9524c1b2420045bc71bac7b541ff60dc37a79dd5eccda2483a3e92697ce29594be98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/br/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "372bf55aae3f8b82ea1a8dadf7153e0c10391393e81972c23fdca4fba61d10dc6ce43fbe6e93190e0a45987cb6bc12fe3bef1ae948a5d35805029b7a901f1264"; + sha512 = "df014a91481412ec3c950250d37f8ee006055f1504070e01573c479b5e3f157eaf84a6ab41ab5eef96c94b868e526dfe0f884f36263e36437a1e3269e8b33b43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e21c10011842cd8ef41ed6dd1d864750161e177bfd834ffce3807e2eaa9a1dd479fd0c613fdf07086d50d02207d21447cb027498e649a5ea770222359d7e5f53"; + sha512 = "982567a667735df9fbe86a3c3dedc3103d6b63c81e8e54f70fe9b3d6ba751de1545c1dcf3b902189dbdbbf5bfd5b129186e8f3a09f417a64746c71bb30228c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ca/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "056e37e201b6f7b0511472bd8e126a3b23072bd19b0a83d55fb2f03960a78bd7800380e77e255b38f38b851d766e4c08ea429da49551619df9d144edb9576e57"; + sha512 = "c6fb02d7867bd2541d37ac52bc92da0357bad6439fac72fde1883b843a14b6c5bcfe3638bfda989e9169d8282624ea43735a167fe78633601545cd04636d2465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/cak/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2e985686c3db0952045d6ad53d9bb9486f305fed3bc5129da7c571d3aa142fc51522463254a2346251705884bd28f96f19337f74cdfd70eb33b9ce4d96054a31"; + sha512 = "9b6542199a9e02ac62c604543e2ba72e63847482662992a1a1717de78f3d992d7c70c5476559dce147a1756d25dbbe78720118e607668375757bedcfcb3b919f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/cs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "4fa36d4af8891365e1731dc71134a3a5ceb3252dc99559e1c66ebd9033b31d05fbccf7bec974a97d6b184dd343e3f85081c0cbf387245cd31c33c5402f062a72"; + sha512 = "912eac4e2b9ea7e48f3270138aedea1847ff7c2998489244beb52125286565423ee287b967d675556204e38cc90b224f88b0830caa03f13fc908649480f8b6a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/cy/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e1e53929351f818d9e5d1849d5e0169ca9d6a76c34e837b3a1e9dd29374ae8b052c5393b5fbebf8f7e0e7af82956fa6d4c39aa0fe250d72ecb5aecd3f005abd6"; + sha512 = "9f9ad35c577fd5d8d387861ace87dbcaa46768a6b16b1351314c1eba98a23ab99de3a3670e54c0b6463be38fbbf347868a4915f2827ecef5fc722c19bde82082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/da/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "2fda22084391b97bc08a273f86be49c7630e280356db6599c78f118e44812964a8b2fb0061f08f2c39b8e0e65bc39b8d476005f28c8ad2f9535848469b84a5b9"; + sha512 = "53f724c516ebc8d1ac72c8a6f3e21975ccaaf2f7c12382c5483e9755568a1908ddf8448eae34e91c64a1b3d4f73ca7b4f71bd5f3ad36dc14468323599cea1745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/de/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "55a001654698044ea71e6ea6006c8d8ffcadcde643f129d1d8a5c0993efa7ed46b23ebb9571e9cbf475e341f6aa75d9431b4e66a3179261afaffc991bc37aec0"; + sha512 = "f4332be64f0a87f7afd98788307fedae93021ab3578c7c193e16e6e3a66c2b7468eef75e7bd8ffad4e23b05b47d04a95d56e0a51428ade99e956f97152b1b2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/dsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "f5eaa97294743c981fdbbbefa1fc50c6e318b95e3cee13983efcfb3c8dd34c427d7f34316faab37c5e4bd2b75e05f57a694f4232efd5069025d504a610e85530"; + sha512 = "8e6bec92f696e49273b1ba9ef1ee367e7d67db409e2833dc3e76a7cf6de2437f23a7203865262e9e0b355ec8aa09d8ce6a8bccced367108039755fc8bbee5319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/el/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a0c5e5627b17e1e06732c73c457fa474c1ca150b3b1547514d7b52684d56399362365f87521e6b6d5b33c4360e571bace10924cb368809448a9c70aa1ebd9c3c"; + sha512 = "fea0097f647d170f04e239668c4f6d3a31d0c0e0a7fabfef909fafe82cd2ae6cfc08166b6d8c55f2e778781bff98055ecb1393fbc21164b699feb3797131d426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/en-GB/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "48ad4c8f83b96953437478acfe20235a82792e6de81ce4c1a703483c88496e14946676483124b1effd27893cfe16cc23335ff587aab163b9d47a02b449af510f"; + sha512 = "9664ff64be155b308c586b8e170f06004160809c7802674f5c14549a36ad18260e7736f40ce841013a5db9084be83a4e0f44b8c11b69c11f0a34be8bbe7ea11c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/en-US/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4d35d7dd10bf5602695b39f77f1c03e5f432ff1c583814e905b86199542bbc98f520603b34b1d2ab204c8bd6a042e57460f390002c438b892129c041a65a1f1b"; + sha512 = "ff65f20d9ef9911ac853dcd830b4fdd60790c9c860fcfa3f57791c3d2615624a8ea837342745c7646c1704c04e145c4c5b68c939d49a1fe05d5835e78d141132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/en-ZA/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1ef650ab59f4c821e2c6536a95fe842f69a9fccc39ceaaaffaa92cb3ec36e2d5efd1e18cf187d393ff7a480c87f0e0dcc49503f09a62b126093a40594c31002e"; + sha512 = "de76c940a1d3f5ded493455fc979582908368e10035d685fcb2c216dbbe55ca539a3feae8851b6ad97901be6d4a6fce34583ff35c5cc241765ea115ba45b6d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/eo/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ea349110d62e391ca707658a1dbd83719b763953867ac4a67af28df7fe9fb0d54741f937e13dec46c3670eb6e9e6692d928c01b93f6b999f56e9d7e2d789db42"; + sha512 = "4268e22b96f9195444bca4fbeffc1d47f1ed93c3001115f532f3bec1bbf788fb72c99d5d7f6ee427c19b103602e35e98354784aa13368f0df53b52fc9a8d9c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-AR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "5e3791e89c3fd6c3019d7920b30fe9941c985805fcf5f7b8eb5bd565bd5de74379b9612252e3afceebcefeb27792e917121d21c98d12a20eb7e0de02d6234733"; + sha512 = "143cbedbdb18aeed78a1805591011b2dcd2837ed950aa2579d34d4006aeaaa85a84ceaccefd8b14e1d4695469d0cd8088261927e80eb5bdc6df4ef1ee5e07350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-CL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "20cfb102e58b59af0ea765d15b3dd658e9cba674a854e616c34dd158a695fff28a7260148199773460a3618b661e3de29c514a946aa1f546c935031493caeff8"; + sha512 = "6fe0857c8615720b5f268297c1809148943a25b1549f294ac83db6bf3315f7984de7b9b9921fffd0505f2d956fcfcba6b90e0f14d0a25e7e1c52a89f13eb2079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-ES/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f628ca64290a37769ec10780633dfc22f80bdfaf3054e0a3b6c0d8c8e4721dab405515ac588a101912082f050263d44ec8009ba2e97a9d5707a598d95115e1c4"; + sha512 = "93817b6399e451a99317b1981c033cb9ed46b673ce00fb6014e384be250ec64b5f32625d9e1b79e80e4c38a203a32f4f4716c76bbf2df130a3d7be1604a91106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-MX/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "159aefa0be24137a29e6d41acc6ca31949e8d2c04f7b1a4207d07a081569867131ac55208effda80245f7aff58627a6e4c1750f870d369685e27efb582e6f0c6"; + sha512 = "c6ed809031bb31dfe29a5fa9af201b59eabd59b286d0b7d69063c98682f603a3b6995eed553ae1db2f433b3ccd85e1a9e0ee94e14ec63f2e428e317335137538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/et/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "67420de67c8b36ec17ecacf552928094adcf16eaff89acc68d02c4ca13221c0b875476efdf8ffc6ed7c940e06686399da969e85deefe56357c8c5e563e0d8f58"; + sha512 = "9e688803943cafff591e9f675a864447964cbb2f0441db212e9152e88edae83331d913094053c2af49db9caf0341c7e6194ff6f54c48ba6931e4b5ef4222399a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/eu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "6ea39915cf9f11609680a94989694c9f5148bf4d2df51c9a6be0d4dae22c63ee59bb3a67dba51c4a73572795be8a54d129da847c9cb086803f88b53cb239f859"; + sha512 = "47cd9810a14f512857cd6b11cb839800f0335c17cbe6ecd29c22b765f475891bdf07f9756f5a9258233c16389543f4bd662f767636823bc578744323bc56eb37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fa/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "0b0578bf25c7ff6f8f2240645d1108b4f62178975a894d986694c51cd31dd38ff2a50a8cdddb655eff78a6d2daff9072da7edca0cd0a158dd433ca5627425062"; + sha512 = "357c1be02050c9871f54b444c7cea4b56a3834779e239aebfacb00feac0960197cee9837ad127cd5e617423b44ab13ca1d1a4aa4d75d52ea59a4d8caec64cdeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ff/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fe9f1f20a8d16a495cf3d1d73abf47adbded5b083f2e2daedfeb200766cef6fcd3e83795edb1f6fc87e38057eb1b43c9a68b19d4ccf2b5cec91ab1b8a44c5347"; + sha512 = "5b35389950b1e5913c0a8177348f314235fab8560663abc59ab09c360ac02857e3387e77be119d2c126ef000ee52c9ba1b408d9b760158dab751e03a618863eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "73d7c5691dc4a7f2daacbb54d13f8e3fe99e61563c7342266a6b43b0a98664ddb58d10b3acf5efaa3e27b02f1027aba4297deb177c1cf47fb3e4a8a54f458b5d"; + sha512 = "d9a0cedad0e8715bb86031797639ffe28ba2b5846531b6712de5b1ad2dda60f1279ecb34570b172091e4e245f09e8cf3bcc62478f7cfb02a38043bbceb7b2d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b262150f25ee37064c0e2dc72acb8c35905032ead049ed436fd8c3dcdc3476717e6f3338ce21200862af1d6bd2a55fad87e7f7cb48da8937e8fb20f43949541c"; + sha512 = "b850891b14e1aeee6779687f558160d21f1618da6e6b8133b5701a2076a8b91a283af711c0107fb9862e4c76dab318c6be9f19c03fd4567c67530f573003bd0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fy-NL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "94ac090ced43398681481634f7e3691d307f7059e44ef7cceddd969711c7f7160a046c6cf752c8dc7ebeed75e5b0aea542550295ea9858df0c4764a85140a204"; + sha512 = "cc37b6614980a31fcc11a5b964a08a900661ca1057ea8ae486ac7dd6ada72adde58ae1839dd9797e6aeda28e657d4d763c94a906f745fbedf8fa9423e3d83061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ga-IE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7ca79b03ed78de62fa5aee9e485cd7260cdb90cff649d9fdf4e7b25cfe0fd5bd2ee5a5f199e658f9f0ed53c28ff475bebb167dbed70c35e9ae16ddbe5694ca93"; + sha512 = "2d078d00cb4fda65ac14abc3ab5e4a4a0c203f12e64f726843751884b51bbb15bafb15cc1dc76cfc587428a7348a6886d3f41a125129235432bed16ea2b53f94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gd/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "52a0c53b8a4f1c8a83781ac8ff2a13306509f0dc8da4239299c907887fbce49aa72468c9c66b6f1bc3105022f4d54e83420016dfe0bde9e3561f07f208115652"; + sha512 = "74fc1848fbfc826e18a60b34dfe61b056636561927aa96e2c789d26dd72b9adff32ed445c62fe62b877b28945ea5a0007224deabae1d264dbf3ad61c5b38493b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b28f4918fd530d9f60e3be5675afaa03d34910051b921dff649184df95bdc4a61264c86e5a150cd8c91a2af7de90c514c1697c8d39bd5186b2bb5cbaa2418af9"; + sha512 = "9ff0b453c118cd48cb3455690755cba41d39ab81cad52d2f6ae6ce26589f5d09ecc6506acda66b5a0b79e0c53ce51d9875eac646cf31b9643baacc8866dbf50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "b9814ceb521cada0b0104e1e67fb8ab1f9c60d5e060aaf8bc41103135836808dbf7828f1de56db14d27658f9d2b396e8fafd80d8e0af9546497ff1e4562ffe41"; + sha512 = "6b4c85b78808d1c28869363a0760aa63bb6aef022734b5c4bd77035e68faaaacb8501d296ae32bdf70e4a0c8c001978be13bf596e6e87c6d209fe0766b40bf33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gu-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "8b8d318c6582cc92e17187fd4b965c0b86ecd62babc81d40bfd605d3e40dd748575452149fd6c8b9030d1fbab27b1f7e6048030150ac4a9d4f057cc398f6c7be"; + sha512 = "860423153134eb53a0ea7cc1e77f3e9ef03fe50ba59bff939b082e41ee015f464ea76ceb93400f91b8cdf2288fa64382f44b735a42ae4b805c3b7ea9d9dd4c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/he/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "030f7c6e6973fd46f6afbd42edb50d71e18bfc99214705ac90b8201382fdc39175a2b8056de87517e1aafc0037460a398943538e1547282d3480e71bfa736d43"; + sha512 = "10eb3db2c96e3c9b157890abd5cc83ee852a530d4f3f11b043049e11458bf52f2d3dc3ea2e8f1a0352f9541177130e07293f1d008f6d89fef734a8bfe65c247c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hi-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bd4423f60836ae696f76547838427aa1db63d96e949829f0cca17b6a57b2f5c812580439c1305764b1f3dc9f1989d8d12c31c564c5065a2a67ef71204f8962f1"; + sha512 = "e55dcd464c1c99613842a3b98d7ea2404f516be7ffa92765021e0fda65a4f961b470af53f672d61b0579d18618dc84d0f851158fa773800163ee8cbbb6cf73cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "49b07d74c0ff293ac634c4e5517e2a6c26d98f34b40827c6de5cb08c6f151bd8379f8a106fa5bfc391f90cb49d0e5188c507444483e91cb1e01acdd888fdded9"; + sha512 = "ff166b9bd88bb607eb5e06ace5015a76fba9ff8c70967bb043efc52d6eedec8f1eb2fb720a85e19ef3994ce5a1de081b624fac37fea2ec7d88236aae829cdc8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7f1616f5876993586e2852eec3e39f801a1b96ee0a13758142047fb5df4b2c4874bb9c6dde75b2bb96582476c1bd546fd4a0fba3f9ef67d8f03779e8a678f51b"; + sha512 = "679258efd864a674a471674ef4cdb241f1ebbd9713c7017c28fb528065b52ab658413269f346415ee14268664bd667f53db618290ad971fcc24d33e957605eba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "51a7b57968f11f22820a11b6ce71113f9d831cea57ceb766d33454b6b2d3f5512ea6548c3df6cb32dbe9e6e4a32e54e1946c6bc662c8b95bb8b4a4aff736d6c4"; + sha512 = "51758c4e4c57495a6a44bafba54b1ee376139258f1451e51cfb68aacc5990253ed7fe1ebd0639d9f8c1fd7ca59c344c330333d5da6b2b992fe9da576fb251aa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hy-AM/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9cc7e5bdcd6e52a9a0e633b376b144ca77380ff948f69d19b37b011c072dda4c4cc83ebba7331d96eea3f678ad9ade3e32bac95fd2d5523718fef508d3cd4b0c"; + sha512 = "419e445b1d97710047a80e74645fa1504766e4d89d5bd616f98cc4a50c936b60e4c1b32202b13f4703e4edafe13be13a2eef1fa22ae77ebb1432f12463a977b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ia/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "ffd1e8f96ad053e4dd6431f2d4869432156acb77965ec52be1cbe66bbfcc80cbde89cdab061b9994ba6586c73f5c5b92330ec11e02fa7c715a995aa89a6c5e13"; + sha512 = "59084fde1fc58ef1ed14db350281b6c4d3fc0abf08f349c69083e2185b4441dca760e288ec861ff97fb1f4a12942f65f16fd4fc6ad78a7e006def5000ac28cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/id/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "25c406c5324ef17f8521eccd9774c689222d3922fb5980d45a414b25b4786b5ff430ea9aeef85024eb2bbfe4cc4c33767597ea5e748ae440db51a55262fdb01e"; + sha512 = "a97dc85473478c00a35767dc725030fd55a285b707ba0627ec6413c51c64d5f24891b6a9fefb17aa54a4bfa42cc6625e77df8942af66e44de1fccaa7fb4aca9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/is/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7f58dfa8b716b5df3055d87723ebb62a3b1fea4a8490fff1d3a7343ae542ad68b2b0026f71ac3358bf01ad4906a2ec0674b7f902f056f108b810311f071bd099"; + sha512 = "1ebd9ce8b8285597ce3ec93e30ba3d8564f400c6c1716e8e7e043342cb2c69c391dfca71ffd62ccfb1c9a6719f107d869fb1f4caac18308b0d33a912139297c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/it/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e8deb322f6c6b843a3375db40633dae5d951e29321bce83758df76a1a3407bda4b0bffcf5d8ad83bef14ed518d7524324de1147db0dddfa3146b23636722b780"; + sha512 = "e96beacb71274940a491fe68c3b12e2c65672bc3a3fa45f3e8b1febd72acfd601856c109bf3a1027e9690803ef4112611fc571b7e7e51a01fef1b0a0f2a638fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ja/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "fa1040a763f8a39efaf84b4a1fe2c828013e321acd3ea583b4f168297b4eb91b2b34304eb2d8460afd4cafae279f91c57c207bf7e0d13bfbf79fa1990dd07abb"; + sha512 = "f1ba3a7c77da4f4d6ec8c48ce3353356eedb83dd16f342ffbc5df602922c098ad7ac48c6414ac9a0aa029d3d504412c7c614a63b85bc36f172663f2dc65ed66c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ka/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1456d1cd74ad2b2670e5f4b9e9d508c4d09745eee4b91bcede239b68a34eb6e4dd886d1faa71b9e2400e792a5a83a3523f69e5c0e61e9fe1b042aeb7f36164dd"; + sha512 = "5a63064d45cdead33f387c3f9f053abc659c02b957d3c7edc9b319defa0c6c5e36aa9134257ded94c102511d382c366cacc3c744280194e7a7c1d920966c692d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/kab/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9e4396777582b9c225c5b856ea210a3a74b7aaed2298132da308553f6283e6b7982f7e8c85cacafba8190565c714618a9c993f80bf65c13294483ab781888788"; + sha512 = "1c9d970798a8cd1e7fc302e479e1609d919bf098aacc4ac398e1287e598d33e396f37cdd521e65ac1ce828d1aa690765c1d5b407aff6835f53c725d4cdf29237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/kk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "70dbec454af08d1f09e8cb98e7c6ef58a7be49dc27008f0e7ebc7fb1fcef498a6b23543a813906d95b05aa48d8fb465b7e3512c2b274592cca05f2778110a63f"; + sha512 = "e9aba1a5ac3a4aaee4623b62abc22e387539041c940b316cabfe89fb0320d30e1a063c72a0247fd364f8f32c5c02ca4431012c74795d4cbadfb96f2f7fd673ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/km/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e7573a67fe1e572e90dc2ca466da8c86381c0d3b2aca9ae999ffab53337e312487b30b174b34c759816de89561509fc588dcd07a7c19cd28f35424142155e954"; + sha512 = "92547aff76f0d0a124e82c9a6e6b91f66b1126d23f652423333513f618bc674d879cb777447963717663b91e23cabb687de730129fd5af9daca2055ee2dd78f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/kn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "f843ea108a5421af409d4de4f7b23e279cc7123a2729c42ccbefe3e1883041525bb8688d98cc9ca0e541e570e159e29a7bba251896490b82fbe1ed3f19bd630b"; + sha512 = "d3bfcf0ff2b91b3023c30a7cdd0ff568f4b98f36012ec3368f52b4cfd3f6bb5e0295078f2b45f121b251f03c5b9072bd4c742fc5d225d21ce72026012f1abf77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ko/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6e9bb9faac92f4bcd81a1b1bf2eaa3676eac7b5fd327c0a1f7acaa920adc8f507946aa6e9bf7ae9b2f51a61804a69b36c101571e938a4af3fd83b89513ae1183"; + sha512 = "d651f789418fe39b1611f0e5a24be58d9602209f285d1d0db62d33b93bae34e542fb9b59d09c96b2c14891119bd0ed20500e0cbe0e24e86ed9801af4072bd7fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/lij/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "89fa09f1738c44d43cc328e806d3cc90a78da56731bd1a3d1789090a27cead1de1358f14ff5613e84939366b341fc32cfed5b8040af5173633d5e09d3ffc5b2e"; + sha512 = "fa9c21f3c81617a275c8fe15f142707bb4227ae6ccd5895262309e771c221c121d01bc57af39d2b45891e689bc6fd6a34c51ace106a35cbab176f98b60c5ef49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/lt/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f56417b8ae3e2e5343e4289fb18718eb25984f1eda4958706ab2d23a940032b16dc1b3cac556a735b34b50c8d9dddfd201db20e86799a42bf0b3bf07c9cdf425"; + sha512 = "f934a730d3e22c3b49f7bbd3d4ebec5efae8f637ca39f72276644b7e80d082f87620f58c76c86cf542b3123a88abb58a29fb781c40ae897902bc0854635e0fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/lv/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e1418fac0a563c00f0654d5e2fe46badc260f4f92b272d69cb96e1cde822a068420268617f2099b30ef7f777575cc66dd9fc6bb2823d882c7683b30b0402013d"; + sha512 = "afdd6675ba2bfc18eb4fec5c63f9ed394fbaaa3800097843925c2c8c76a29a4de10e3c7c4fbf4897067e73f551d549bbc93550fe8a7f8c78878a61d67c414764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/mai/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5dd4c15027a2a1468d0c60b57ee35cdb7ded3ea15326a7bbc5712698cc58d0e1a3ef65ec360620b075e78dec3068a4035ed4303edcb8c1ee20de2b0ee00ec726"; + sha512 = "a52776efbcedf14f1e3878d3ef06e27eacd39c55ef7ca743c99429f7b8e24000def5535cf082226fe337deb2ebe1ac94f8f42a0b0d855c099b6fea4c4980d971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/mk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "1010989d15299a581cf5a13c3ae9ec8a12e04a8fffda16368e09fe0b883991465040070456ab1a0eb4cb903b8aa32e20f3ffcd8c4d5d49c757a267f3177f2ea5"; + sha512 = "601500f68a5b9fa8297a0d7cb612f3bdc8f5910d3a76d2adbcdcc468c4f2beac24d7f85701ee20fe98a0d6a024c4ebb8dffde33ecf113da2f833e10d18395528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ml/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "6191f6b956c4d76c591deb7057799e2e74fe22be4f1c3802780e8668d7133b27ffea1b60c8ef4f11211a8c735c1d3bc482e654f6d7645dfc6ff1d010cc32ad67"; + sha512 = "1163bf2a97011e86401dd429834ac0be699c9dfca2c8a90bcdd79c54537d5f56e6ff8c788e5dcb599a0d094a6405b84f6f0de6fcbeb9210c53fef98220399733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/mr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a82a3a32ab2b4115b0b971b7f5999d3d640e5dc3d4c5dfb2ac70692523fcd84918938e974fb16e7789d6d22d12f0d328b285e3fa6982303e558569703d5f36fe"; + sha512 = "76e48c4b910532d5b94d099994341bced12a9db673af6baabc75cb786b59ec033662873d532ebe7266f1af4cca799fb4d468150551ea875b5f3c78d0155eff60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ms/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b75c48831d82717a69763fc8a2e6abbe08c421865eba659c6c3e341da552cff25a00f7442cf041913364eac4c3c8010a0aefc5617d824bb4902116e58c913846"; + sha512 = "1e2d3e00b04fa231b5fd8d52e624dfe6d4bf22474896c68e6c54b61a9c363c72535853a93c5695ded4cd1c1ff56c7f690c5716f22aaf2a2b7f652c31084372ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/my/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1409b5db535f8580628812cdecb03e80ce9c8c4b7a493b4289448383e1292807f8dc4eeba538d0144ddf561d0634ed8d680d0e4fc3aacf4f85e12941c6e172e1"; + sha512 = "7ee2c4581657472b0747ab4a0e188485ab67d4ce9a14b0a5ad27c45c7f5abc9e021723f4af8aa80ac698ced75cda9043e685cb568c3fc20f34c507cb1f375952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/nb-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "11e06f45cf7a1e2adbe1b0a2ba5b59239cb75917754d251f07ac4e4a403c7457f2953af4a4fe5f06409c1b34b0d56b1104487e22819d3b0a5b4c9bf0f8b5b5e9"; + sha512 = "99d0718cd52cbd9483a8d19541dc6ca2d3c6546a08690a30c61d18f71cd9620aa7ec5080925c9115c5f96fde1887bbd1dae6e93e05f461da8c06ffb29841c753"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ne-NP/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "4ac6af943e4f43498f9d5d5f69324c05abb05b0821d9e083e4469846893c8dc2938e1becf59d19591c3f74dd37d8bbb609fdc2ad80573389b2e23481fd505472"; + sha512 = "db9d211a189398ccadabd82d6a51f60e3c5d5c4e3d2581e172681e7313f8fc2783b7488486b0f4b4b3d32acf891ec2e99f32cd995584073a03891db95adcddbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/nl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "eec10e6f508adb9f8900ec129ef3491c7968f235f1cb7b260b472f8831d1d250392c77d61455bb86040d3009a127e6b2f5831be8507456f555fa8ab903f3c887"; + sha512 = "a3fc5b7f6209e348236449b3c66a7fef1b230421f66392c8c149d32d4c7d2d606ed9ecc972d58d132682ae1c415bafe410e218d2dbcf7ef183b658e2b5d54f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/nn-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "db0b18d20529288a38bc91d2f37c4dd1dbbace9c88ac86e0668a559051d070291f4df0e27bb7f757766cce7db5a637ccc3d40664736fdfdb0bae6ed0871b4c16"; + sha512 = "f701240e3c4c5f112ca9076aa83d3d399c0e65be600ea7baf6c4b2b232b90e1c8c56a358c10302986a945256dde3f1f9397a8c0aad3ff35f8582e0dd6972f3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/or/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "4ece66e3d89847381bf3577c817dcfa38a6f250d09d880e6932c5c088e2947c0aae076f880cc5764ecbbe0bd78f8108160352cd5730666f7c1d7c6c60ac27d23"; + sha512 = "b912565bccfd31b9f32742a83353f7d97a3ff272e05cbfeb5153bfb4b26479404ef559b0e0b7c1636c5d41a81d409522c5726a38622f26f3719a076946cef076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pa-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "bd32b6fda55490e16fdb2e3fe01778e469de82b0298a74a53d165d67b77f74f8ae8002deb4bcfd4aa6c56068d91ca2563800a054269812e904207ee796e04d20"; + sha512 = "4fec18f06be41273f84c16213de8e4877dd4dc378ba051a761fbcdd8aebbaf937bed1d547c976b8da3a2b377d3878bfd00c8e3c2ec9fb40b1442e12dc395836a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "0361d68cab2375cf6c23cc0f32adf26e5ed4971d69f35846a027a09c067351de4cd493045d772f3f5be251828eebf6b8c44c7a6fa96ae28e42d30b6af1b96f8e"; + sha512 = "0fbd127500ceedc19c160764a2a61f3fb788e54b029c2728b50a7a35b1a51d430a67bec739ea623621c05cb64d1e35fc9044da6c5403054d51baf141baeb732c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pt-BR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "bd1e7513c3dea9c4687f73b25a84397d49054ef0453676e5a3ee9ed4b605713f44da213b2933677e1d130f7bd6018cc49157eb6433695ed3197122a0127d50e2"; + sha512 = "5b960fe9614152e27da77c659cbc198b8b7eda777e3ae188a80c79f96f775330354f3a76f409b022408905dc4bdfb102acca42227cca1e0e20811644dcf14c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pt-PT/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d4c6f9ec0a9af683953d9e9b7857b29ecf1cd91c881bfea26f544f1ce8c39d6a53baf1a69a415ebf8f5c8ed74fd5cbc10e17c4ba8e71227e9512e604b9aebf93"; + sha512 = "7bca9e76dce8eaa92e9c6836cb07614e0b7cd520ce085d245de8b64499c8972cfd9ef74e3b04744446e5ba5c34be7c1b39fbc1d6828f411ffc2b1a1133bdd993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/rm/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e3429d1c53ed64c21158229fb446913d3901343f5d7f1e6145a3a0c7ca8eea384436162af88025612e5176221c52efc30de27296c30529a12689da2b6f46d08d"; + sha512 = "9770c6ece4f52557bcb47dabc717b9e422f915feeb5bd4d02debf4b4e2bd9708dc4da81c1e918335b8a9813b567df229eff83cf8dc413e1287dfa6dd57c704db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ro/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4837f0819c646b85271da39cb97b1b8d4fad98c3960b5f11350a6e84e76900c5d71a91ce873709833e20462627f08d1c8f0d9cc29d31fcec7b9961155c2361a5"; + sha512 = "43df1f25801a0bdbf0d47327264b8c4ac6eb8c10e5e48ca5993b9aff92f3c6c97a2d289073cda0a52a81d72c384a62a8f233b7b155a424378f06fb7706eebc04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ru/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "83afab121109fad7543a936540f74e7bf7274fd111e6c3bbb5fd18ddbdd6355ba655c79c567c082f98d8cb9286b60ca85cf787d02b7781d171f2f507f04622be"; + sha512 = "9d0ac601df2827191c8ad44d88b5bb5b46dcdda85281ae73090ef735c9e9895e2eabb36aac1d095a0cedac525b315f588ea5f64163b5ec6328412ac29046c0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/si/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2d1722a5ff66a5f9e0451f79aa876368fdf4722024c14d4425c709febc9d503229a4b7f74b29533ed1ff3f9f7288156f372e2b73bde7d4d609b44f5ebbc9ef50"; + sha512 = "f45e432475757cbfe66a5ef12071a95bf74c1ae6c357165f2caff119c677974a53c66ad92e7c951c4ebe41ca82b7ed25fdc308698b03a6c2aa686df0b173cae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d46def7cd726aa677a6279b049fd590bfbbfe1ba095dca81599b53ceb20c2588d1635ba16e6ac9cd600b05722250cca80c8b3158a9efae46e85f4ebf05d4a54e"; + sha512 = "a4e0e3db886326d6ce74a2a47d8e9d7b80e2090a425cc7dd3a386835ee4c5ae525c597ec8aae603ca638f4a742f517559b821a58b5396799742481f7f859cdf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1e4f059ebdc0056e8db15f5e669dbb4bd2a3f1ea11fdb9e3a1d733ead324416ba4f5a2ae3be8e7623f205a8c6c55ef50e2aa4d1e18bfcb36644b092f5e2ecd06"; + sha512 = "3e83fd71a7620c4d58dca6437fddaffec172405bc10ca7e7df2a7c1f34ca5f3f3dcf139112fa5ca608c911d08b30d08cb55854d2edb84b9f59d14e459d9bdc84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/son/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0c2200c882b5c78a76e58f11354cc67ca0091da6670693803f659bded98ac03ae9944dc38b174ab4dbfd8c00e8bdb74acfc88d37633d4979b41ca45091171865"; + sha512 = "eadcba6770e85c50394ce85def8915c7d819521e2ae8025a79a1888280278c23c0a41846705a3450dfe3548b1154a84fd17a1c971478e4746143b2d4d3925749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sq/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b44b8f2bbd58e78a2e0b7d10248e53274fa2021741646e65a98210e8454fcf2f59369ff568e9df0aaac3aab152d19bdebdfb1dc860864d3d1a57bbda760096c7"; + sha512 = "861148e9080b230884b8cbb415e116da836d367b7c6b8e3edbe55e2275f03697dd0219d2c30d01375abe023e99e0547abb7d47e7bc29dc68af7ea05a2849dc92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "954ae4a9e3aef24389b10b2439c11b6cdbd035e2909cf52961d8547fc4c801c88568d337b3b05ae6c51a9ed8646bff75adf8c3f9985df6cd36d9517c2e55ccd3"; + sha512 = "242794c64aeb0f350d83a22e12225e723822b70f79e629c41715d3e47c7c482ac9b089c71d08e9d1674da0eb0f4c122257d4570989c59d5d2d3877385fa95268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sv-SE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c0abcbfaa65140d6b39794f49ac80330e9cfe67cb4c802dc99390ab91701ba19c5e7cb54e7502f8c04af9caa0c99a476deb6d7c58e1ee3d45daa2a45b274f15e"; + sha512 = "ece418ecc310406da2e8bd583468435d0e6cd4eade1f0334b867c71806ccccd2781c22482caca04c8924978907b2fb654660944df4bbd31be8eb13b0bfaa42a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ta/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "437430892223927941fa1b38c48115afca0848b2a0a0f035b8f14feae3d24afd5a33048d62054a4de3c67182f3db32a58bf53e74c1ef75aaa93683fd256771b6"; + sha512 = "8bcb70380c63c5b6363e4b13caf4462031f990455f9e2d2f47b4621ac9cada5f05de4d1e5d1e2c65437aae2533867bb81399768577f9d68c58e300712c96c91d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/te/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "c79572d1ffdc55197f6e6fea56904c00341886c2ee45489914f32eb42824d2f21ddae34ad6549328e07ac86a862cd19df315952a1d61e05ead994bfcf50db9e7"; + sha512 = "40aeec3c324bbde19bf6566532d995706fb9c603222265713133d967735ace95a80af0dbb8401f8589a78332958e0c02745ae5e99030cb5b8e990d87ff441241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/th/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "e2e707cefd47863a00fcfa2e0353cab988e2bc3b9e263b15ac19a34b467ceef6dc97805fed5942cf645779e32146ccae17b13092042240d8524fea45dc707c5e"; + sha512 = "1368b907c43cc93387ddf74d86c2e04e1c2e0e867217de11595662921a48abf9660030f54bdc7961df90b50729e9ea0d0d2e634d9f4b9773d9b8da75517b961e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/tr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "02f7db82833aedc163301f413f83919de6488e92bacb2571701f4cc74c8858abae39822a9cd4c289d3c2f632669fa07c10f9db0867edf016305b48c7e4cc19d6"; + sha512 = "a9019b3bc55a87bc20cc06907f2fc24eb7ccbdb397ad39bdbc5bea4bb3a3eeb23cfeba68dec1bfed66fdfa42ab281c41447b2ce848b38410b84f53be7a8ff9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/uk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "8ec5bf4f4ff8726fe2905447558a8b39d817e71640d2aa3914925e09ccd401c6a02da4535f2bd1d25043a7d59bcaee80cbb1231b8c4030295fd36ad6118ae16a"; + sha512 = "a09122c768e3c90a4a5278f800c1e41ee566792e5c3a29d8f2d37cd1b647fa5160376564b0f3fee08d93627b8fd5b084fb66ecf34500a73f9a0a726a353758f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ur/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f48602af1e8250fd9b2e24a93c3ba391c700206890955f4278bb538555b411a2b41eaab0b4b169492f57e938ba2a96c1733810558a3807f81a4cf4bccfdd2c1d"; + sha512 = "8e4d3bad6652afa436f690ea934cdf5feddf2dea13dad1637b4ce244256d3823afb6e23a511b38e8a467c324539c8cfa0113a3897cec00a475072ba0325c7403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/uz/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "7783dcc48245f66b75bcd6ebdc494a1846051e0b175c01fc0e55645c379ae1b94e6908aec1896a76cadea5f5384ff4e2c569d77ff32921217829090b78a85f53"; + sha512 = "1e532a744f4969b1d6df7f5d9d958cced92ae996a123aca3de97c35ec5b3d597db62c3da2191bc5b3bea172c6c5d1f1bea93ee2127fa417a43e4550cdb1c3b82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/vi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4d67cb69465e8a254c26d8ad1e44aa3303601d567b1bbeafd8833256501f68d78b1eeb17fe8911a8e1419a70fb33269be53a264d8a9aab2c2c43e66b272afdd5"; + sha512 = "5f9980b4d1fbb7b620021fe1aa80d2aed5cefc4c5be8716ece73697428cb157c79c052aee7a9ebe505a811da5c9a01fd789b27ae1fa8b11292d5a44ec28adb5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/xh/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1c8349853afa7b6daf5e5ebca92ee0627a531546e76a0967934e5f57c3b0d32578ebd4bea82ebab4eb289904666254c7e4543768739e8e8608c406761aa89c87"; + sha512 = "e8a9cbc9df298c53b54b6c3ed1b75b87f668ae7feb11a911c4e90b3d925b4e818f7a5f8c50e22cf5ca399324e41aafc436abbe787fc68d0b41fbbd9c0fd99502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/zh-CN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "645836c722a15e69606252aee00181ecce3ded146cdee5991a63d601f77371760e7e71b021b13a0150e204b628f58c4a2c3ceaac718382246020b3fb38c62232"; + sha512 = "e7d0c0a7f8bfcb63a2d3d1164917ee8ecb2a0fe74871437723edf381cd2bb5888c86bc9708ddbf94383569ff5b6703f3dadbc0cbb5afe56e70130dd4df4340c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/zh-TW/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4b1f2e81b76f280cca25100f2a6bd52d62adeb5d3dba58a18a8812efd4f23a97d38c86b40777a6ba6f8e2d69e50d043950d4be5b2e3f1e4c2cca61e9037508dd"; + sha512 = "09bacdd45bbe517dfd7c30b20307e1fe50ffd97be349fa778cc977af64a976326f4bbae30baefab714ccbe8160e5ebc375b7f409d8c8e2d18a7615481abee811"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 9faa67cfc557271b3ab0792d09c6793a53548547..12cf5c30df431294156048ed1a092d390cb17541 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -4,7 +4,7 @@ , cairo , curl , cups -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -92,7 +92,7 @@ stdenv.mkDerivation { cairo curl cups - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -115,7 +115,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui libGLU_combined diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index ccabbce2c1c8ac127a1c27618847f6383ca6aec7..1bb7ffd1b092d48e22c3dc37144636fd0e8ee01f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b12"; + version = "59.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ach/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "76b5f6dd1202673f2fa56fc53bb727ce20eb8b9a15590044affa07a24a15d845ebcee129579a56da913b7ef297528f4a45b88c8ef0ff6ebf23bd82a017b85439"; + sha512 = "b94b5d17bb2bcdf0997e8e0b8d58cb07a7be671fba4c9a6e42c4954fab5bac2c2243b9f57cb2513db319f0a257561aebd837531f134344b1c51486f66f96ce3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/af/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "835739b8f0f89245b1fad9c74836d7249bb6021527a42e646d937fdc88b69c7a4c773874cd15e5a297d6d71286970b839bffce12077a0df0b8e6f0b96cf43ffc"; + sha512 = "10b1db6c1abdfcd1cdfa5465447b70413b411cbee9fb33161bac21c3f47a9222243be4267849008d1bd20486c3d6dc752a57cb9003c2bef4566ff4210f37e388"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/an/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "1f10dd87ff48f28934336b6fb5c3f1a34c7a15c431e44230f87515b114e86213ecce7be15886c857574d2eb20a3e809f3a7b63e69afd265d23562ca795f62ba4"; + sha512 = "8d94ad871580dc295783c5f3b7f22c88db3f16f0fe3511a505569571082775dec3edd95c472b17fce9353cd07737450df8a9a44a78f4541c26c9dbbb24f1ebfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ar/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ea5dde04df8c2cbebb79e973ed4829a530ffff174922918965b6c69c0e1ff3debb3387a93ac6f75042daf261b678340c1d63c766199b235642e7c9cae99ccecd"; + sha512 = "9f2cf9ae453fb79dec52c29371af50830b129bd82e190cf93d846042579484adb389ba33690bc5dc5e3a652af3924b70878fc0109d5a6da679d97a48fb3de567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/as/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "f60dadd2c7d6a0fe96ddb9616810255387161e13b9a996e664c1041bb7c71807d5d0437368a2dc4ab88e70fbf61f4d1ac39efbf4e4dccde7ee46fc19bbd95d03"; + sha512 = "b97ca2803feb8b9afb1b006ac375111a59a26f67ed54ec0bf285452f2b59999f4c99e40b2cc066314ba761de465a7a893de671b50b575464d6f9f5bfa631368f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ast/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "02228122502cf9fceae06f874ccd86399a2b69b668dba0887503ddee83574bf997365248b063791d7541785573b3fe095d1952d8d6cfd16ac5a9d0b96710ad2f"; + sha512 = "1f92d7ad29a89ac7e27181cb67cc956811ec512f48a9b9bb5e35247e4b03bac680dcc900719d1975d476c8ea7f51ad3d21d01aa9fed8f0f4b9ec81a443354575"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/az/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "987423a79ac63c7d9c4d7c306b6bb3b9dbae6c1f44fd1d62c0efd97f2f531dc520e66161089018c6ddb69d5bc6c9909fd49725efbe000df8be8b1c7946d5601b"; + sha512 = "43a54e6e62e02f792ce7aaae7fdfb4198320baa34c7e1ae76213e10bfe118f6c49a2d8c85536910e5eee7ea2d48b0e15087a906ef01d100a2978f885d0a04515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/be/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4b2e99d9812d7d042f3a66f0444c3cbe9de4210c1c93e5d4dba3c6f86723c0465036f574b02c59286f9254abe31f2edd6b0b9ac273da344afc6c641bfb8d57a8"; + sha512 = "9baeb1245ffca545d6b0ac79b4bed8398406f411cb4a6b7c2f703d32435709521894ffbcba5d31e063dbd0a1c2ed1639656454ba5f69ef5a53c1c3622b5cff21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bg/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7f12bf4908cdb35370ec3ab3c219d71d4ddb7815d41eae77293fbc223435423ba21294d431b48293d0182aaada5e2c7b7b0b669154234fdea24c78b44a45bc0c"; + sha512 = "57e9db4705224381034f2c11434bf750fa8addc16773a8aa6e761c2a3bc5e583568531acdab844337948bd5ee2e39101a99a32074862f36738ff9c700087227f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bn-BD/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "bc0df029c024dc09ef56c98e94bee2e25b7cd6719d4943f26edde52b13456232c61cbeed7aa20cc1ba21c85f6a650147d62a3c597e4c124406ed8cd96d3e6ecb"; + sha512 = "f42d8d243a88bf713b82f3fd284e1dbd3a320db37b43d14a11aa6ec98dd5db4e50ac5b014f00495c11204c4732461c9c24f3d3410aec9f33f9cfda6e97d867f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bn-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "a37ceda406fb81d6a9e80c1fdb0fe721742596ac0b4feaa0a8170537836c90ed23fddbc08e7d0fd4a645feaae06395ee89309333df0021086054e0813f1de69e"; + sha512 = "ddcb486b0909bce3c8e917ec504e0f99c366a83385c36f18ddbc0a0456cad295e689ebc7715bfa82aa62b679387b31334000c92c4c7f7223ffdd9390f039ceb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/br/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "66b2d83f46fd22030594df06ff2ec9dbbe4f945c2cc9cf2700907411b95fbedc34535d9cc278186331536a72669b08b45ce24f854bcba1026aad6e0a346488c2"; + sha512 = "a271350d8d0f87461479fe4bb5b998535ce5ac673e0c8657b820fc50f805cf282141269bd1cb467b0df3c1139362b33b15b4dda5eccaa297894bb400b0e7c6fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "511490960028d760f894d1f6fba23b1cc409c258445d27d68c74f9b16d5454832f35123fbcbe4824117d715ce9a559fe95ed9b70154daf605000916bb5ca53e5"; + sha512 = "a897577f7c233a4e6d905a9e03dd817cf26636dab68deb8c4db13b0101f7317bc55de40a7570d835de3256803901acbdc10041e8cfd0aa21ced140a80bf7c845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ca/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "841182ffe9835abf641feeae551e0664aee1c4aa9696a036c69383ffd2925e96d1e8a74c2e1d7634310fef2737b4d059c9cf4e34687c5f5fca60d8a4a167feca"; + sha512 = "d032ca82efbaf4207759f8e048c5018400dda9e80078fe13c2cfaec542b1d16bea8ba68bf885a6255793b3724c3f1d1b0a79be8028651ffff6ffb85bfb1856e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/cak/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "105cde802f47c7d736f9978f6d02be6ce15f68e9300d64c85dee847d90beb8ca62790a800488e40a542afcc97331569baaf24edab3489e8bd159394011ce95af"; + sha512 = "d3c6c7fc0b505f0ec8f670b314627061b3f829ee04fbdca6301956cd6ba244de194295aa989badf0cf3a015668945a8311f12ac37b39e1caec653380a719238f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/cs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f9203d2037924728bb1970fb0235d195c658dbd140f267e53c7d72fabdb74b4d5e81be81fec912a9bda5f25d78c981fbf52dd7067c1583d190bddd1133f5944c"; + sha512 = "e636cb9df591f73f0d9b8d596e997893b92fd6db9692be44e6aaf83b7eda66ecd8e4ebcf8a4c3d451358f3ebc510e51c6ba1a79cdb76dacb21bc1a9904e425b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/cy/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "48a39bf509f6ca70c2bdb6fa2afca40a3add1ef01bca7f5086f7dadc5a86dbec6ee562c2c03aac7fda5de7c0e32bc2bfa180b19688dec2170a3d8ab5f1871f00"; + sha512 = "8b4252664548625e4b9e007b88fb6dadfbf2ac5592b6721e37f44a86e11e1b429534b321b8582b5b82b17e3819fd94c45e9d03e5f8faa1eb5e318de22a2e6ee8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/da/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "2bf58ac0d8c258b3cb8fde4493714913584d5790c7d21a0de9ee1053dc8ac14c4063ad21e1bcef4581a2f2a0c53cfe99225943c4bb975b90e0d1d27346ef6ef8"; + sha512 = "5d2d668d74064dabe2f0a074ee6a101706ac76e0e21129a68d201a6eb627948b911dac86746cface983dc077ac44f68519f81b62e8fa07f097c3b5bfecd88739"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/de/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "dbfabae327e7c4135ae52f2a726abfebe25e82c70d796c5a550e29aa476d69562bee0c229d49f2396bc931c31d1d9dadc34a808190672c5c5eca4d51c1936d6c"; + sha512 = "8730f4173165b961badf184c7a8e25659e0844eea51c26a7f7bb958ccb43a0b1cb079ce8916a8a58853f7a1489c0464330a8467822c70f6c6b2df510db1460ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/dsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2e601dc121842888122cd91360972290efad5bd3ef8b0a32a48dc18cd5a4e4a1adb0283a6fef4ce5d3f398afd324bc17e4032631abc04df3ddbbe00489ef76ff"; + sha512 = "522459633b1a8638efe961e33c8779eea0c83e51eff1372731389d32c1826ee019c6fbd7e5592a632fb7c07fd85adb3c7ef08200dc087b95568d75d86033dabe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/el/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3d88ba7e3491d21901e767a45b9b63f00fa7edadda86c03ebf4c85fd3bf5789289a119569c4142027d29b5f8feef0fca7950d88d57ed6573772abda3e0c8713d"; + sha512 = "46ec66ca8cf5a2b299ed1eb21db01b115ca54044adfc74851ac5436ec0d8fdb227fbd9033b14745dcafedea722f63fca3ad1a860efaf9802d717b6f91bb51174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/en-GB/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a032d233d9d296d0acd3da7f8319c67df6c0934e00063332dff12d74ecb6cdc771427f0a97d8e9dc44ef42bbb10b83ec4771d750a95e7f566679e874ec59ea6d"; + sha512 = "ac52ba67083f9d411e9e14afe88bb4bfe9850f7509d5ff70812c30ddedd4563e758852dd457fc7c50b285abe0e8423a5b72d8b39dcd9c501e3c692cce3591cca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/en-US/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9ff68729f80dbafbec3ef96a2022fed7b77340238bd5fc4a14d6b3b71819a821398118fb57afd5ae2df10f0ec29d77c22b07eb447b56aa3a1a69d3dd5114d220"; + sha512 = "c911e4a8b16272d4bc7839b5f13dd4892d68290ed778d72cde95ce110cba5d78df1572868f50222d9adb81df367a564d542c8afb4b1f7ced23e3b9a8a759e4b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/en-ZA/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "eef030adc910b3503fee38253cf671d3f384c97b458a667847c75bd3498492413f0f96223ddfe2694f83b0cc15bfb9f235eb57786e5a34d2f72da84dd6cd69d6"; + sha512 = "67baa5b7bbb55b3732dba842fe6c063a0bac2cefb55f201e6aaab2d11105c50cbba4850cf80c7d99b2e83b32535ad4cb3a95432bb26563592d48ee961cc1ac0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/eo/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "79d54503503d27ed0b37b279fa610c2f9905812bedd845ed7e0e560d7c797288241db8fd92524f8092ad1f691dca0bc92c8c9ba63c8118574ddf749f69a46290"; + sha512 = "3d952efdefd0f8b7886506cbea3359f747854f73d53efe58474a8d31beb396b568849151951c6d0750d116570a8f894c5d6e586b0487e3696cfaf451450ecd3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-AR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "3f55035170caa2b744b02b9b357b50ccaa6d4e0b0cec68c2e87414199d0ec59582ff2ca0c0d15fa7d72918285308dd2364ff4cda9e8ce46bf606836d3f0eadc5"; + sha512 = "26ea9b1ddff5518975d49cd851df6951af376d3086b88483e7da9253fc4b427241d77019a8cfc22ba4ffa279af83fbae3c4deca8e43ec085fa366abf44629ba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-CL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4549f07ded930255964bb9f6b80f08bc4308d09106bf22fc766ecb42620aa558cd6c3812f32d5f5cfca93075dd737b2b2d774b99ad629f7b7c94445bf0d95f55"; + sha512 = "85d260e0dc02a4d3f94c43b4c3425c0ed0c6c9569577faf80f8f7719f368d0c353d59deaad519ccecf9da081b3063721746cdefbef18127ae2eb6d7c9863470a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-ES/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a81d1a4b08a2df595f57fec61ca2d189f0a2742b4dbd02ecb2f6094cb17d82c37ba8cf8bf7e27c9e29829a5d3b46f471b3a8c00ad37b60b1b83df6c4403efb7f"; + sha512 = "0efb25a3539fce60d2788513ca26f2a2ea48330894fe9468d54e5eac1bce411e72d937eb5997c18f60fc64c9d15ba247664998199655c73f3e9488a84810e4b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-MX/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ec4855478633811aef744358c7d6cfb316b8acfa797ffa750679366f62678381134888c0941bddb73c5003d8739cd8ed0a73bb4b8d6691fc9b9ecf754573d040"; + sha512 = "64c1d3945d866649891da16dd16d7d3261d0434e275d44c179d98fabee7eeb35e7fffb6e20b9b6630d60de52559f62d01ab59a5e460a389a17f5d5513296fd5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/et/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c623a9562ab40ba41a931355f2997469010223938f61db24a70b123a3ad6b7313de31f7ebd400eb8f2b479776b2417f94b920d4d9574b515698a23c8e9fe3465"; + sha512 = "6b63a9fe3f12f4c270dcebe46d9b13082efdc32e94c8d1937e1e5248eaa84e8e0966092e408475bf20014d116509ee773bc91b06be9cd14fd97e64b8269072e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/eu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f34c4889cc8d186ecf995855c782258f855d7308638c2182d639e02d41549432316e1ef506c5ec4b73ea2af9fd433127a909b2d9198afe430a422f14952cea97"; + sha512 = "221f867cf7384f2d5f79906ac68c53b87ac6d11034698a7f390def2008f1acdb944db748b8019a726ad9eb89debf72b4939034057e48ab0a2642d041e3fa2b14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fa/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "98ac96c6e044830b36bb8d30ad0ba11d79bbd75059688204103454d70e3ff703f061d79765cfb986cb41dbacd2891664e2edb426fd860fd491534a19a6c9f037"; + sha512 = "e513f3f871c444c6dfe4af027b31830e78d0d90ee6f199f26b3dc8fac1dbd3293c1ae74f4df735e15cfb4338330665f94c6d1dc4221e9f30250c7aac33ddddfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ff/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "37abe707566acbeb143b7570e5172ca75525df701dbbfb2aabb234bbe4691dfd2d8a54a73772530df9b5243627a44f034be2f5d7481b89533537248c231de3ba"; + sha512 = "074cb42f7b6cb93ff5583834c8ba1f16d92330d241a166983b26c3311c3254a323ab52badc16e9fd3d13e71a783d5aea55674c04c7ff5bb68f60a5deae446954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "baf37e00cf5c8705be80ac71202bad6efc4073c8a857a1652f44c6b5453674dc01e31754302659f9b8a02962594521564ee3712127b7501e6aa8248b32f2388d"; + sha512 = "901bbb71c4293a6cd7c79210a64349d65fa91c2c2f0bc00da5ceba0a7906c0cdfe00c72d316cfb39604129070d48dc1a30416ae4d6ea2fbf9c3be3511b1a3a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c7b4ffd1ed3da813a93fcca7230e0773042a18697defe26e19f75a5ef14feadc49917b757796f268a271c74ff32c9165b9836baf3b2cc74da92e3b73d73a78e0"; + sha512 = "b70919cdb4f6798253acee401efc6fe22acdce8e12249c59c618b9d2858ccffd398a51c0c77c82ffa4c5a68dc0ac6a9066466f8bb3cb7bbed621ddbe426072ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fy-NL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "97f6f4ef8e412e5fbc543c2eb4f71c94bce8a56c419bd96bb1fdd0a3637d6ab0efe7c9b212da92d24113d5ed1e1f66f37261ac5a26ea2bb49908e7d1f8781abf"; + sha512 = "b3ce427644dd2997d8f21eb60fa1b94c03ab091e79e5c8c908d938ff73871fec81b288d70cd754e03ff9a3758289bd9886077c01b5e3db0458bb7c6f04b11ea1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ga-IE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "170773fef230ecb6a0b36b30388065d49eadae312cd3ed63d78e57a75aa1e553a37270e39410709804db2e5635c6215d03c0a4e101d933b07f0e08a8b75ab7a8"; + sha512 = "6bc8201b78d85d5e5e2dc226628ce03814cea2c9084e5c4bb332b21d50418fcbb5ba656ca3a592e5304bf9fa10b64b32493daf17f6f3363c154b59ff3aaea828"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gd/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4b681fda7400e27a94d2e4867525ab6924d5b2eede227706d37b1d6f48385bc11604c3f509edea0fff7fc5e55260600ac4915c4195f02f0c21391a35cb99a47a"; + sha512 = "8167a0e36c2ff85a85c9155a47f5530c581fcec9bea1b535b60b8c9e2bc4a370d002f942c9542787a34c76117356e513822cccdf8c02962d0091acec16724001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e9384b3e35af0584ab8f5d565ace7462ff6ec81a02d2630e853b6e00c5c947df92e0b8f2d6070189bcfbffcce3db360bae57724a16c9e0584ee7b7d4f28452ca"; + sha512 = "b1d8de0f315199bbcae9ae693a04e038dcd24c73b8795f031a595e70fbbb4c79b9fb93ccb1761319010e99a915e3f71a075b2e368731bc530ba59b48873b5b48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "d7e6e67824f1abc95105e2159c4b5477753c71705c042f4d5a020bf3a6b7fd8b40ea832795f0059ee6b1b8f1846fad0c5d1ad4d9c58bb676387dfe404921f4bf"; + sha512 = "2c64c3db99edca9ae722953a48e4df9f106dd485357ec0bd35bfeaf5d35ca72437f38991e2af7fd46fc3653a9907a2f67f6cd931f8d8cd2f55cc56f9bc3a9b99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gu-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "acaa45a4b33aa16be8f9207ae94294b67f090f2beee7fc1bda7ca3ea1a7a143bc8e015f0b66c129a8423068179eb1386379fc93ec46c5b4228b7e22a9be20688"; + sha512 = "29bead26899e8cc33cf47e7e9248493d80a5ddd82fc35e94836f26b627d7343768d427a7ce4e7ebfc70465fba9a5c81bdb56ca7e0e06c788d179c500ee42b44e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/he/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d6a899f84a98f380cb1ad14c520e737e5e01e6718616c2e4fb6694539cbf90df15399dd6f00dd34243b5238da12388add3f9d330611df7bb166f110c252b9fb0"; + sha512 = "e3899e1a3fb97df70a29c0a0b314bc871a9625e736249eb9bc056cf0c56a81d1a2a3364ab964078733f5f3f4cb20229a5fb65a4a481e74b1afe2f1282e41894a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hi-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "693d99da1cb75ed371de56bf6a81d84904d2964de288e1b6043587a4786fe4b512c7519c3aa2cb1a7d923c40f0e7636cc85be8563ba9259054a4ce1bdf07f966"; + sha512 = "ca96796c00ea4f028d833c7b9720de0ce2d77e72b9de85dc6e77fcf83379992abad22ace9201de0d4e45c4c89f8a77bf997228b9667accbeb774d3035276d1f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "17e2698fa8ba3b9c68813887961670af7233644fddeade8dfafc88ca85e8794d9ad101884508bccb9525b45056da05ea098f46c225b7969c08da8316537af9fd"; + sha512 = "7ebbf4ee67c475d8abc48212b6be0cac569000f386c54d893c863e329b0459e59d2af70c1a9ec5d5d123edef738c84249bd41538eb876e010776cd8920744997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "9d17853cb8731c89a06a05a556381c5d26593958b44fa607dc0d1943a03eec14e8159dcc58b3934b135bc3dae1d6e240f70cc72d7a65f65f621dd7e013eb1edf"; + sha512 = "b1ed1fa049df575cdf5e7ec1e0e5e0d70f3fd235ecb969490e4e6ed694db677fb9d561b6d78e798e684df1a918d1660aa5460494639a525e71c5689d7a0d312a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "248f209efc4c6c0ad9dc17b3f243112fdcf5ca5562f2787a143098ac4c13f053ae6f67eb17d54319e1dd45f0d295d3c2e2bff3167081accb08a8666827790f5c"; + sha512 = "7f2420f9da6b68a461cd7345755b8968b55e7cccf2d89ee1e5133a11486f35fbe20284e1a083c108806f49f61070550222fd82898d8229baa64d2097f448fbf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hy-AM/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b02548304612539258bbb9e9274c78d067def342fbf4aa9e5e33e01563cfca71eae82db4404e38636f65845362cb8fa4558a5997ac02edf215ad80892e1a7dec"; + sha512 = "15394abfe0ff50a85714a601b250530ac8983bd456e6eab5f1cd6551ac19b283433ca68bed8f05874785eceea4e7eaa3eb442193ccd31c9e611cac43a20655e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ia/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "d76d4821d7ad76c58a19ca9ec858de17bb5fbdc35f5c0d48de254e89fc1481cad6c646b8ce51c495bcc568b9c1ec8ccee5fde89e322dc38e3b916b0c04236f89"; + sha512 = "80281f638231443c959e0f8ba8c40a74bd96dc9d5b95a3d15d6a62b04fd308b9f3c4613685098da85d45d6e1f5b0f813b8e9b7d2b6f3fd655dfec5481d184106"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/id/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ffb410f2f320f9430e8f0e3f9ea9f7c4044781a91926f1b2f7e916d5b5a3e406b6aafbb0e90facba47c843834135e979357bb58fb3678debd93e401922062d03"; + sha512 = "1ebfd95939088082786a667284a30426fa98d490eb0fbb0cab1546b46f8f22d2e2f4e58b862c2f11b1c2f2f12efc76348f435230fbbaad8451bf7896f2fecdab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/is/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "7bc5c3b7b9fa7ec04022eb25afeb6ca663af4ac4c7aee85fd95e1d7744f67fe8135c9b08536dc1f7ef52fec84a813c0d49c5d67794c2d3ca94b25fa43977807a"; + sha512 = "2bb326166ed2f5ed8cc8c67607b817f9acdc760ff94b7cb5078ce45068ba7bf10aed568b1b6bbd68a5882103f490fa0c6aae1f9d66efe46bdcb606cbf4af6f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/it/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "39769d4e2cd12c8a1f10d5fe142be2dcd67044b3c657272f703626a5d54d1de648d243125ff9cdf00f8d743cc30e94f39504d12074cddceaccf3b0d076bca911"; + sha512 = "f73757b9dd8fbe5b079db6399513a01867e3d910ddc35bfe2f7046bdfcde7687c4e90da67ed9fbe829d4007edd6e9745886a458d81da07ca244eb1cde67d9f8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ja/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "bb0040df3765c1165f8da3533bada5df740450a2b9bd2da25299bb0363b518fd8b8b22f2f30eda622321453110e5685bd35de0445628ed8564aabc587ba5ab43"; + sha512 = "60308c41f841ea80554ec084fcfabe002922aa86d67ffd9bd9ed654bfe94b3a5e216ecf2c05e7b409a21d7b86ef07da72738ee94e7b54a1fcc15c056b156d396"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ka/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bc7ba6b0cfb7343976350ac3133f12bbd2312bec45717356565e9a6005fd25a48237d139ffc036eba35ab3b63da23f56a88adde8174043bb45923d8221fb3c00"; + sha512 = "f18aedeb49d25f3d5e87a1121fd3ff42e70473666c7d6d4ef6006d0f7303c9b64568de36435d4cea9196e92523b5d808a4ebcc7bea94f68d90abcb19bf2d6f2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/kab/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "45accd008b53479a5232b82e0e31c68a90042866f25cdd473cc9232bea94f74d51da9d85343b25d453ab466d54396ed9bbbbd295f7b6c40975a4e86002cca4d4"; + sha512 = "40db6321b4793a823b37214d08f4db718f84d4bd4737cd03351100b417e48cddb36ff550a26d7462cc793ce2aeeadaa0b72391701215873707946384e122e6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/kk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "fa09b247dd1e8efae1e18956cc8f560c0230397d02b8279992e563cb444b340f02ccefdf66e5140c24da5c2f40d2b15968c83fc703f88b37869f016e5aa36da3"; + sha512 = "3511fe6537af25878518394f460a946e6013ba1ca56042070a2de96c637d9726a7e6b9ce2db8bab7972bd434037db76abff03fbd2380c893f5cb60b2a68c1640"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/km/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "05cad8c071aa43d463d3dcf4df262950358564ef0bfdae5c72fa2f59d306af36f74786ea6ebee75617a78648fa329aa7869059146836decbe49ef2e2614cc509"; + sha512 = "8884ea6d19ebe1091768629698fb7d11e34c9d011f9270a603b4530a0be5e8479abd87c2aca0cb6fbb33e944b22a69d3267b69c665fbb9b41b0e54e4f9a25c19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/kn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "375b7792672a6b835570ea13514ea4d73b880da3d917500d9165780dc617aed3e5b5509f309b9511440c9c009052944d3254f6f14a4d24ecfc7a33d0d5013cd8"; + sha512 = "6ec80a671c71d5995812417c17e6a65dc9188238abaf2fcd15d9494b9c98ca3495c4b9be35e16175dc88d93a32d51ef2ab5c8d58683ba564e063a0931d63c25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ko/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8edb7a4c0f07954fc9d453838203b72138f6b5f8c83da8957e7bf53eae38735b10d694a4e80acb44c8c65e2c54f554fe5b0a551a7aa57d96c54c515851b7d56e"; + sha512 = "3c4ee32ef52f915e0a64a28fdbbc1bb19e80405b63a1d574eaf503431165761d8917c972cf5757b1c104c2cfa9f080ee3c4ba550511b51458f9f9f8894cd4abf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/lij/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "73b2217d8a7af31223a5278c59e5a1e4dbfd426fdbb083cc1c8f3387735ae5cb7229434a513e37691e4dbf342b6bc1c0d1374c873c8a9ef6619d8ba9a273fc8b"; + sha512 = "f5af79d0aa476e21a93a077f94e8408b28f4a1835596aa34caef4176ab37e201e3cff3c13e96e67687146eb2c6b3443744e43e99bb1766d5b49b789980a6545d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/lt/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "98a89578b14589fb4a049b75f3d165a8bf39d21a28eef83b88bb62829c04f30f8e7b18846db8cde2588ff0b4d6dc5ecdba410c184ee6bd1cdd6446c00d471a02"; + sha512 = "ddb0cf56afae0de194528dfbedc96714e221d43486907cbce6014731650d8a9bfe8bfc639e27aabd5eeef9824004c140511178b89f8ab46550822950e33608e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/lv/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e8482cfc577644dfedad3332a57a35b1209e41aa13d2b239fde02bb26c6ec3d5f98867da5283d5156d04944893261a9e589ba38e249329b3a6a00ac7b0d119c5"; + sha512 = "d2489d3e6f46695ef8e3aa12d01528a289fd687c5840e65d2cd4aa01c122b52ffacc139bff635bbb959c80e686dd8ffa1d0cbe585981048ef7b78ab490a53c8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/mai/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e7e53fd52f1ffb4e5c4246e01192044a4262a8cfebabb980a0f0a0c66368b27d9df44dd19bc7bc15f9e61e896bdab5d34a4182244fc53057ef658a0858991a96"; + sha512 = "e5dabfeeaaec8bca3e8265b395b35ab2f4edab143f14461b9bf63fb9e0261c899e7d87ee194e2da0d4695863c9332b6dee6b8f3334af64832664fafb4c6daac4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/mk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "5f57aa88443258977ed0d40bb36b8c279385183f0d8ba78b2cb5f7c2ff77575977aebbb1bc5eb7fe2ed329981e776b0301290c8742c76fdfa9eb21bce3e83499"; + sha512 = "309d35b7611336dd11933d7cacc78d1c94813ac6343dc522110bd153d6dffc29eb803601958735789233c0f0163a983d6ddf2072d730a2858a8de808db00e3c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ml/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "29445af99dc7dc5c257b2c5e819acb12e7c56afb69b8f756588f2ed25a27a7f5662891303c259f572c556c5a637cc870fa4b88750643f13c594bb346a116da96"; + sha512 = "de02f9cbb6f47c3fe16e081aba67c45290fef2c420c29399bb4f0e32c3366957d381190b918723660a7bf9425e02bb290841062b4104498af4ebc35bc3bd3323"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/mr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8f863de4611c353093fbb12bb45c71e3e867d2388cf20d2204c8826977a7c9e4b6d7be63ea31f20ea7818c3d860ac8ac2563bb85f323f99bf21a83a9247db742"; + sha512 = "079a38be805c8527e1f17e64598e90eb9e464594656785e125f9daab0d3355268d8d18f28c2fe9ab3e8cfa526c2f9010d0a3b8a673e041ad60a8f5b2b6dc3796"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ms/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "722be877919cc1749e16a99e8d5b9cf434f2de45785c25a6234e9fd150c50c1a34836d0687289174940ccbf864b94b7073deecc909e0316ec49db0ea8767a7dd"; + sha512 = "05a087a15ce680f8330070e5717cb32bd42fd7530b48917eb0f47f3608a1d08eb6e99834d20a7b51e4382c16e397ce46db166c49650e3d38112676e3d79b83cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/my/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "2c5001b9fef34a091f181d81c3857a9316dbcdc44e04574e9ca7b6473cdeea8c8f0176bd2e4929f5b7350d4bd22d1448ed7f08813279578699d011534a00cc9f"; + sha512 = "2ab117abe127794aed26e5c50f65b7d32dc2fb8b46ca4766259df8190a33a7cb0630315b5a9d19a36a902f8caa2d33730a4500585ffb3deabffb65ad53ed7bd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/nb-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "84638330ba597364b7e137bbcfb40fcdc71eebeda9baea7f586736f8ec34cdd6c537821ee0dc1af42ac1f15d5aab475ab07615fdf5a62834e9025fa93a1c0535"; + sha512 = "136b17bf57805f1c5523b8a170b6c0cf70b58760d8c3485d5c2d0bf6480acecf98ecb10de0b97cae79d8d5595b43b4289bbca851edf07844121dcc2e74c1e68a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ne-NP/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f3dfdf5396b8a47df1c550a4edb96020bb7a295f60ae8a0fdb02204d16edcf6ed9f78f47a4797a0514583de2f134a4fe7a8e61092b93f757e01a31932ef227f6"; + sha512 = "4fc566997dc0a55caacd5a2b3a1a8a4d4f691e593da07e19cfc1e47fc6477e32101a5de1d5bfe34741885589eff724c6f2886d18fe208e8e7f6eff5a65fab0eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/nl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8df228b2a309af2d0fe5937688660899d2c21dd617ac6aff9aa29a81a34f4776d6547aee7679a0586e6ca3da549112ebac0f887491b300bffaf50350c8cbcd8e"; + sha512 = "a5bf66f2f9180763534c7d5cfa51fa9d7c9f6b00e01c98245bbc836597f81bf0b07a11baa7ae4e3b5c49864f71f60caea673883d7c93ef3a5b3286b084c00b57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/nn-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "aeb6851a866462b8bd273d9589e1cb9b555b781b000bf779c8cb54151825eec534d7e63d401c78c7f5ec419871e786a414bade1f586e9ba1ebf712c86e651036"; + sha512 = "900f3975c993fcce0a043989b9dd92d09daca5a0e16f601069ce56183407380685fc3c4106ba38733ad545e4d79487a945ddf192ace54db7c7d97305e7f1f96a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/or/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0cedb8f36d910a346b0cd242a50ea62611ef14b90bb17a7b11bc0694117ace402489f072e5465bc5a1f502b56e056ea11f1a4b118c14c7ba60f6642d5b5c20bb"; + sha512 = "09214aaa9c182013dd12f38b17db33e6b4872dcdb3105db8405bbd068163bb65546620692b5539ccf7bf477929619ddcb438593bd41929489b8842011307cae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pa-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f1085cdac53aa694730f124e6feecbbbad5fc6bf4a01bef7ea5d8997c1f417b6dbce5aca92022bc29fcf57e47d1b83f7e094e78b2e3248cb460b2b698e822fb0"; + sha512 = "0e09950b757f8af342329c933414a8c8bb26e8759ff47281208f3cf4aebbe6ef8f230e2fae80070649897b52daabc695b4e47a87e4682d3570cd0b12fb4371b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a8196bc00626726cea642b25d52199f9f6a16027ff3347080403183858f615db1a93df180a39825396da0809334e7c82b118a241e2bbe998021bb261a9e70851"; + sha512 = "dceeee73fdb4810363feb949792c9fed1e58cd99d64585a8259fd0e0709981de85c174b95317e9fc77667e73bd86faccbcb491cb77b14405553d271092b99989"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pt-BR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7784118a72f558c700d3e796607020fa786903bfbe4d0abbe4cf954f217ab8e1e61445638db1d64da44290d98004329b3d4fbb98c54fbd20f06e42ec5c335894"; + sha512 = "111d579b63758bb24995b74e5fac69a299db6caebab05eea1af3b2e86ed12db1a7e7ca4fd3d55e2ee18b7640a316bcd1964df18f8da8753f2b7f089f88bf213d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pt-PT/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "08875162a408a4ea90afd42b0e4796b7467c00ae943660055c75af2be69a83b9638764113a4847a1d7da14707a75e632fdaff195b87e737d0b726b4b42f8b60b"; + sha512 = "d62693d19e7463639d0c06a9d07bfc34622f5748b01bf94398fe7195f5d9639344587d81ada0f17ae43f45fa8371f6558b9b468fdddf6677a6ac919e439ac569"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/rm/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "a720e330b6ac4bd439723f7e09ea0a2d2f6ac3396f38b4838461b165b7516952083509b4016cb191e694357fe672a4b4bb391c32239ee80262f84d514753d76b"; + sha512 = "ae41b07013bc8908282b6683f5f161dc1e7d90c7373f9b31897c25d7b33da2b7136dc6ff94f9e0b9112de334c3c79c3176dbdedf39f09f0eae1af7809d23b224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ro/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "cfa7a8594ccaf5127704a033f4358374ac2a1241be65396a2ff425ef8d15f33420289c40ff7ead5464ab28e03e97dbaee906df736af68152c5292b97ac8d9214"; + sha512 = "91b1776539108dc7cf75c6aae2c07153f61ddbaa0a46755dd70e418d0540ff752d6baa29e54cde95aa7bc4c3fc4ad05ac391bb63cd13b8ae8ff54cc4a09e9a2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ru/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "11a504743ed4fc55977cf58f378a5952197580bceb24ec5e3db4bb98e9e6b5ce5a4aee108b4f1cb5315c3aacde7f48809a84624f9536b9cfc784b4ab65533c6e"; + sha512 = "41b9995ea1002ceff23a785e5e15b8978071554ce65358e68337bd00fb32be101fbf6feab1734f78b665b6f3eb1b25b4fd187a328fbdfe4e70824ee5f8b4800e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/si/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "987d9c68411b63d5d048011fe6132751e2860f86ad41da170ac1fda67682245b8abf526ac5ee9608e056e9effab40d6e5fbf909039609cc528abc15949347dbc"; + sha512 = "e3ef0842002689f2430b8a70e2de709b18690aa8e691494e51c032126302e0c661ac4fdeca11a9249aa6dc94edbeb4276be49c1c30707566d3f5b33737677f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c425ba05e70026300f7158a30eb1a6b2f56910a1d8bc18e58fc7d62b297d5fd269efe001834f9f5ac5c0e7b38b644a555b5b7c2831d629fc7baa820e22870cb4"; + sha512 = "92a3ca10270763cc17bbffb9d27286c029a1bbdd02b341748c098161a270b645e07b5939c6cea06d1d9e8c70553e3df887fbc6937f01b336e1676d35e2f15e8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1f6a079617586d0f61a103b069a2d900355371d6155d7f37c0a63632c6624514935f6ccf73fd9ec24050cca8d13e5904da5a4785d6504e29528324c2d2bf6a14"; + sha512 = "462c88a1112a75404782c189817f52925c11d3e0e46f193b9c3a9446bc01a7675d222881c563a1217971a1d5c7b5f4780b756e6913e2ec96034a0fcfcaf53634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/son/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c1c906b97127309ee031dcee47cde296fb519918c576d969702703426f02d33442ed2e6ec2c774b15563a741e6652285322cc44a1cc4d1837cc5ec3546ce3d3d"; + sha512 = "7d0c93e02f1b71ba5625749c0fa39e3f09349cc2daaf8161248baacdc41794955fef74d5144730972abf0e20d8610795feeb9d47d1419d397a739bf52f3d794c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sq/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "eabfadbb0f25b54de213f441a3e71f6e2c9b4d4510c6ab20edf386522a3646d34a6ece545c9892bd87feb6e50e612652122c2b5b18e73dcb1f8105b9948326f4"; + sha512 = "dc4271095f23a32c20e1ef7b9356fa5d28feebf6347b31d137744bbb565433b8e0fd6b811a2d0ef024405235f2747875f0457e9d5fbe35467ced4e79852d2087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "de2dfafce444e7185da8ff0d2c2a6d509c7e9d399085769471ba96f34868fc639cbd6b5bf3db66c2f52140ba87915cdd9f5b906cddb57cca0a7057f0283c37d3"; + sha512 = "7e4045f5daca691b38268c721249fd03c43492f1b523465fb5fa9b4652c7d2681f908c71e204916a016683df2423f2f567e8f9f34b836494eeea97e412bae465"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sv-SE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "df9a729b93965d275580d5cb5ed7be9b76da29eb1b854c3f81bfab61ba07af0e406b20be90eaa6e6fc254b95e952503b6c1dd7857b0070685d70d056c0c63f60"; + sha512 = "cb2c3763f087f8478abdc8c40e272737e4e3f4bd5a4c9aa39de8a54f950d970479824d32afb21f3d78dd345fe8023045a974d5aa5e4b5169c885da7ce57f668d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ta/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f35fd118ec67abc3c3023632b0451bd23d98077c2a8e5233a3a1b4def09e346d158b1e1267e1ca3a924df8995927831caa2ac6440b8c7fb168a73969178cb73e"; + sha512 = "34290d4dd472fbd0488882cddc9fc107833a9124d68ae3be554187bc1418c4614d6a3fd0afaeab70d70f29ca588cd6ee3393ec1750590fffbeb1171d110da373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/te/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0229c33f18985bf9b5bd5d9c3eb9f3a7319602552f12a43b7ef4fa993c502797db7677268ac0699b9f68db77f7871bc665b8537473a78ab1e62aa8750bfc08f7"; + sha512 = "866b566de668a28e7975e9aabb0122afc58e7fe8ae8b2200af9f1118bd279d03819ab8f8e02ff3182b741e50adac994de33edbe7f611eaa80b81c471ffa0fc75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/th/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "878d3e255be1f8a4453972238c21c65ad17ee1138af8bae252e207af065c3326ac9ba76279f54c10a6b1c1b8f8b8b518cb5200ead157ed1ce4b05abeb695522b"; + sha512 = "8dbdd85fdf77c1e8bda711e4400048b42341b34d21b68221e658d03c119f05e78f870121a5f60c354163b797c5fa4213b208a63b73944fbde35eee2728d04a3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/tr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "5c159577e3cadeaab76b7abd36d0c903fa386941e2f1f6e2f39328634d99bd41fe3d7b2e3f1e9f5c153cf5ec257a4f099cf9e946fc07cd8bb41b34e239a403c8"; + sha512 = "e537f0d5843b26f0e16f8c0d2b7930b604a6a2d208ca87cc76bd8b11bb18d38cc8a247c6601c0ce607df0434534e898ca1cb73e062b8b7c4a1cb02c8f41b1ecd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/uk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "5e9778bd95329c7f48944fcd95f78348ec6311338be843c1b061e6816277f953d15ada5470a46fc99998cea7d1a24e4e8c1b1ba7df5a2f0dd0ab66ce25f0673a"; + sha512 = "8169a900880914dbf76027f3e7a8b7f30a00d729d8178e30c99a108944029640ff9ddfd81a88dc3627c704cfdf2a97daf5cafb6434ff8dd342d27eb72c3d8c1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ur/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2244ccbc7ba1fe284c53423aa54b243e7ef19f8e4be0ec666818a7fb4d1510ca43f16a06240ed215cfe8033b540d6770c371b203d7b8101ec0cf1faa45a88658"; + sha512 = "8fd7b1f7cc80978f6d0658d265883bc7a4f38462ccebbef8ccd537114b40bd5eacf3195fb193059cd9e1f4a5c926eac5d94bdd611afc1e5a738688461b714ce2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/uz/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "658abde702b98e541cf9373eb8dd26d73a8646827f8dfbcafb037079561edced69864568828b379f3639a27f4a9f82ccaad77b06a13835a9508eeb5660ac549d"; + sha512 = "b2a4c15f3b2304ebfb809c3eb654f53c13837feb9ca895c1c8e24a823ba646971df1726ea7c49510a8745f34fc6fbd004fa83b00752bef18cc7ba4f928e34a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/vi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "659aa8ff1f2b2990e05a48318eacfe7175e71256baf90996dc228edad52cc27af679a3d6c59442e5e1341ee6f1f59cfcc06445ade7951d7d76bf65a1e8183877"; + sha512 = "dd8cd6dc52ff521b70daa4a2b4a67a500fc6149d23da635b453b3f49e79343a64f2cc9206e0ce58fdb2598b3240e36e5180a1ec1f21be5b47251b07eead7b363"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/xh/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "ce90fafa7d78a469d1fd84eb484226122e2aced7dad938c5db060a6188a6d50c16e487ada6ab60414d7179ab26f4dfaae53872e074a492cb2d962e90012d59a2"; + sha512 = "c9c78d72670e5e707bab9d53c38b542e0eeacc9ee4e883f9096881ccccfea339e24aca35ff71c1b2f0bec63396309ad55d65ba42fcd0fbb4f1a3876001412354"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/zh-CN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3b49afc196e51cde57601ba821db9af43403a56da1fdb5ef7125e08083f018e4df0fdc730cd262eb701554c6981a0f924eca372246e6f9199f95187081f0c28d"; + sha512 = "1427b96d989c898d70c4d8419742a6e647c952951843aaba95668d8e4a02f7972d7e2f1940417a6c605a53f23ce08c52338c1f4ad605256baf4908694281b47a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/zh-TW/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4a285291211b4a3573e2dbad56208bf1aa6ebafafce5b573e5a4657cb7fd0e611e26749801fd19eb1f0a695d260d3b53854b887a43f5c0cf7c722a830da778b8"; + sha512 = "0a78c8076b21ce6ee385aaf85dec8ca6249eae73e66209003765edea31660f3707cf3ceaea55d75db08746a6a4636ea8bd18ac3a0c0b2265013c501c71166af6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ach/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "0039392ffa80144663f9a1247f49ae70b48836ba66be6626d8c68d34f4b70725e1cf2351d139e8006b0414e3dd5849948737757e95505b67d5274c8184cc7c12"; + sha512 = "963cdae76d22bc167d5d24f6c6c12705dd095f837cfbac6729cb357bd3a2e348d1841102d969e1446c93b56099087ac26af9454e72126c6d37eae2b1af9d437e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/af/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c1cf80763ff3984120983d8ed094746b6b59c011c64d413878ffd1731ab96ee30eca98fe54da84c875df8eedc8bcbaa69951956f58297273dad5e83db21339d7"; + sha512 = "5feb546e412702ce7dd12b3d81bf1099499ee8461c4d3ef8d0857b9516b6733902e4c554f43c19bfe36425c55dc98463a2e4f576c5ed692ff23dde051a24f82f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/an/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "860c4438660b72756b026a39f037a0146ad0808db8afa4abc13f62e33bfcb8b5845e7c5952e4ee776fad60b891d031452c1254f6afadc6684013a873c7435ca5"; + sha512 = "55208a195cb846401e1dd6746157d6dd6fea37fa179be33c73af28f4ee2e2a4ae3649ab022dc20c0f678c0741f33cce6cff24bc6383689b804c5c770e648626a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ar/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8756a32ceae7dadfed10eca4393664e388f928ec0f91b882af148124743748ea6570108c63fdf8ec9d769c942b8e89502b59f6934b8a14529ab5258fa8cad0bb"; + sha512 = "c4e185972857b5e47d6199e89dde4e554c2b636b67cee70be78efd7bd06d6d0efca50309000258f7c499a3dbd5e38f1356c362f3602ee2604d9fa7bdb45e8fad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/as/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "ffd8d061fabd774e4a08210a15a88dd4d2b762f31750fa16d420341704583d659094b44cf781703f5cbcc7bd03a680fc6ac79ff13278dd5d04814124cabb9906"; + sha512 = "8e2c8a07665b989389a443539c26017e81f0f88ded862d6293f801989556fcafcc7453d9d6a9d379eaefd7987b7ca3ca365ac26feb672a1bbd1717970b6f9e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ast/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "758e5f251d3961c5ed8472ecd1296c6cea52662bd4502453cf11bc6f6c6b4a33fe69121137bc842f4003f6b7600f30c1b3ea32e8eb79a4b621d0e26a5fb012fd"; + sha512 = "65fe275638d5b0b4c9d597ea024665ee75570c302296e1b8a4f5b3088ad6f23cc094f9099085ace25814663787bc973339327c1c3ef9b887338f81bafcaebd4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/az/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2ef62281bf67750161b277bc99349934f88fd2906dc53c0e7e876f7ead39f36bd7312c136d32121867fbe17cbd5c44731803f42329f6d84fc08551a4d5d8c0d8"; + sha512 = "e822f84cecb6b783e6cb3d5bbde521c03d73ac9597533217173f84a62d4fdebe1cddad7ca537b7982498842d333f9e03a41bbcfaee21a7b6d1a4025518fc47df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/be/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f3e6bfa10caba43d5c9200d8860f34f87281917233327676dff44c5fa218190fc77e65b2d7dd48fb28b780c80c1c86cbf947b3dee21c8e752fe543dde92cf8dc"; + sha512 = "3f682a589e8701c4247aba7d79b2606ed94627f55ba2d39c4d12b97c2bfea9279844797fc79130da59ec04c9e05a722ac3a3345acc65db0a638329e136812053"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bg/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "1111c5925749e8cbf151b17f5dbfd45b463d614f013309cf3d899879f49f08dcfde610e07cff09b41693167fa6ab53e34ad48d5881ed1ee376ed2e0e98f755dc"; + sha512 = "8e9dd34afe39d623e8015eb63d6f78f20aa22cb9c1cf97ce0279260325c86f1999fadac0b4e622a55bef1e994ffc6c3e347a91ec1401105b65e0dcc968c578f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bn-BD/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "9161bbb51eedeec73243e6d9ce2703895725e5218c11fe98d613fae925a11a41bbbaf1eec34a08a88909e50500749779b83c3df1c3e2bf780c2154d6e8b57015"; + sha512 = "eb0cbec48a71db923ca6054ec3fe908a9c60f7a21f74e6e18e85a4d7390f5a48c56c08ebb36f57b36bd517446d62a3ccc7556fb33c9203dff0f90dfa020b79d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bn-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "169ebe60d7f42f00399ad200b8980ac654a903d131222ef3c7126fcbb809040faca454219d885def598c7e3bcdd74fc6395c3ed3e0cb6a4f68bdaf08b6616b97"; + sha512 = "bf4300ef92802f8c635aa543156a2310379d8cc8bd1a1821921e4152ba1134b9c72cefd82597499ff3dee3b19cdb6ed7e264628499161ad07497a3e3912603e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/br/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "eee02a85ece0b3f8982d05a228c18f830ed17eecb40e1e6c8373eee5d0849905ccc2c4eba0b3679dfef7b01e4c376a002388ba0709a0dc3ed3da7b4711c31384"; + sha512 = "aca08a08d8c9c77da57d5aa0f9313c0bc9dd5dd766381c189c361ef4b311e49e462f70b6350dcd9dddd292d0a3dd295f0180444d607a9d33eb402242e34c9ddf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6139ba5c93f1734b86ebe907e7f24d62a46b6343acb201b6de7cc9f1a91eaf96f711be08446225188960f0937b45cb15bca8f2c2754dfd2d40ebd20611155d7c"; + sha512 = "56334e40e7175a49b77dc44bc2d915ef1836c1a67d71b2449f75073a113c6f87361e176defd412bce60f8d687aa07b527e5588d164e1177fb139a077527241f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ca/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2e0e78cd5f8e8897a19101769370e39dca863fd4f2174b1aeb9542ba61aede150eda7a8afdf47a194f7836f6fb605ad6d8b2e3f5dc42916f89c0cf236ea42855"; + sha512 = "dadfd68b729ec9d8fceb68dc1ee65fd0f00bd2135e8163c993cee34094110be3cdaf856f48c16a0156da395842503bf52a5438795c56caf9d6ea5f4b36961e1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/cak/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6f7164dfc2224b4191d5bc9e62edc01ce343507959539f7c82ee4fd152f848a4eb21225d1fa61146ee58fb32c2048f9ab66e247932fad6abd37ac25045437180"; + sha512 = "bde96a0f22c762f7d7a877ecefcf876b6161326052110b3f8efb61a67954b93d456acc854901a9af9857005c622ae9d557a647a10fe4e8df6399ee4bd889bcda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/cs/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "39c06e79317717851244f73e25c516be2b24db8c33ed8126938fab5058ea0e5ff7507090e9a32e35d2d3ba922fb60a3910669f5449b7c20f4d69f3d2f6c5a3e8"; + sha512 = "1174c231b511292e4528f59458f26f4ad601b2b4815c30322dd5e151e2d24e1f2fc244cd512e2bd43a46436180f83b25db61f3e8ca38164de130e76fa3415429"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/cy/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "6c021ade280ba1611b7a6851b5aece24dc83034da7fd26b7057a280bfb114d2d5bd643f9210845c3c1435902b3158d52a37f2542f8d87a1776ea7484a5cdf442"; + sha512 = "02eb16c001278e637df52a28c5ffa9fd2565ec71b163cddc1cf0e01bc82895226d746474cea36317a43cb2dda7f0bb1e7ea74c1101602220db850bc8b238576c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/da/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "afb721ed3fc9f96016ad11359b8ddb9037439be684bb43778b76fc0f2e2d169931c280a4a84939bf6e3ff5b5cb65f349eb2d20b053473a0a2e71045b6aac2b86"; + sha512 = "58738db35718350a5eb1ff0ebc1fa6a7c49a4d8604fd60bd5dca6fd4718f49ab4817abcdeb30d99d8a5a0eca5374b17dca28134d554eb608c030eb0d2be59cf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/de/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b1aa0629bd6ab23da6cff3d66c71607944f54b6da74af56fb9e64d222c7aa797379c23c915f99e5693226960e3b745539b6d7e76ebd13a078d51f4a1f4b7ed6f"; + sha512 = "3b2e2f745b61a182a6a1c4b1a236e6e3639cacf0c3034dc5ac510e0595cb636b728e8c6f39d5e183a181f54788a64f19c7f3e8288cd73929e4a7b96e760a714d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/dsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "3e9e382763a622be7c638cfbfc31dd003aeb93b7b447a413fd6bb54f536a6c5ef263e8da903f3613f80b40fa14f08bb1bb761de81d7b4628c35e7f5364b41d50"; + sha512 = "f05b7d0c56278b2d4644ceb542efe21ca4a548725ba5162f82b13ba9a122f6dbeb71db227a413c37fd05590868a41fd3e77831824753b140a763514c16aee76f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/el/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2c6bdcab1fd20ee6de0d6f198a1bfc88c57e1afd3d277f9503c29fd118d79cbcbc3d57784cbe4cc26b6dc0ea90a4fb4308dffe0224725d41996ee37062c28d6e"; + sha512 = "af7f98c5461b365724b81b99daf054b5308933debc99cf20eb8f4a0862b27b4024934682f780c09810333799ab297750cf59b4f4a709e0387f8f98ef4fb9947b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/en-GB/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "70bb2ad5a3a58293161c753873bec87b91d3c95dd25cbddf6354b655ec047785c61c273cc433b23220247f1736968f5eda5c41cc26e47a088d577aa2bbf9508f"; + sha512 = "d8339bfff4843038367a6043eac811138a9d0084dd6d0ba92d0cf23575a6d9780e071bccd281440a496d3d8e0f8dc0b25eca685a3012032dba1bb122d4212ad9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/en-US/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "186d0dad2699c3f6050c46417cb3c8f1dc837e3c4fdd4b6907b05bac6a677554d161982cebc7387172ec73c04dfac53445fbfe4fe4215eea69f311f71259239f"; + sha512 = "3b6be53409502fbc88498e14129c0ba9d68fed4bdd68833a01fba16d75d61471eabe344a3be487834e6b36205df0584cd09724c650cd2510075a54ea786a4cab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/en-ZA/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "0d49ba4450859f0569ec1eefcc9735692f410664bc9010a657bfb69657b52673c898465686d053fd3c0cf62d58d1d2bb5d8a35c342c28439c55f0315f5ca1629"; + sha512 = "d3fdae13673f4f6c2d6d0e675f2dabbc9880805ffebd03c531fdadd0ccbf7767d434ad8f8cf5c50e385998cfcd0f16433e40fee9b280784eea815ee14c846f70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/eo/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "6f063ac1224e406a01d758f5970caa53f5cb2e657df172489172cf5a218d1b3fdcac58cd05693de3edcb5736673d736ea31e9da60ad426a7eb70934f54d9f373"; + sha512 = "e9d2468d817a93e73a5d547442ca5bd12ee0e7e030b6b63d4d889a8baafa566db6c5a5f8bd2aa4411bda49bf0f8eb0af6f6845ca7297cc0b2b6f5dd25326021c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-AR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "0d099751b32754ba169d5382a433f2f333b5166a6cc7f4b6f9761b7290e69f379d4941d57814fe56b1b96cbe812d124f48daecb39b14dd95ea502d6a4e1bafec"; + sha512 = "173de5049863b8e291fbbfb4cf1d7c04c15bf3b48f9eca1ce3759e1117f6fc64be3e37cd0548e4ad4dc8cf2be8ef6341b7745423a5e39c0d882d040ae9f94623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-CL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "4a0384eea57499e0424e7f2223da7881e35bf8826109981083655ae09aa93b97e3224bbc886cbe00e70ab641aa835da9636c87eb3463e1040ffb84f2e4c23bcd"; + sha512 = "bee968fbc414f05b467528c398d8884c0ffe9390fb44c2c9a5d7e9807f63bc58bcd11078ca7db4e98dff470280b066ebbe605f5600d8e43782166b23bfd2a0e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-ES/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b2aae50ad3112c12b2f258bdff580e00604f3c38f06612dbf297e6924f7f207a796c171cc138463487eb34b9e990eefae1c19401cead4fcb8bb47b68d3a5cb10"; + sha512 = "dde6f0790c19fb619dc408eb3a6a9abe8cfb749110fbbc8f408460c3181755d408a7fefe79c8041187891ed45ce374727a54232510ebbae3e9620d207f406b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-MX/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "02d978685b34c228f32d9338c5d0c182acf972df5a6738f9cc99718502a455e17171802839806d9c11772f05bf9c4e2b586a4868b656e14bb7ba515b3ac6df85"; + sha512 = "7794d4152d2fdc6d28d6c4607841364fdd5211eb7df56cc0c386a581140d16fb94b5fa26035f9c1b45fbeb3dc02d6fdfcdb51576599717c551416a961ae8e244"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/et/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fdbd8224fffb9278033663b183bf6655953a1447da48f361659e3963a98603ebacce94572969760b8a9ee9487268ac84a54ce1b83ee0ea2cce05e619b595b052"; + sha512 = "3984aeac5f5d27d0a2e3797b91dfa3b23766fe742fd30b8872bf88010e8852a2bd7390c6180ddceb4685ea3f763ec7acc402eaf11930769c28c8069147fb01c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/eu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "02a3a7da9c00a409415580697740bbc142e7096d47b67d90df2190c21fc4fc1c78f23784069610be232e640b3ba2a1385fe80436bf59f5a9d54ab5892e90e965"; + sha512 = "f4c38298ec6bf715011b631151ae599e94546112e50888d98229818be9551f9c8dbbb4664e99b00d17640406b86ea9496d59fa620fd13be850ca77994d50d9cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fa/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "abc53cc196033c63d76f001419cd44eb520f0b995a7f86efa78cc2a613989225160e3736dbb8834f6005b01b6ad36659d3043ba23d9327ee5a615db20daa8cb7"; + sha512 = "49e5fd356f031bf60952152e4e7fcd0cba651a20178d220d9927089639f783d2b866f79184015074c77606209a1c0a455554a6c9b454c21b46e3a9f083c83777"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ff/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3c09d6172102f4245da55d8acb0f5bcc04a219e7b0c81af1f298ff444cf042dc3e6f6c30e69c2526f01d8edb2614f28f41d49f034608a0c3612aeba0b26cab21"; + sha512 = "29c96f619912254b644b479e60a38f1532b140cfb14b83c09e9b1adabbc95ba0b11b6f67b12668f194164d933e1bc4fa4410ceb33ff2511096765d2b447eb434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "910fed919c02955f4a9898951bb3b4aa20faaff12e585a9834b0e23f1eeabf788b8f9b4b4ef8a0d04cd0ba9d9b420a602c1e8929874dd47bbc9da746b5439945"; + sha512 = "80929d60bf83d81e732f2dc0348cee41f43568c8652d16a96a46ae10107f155fdefbd7755c149b1522083e54b96c1fffa84e21007f27f8164663360d662b0c5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6e27f8a87ac14a7b0c457d67350c4d54fd2fa53f97a4670a77015160620e323ab551a423b0903ccdc6110ade4d8ec25a04f90ebf10bd1c1bd725135041f7600f"; + sha512 = "313722edf4b082eae40b4eeb2c5b382606095c84e0e112024d07552e1d9ce3a4ca0fa39679f574b8f41074e7e850a94db034b452624caacd98aa3d837662b409"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fy-NL/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "ff8a8efaec34c63aa7723eee4851f0d3e8d4d3cb1801e8febc58839df37a0ad4bb1e3ce0443b901c6804f308079365a330c8ce8c031d600c87d8e35c732cbcb7"; + sha512 = "2b819cb5bf8e1fb80604a98d134a94de735782b8539a89ec4a542b7bb5b795cfad173b26c66c77c9f518ca1edcd3b3946225a7475253bd948f44939453d20d26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ga-IE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9c7cd82dd70e48c0815c8f7dd7ff0596bf29fbf7345b6666b9e195363684e2cb290a1bd98e596f37d5a6885d194eb44aa6f41b0bc03500902734d1cb949056d2"; + sha512 = "dacde472539682785a79ae2fc01918ffdcd23e630857bf0dffb13eb53651217dc081b8103eccafe62db7b5aaa36c33268e8378bef51a01111249718251b4215e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gd/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "df6e2942ec9c70c7ed287bcdfbdc7659a3673b4ac90cf517987e8123e918387b8849c59ac50e2c2cd349037b81b53eb935d8f3746df87304679a18dc3d1d4d91"; + sha512 = "8ce645014642c907d309b965aec5d568bbaae65805a8331ed4726a9d404a1e8a243763c7a92bb85295a541767305560a2e1b5bea93ba6b2f96341e3587105a29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2facbb179b3ba7b888a56526a35e2477d08545959f22883df1d3d96f272048b434d6420cfcd8f57085d08cf9d5120a5bd761b343376db71d19073065b07f6440"; + sha512 = "729da9849d664ed6e2cbaeeb89f8b81d1de29b5f28d599d26e0d14e9d1a2daf1b37c8de769435c2dd7a88d8807f76ce7233fe629b0728ee063b02828edf8b984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "255887a39c47dd256010427fe9a48070bff9cccc6703b68298e4063a56dbce04e06516d6d49a5ceda348e84d8183c15b8605d66523247433a9d43388abce5543"; + sha512 = "f4af9658e7e0074ffcbd38ed9c2a8a131e279bc67c86da47f3322d30c5051c4b41cee8d7b61bb7faf9993d8ba41ad151681621525f92b50b88e4680246eaf2ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gu-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "32c69a99bdaf65b091523acb898e4025ed85b38ed4042f55c5641ca4374ff968334d89fd87364ffb1ababe4802c2d7d858abd9c64e91235f3cb7ae337656b7e1"; + sha512 = "30218d1a8b550130520018af0079e9abdb4e78642fceeee25806f739ec079f88a5df0740c44828678d865a7ab242e6805a7d632c41fbc2c3b84f44fd58fd9cfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/he/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ad5280dd00a210dcc5d7be26a10c4d4c98c9d7df6d723efa6b2cb1c3825407fe9ccf6b85f2c55a1eab30c112ed65b562469e0c111add5e1eba3de9eed969de66"; + sha512 = "809baa75d75c1cbea94e9934ed9e445d60f3f0cb37b9ecbae851c342f0477731de0fd5f6170c43863035f5e2633ab8cff960729a9f8594c684b23d5819192ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hi-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f276b69eeb73b4c53d400670829bf838929affb13ffb078f92a5fa22c534ea9622dc73b8f20dc0c32b02f1316cf9a973b19d9168cc352e03716eb9b057a31e8f"; + sha512 = "440638f35d07edbc4f854924f60f22cb4115634d55e2847867c11391a950c3c792afaf2e35b3090764acd8512117a1a04e77d060ca2d9aec12638d00c2032245"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4a8ec3dbeb98b2f6a42a6f21fc625232d84aec5624ef3d23af606060efaeb3b79f4c28a098985a5f16a213ed73710debc51082c2cc1e9320fbf31d4eba037e6f"; + sha512 = "df6b3ab4c53799b6100722fad4f20403d1a1e659b17d66d21f65e98e3b335b0c7ae8a9a099c44bc8952359dee184f9acff836bfecab6cc09c686a7bb3d9d6599"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hsb/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f28881bef53d07b0015fffd51766ab408fc90759e68da230be1aa1a09866a400cf261e948048ca8e2030625bd40d3cdeb4f974972b246ccec3555b7370414373"; + sha512 = "c3ffb3eaf9d86a42ce281f97cdfc942081d14bc671e28543603e135bdbbb527a004af13df9e7cfdb1846c9cb42d4f2162b8ab63129eb447433ee5f47baad3ed7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hu/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "943058206a95982701a6ad28d9726e2331a3203ec5392c3063ecca69c145ed5b1163856a758d37f9d75b6a33a736739b20bb2b8f157de90afe981f699f72010a"; + sha512 = "7b1f231f3add4b70b9f1f2d2801237dcaca17e4d0b0e0ce5934a617dd73550db4b36386b1997f835bd4712313fb9ce1752a3a972d77dd0fe8f1fe51364048ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hy-AM/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a56f447feb84edc507074588169b42fa4603b72f3793b76d2f13623f87e1a381b4d9d1a3ad330a21dab85d42b314629e15d2a3270db4e943c3576de3f2492b11"; + sha512 = "2d8d1b61a9609d5e69b031e51428cecfea166b8bad1e2c928cde2aeff0a5a105547954235628f3d67031ee6b150d800a2dd09235e69af8e61a5046a80d74cc38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ia/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "c0a3fea5105fd8bceec15575962d758f7d8ca124fb52ca175917115a6f81765b9ef91316775cc6ddf0e5c7d3490cc6f13bfe916645520771cccae4d57699a962"; + sha512 = "a8045c13e33f28c136923abcd2131deef56fce717eb0be77ce750f80d1f0617b6b86cb3b123eb2da58bdf543209cc6b6c803cb3dc9a53b3cc6e23c98ce6b678b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/id/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e8ead5b2940c02e9058f94a389161e6f73e6a1eafd37db26431c03f7b42c7188f1abfbb983072082849043b306e4011e7d116b042c084e479798d5283b4577bc"; + sha512 = "4e89147ebe166243ef1a551f7943e3fca44d5005f8b8386728c3d9d82352cbdea004467ba7ccdeea5a4710bb34605217ee2577e1f1c534713fb52fe55aa0bbcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/is/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e2337b22861d1d682c656b75a34aa61bda66caa27239bf07410ed73ee67845952dbcdac2b83aa1fb4e34c88695094584d563683f08ff0b2165426f63b8afe18d"; + sha512 = "5a94e9fb47ff68a2f5a07100acf573d974222446bbea110e11729286b64e59d1a1a9df91b93848b47fa9a8e3e3471d5d4973872ec1c6314b3a76b852459574a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/it/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9430b020d6ea7632b8303861c5cfed02f31f1dd8bbe0fd8e89502d83011cd4eefd51ae1b487341efb3886b7cba41069bee42ef0b2da4c8663be72a3c230ec74e"; + sha512 = "c11b004d02096e950c59f77ada04ba557ac37e9d95994a105b0bd76e8a9193a0e66f0a3efbf724fcebe96e77a5940704c284f79d48f8865ca1907fc2bc7adc1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ja/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bfc209e604e20c29afe1aae3caaefd1544f61c47f473e10c517e1ab0c13b2e31744c4e3fa54af0f82d92bf87b5294f4806d023c4499681465e1653aa663fe398"; + sha512 = "9d98fb24d1c705246d2535a1bcb5ee38d84930ee609d15d350e3eb8bc905d1103e7e1f1cb48642ea6e6b99531e74929497790549e9ee9ef9c597bc8f16a827a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ka/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "62b24e280de2b6446a9bd01fde4e801243163f1300ef3196358173a3e40d633386c286d88497e81be94587f69930569cc50a6e8ac0524540c39fd539d87ae5a7"; + sha512 = "767d109b2e7bfe89a01b923c859d6f3d3f1050922cc84df9aef775cba990a2808bb839ab1b2431b3c6603b41d0e757dbb64b1c766ee150aeb221900bc9e0fedb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/kab/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d919e85ec10d9082df6bab5fc79ac8e5ea68b933c5adf0677371ce7b554e3e4585c314a312e5ed1f6dbdc6da528443572554051a3fba33fa62fb52ad59778204"; + sha512 = "3dc103b9a807abf43816db6ee9bcfdeef31dc21b969762a7b1e9f4fa06d5ff6a57cff134382b6d1d578c80d4b902232a7cc79642a68b2e26680887ee172ed11b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/kk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8667f4ff1ee071783d525b8bedcbe27274308e2691709250cc0479aad8ceb0d846837e57dd95287e7c3c7a98b85d95a11fcac594f071089f0f390f3df662d1fd"; + sha512 = "e7cf35aae82156bdb4dd023e5a7530fa431f41c0e4f270aab89a64a0aa02dda228c92dfc7aa4ff289ccd256c543bfd74622c6d44ccd5b48ceeec880b394d38ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/km/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "81ddd2c2c2d26caf3a9f31bf48421969c9e1539d268ecae77f520b1ed6f44fb9eb957940f43dfcfc1af45661d74cea51f5bbe45c50e9639d34e749740b5a7484"; + sha512 = "03afeff083f483b274a8526a4418dda8ce7c3773a60354aea26498c7f006445bd6631357213944ecd6996a5a4508b96797d44f16eadc5f1017b7fbc18d0bf3ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/kn/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "07d337bf9d4dcd769982314d9561b00f6b379d19d719284d4191509c09f378260105fee0cd70ad707e560d22c629430da5c7f2eb7a34004cc5451e5c02bb1f3f"; + sha512 = "a8d2609029d28f8d2b59815bd8149a2473e06227fe710c77e2e72044663ef90e65105a32a7ada47a6d889d6aa761dbbd903b61ce8dff8100b052b54f35f86b28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ko/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "40c07eebaaeb05aa8d807a50532097c5c52a95d2d3c1f9e39f750f7b8b4c3b9b3f000b66ce354b44b7287dc9067faec409bdbfefd1c2c36559df365678925254"; + sha512 = "1d073bff96a15bccf6a59e11a28eb0231983a0392069cc785ba8760827ade0e52f511040941b8e142c6de91621bd928e218ef4832a95439102644670b9be3a9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/lij/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8c1d35526b84b053d685db6d7890a7b58a07e1f2f7b9fb63eab1a76f5d6014386de28cae144ab78890c2adfbe29219635215f9b59770d7c06f6149c09037d707"; + sha512 = "a69b4ff3b9a452a56e4ecc07c09d6276b26356bf35090cbefe9be419ce4d1a1fd772b7013a13fbe4f39fea495c5191575971db5786d3c1edf1b4ac9acac33323"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/lt/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1c96af7c40b59014ae681d2a5cc5742aa7c413de142c17bdfc2886840c2a601e513ad83e7e12e86b02fc750ac6385faddf10abd098f0d80b8fd10d2fdab49e58"; + sha512 = "987863606a8f68fdafc8c61f206db6bd8bc358157f28631fea598872acb5ae0ab6e56259134ef3ea46f5d74d908e49981eb6e8bd80e32a9cf1de77b6086e1ffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/lv/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "acc84a8d49aa4b0321359a598b9ff672cd3235b825d132ad0af2f70131d8c033292dacc87120dc1a39a0975563abdf8001ec8d867d43e29c74b4a8e38a41a261"; + sha512 = "3466e0bb5ebc426bddc9fa70f4c84b6c07e997119c707a3638b726c335ec8cd58fa9ad038528de4366ac0866b4e535b2a6ba307c0bd42a3590f55ffaf6fe7032"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/mai/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "4d5e55ef11ecc0e9c683d226f458eb214aac2ef1655cb052a45665ea5c0d4e09dfb4e83aa8b23099e2c18a8497e31f6d52e7ca91fe21a8c91b71092e2bab09eb"; + sha512 = "427060dbefd340c2e5e0006b88c40de5a63786afa7dc7449b11493faf66acaa4c17dadccbbe8c44ba4651a4a44d65932a9eb17eb79280e4cbf2d10696077bd0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/mk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "cf99c9a0f83ea01ef9e379c8842362bd5c5b82894bfb0f73b42e59b0f51d3bbc04c89aebd354f80ffe8fbde2c1a464a45f9c5e3d8f083bd7f39a4264568decbd"; + sha512 = "d4ad81fa8aa8ab44b63421d16d7cea36d900bf4d374e4c5a167c46e3480b459554672815cc9e54f02aa3a53f1becadf675e730799d57bb4bec4e245a78718aee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ml/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "f05f665310ce6f519350f262c799a1375942e2fef71aae6061a31bb0ae9ea897e8c81db80f1c265a58ee8b9fbee3a900d1aba4151a3b4310fbb49cf28d60c36e"; + sha512 = "c933f92ef6e972c2ede1f67852dcdd47e7f59928a3569c7fb935b538f8145185e2b460242feb6ec58f064c6581e44c046d568ceb1e96b5617821aa1a5cdec7c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/mr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e0bd6bb184618df655cadea7e77bbb26d3850d4cd3d70d4bf3e92ac5d49ff9dfacb922616887756b32619f36bc76ef26fd5bfd5f6e3bd40a1acd7aaf4d079ef4"; + sha512 = "49318119e82876c99741b7829946d124db7bcd4833e014996842399bb8cfbd4f2f3374d4910ff208cca558da027dd6a6041c2d66e4026c6f1df4be199e4b9d9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ms/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b36410385d4e71e6ad35ded3f7189f964948f09269c07aa53a371b5678485234ea2d9e44729a43d274af8ade7c63602c5cddac6eb65d0f2eb6fbbe9fa26ecfbc"; + sha512 = "2e5e74999bb921e1a78c491f9794ab04efe4f069d2403757797e4aa408c41e6ff3bcaf9d94f786a407fdcd085ce57654a1e7aeb7560192827d6bc01786fde7ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/my/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d19e3e13bfa320280e1d670a5125a4071a37dc5f8cf065f27117c91a3fa7627aa52e158360b55058bbe36fe25e747de4cbecd00e32f1f3831ff27c510313aae8"; + sha512 = "a50843752c15dd9ddaa30f51188a4992bf9624f290f3179a95a93ad09c3b5c0080ecde02005264c7364de1d072a73a40159f3fd3b77c481f5f301604d1042db9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/nb-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f6fd6bf32bb68b953b67601c96861c5a3960fef10103df1fca796dd1d66263a5c42ffaf0684c7901375e970ade5bcfc707c8ffb1787a10dd58b94d111be470c9"; + sha512 = "9e03fcbd2e10345eac1483934eddecf6b0469cad4772787b8e01733283bc7655faffe504a424031e3dcd6fd27cf40148dd0ad82a9c06861f64b38fadc9e189c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ne-NP/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d3e226fcf97a48a950327ade5f898d8e0ccbd4e7fd9b1e9dc2964faed87c1816113e4eeb0d6bbd1cc127ba81bf5950c4f7355eaa6b771f8b9e5797cd11a3a752"; + sha512 = "6c969e22d53d6fb723f5d722e1ac2b3fd6d3970b42a2971eae647a1c1d38a8b5f5456298751ae06e02a17ae619f613459da114ea8d335a29d068aadae30446f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/nl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d10926550c9ce47395576403b78a18d47c03b0bca8c6a0057103732f99d8b349aea315d3e2bb6cef4f69cc6ad2fa9ab8cfa4b4b2610bef261bc8fb82d1196d9e"; + sha512 = "009a49a7cb71bf7876d7c0d52ec1145d0989592a16a560fa76c4223e5d71c3f0523a39202928f00f7499689d030afde1e21808e504291d70ba7cc7e5bc117c91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/nn-NO/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b9848a188000d6bf883c2a42bfb2a62c8a9df95b02073744028776b9b5d7cfd5173c543476819e16be8b6500f6edf39c41e86f4e3d458693f1667e3e757354ff"; + sha512 = "da95a2bf55806687d77b52cd16d2a03e75d573318eb3a4f8b19720914e13cfcc965975528d21439da87b71bc1ef6aa7506c12afd641100fbd7ab1b58017301c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/or/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "b556fcd7d6a156d6cca51c81c4315b61e7fb856fcefc8b7753d0b9e3631c1a69a0b195f6c29be2b646b820482caa543c911b4ab814d2800617d7d27f0c7be1f1"; + sha512 = "b969bdd2d27eb9f5ef28de7537c09d7939534dd6cec2b5a95a32406e6b3c6687f84498f990ad2a353b5e4db38ad7a170649467688dd3fc51cbefbce3253f7a2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pa-IN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d7a80e8e8057ea3b80b80e265f00bcafe75099215f90053829bfd08de8620f22822979cb413bcbaa0856e8ac1d6adb579556b43a1f3dff20cf6c6c9417696f42"; + sha512 = "7c020da300a1dbe494180fc8299d42432f32b6f473ce4bf47b30105db39789f2ab07c2a883c1443202f39c4dd47eea8221b0484deacff6a90f4eb6cd4b8f164b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "0af024d6ed1d27acdbf0d1e2f7ada4c2c8a22e104f3269d61b186bbcfd527a4c09a36d973fd7c0730bbbac2ca7145a7c8fc9cc46d01f58e9f4a8415110827edb"; + sha512 = "ad50c7a6539ee8b2f36f6420b524055f20880bd01cb118d6bef124ea9f1acb83148078972118fd6628394ee0d22215c26a1f9cb5cfec5713d5265229e0bdf681"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pt-BR/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d4d0c999c37c2533d4b5bfc9606edbc7b40544fc0c4b756a120f8746cbc66a6c6b16153cbe41cd1f7ac9ea67e7c3602381a875953bb3ed7774b23ea4e5e6e163"; + sha512 = "4f915c651bcba9581db961e0b5e66c15db0cb72298c5389183f0442e0ed18c84593235fcaba2274ee62ee7ca7998043ef9fba650a476a4017a8e066825cabde9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pt-PT/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4cb6bf559c23e12134d69404080d465ba3174a03ca9e6228dbe35882fae7cff7b8ead8f8da3a8f7c87457b41febd288586b8b1452c1e201e9520326c426656b6"; + sha512 = "a5d9f49caa6e20afb8410f7668d0c6a71f06f5dd413e004183b82022db92406f752609ba6be05b27d70a8d68e4071e3a42ba5bebb8bf32e3cc074df4ce083bee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/rm/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ca588c4a22e21b37803c4ba1b6805f57d926fe19d4c65b21e396e3593582745f261bce01ed66c3fa1754fbd705fbf12e6f8fd7fa5988e03e989275ea5ba23ced"; + sha512 = "50ef735ca5b2987200978e2df10df33ba9fec6be80cbfba63bdc4a6409c6180080740e5e716cfaf4c536c0dc84727431e16c08d91be93abefb214a4887653492"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ro/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3d23f197639d2e573c0e8fe4b72b603a7a3574cdac019d60c7ecaabd51693d6f90977de85a38417d836ad008bcc9aa47eb44628d4f7c758d18a17b434fbf4206"; + sha512 = "9b38d3798a880ea76f6f378c0458cd2aeb7887fa53ec89b9f23c6d5ee98ec2b4aed0f3708b1a4fb17b2a818424479643a3706a812cba3291ba7b584392648d8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ru/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cc49672de738148f8fdaffd25b9d595fff8944dcdb262b4033f2ca233fba4b8bb2dc0127bcc2b42a9c39ead8db713da47d33c637cd0cce70dc800668d0fd9996"; + sha512 = "b772760cfddb791eb57c23ebeb05611b311b30041de8f286f639beceedb6482be36ecc183acfac4aa9f280904c2275c123f3e71302aa3b139f863ea01c7c4966"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/si/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "37287cb9d5f690439972b49657c9ea98dbd693155649f7f9ae72a40325979c6616f07c8228c692f19e532ae5c4d6d31a29d970094dfd9659943b51610f48faf4"; + sha512 = "1934317eef2a5af831d7bb9fa493584956a32e28f7e22b7186ef8258abff504adfd936f473c9f2e2b414a880a2d9b6b2b09c9a77b3fd7060ae8e5254083a3a3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "7d9e0fc4e80809850f95629d4ef5373b2e1f04a8038d5dc54396c20ce84f8f8156558a424bc55670c599fdbb51086d2f231d35eb00cca883e3967b9ab762e95f"; + sha512 = "fb4c68917e17b472a592474e1370719c102072fb70a97ebd18a5f02e5295a1392afea4936c5f79aec041ee6f9ae0056a74233b660f55162b2d84562ef86e5265"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sl/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "640c6fe5e6d1c6b2bd81a6f01b009be0cae2c4627529523d6e03e4d59742361287e5533d7ea7fd7c3b633c0866fbb775b335903a1dee28f42007b87b36036aaf"; + sha512 = "0255e54036f6ca78213414c63d40ca1907d597ac4da1a6f7bddd6bf307d536e710bb9cbb8caefb8f08def99f1fe27f28d22e076f1c7e62fae4ef1cb6d093c51f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/son/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "abb21c84e8be1cec9a01928806e96ca4f09ca064a34a2ea7306a0aff9d4c81a53fb2e2f9cb573e2def8581c850570245ced007e5408185aba7d099cd69b3f4be"; + sha512 = "43dd5f557382d9ab69f8a087dbe4d06e71ce68416f7a88a84978d1a6a9144938e12e4b9a50c3c42ff77131be16aee474a4a99f092a95671dbcb76e367f95d280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sq/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "918de73cc6aedc5743bd0c514ee3f8c54b82d2f1c9903a0092136ea6dc935481bd37423398da34f24f92531307a0d24f1ccbfb48649cc713c0351c9ee4b0e57f"; + sha512 = "55ad59358e6e84204ea33f7a98436283ea7c843de6ecfe7f9feed24e719fb8fadb5f4de4d236a8f0490e56588f2574d3904093b6b3e9c58b2500fa04f302cc3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "07a63dab95a898f62f0f8226fd37e9b49455a8685eda0f6d0eb742b71e8b298e1e26bb65811e0b116ca9fc63893ad73092ef602f33ea3adcb10c8c2e740bf505"; + sha512 = "871214235400256f86321f95ed1a5d2cfc80bfd892eada49987d6e1330901126922439a55ad03be84a97bc92544ab145892eecc3ac54e350876b7a2e7d2773ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sv-SE/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a0954abe69891d5b61e1266bad58de40c3358232116d5130cd149d5496fef2d476d8aa1c0045939621c78259a7086001ba60d815c5430318a9c0c298e1f3f10f"; + sha512 = "fd98c7c2c7347f36ddfbf3adf1e3b5059cabbce588785bbb522cc0c43ab061f0d776757633ad801efc53b769374f3f71bb810d07648aba98843ddd2b6bd97322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ta/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "627048d83c9e1988aa5a85a660f28f073803d5cd66499472cc8f47db1856231206954879934501bcaa69a41dab25e56bfac53c23a842296662a7093add7482c3"; + sha512 = "4346ffc1367a8892c49a42717056d2ac46b5ad6e577a6b018fc08d673dd570a7ef2de6c6db493ab7f6cda899ac9a90b902c7d79a2ad8d5fc9dbffd8bbd5be32c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/te/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "4a7f5162db00935f753cff193af57d634be3a2766f0b611165ab605c19a40de5ef66e1485e9010cb1a4b631f0e4368c25495716d0cb8c8813a5faaffd99ed8e8"; + sha512 = "7c361450f296ac828068a97d9d936219bfb588d5dfdd79e8ce05839ea2f9a530736386ce4945d1b740f5582abe1a4c61ba0185632a0ced948d110c867e819d6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/th/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8acf03be030c07856e105faef11ad9f3e445c1767c58cc524589a9ba26a45a593fcf299eb6e98adf20147ccd1aaf4f4d03b49af4e4f4dd859600eb95de77de6f"; + sha512 = "7cf88ac5b3f8d3e32d337fed29ee88bfdab1df2c733f8f959c5957dd4c3b9b866792fb56e776915398008f1f804544e0b0d1fdb0cf5fbaa8a81fbbf12f386b7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/tr/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c4ad953689c6826b34d81c35c7c978b44d4ad17a53411298d8ab459772895309988d74e0f05f16376d079bd084c9a71213d375bbd98075177cd4818260737709"; + sha512 = "f4816172c5979b7b3bc4bf33084f319bf964876356b08a32d2337e7e5c599596f41f4e4efeb5996a53b462635f4d2ac51bd95978fb0f00fd74596f9203f1d94c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/uk/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e1cf1ab9c87a4fa00e3bdad41b6cd2c75d8fc432ad3696c8ec1c2f8d79958ced32c3cef0003b3311766c2502a637b4be27974df1ef7fd0a918c2adb33b2bfebe"; + sha512 = "143e683fcf134dd6062ab87569798d34de1f3bf53ff2d50a73b35e2cc95d83d02654a047c7530cc5c1e34ddc791ce9d455ffba9f1f93d8b782e0968ef41621b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ur/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "8e583c0d856dfb4e9dc56a01d56dce5d89a2a9dd57df2c86e641ab35a6fc00b4146ca0f09e7d2c025e3f39aaa680519a54c6d7a52032b2a86aae056f6bd74261"; + sha512 = "bb82ed997dd8d2b15f3881325b4f879b8eb49cbbd661da99994a54be21ceaedfa3901fa56214936c5ac05430035e41e9a0ac407afe73db289dc656f70a2199de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/uz/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "079f95cb3e6b4c40360d08b33781772e9cc4457417d1aebb04e798925e4c69bdda686081bad82b816debb99d2869102748417acd22ce273e74fbfa212dbd9cc0"; + sha512 = "d2db8f09274c73d63729fc32fa8dbe3a51f6421e16a741ea39e6cab1bc3d0e833fedd26678e68ac92aeb2caf01cdc7a02bfa518391ce20f9a0855a498297a001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/vi/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4a75c892973bf3ec6a4a4026bc0af6d222d8b8b657bb9dbbf157045c708781e82804501dde5e0bb9054632ea393359ad18f2771098265c4c264615afbdb5314e"; + sha512 = "5b964331ae4567f12e3241eaf30a6d7d13b4da1bc4cd300a86d8a3a4102c6e8d71af5e6cdebe8a6399a2525345fcba06683c06216779aa2a6f375a56b0c71e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/xh/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bbeaf2f0565e1aba63cce423f9203ade7896360619f059ac1b002e126c3e29a0a1edf4522b7e37e85d9552559219ba677a349f0eb287897b73fa53fd7892c2ea"; + sha512 = "56556a238bc874e931e56f00879953bee1903ad1f1e67e2ae6dcabb8f65c97a74feda0f98d27f3e0a28b2a813d66d956696f001e08b809901e3bffec246f8f66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/zh-CN/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "23d6f3324af5206d2ed2c085ffafef0b1f5aca00b443b17b7a445fc31c0915acb2c47c78ba508dba8f5d93d85db19051734bb014797229e5825cb6dee4f21168"; + sha512 = "cdf97069df00610f1f964de5aff4dc7134e7cb27768b15177c03b96c486b5856816b685a6acd5308c0e334672d39ed094f35a2bbe8046465f8ce6c9ed803baea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/zh-TW/firefox-59.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c04971cb9cc1efc9396c5e03e744a99d91a76efacaa2dc4d821b3f397be6528d6e485853344c1def6c8235d83ec59eeb2aae4cc8f5fcc6bec75c4fb4d50e6ad2"; + sha512 = "ad5266e66e06bf5d0dd674e57bb368e66917beda800cf58eeef9b5dafffb2f6272ebfa67e03a3a0ffd2a6d9d273fb3f93e6feee011e8971e760d8af04ec91330"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2b3407d0175c9748c40f294f9fbf2ee1b1d76b11..a70b554c850dbcd94ca8443cd0f8686d74d7726e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -3,7 +3,7 @@ , isTorBrowserLike ? false }: { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 12ea714fb234d6de63dc1615a3f0c52d25f8f695..8d08eceb1692e4e01c4564203f7afda71edd1512 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,10 +2,10 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 +, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome_shell*/ +, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , vlc_npapi , browserpass, chrome-gnome-shell @@ -52,7 +52,7 @@ let ++ lib.optional icedtea icedtea_web ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader @@ -73,7 +73,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra_gtk2 ]; + gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { inherit name; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 17c285d9bdf7a47452da70ad6bfb50e1132c88a8..eaa05726f1c027dd54fd4eb628046d170d83496b 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -33,7 +33,7 @@ # Only needed for getting information about upstream binaries , chromium -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gnome2, gnome3 }: @@ -57,7 +57,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap at_spi2_atk + bzip2 libcap at-spi2-atk kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { patchelf # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS gnome.defaultIconTheme diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index e013f54a39ea73edf27b6f68395d5d813c855694..26a7e883c60ca36fb39a5858381bff76c686c971 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper -, gsettings_desktop_schemas }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; + buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index cea6d5dbeea46da0e598379823e9209e4be3bf0a..f7d4f1a694171c952ff46ce8d8057a31bcf0c81d 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 -, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core +, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3 +, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core , zeitgeistSupport ? false, zeitgeist ? null }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr - libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core + gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr + libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core (libsoup.override {gnomeSupport = true; valaSupport = true;}) ] ++ stdenv.lib.optionals zeitgeistSupport [ zeitgeist @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lX11"; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules") ''; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index f3c58725a7a944c9cdbbff7412bfc5754e0eb4cd..a320321ea171a1957bb6b1fb2d6df280dca8d891 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, libpulseaudio, systemd, pango +, dbus-glib, alsaLib, libpulseaudio, systemd, pango }: with stdenv.lib; @@ -36,7 +36,7 @@ let stdenv.cc.cc alsaLib libpulseaudio - dbus_glib + dbus-glib systemd curl pango diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index a5c5472f1c78311c190ecbdbad06f0cfe4e8fcac..ae7165a867ce15f4961f5fd54c9d741a2bb4c229 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus_glib, file, fontconfig, freetype +, dbus, dbus-glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify , libstartup_notification, libvpx, makeWrapper, libGLU_combined @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 9142ecde85986a0a24b93112175d9697cc4308a2..2f9170eff87b6b02e2c6489d1a937ea2dfbaad6d 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchzip, python3Packages -, makeWrapper, wrapGAppsHook, qtbase, glib_networking +, makeWrapper, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -43,7 +43,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ qtbase - glib_networking + glib-networking ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 1aa9bf044b05bff5f82cf6b7476319ce27c64ac0..88680414d1c67ab0cd43fdbcd0b0cd7bdac98e7e 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, wrapGAppsHook -, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , patches ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; + buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index d64c7a20cb992423a142c16dd1cd925db95a4a05..299ec43a8b901f4c9e494888c4c64ef27651f3b7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -9,7 +9,7 @@ , atk , cairo , dbus -, dbus_glib +, dbus-glib , fontconfig , freetype , gdk_pixbuf @@ -42,8 +42,8 @@ # Wrapper runtime , coreutils , glibcLocales -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info # Whether to disable multiprocess support to work around crashing tabs # TODO: fix the underlying problem instead of this terrible work-around @@ -62,7 +62,7 @@ let atk cairo dbus - dbus_glib + dbus-glib fontconfig freetype gdk_pixbuf @@ -261,8 +261,8 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} # Generate wrapper diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 508ab6ec432eec58030343d0ee23b374d932f970..65ebaa3f80c571c162361757b0b195d93c720b6d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -8,8 +8,8 @@ # Wrapper runtime , coreutils -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info , noto-fonts , noto-fonts-emoji @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { # Generate a suitable wrapper wrapper_PATH=${makeBinPath [ coreutils ]} wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} ${optionalString audioSupport '' diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 6ac8d9f1f6e7f1f84a0f627925caf5d9a82f7477..8c9f23996ede60783084c1e850269d5a0448101b 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python3, makeWrapper -, webkit, glib_networking, gsettings_desktop_schemas, python2Packages +, webkit, glib-networking, gsettings-desktop-schemas, python2Packages }: # This package needs python3 during buildtime, # but Python 2 + packages during runtime. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" done @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; - buildInputs = [ gsettings_desktop_schemas webkit ]; + buildInputs = [ gsettings-desktop-schemas webkit ]; propagatedBuildInputs = with python2Packages; [ pygtk six ]; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 5b10932e73b31f4abd33f97a860487adcab26876..251315619cfd46dddfdd8835baf67c069f75f432 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking -, gsettings_desktop_schemas, makeWrapper +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking +, gsettings-desktop-schemas, makeWrapper }: stdenv.mkDerivation rec { @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup = '' wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e6275b2f9592d141c9b3b514337f407c938b70a3..54abc7dedff4daee5c539da7edfde2d9caa17698 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, - pkgconfig, webkit, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, + pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ]; hardeningDisable = [ "format" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/vimprobable2" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2612df3efcfff050dfea74ae6c114cb85ffe7956..6bd9614e08de6ed49296d147e4b8ff764dae8dad 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at_spi2_atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at_spi2_atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 542bcbc41b0d7b9e1ab46f43966b54aff92f26d9..11aa0ce706d665acf35d7cafcfb86a5b8782afe6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch -, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss +, dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; nativeBuildInputs = [ - dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig + dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig python2 xdg_utils ]; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index b2c97d1ea396e3e664a8e89c7432a498036fa471..ff0f664154aa87bcabfe3f017c4d864793c3d41e 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kompose-${version}"; - version = "1.5.0"; + version = "1.9.0"; goPackagePath = "github.com/kubernetes/kompose"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "1r5f8jbr2c1xxb5fpfgy23w4m30zahhmrw23jlk1hpx2w1pi1iyh"; + sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 41099192176cd2e46ec2813056aacb20379056f1..ddb8951740cb8456dd1511189e986a7c34c90390 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.8.0"; + version = "1.8.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0vaa18vhwk132fv7i896513isp66wnz9gn0b5613n3x28q0gvkmg"; + sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e39bc59709e5c211da3ff33f95e5e740a82e2306..8486f0d53067019e6c5aef7f82aeb1326b98924d 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.6.2"; + version = "0.7.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "12bxqn7yldri5cwyxybd1lwg4c66mxd7g9syf54va5788c0hj8ij"; + sha256 = "0hn80dqzxkwvk1zjk6px725mb2i3c06smqfj0yyjz96vgf7qbqy2"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index affcbcc4b3c059f35728734c77e5064ae1b3ce11..6a71afcaf60a6e69d21548d0674be1e6074e8386 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32 +{ stdenv, fetchFromGitHub, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_32 , automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook -, glib_networking }: +, glib-networking }: stdenv.mkDerivation rec { - version = "1.7.3"; + version = "1.7.4"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1xay22v5j239ppl6ydbj842zpm5v2mg5mcgpy5cjrhhmnbg79fgk"; + sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; }; preConfigure = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking + gtk3 json-glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib-networking ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); meta = { diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 0a89ec6023bec88713f1bbdfeb6ba034f53cf82d..297703cde696e4dfb62fb41482d46821015aa3cb 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -3,25 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "rssguard"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; + sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; - # FIXME: This shouldn't be needed after 3.5.5. - # See: https://github.com/martinrotter/rssguard/issues/175 - preConfigure = '' - lrelease rssguard.pro - ''; - meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index ddfa4fd607d130e978d4451eb389349cbb0580ef..49ac1d26dda601009a52d3a032a7f95a4c8c5ae8 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.30.0"; in +let version = "3.31.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1w0zqkccbsbmnjc9pfd1i3ywzwrdp0pprryvdk4sfn5ms9nnf2wi"; + sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l"; }; configureFlags = [ diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 7ae3e8c73611647e20008033d1e14cecca6a7787..577252bc69e0cd25e54f8be016d3e17eb5a7bd11 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.2"; + name = "bro-2.5.3"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db"; + sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 5261bd451e0b1319e999bb349cdeb15db86f224b..8f4b54cec86ab5bff4de1021a3a107fc7d79b5c4 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { - name = "daq-2.0.6"; + name = "daq-2.2.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "1jz7gc9n6sr677ssv61qvcxybdrmsll4z7g6hsmax2p0fc91s3ml"; + sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; }; buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 434ae803f0acf1b22f417e04d88d570ccccc08f8..e3a917a12eb37dd8cfe15c24d2412aeec4bea567 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: stdenv.mkDerivation rec { - version = "2.9.8.2"; + version = "2.9.11.1"; name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "0cwk02jan0vw6r3jl3vrf31vfp7i4c1r4yhb42h4gyhd6lnh2xa0"; + sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; }; buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 94490d9f03416c70fd6edc5ae5a857d5268c9fcc..9793fd234a18de96fe58dbf514ae0cb1a0f114c1 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }: +{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - buildInputs = [ bitlbee glib json_glib ]; + buildInputs = [ bitlbee glib json-glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 35cb2100254b8eb0f67a96634d4c2151ed5efca2..810422dcd3f3dea63fb816b87f1dc05fe21c3daa 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext -, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking +, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup , libgcrypt , epoxy -, at_spi2_core +, at-spi2-core , sqlite , dbus , gpgme @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection - glib_networking + glib-networking glib gnome3.libgee gnome3.defaultIconTheme @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon epoxy - at_spi2_core + at-spi2-core dbus gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 283d38ef5c7489ec819fed4a5dba845b06f88b7e..003ffbfc7d1eb1af37d7045be934bb72c4981d9b 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool -, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook -, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme +, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook +, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool - perl perlXMLParser evolution_data_server gnome_doc_utils avahi - libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite + perl perlXMLParser evolution-data-server gnome-doc-utils avahi + libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index c4cb25dfe987579b6eea4642e9ca3cf4988ee324..1d03c2f47c89a212792a1b9f6c4fcf8c165251c3 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ khumba ndowens ]; + maintainers = with maintainers; [ ndowens ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index fbfd36a5928292b8094f1188707c70bc0f1f8eed..457e76d0a82cbf6fac3a245f3b9f55bfa621173a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : +{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { name = "pidgin-opensteamworks-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ ''; - buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ]; + buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/pidgin-opensteamworks; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 7ab9b194791553b270a6ae329afec1414d299039..6e589febe6d939ed97b8890bc64a43a45ecb6cfa 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "PLUGIN_DIR_PURPLE=/lib/pidgin/" diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index c69de60c6cf5dc5e6d2e7a3ff8e6a6666a44ce03..f482e12a4bc97527a32d7b8052757070be4dbaea 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pidgin } : let - version = "0.7"; + version = "0.8"; in stdenv.mkDerivation rec { name = "pidgin-xmpp-receipts-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "noonien-d"; repo = "pidgin-xmpp-receipts"; rev = "release_${version}"; - sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm"; + sha256 = "13kwaymzkymjsdv8q95byd173i4vanj211vgx9cm0y8ag2r3cjsb"; }; buildInputs = [ pidgin ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 632f2543f57c10cb19d8c65989a63d6f8a0096e4..37b490304c4f2993b716ef23dfd2c81b6e86cc16 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } : +{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } : let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [pidgin glib json_glib mercurial]; + buildInputs = [pidgin glib json-glib mercurial]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 07cf66e572a706f9498b53bde5e66b136ff106b6..460143e354947079336d84115460359693ed5c6c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }: +{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; }; - buildInputs = [ pidgin glib json_glib protobuf protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf protobufc ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libhangouts.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2bf67f44c948d4a5ba674d0fd9fda3c60328626e..a6d893fd95a47d84f5f3868b07472b4474ce5ac1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } : +{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } : let version = "2016-07-11"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib glib http-parser ]; + buildInputs = [ pidgin json-glib glib http-parser ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libmatrix.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index d02c437945e08d693b4c813dba6560a55b985b78..ddb9217d5e225cb6cec4dcb56d6cc514e4855d6d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus -, dbus_glib }: +, dbus-glib }: stdenv.mkDerivation rec { name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ]; + buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ]; meta = { homepage = https://github.com/novas0x2a/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index bd3fc82f7cba20d0cca588fda921962467db3556..3ec45702b1754275e859241fa319b6f740e00dda 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farstream -, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn +, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn , lib, python, libICE, libXext, libSM , cyrus_sasl ? null , openssl ? null @@ -33,7 +33,7 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr farstream libXScrnSaver ncurses python - avahi dbus dbus_glib intltool libidn + avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ea887454815591768559052ec332e8340df971db..b47280d3b156b62ad9e7ced359957b51e9a5a591 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }: +let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; version = "0.13.5"; @@ -12,6 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/ cp -R . $out/ + ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"} ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f79d708ec5d7c9c279ce7ead2809bf984a554596..c77173d490a107348197e0a516790a83c8387fdc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.3.0"; + version = "1.5.2"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "047l3yyqvzyi5969r0n9cwdarsxfbssj415ysh57w7vkdp01axsr"; + sha256 = "1h4qa5i7axkmsai854yvlyh5r038mmjl4pj2rd27mz11if7yf067"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9e7377699bd77a794307655834fcdbbb728a3b6f..87b2ee2238158db5ff4489e251a14796b1360e6c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -27,7 +27,7 @@ let gnome2.gtk gnome2.pango - gnome2.gnome_keyring + gnome2.gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 34f0d16a7b430e2a820f5c98ce33c10bbe1479aa..67b116274a2d9264becc442a19e733747ea43447 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchgit, fetchpatch , pkgconfig, gyp, cmake, makeWrapper -, qtbase, qtimageformats, gtk3, libappindicator-gtk3 +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -31,6 +31,11 @@ mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"' + ''; + nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 77645371359bd371b5fe4a1d6941e998008f9d34..1b9ccb98d0fae9a0d3a36a9954f0f35b99bc42cb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ] + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 4e4a2a9b6a967ca26e82c0218891fb52d3ab9409..a1669183bb3b7302d28f062664e001bca35dd240 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: +{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index b4fd71b01d44230297138e928e08d8d3c8449b9d..7894554eee4f80070170d491dcc1fb2beb028ce6 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 9206aea5c54267821116f317005fe91438e4b207..111970ab71126d77fe8c326fa50af93dd54d6572 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig +{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig , gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig intltool libxslt gobjectIntrospection ]; buildInputs = [ - dbus_glib libxml2 sqlite telepathy_glib - dbus_libs telepathy_glib.python + dbus-glib libxml2 sqlite telepathy-glib + dbus_libs telepathy-glib.python ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 82485de58fc1bf17cd574063e5c628ac27730c2a..18b3bb06e98fee0ad44933cae4d12abd63e9e274 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { name = "${pname}-5.16.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; - buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing + buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing nativeBuildInputs = [ pkgconfig libxslt makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index cbae6af97b8528d46c4a1fb953b5fb6736fa0c86..e060eaabf2819069ef49ed9016779e5647bd7142 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup +{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 - buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite pcre telepathy_glib.python ]; + buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl + sqlite pcre telepathy-glib.python ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 700fab061164033fc436ddb67dcaaf116a77af3e..06bcd7a0400ecb4eea44c86aeeb45b561964602a 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index baa0b10fd756a78d8785e93e6c6836bb76825896..b9860fa4227320e079cc766250adf40ee3dbc16c 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy +, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool -, desktop_file_utils, hicolor_icon_theme +, desktop-file-utils, hicolor-icon-theme , autoconf, automake, autoconf-archive }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy - libsexy libnotify openssl desktop_file_utils hicolor_icon_theme + gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + libsexy libnotify openssl desktop-file-utils hicolor-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 5e65c0dfeaf82d8dc86960c3d1b1064c2cde1bf6..15f9def1151a62fee6caeeb0ff20d5a598bd4d5d 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ii-1.7"; + name = "ii-1.8"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis"; + sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; installPhase = '' diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index a89898c37392438f72425b5c55334d39e61e3f92..ec67321400dc6b8ecd141120d7f76bdef2867c39 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,22 +1,50 @@ -{ fetchurl, stdenv, jre }: +{ fetchurl, stdenv, jre, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "jmeter-3.3"; + name = "jmeter-${version}"; + version = "4.0"; src = fetchurl { url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5"; + sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; }; - buildInputs = [ jre ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS" - substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS" mkdir $out - cp ./* $out/ -R + + rm bin/*.bat bin/*.cmd + + cp -R * $out/ + + substituteInPlace $out/bin/create-rmi-keystore.sh --replace \ + "keytool -genkey" \ + "${jre}/lib/openjdk/jre/bin/keytool -genkey" + + # Prefix some scripts with jmeter to avoid clobbering the namespace + for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do + mv $out/bin/$i $out/bin/jmeter-$i + wrapProgram $out/bin/jmeter-$i \ + --prefix PATH : "${jre}/bin" + done + + wrapProgram $out/bin/jmeter --set JAVA_HOME "${jre}" + wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}" + ''; + + doInstallCheck = true; + + checkInputs = [ coreutils ]; + + installCheckPhase = '' + $out/bin/jmeter --version 2>&1 | grep -q "${version}" + $out/bin/jmeter-heapdump.sh > /dev/null + $out/bin/jmeter-shutdown.sh > /dev/null + $out/bin/jmeter-stoptest.sh > /dev/null + timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124" ''; - meta = { + meta = with stdenv.lib; { description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% @@ -24,9 +52,9 @@ stdenv.mkDerivation rec { measure performance. It was originally designed for testing Web Applications but has since expanded to other test functions. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.garbas ]; + license = licenses.asl20; + maintainers = [ maintainers.garbas ]; priority = 1; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0324012b278b540d09112568bec8b4eafc356b4f..610b16dab5bc5ba21b78d068799c321c5d58c0d5 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas ]; + notmuch boost gnome3.gsettings-desktop-schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index aee4d8ca04e63336e190b5ec9cc753c633a37182..10daeeab8e13d92bda6c1cc6caa27f42271d8972 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, wrapGAppsHook -, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme -, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2 -, glib_networking, gsettings_desktop_schemas, libSM, libytnef +, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme +, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager +, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 +, glib-networking, gsettings-desktop-schemas, libSM, libytnef # Build options # TODO: A flag to build the manual. @@ -45,19 +45,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/procmime.c \ - --subst-var-by MIMEROOTDIR ${shared_mime_info}/share + --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = - [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme - libetpan perl python glib_networking libSM libytnef + [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme + libetpan perl python glib-networking libSM libytnef ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra_gtk2 + ++ optional enablePluginNotificationSounds libcanberra-gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; postInstall = '' @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { homepage = http://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ khumba fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index ef66f69f979ab705f5819d0f4d26cba3c85225df..a71db1cf71515c97a52f5bd0bf7597c0688c2bb0 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.0.0"; + version = "1.0.2"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "01384fi5vrfqpznk9389nf3bwpi2zjbnkg84g6z1css8f3gp5i1c"; + sha256 = "0nqgsqxsjnj46wsfb60p7fr631yx3fx7dfa4fpj6x2ml4i42kxid"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index b1ca80fc7e474eae9008c0c7fe1dd264c59205ae..75f34952394eb1462b75de46900cc7420a50963f 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3, networkmanager +, libgnome-keyring3, networkmanager , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true @@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.defaultIconTheme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3; + ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index dac9475665f5fe3f4dde7f261bf6f053f88414ee..ff4507991e4043c18389ca67ae37ce8ee68240da 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3.1"; + version = "0.3.2"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "1a4rqadq3dm6r11v7akng1qy88zpiq5qbqdryb8df3pxkv62nm1a"; + sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 90fbe18f0bc5769f5b639e8e0f92b78a1acb82d6..03bfc711c4308379694233ddcfccf6ed467ddf19 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1qbngck1pq1jkpnbpcwcb2q2zqrkgp0nd68wwp57bprxjgb8a6j3"; + sha256 = "1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 6413c1407dc1a0e95d2cdf98b877178473a10abf..ea7e7ee282d1e9dadccb02da50c57065467960cb 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }: let @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20171215"; + version = "20180223"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1c7vjl5cl0k41vrxp6l1sj72idz70r2rgaxa2m1yir6zb6qsrsd8"; + sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb"; }; buildInputs = [ @@ -32,12 +32,15 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxslt.bin makeWrapper tcl which + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which ]; enableParallelBuilding = true; postPatch = '' + substituteInPlace contrib/smime_keys \ + --replace /usr/bin/openssl ${openssl}/bin/openssl + for f in doc/*.{xml,xsl}* ; do substituteInPlace $f \ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \ @@ -48,6 +51,12 @@ in stdenv.mkDerivation rec { # and use a far more comprehensive list than the one shipped with neomutt substituteInPlace sendlib.c \ --replace /etc/mime.types ${mime-types}/etc/mime.types + + # The string conversion tests all fail with the first version of neomutt + # that has tests (20180223) so we disable them for now. + # I don't know if that is related to the tests or our build environment. + # Try again with a later release. + sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c ''; configureFlags = [ @@ -73,6 +82,10 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" ''; + doCheck = true; + + checkTarget = "test"; + meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c23c264559f86e4c929b9a5751ec90ce569b99e4..a3de728ce4157d16ec99cc3b25d3554bbb105a55 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { done ''; + # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and + # friends + setOutputFlags = false; + enableParallelBuilding = true; makeFlags = "V=1"; preFixup = optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 76231dc7abf2f010f26dc504f4e63632892b65e2..766aab39ce307080f7f86275a49ec2ff632fbc53 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -5,7 +5,7 @@ , coreutils , cups , dbus -, desktop_file_utils +, desktop-file-utils , expat , fontconfig , freetype @@ -14,7 +14,7 @@ , glib , gnome2 , libgcrypt -, libgnome_keyring +, libgnome-keyring , libnotify , makeWrapper , nodejs @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { coreutils cups dbus - desktop_file_utils + desktop-file-utils expat fontconfig freetype @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { glib gnome2.GConf gnome2.gtk - libgnome_keyring + libgnome-keyring libnotify nodejs nspr @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome_keyring ]; + buildInputs = [ gnome2.gnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ $out/share/nylas-mail/nylas - wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib"; + wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib"; # Fix path to bash so apm can install plugins. substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 15c251f3857945e0c7d6b133afb2349ff2dcb88f..9dbc99cac7d0e091482bf72fa588439779aca279 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, config, makeWrapper , gconf , alsaLib -, at_spi2_atk +, at-spi2-atk , atk , cairo , cups , curl -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -82,12 +82,12 @@ stdenv.mkDerivation { [ stdenv.cc.cc gconf alsaLib - at_spi2_atk + at-spi2-atk atk cairo cups curl - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -108,7 +108,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui libGLU_combined diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 4d90d4c94d864d0c7725dbbc0c530485cd5beb31..e2b023cc2a8bc8d337c94722d2cce80f0081a258 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr nss libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ed6fe17cc7e8037724a6f6fe4cbf3027f4c1c3f0..965a8ec58dc8ca27cb7f7d9ed844df7c6927bafb 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook -, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1 -, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib_networking +, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 +, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg +, gobjectIntrospection, glib-networking }: let @@ -18,9 +18,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; buildInputs = [ - glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas - libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection - librsvg glib_networking libnotify + glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas + libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection + librsvg glib-networking libnotify ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 63d7f29d7de658a75d7ea699023d1b5d51198c2c..ad35c49c01465fee3eb0ab6203868ad88846dbee 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,6 +1,6 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null -, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify +, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify }: assert spellChecking -> gtkspell2 != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ] + buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a7deb0b75b54805f4c3587577461522dcefb94ea..f61b887cd87341e48720f57386a6aaeb63be1849 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: +, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { $out/share/applications/nextcloud.desktop '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index f2b7a4a4e999338575bb90604ce25930f0e53a0c..b3a1c1a23b3798b130703424ff73d166834a5286 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ostinato-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3"; + sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; }; ostinatoIcon = fetchurl { diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 0d7a41735ea4d67ccad5e6a303fd8ec52a9a749f..950187ed9c60beee0f0db8fa0169b8df8c058639 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index d37f5293ef806f6ae9e088e8e4ecdcccef09140a..688f908c798ca77720e1c1390862ebbde7230536 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }: +{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }: stdenv.mkDerivation rec { name = "tixati-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \ tixati install -D tixati $out/bin/tixati install -D tixati.desktop $out/share/applications/tixati.desktop diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 20c3540b7f45fe920257a4755faa702614239cf2..eb88d1c24c207d5408901e4d8aaa7adcf72f5914 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,6 +1,6 @@ { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig -, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib -, hicolor_icon_theme }: +, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib +, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pkgconfig intltool autoconf-archive appstream-glib ]; - buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ]; + buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ]; meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 3c5fb499a8bd5eb2ec6b99cb7b0642e7ee15bc08..cf825b724962ecbf1aaf70090bd32cbbda14298e 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -6,18 +6,15 @@ , enableCli ? true }: -let - version = "2.92"; -in - let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; + version = "2.93"; src = fetchurl { - url = "https://transmission.cachefly.net/transmission-${version}.tar.xz"; - sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; + url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz"; + sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"; }; nativeBuildInputs = [ pkgconfig ] @@ -27,16 +24,6 @@ stdenv.mkDerivation rec { ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; - patches = [ - (fetchpatch { - # See https://github.com/transmission/transmission/pull/468 - # Patch from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126 - name = "transmission-fix-dns-rebinding-vuln.patch"; - url = https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt; - sha256 = "1p9m20kp4kdyp5jjr3yp5px627n8cfa29mg5n3wzsdfv0qzk9gy4"; - }) - ]; - postPatch = '' substituteInPlace ./configure \ --replace "libsystemd-daemon" "libsystemd" \ diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index d8e0c76dc490788d439e41967c86b4429f08acdf..f6828fe6f317519d0ec1b8e3764ec155315bac5d 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-rc3"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7"; + sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; }; buildInputs = [ diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index b432872302782d5cac14e71874c12899ab9e5581..2a4991b9318f8f1bf35acddee4b223b6927c20e1 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; + sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w"; }; buildInputs = [ openssl libsamplerate alsaLib ]; diff --git a/pkgs/development/python-modules/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix similarity index 85% rename from pkgs/development/python-modules/protocol/default.nix rename to pkgs/applications/networking/protocol/default.nix index f8ff177437c3f91f5a7f78a8c714322680784340..305aceec62b51a3f71b3e068020adbff6a25ea88 100644 --- a/pkgs/development/python-modules/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonApplication rec { pname = "protocol"; version = "20171226"; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 643ef32f6eb21a4b6c21c7d82fe948943e2f05c7..00332754c264d2794e883596d651d14b05f5152b 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -202,7 +202,7 @@ let makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 959608b04f5cd2f7b31ba9f326db494d937c8513..6d32036def550415080b78a0bc379f0a1f19d9a6 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl, gsettings_desktop_schemas +, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core +, openssl, gsettings-desktop-schemas # The themes here are soft dependencies; only icons are missing without them. -, hicolor_icon_theme, adwaita-icon-theme +, hicolor-icon-theme, adwaita-icon-theme }: let @@ -33,13 +33,13 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas - glib gtk3 gettext libxkbfile libgnome_keyring libX11 + buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas + glib gtk3 gettext libxkbfile libgnome-keyring libX11 freerdp libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret spice_protocol spice_gtk epoxy at_spi2_core - openssl hicolor_icon_theme adwaita-icon-theme ]; + libsecret spice-protocol spice-gtk epoxy at-spi2-core + openssl hicolor-icon-theme adwaita-icon-theme ]; cmakeFlags = [ "-DWITH_VTE=OFF" diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 74f5ecb6b75f8e7345079dc1d60e73e358aa3898..e47a6ba6be3d20e141742ead3947626829c10764 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools +{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, makeWrapper , withShibboleth ? true, qtwebengine }: with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.0"; + version = "6.1.5"; name = "seafile-client-${version}"; - src = fetchurl { - url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd"; + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seafile-client"; + rev = "v${version}"; + sha256 = "1ahz55cw2p3s78x5f77drz4h2jhknfzpkk83qd0ggma31q1pnpl9"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/cmake.patch b/pkgs/applications/networking/sniffers/wireshark/cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..890fffedce031975d2996b3f08a2894bd504701d --- /dev/null +++ b/pkgs/applications/networking/sniffers/wireshark/cmake.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # + ++cmake_minimum_required(VERSION 3.7) + project(Wireshark C CXX) + + # Updated by make-version.pl +@@ -40,7 +41,7 @@ + # Needed for GREATER_EQUAL operator + cmake_minimum_required(VERSION 3.7) + else() +- cmake_minimum_required(VERSION 2.8.8) ++ cmake_minimum_required(VERSION 3.7) + endif() + + # Needs to be set after cmake_minimum_required or cmake_policy(VERSION) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 84e10fb18bcac1dd9184939e1a0a19c2ba73eec8..81859eb1fe33a6407127b4b69d3e181c8315be0b 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules, fetchpatch -, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper +, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -26,6 +26,8 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + "-DENABLE_QT5=${if withQt then "ON" else "OFF"}" + "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" ]; nativeBuildInputs = [ @@ -34,11 +36,12 @@ in stdenv.mkDerivation { buildInputs = [ gettext pcre perl libpcap lua5 libssh openssl libgcrypt - libgpgerror gnutls geoip c-ares python glib zlib + libgpgerror gnutls geoip c-ares python glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] + ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; + ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] # https://code.wireshark.org/review/#/c/23728/ @@ -46,9 +49,24 @@ in stdenv.mkDerivation { name = "fix-timeout.patch"; url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; - }); + }) + ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch; - postInstall = optionalString (withQt || withGtk) '' + postInstall = if stdenv.isDarwin then '' + ${optionalString withQt '' + mkdir -p $out/Applications + mv $out/bin/Wireshark.app $out/Applications/Wireshark.app + + for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do + install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib + install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib + install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib + done + + wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \ + --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} + ''} + '' else optionalString (withQt || withGtk) '' ${optionalString withGtk '' install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop ''} @@ -75,7 +93,7 @@ in stdenv.mkDerivation { experts. It runs on UNIX, macOS and Windows. ''; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index a7cf26ea7aeabe3de5065a504213ce15a41c7c40..e4bdec668a022ed5db07573687ff2bbc34750877 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lsyncd-${version}"; - version = "2.1.6"; + version = "2.2.2"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1cab96h4qfyapk7lb682j1d8k0hpv7h9pl41vdgc0vr4bq4c3ij2"; + sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y"; }; patchPhase = '' diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 5e4f9738d44513d9df7d4dcd647b00d31fb6dc7b..5e48f85852dfa83726ae255eaaff125d19179b8e 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { gtk3 (librsvg.override { enableIntrospection = true; }) libnotify # Schemas with proxy configuration - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix deleted file mode 100644 index e5e554db67b8e583635510ef44721b829f3d2e8c..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/syncthing/syncthing"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/syncthing"; - rev = "d0061c172caecd3baf61f3ff720f56fdb805186e"; - sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; - sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; - }; - } -] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix deleted file mode 100644 index e33501a17158534ff164d07e43bce13f0d85ce5d..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-inotify-${version}"; - version = "0.8.6"; - - goPackagePath = "github.com/syncthing/syncthing-inotify"; - - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-inotify"; - rev = "v${version}"; - sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl"; - }; - - goDeps = ./inotify-deps.nix; - - postInstall = '' - mkdir -p $bin/lib/systemd/{system,user} - - substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \ - $bin/lib/systemd/system/syncthing-inotify@.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - - substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ - $bin/lib/systemd/user/syncthing-inotify.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/syncthing/syncthing-inotify; - description = "File watcher intended for use with Syncthing"; - license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index 79bc32dfa40d00462cae1237851834f2decc1f69..8a056e21692be0c8b8d531d599e88100ce6b0d81 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchFromGitHub, bison}: -let version = "0.9"; in +let version = "1.1.1"; in stdenv.mkDerivation rec { name = "tcpkali-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "machinezone"; repo = "tcpkali"; rev = "v${version}"; - sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; + sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 1537dd9b03ff628190fefa6fbb3ac149a8ec78c1..8449cdf05def4e4855012f706778c2419a925a59 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared_mime_info, + boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, @@ -36,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - boost qtwebkit qtx11extras shared_mime_info + boost qtwebkit qtx11extras shared-mime-info kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 14c954c0c831c75a999cc74d2f9dea4a64e3eb39..c768f4c7fa34a78beba66506a657852fb94e159b 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper , libxml2, libxslt, perl, perlPackages, gconf, guile , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice -, webkit, glibcLocales, gsettings_desktop_schemas, dconf +, webkit, glibcLocales, gsettings-desktop-schemas, dconf , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # glib, gtk... glib gtk2 goffice webkit # gnome... - dconf gconf libgnomecanvas gsettings_desktop_schemas + dconf gconf libgnomecanvas gsettings-desktop-schemas # financial libofx aqbanking gwenhywfar # perl diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 29c30204ddbec31e2ba36b641832ffa8a59304dc..62dcf5dd8a880d6f2d3e2cbed90e53369b721972 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "grisbi-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 3d63b4195a27c2998ad618b5455a350c61058531..f4e59d1ca049f5b563252b6944c8ff6437680746 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "homebank-5.1.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index b8844391c7d9a7d2add937b9b57508a098fc357b..59ecb5a5c3b762c2d828d056d644fd6dee29fe3b 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { Download the TWS from https://download2.interactivebrokers.com/download/unixmacosx_latest.jar, rename the file to ${name}, and add it to the nix store with - "nix-prefetch-url file://${name}". + "nix-prefetch-url file://\$PWD/${name}". ''; sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf"; }; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index c2a10d85eb1a6f9783a45719ac96b1d1d80e7422..92feb6618c9e9c103c08c4f65c538f9601d2c5dc 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: let - version = "0.11.1"; + version = "0.12.0"; pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr"; + sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index e7b82183454600243548e3c081ba9743236278d3..5dfd03570121fb9013c7e79ab00addbbbc0f29d5 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.8.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { exec = "jabref"; }; - buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; unpackPhase = "#"; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index cc3329bdcc9ded01b58eb9f427f98c962dd07509..f8742253c519045eac0aa8f2b93c40e867b82bae 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -1,17 +1,17 @@ { fetchurl }: rec { - major = "5"; - minor = "4"; - patch = "1"; - tweak = "2"; + major = "6"; + minor = "0"; + patch = "2"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0c17193vcf4nj8l5k9q87byv27px74kzp0hvgr1dfz5700cv086k"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e0df9cae2ea6dad78089604171531439bcefaba3..7da7a6bf7342e26b736f8cc791641d313f0054b6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis -, openssl, gperf, cppunit, GConf, ORBit2, poppler +, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -29,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "1ir1f5jgjhpnxsw6izsryp4wg52ifzmcqyc0gdp9zh03rjf5i4cg"; + sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1apgc57a8q6lsjfq2f7pzdn7wanqm8zkkrkbq2nd4hidp6avgm6f"; + sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a"; }; }; @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name @@ -115,11 +120,13 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test 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 @@ -138,6 +145,8 @@ in stdenv.mkDerivation rec { sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -147,9 +156,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildPhase = '' - # This is required as some cppunittests require fontconfig configured - export FONTCONFIG_FILE=${fontsConf} - # This to avoid using /lib:/usr/lib at linking sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk @@ -229,8 +235,10 @@ in stdenv.mkDerivation rec { "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libpagemaker" - "--without-system-libgltf" "--without-system-libstaroffice" + "--without-system-libepubgen" + "--without-system-libqxp" + "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" ]; @@ -242,7 +250,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 @@ -252,9 +260,9 @@ in stdenv.mkDerivation rec { neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool - libxshmfence libatomic_ops graphite2 harfbuzz gpgme + libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme + libodfgen CoinMP librdf_rasqal defaultIconTheme gettext gdb ] ++ lib.optional kdeIntegration kdelibs4; @@ -268,7 +276,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index dcda0ff782dc79949c8480c52f616cd3afb3493e..636f36cb383b3c195e01f42d93d26a72456e92d7 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -256,7 +256,7 @@ def interpret(x): Output: One of 1. Dict with keys 'name' and 'attrs' 2. 'unrecognized' (if interpretation failed) """ - for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball]: + for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball, interpret_jar]: result = f(x) if result is not None: return result @@ -296,6 +296,13 @@ def interpret_tarball(x): return {'name': match.group(1), 'attrs': {'tarball': x['value'], 'brief': True}} +def interpret_jar(x): + match = re.match('^(.*)_JAR$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'tarball': x['value'], 'brief': True}} + def interpret_tarball_with_md5(x): """ diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 478c6c4d906210c355581e66a0867fbac1d98d13..e82fa241c00c9a4251143aa7af4937bdc3419057 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -3,43 +3,43 @@ name = "libabw-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + md5 = ""; + md5name = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + md5 = ""; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; - md5 = "98492e965963f852ab29f9e61b2ad700"; - md5name = "98492e965963f852ab29f9e61b2ad700-apr-1.5.2.tar.gz"; + md5 = ""; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; - md5 = "866825c04da827c6e5f53daff5569f42"; - md5name = "866825c04da827c6e5f53daff5569f42-apr-util-1.5.4.tar.gz"; + md5 = ""; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_60_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2"; - sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"; - md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; - md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2"; + name = "boost_1_63_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; + sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + md5 = ""; + md5name = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; - md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; - md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip"; + md5 = ""; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz"; - sha256 = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252"; - md5 = "23a0b2f0235431d35238df1d3a517fdb"; - md5name = "23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz"; + name = "cairo-1.14.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; + sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + md5 = ""; + md5name = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-cairo-1.14.8.tar.xz"; } { name = "libcdr-0.1.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; - md5 = "e369f30b5b861ee0fc4f9e6cbad701fe"; - md5name = "e369f30b5b861ee0fc4f9e6cbad701fe-libcdr-0.1.3.tar.bz2"; + md5 = ""; + md5name = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -80,15 +80,15 @@ name = "libcmis-0.5.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; - md5 = "3270154f0f40d86fce849b161f914101"; - md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz"; + md5 = ""; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + md5 = ""; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "collada2gltf-master-cb1d97788a.tar.bz2"; @@ -98,11 +98,11 @@ md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; } { - name = "cppunit-1.13.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; - sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + name = "cppunit-1.14.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; + sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + md5 = ""; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -115,15 +115,22 @@ name = "curl-7.52.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; - md5 = "4e1ef056e117b4d25f4ec42ac609c0d4"; - md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz"; + md5 = ""; + md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; - md5 = "6b48eda57914e6343efebc9381027b78"; - md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + md5 = ""; + md5name = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2"; + } + { + name = "libepoxy-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; + sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; + md5 = ""; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -136,29 +143,29 @@ name = "libetonyek-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + md5 = ""; + md5name = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-libetonyek-0.1.6.tar.bz2"; } { name = "expat-2.2.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; - md5 = "f053af63ef5f39bd9b78d01fbc203334"; - md5name = "f053af63ef5f39bd9b78d01fbc203334-expat-2.2.3.tar.bz2"; + md5 = ""; + md5name = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-expat-2.2.3.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; - md5 = "821260b61dafc22899d1464d4e91ee6a"; - md5name = "821260b61dafc22899d1464d4e91ee6a-Firebird-3.0.0.32483-0.tar.bz2"; + md5 = ""; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.8.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; - sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + name = "fontconfig-2.12.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; + sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + md5 = ""; + md5name = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-fontconfig-2.12.1.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -241,29 +248,22 @@ name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; - md5 = "919389b307ee8696288ea3b8210ab974"; - md5name = "919389b307ee8696288ea3b8210ab974-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5 = ""; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "libfreehand-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; - } - { - name = "freetype-2.4.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; - sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + md5 = ""; + md5name = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-libfreehand-0.1.1.tar.bz2"; } { - name = "glew-1.12.0.zip"; - url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; - sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + name = "freetype-2.7.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; + sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + md5 = ""; + md5name = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-freetype-2.7.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -272,19 +272,26 @@ md5 = "bae83fa5dc7f081768daace6e199adc3"; md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } + { + name = "gpgme-1.8.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; + sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + md5 = ""; + md5name = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.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"; - md5 = "9c499b8ec9f1b81fd0bb6a3b986f4b0f"; - md5name = "9c499b8ec9f1b81fd0bb6a3b986f4b0f-graphite2-minimal-1.3.10.tgz"; + md5 = ""; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; - md5 = "5986e1bfcd983d1f6caa53ef64c4abc5"; - md5name = "5986e1bfcd983d1f6caa53ef64c4abc5-harfbuzz-1.3.2.tar.bz2"; + name = "harfbuzz-1.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2"; + sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"; + md5 = ""; + md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -392,25 +399,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "jpegsrc.v9a.tar.gz"; - url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; - sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; - } - { - name = "libjpeg-turbo-1.4.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; - sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; + name = "libjpeg-turbo-1.5.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; + sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + md5 = ""; + md5name = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz"; } { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; - md5 = "59a3595c1052c5b51f996f44fe9994b9"; - md5name = "59a3595c1052c5b51f996f44fe9994b9-language-subtag-registry-2017-04-19.tar.bz2"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; + md5 = ""; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -420,25 +420,32 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; - sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + name = "lcms2-2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; + sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + md5 = ""; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + } + { + name = "libassuan-2.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; + sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; + md5 = ""; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + md5 = ""; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + md5 = ""; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.4.tar.bz2"; @@ -448,32 +455,39 @@ md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; } { - name = "libgltf-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; - sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + name = "libgltf-0.1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; + sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + md5 = ""; + md5name = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da-libgltf-0.1.0.tar.gz"; + } + { + name = "libgpg-error-1.26.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; + sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + md5 = ""; + md5name = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69-libgpg-error-1.26.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; - md5 = "284f120247323a35122ab32b4b359c45"; - md5name = "284f120247323a35122ab32b4b359c45-liblangtag-0.6.2.tar.bz2"; + md5 = ""; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; - md5 = "da283d2e3e72137d0c600ac36b991c9d"; - md5name = "da283d2e3e72137d0c600ac36b991c9d-ltm-1.0.zip"; + md5 = ""; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"; - sha256 = "41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f"; - md5 = "86b1daaa438f5a7bea9a52d7b9799ac0"; - md5name = "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"; + name = "xmlsec1-1.2.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; + sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + md5 = ""; + md5name = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-xmlsec1-1.2.24.tar.gz"; } { name = "libxml2-2.9.4.tar.gz"; @@ -507,29 +521,29 @@ name = "mdds-1.2.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; - md5 = "8855cf852a6088cfdc792c6f7ceb0243"; - md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2"; + md5 = ""; + md5name = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; - md5 = "940057ac8b513b00e8e9ca12ef796762"; - md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz"; + md5 = ""; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { name = "libmspub-0.1.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + md5 = ""; + md5name = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-libmspub-0.1.2.tar.bz2"; } { - name = "libmwaw-0.3.9.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2"; - sha256 = "11a1f318431a052e1d623385351c8e659377d36db3e71e188af55da87ce9461f"; - md5 = "d8532ad5630d3f3b2189a7ec5639151b"; - md5name = "d8532ad5630d3f3b2189a7ec5639151b-libmwaw-0.3.9.tar.bz2"; + name = "libmwaw-0.3.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; + sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + md5 = ""; + md5name = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -556,15 +570,15 @@ name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; - md5 = "e55ee06b22687df68fafc6a30c0554b2"; - md5name = "e55ee06b22687df68fafc6a30c0554b2-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5 = ""; + md5name = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-nss-3.29.5-with-nspr-4.13.1.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + md5 = ""; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; @@ -584,43 +598,50 @@ name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5 = ""; + md5name = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-OpenCOLLADA-master-6509aa13af.tar.bz2"; } { name = "openldap-2.4.44.tgz"; url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; - md5 = "693ac26de86231f8dcae2b4e9d768e51"; - md5name = "693ac26de86231f8dcae2b4e9d768e51-openldap-2.4.44.tgz"; + md5 = ""; + md5name = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-openldap-2.4.44.tgz"; } { - name = "openssl-1.0.2h.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; - sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + name = "openssl-1.0.2k.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; + sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + md5 = ""; + md5name = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0-openssl-1.0.2k.tar.gz"; } { name = "liborcus-0.12.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = "d0ad3a2fcf7008e5b33604bab33df3ad"; - md5name = "d0ad3a2fcf7008e5b33604bab33df3ad-liborcus-0.12.1.tar.gz"; + md5 = ""; + md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5 = ""; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; - md5 = "5c4985a68be0b79d3f809da5e12b143c"; - md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2"; + md5 = ""; + md5name = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-libpagemaker-0.0.3.tar.bz2"; + } + { + name = "pdfium-3064.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; + sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + md5 = ""; + md5name = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-pdfium-3064.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -633,15 +654,15 @@ name = "libpng-1.6.28.tar.gz"; url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; - md5 = "897ccec1ebfb0922e83c2bfaa1be8748"; - md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz"; + md5 = ""; + md5name = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-libpng-1.6.28.tar.gz"; } { - name = "poppler-0.49.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.49.0.tar.xz"; - sha256 = "14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f"; - md5 = "9e057ed8eee1f9979fa75d8f044783b8"; - md5name = "9e057ed8eee1f9979fa75d8f044783b8-poppler-0.49.0.tar.xz"; + name = "poppler-0.56.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; + sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + md5 = ""; + md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -650,19 +671,12 @@ md5 = "c0b4799ea9850eae3ead14f0a60e9418"; md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; } - { - name = "Python-3.3.5.tgz"; - url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; - sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; - md5 = "803a75927f8f241ca78633890c798021"; - md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; - } { name = "Python-3.5.4.tgz"; url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; - md5 = "2ed4802b7a2a7e40d2e797272bf388ec"; - md5name = "2ed4802b7a2a7e40d2e797272bf388ec-Python-3.5.4.tgz"; + md5 = ""; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -689,8 +703,8 @@ name = "librevenge-0.0.4.tar.bz2"; url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + md5 = ""; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -703,15 +717,15 @@ name = "serf-1.2.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + md5 = ""; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2"; - sha256 = "f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899"; - md5 = "4012950240c2bf768c9b29ad376123d7"; - md5name = "4012950240c2bf768c9b29ad376123d7-libstaroffice-0.0.2.tar.bz2"; + name = "libstaroffice-0.0.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; + sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + md5 = ""; + md5name = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-libstaroffice-0.0.3.tar.xz"; } { name = "swingExSrc.zip"; @@ -731,29 +745,29 @@ name = "libvisio-0.1.5.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; - md5 = "cbee198a78b842b2087f32d33c522818"; - md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + md5 = ""; + md5name = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-libvisio-0.1.5.tar.bz2"; } { name = "libwpd-0.10.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; - md5 = "79b56bcc349264d686a67994506ad199"; - md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + md5 = ""; + md5name = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-libwpd-0.10.1.tar.bz2"; } { name = "libwpg-0.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + md5 = ""; + md5name = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-libwpg-0.3.1.tar.bz2"; } { - name = "libwps-0.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2"; - sha256 = "387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73"; - md5 = "dcfd1d18bfa9818cf3ab21663ba857a3"; - md5name = "dcfd1d18bfa9818cf3ab21663ba857a3-libwps-0.4.4.tar.bz2"; + name = "libwps-0.4.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; + sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + md5 = ""; + md5name = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -763,17 +777,17 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; - sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; - md5 = "44d667c142d7cda120332623eab69f40"; - md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + name = "zlib-1.2.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; + md5 = ""; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; - md5 = "c611df8664240de0276ab95670f413d8"; - md5name = "c611df8664240de0276ab95670f413d8-libzmf-0.0.1.tar.bz2"; + md5 = ""; + md5name = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2"; } ] diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index d20ec2d0cc80dc187c68f2a409ec23d29c4fdb8f..28c06b65869f81f2959cad8d8b5f173c5f731c8a 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,45 +1,45 @@ [ { - name = "libabw-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; - sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + name = "libabw-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; + sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; md5 = ""; - md5name = "-libabw-0.1.1.tar.bz2"; + md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; - md5name = "-commons-logging-1.2-src.tar.gz"; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; - md5name = "-apr-1.5.2.tar.gz"; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; - md5name = "-apr-util-1.5.4.tar.gz"; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_63_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; - sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + name = "boost_1_65_1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; + sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; md5 = ""; - md5name = "-boost_1_63_0.tar.bz2"; + md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; - md5name = "-breakpad.zip"; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; - sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + name = "cairo-1.14.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; + sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; md5 = ""; - md5name = "-cairo-1.14.8.tar.xz"; + md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; } { - name = "libcdr-0.1.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; - sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; + name = "libcdr-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; + sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; md5 = ""; - md5name = "-libcdr-0.1.3.tar.bz2"; + md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -81,28 +81,21 @@ url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; md5 = ""; - md5name = "-libcmis-0.5.1.tar.gz"; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; - md5name = "-CoinMP-1.7.6.tgz"; - } - { - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; - sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "cppunit-1.14.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; md5 = ""; - md5name = "-cppunit-1.14.0.tar.gz"; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -112,25 +105,25 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.52.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; - sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; + name = "curl-7.58.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; + sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; md5 = ""; - md5name = "-curl-7.52.1.tar.gz"; + md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; } { - name = "libe-book-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; - sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + name = "libe-book-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; - md5name = "-libe-book-0.1.2.tar.bz2"; + md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; md5 = ""; - md5name = "-libepoxy-1.3.1.tar.bz2"; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -140,32 +133,39 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libetonyek-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; - sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + name = "libepubgen-0.1.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; + sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; md5 = ""; - md5name = "-libetonyek-0.1.6.tar.bz2"; + md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; } { - name = "expat-2.2.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; - sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; + name = "libetonyek-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; + sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; md5 = ""; - md5name = "-expat-2.2.3.tar.bz2"; + md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + } + { + name = "expat-2.2.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; + sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + md5 = ""; + md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; - md5name = "-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; - sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + name = "fontconfig-2.12.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; + sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; md5 = ""; - md5name = "-fontconfig-2.12.1.tar.bz2"; + md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -216,20 +216,6 @@ md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } - { - name = "open-sans-font-ttf-1.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - } - { - name = "pt-serif-font-1.0000W.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; @@ -249,21 +235,77 @@ url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; - md5name = "-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; + } + { + name = "noto-fonts-20171024.tar.gz"; + url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; + md5 = ""; + md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; + } + { + name = "culmus-0.131.tar.gz"; + url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; + md5 = ""; + md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + } + { + name = "libre-hebrew-1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; + md5 = ""; + md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; + } + { + name = "alef-1.001.tar.gz"; + url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; + md5 = ""; + md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; + } + { + name = "amiri-0.109.zip"; + url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip"; + sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6"; + md5 = ""; + md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + } + { + name = "ttf-kacst_2.01+mry.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; + md5 = ""; + md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { - name = "libfreehand-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; - sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + name = "ReemKufi-0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"; + sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b"; md5 = ""; - md5name = "-libfreehand-0.1.1.tar.bz2"; + md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; } { - name = "freetype-2.7.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; - sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + name = "Scheherazade-2.100.zip"; + url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; - md5name = "-freetype-2.7.1.tar.bz2"; + md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; + } + { + name = "libfreehand-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; + md5 = ""; + 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"; + md5 = ""; + md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -273,25 +315,25 @@ md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } { - name = "gpgme-1.8.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; - sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + name = "gpgme-1.9.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; - md5name = "-gpgme-1.8.0.tar.bz2"; + 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"; md5 = ""; - md5name = "-graphite2-minimal-1.3.10.tgz"; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; + name = "harfbuzz-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; + sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; md5 = ""; - md5name = "-harfbuzz-1.3.2.tar.bz2"; + md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -301,11 +343,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.6.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; - sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2"; - md5 = "047c3feb121261b76dc16cdb62f54483"; - md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; + name = "hunspell-1.6.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; + sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + md5 = ""; + md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -315,11 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-58_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; - sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309"; - md5 = "1901302aaff1c1633ef81862663d2917"; - md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; + name = "icu4c-60_2-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; + sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + md5 = ""; + md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + } + { + name = "icu4c-60_2-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; + sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + md5 = ""; + md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -399,18 +448,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; - sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + name = "libjpeg-turbo-1.5.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; + sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; md5 = ""; - md5name = "-libjpeg-turbo-1.5.1.tar.gz"; + md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; md5 = ""; - md5name = "-language-subtag-registry-2017-04-19.tar.bz2"; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -424,84 +473,77 @@ url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; md5 = ""; - md5name = "-lcms2-2.8.tar.gz"; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; } { name = "libassuan-2.4.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; md5 = ""; - md5name = "-libassuan-2.4.3.tar.bz2"; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; md5 = ""; - md5name = "-libatomic_ops-7_2d.zip"; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; - md5name = "-libeot-0.01.tar.bz2"; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - } - { - name = "libgltf-0.1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; - sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + name = "libexttextcat-3.4.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; - md5name = "-libgltf-0.1.0.tar.gz"; + md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { - name = "libgpg-error-1.26.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; - sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + name = "libgpg-error-1.27.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; - md5name = "-libgpg-error-1.26.tar.bz2"; + md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; - md5name = "-liblangtag-0.6.2.tar.bz2"; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; - md5name = "-ltm-1.0.zip"; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.24.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; - sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + name = "xmlsec1-1.2.25.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; + sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; md5 = ""; - md5name = "-xmlsec1-1.2.24.tar.gz"; + md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; - sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + name = "libxml2-2.9.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz"; + sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"; + md5 = ""; + md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz"; } { - name = "libxslt-1.1.29.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; - sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"; - md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; - md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + name = "libxslt-1.1.32.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; + sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + md5 = ""; + md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -518,32 +560,32 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.2.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; - sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; + name = "mdds-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; + sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; md5 = ""; - md5name = "-mdds-1.2.2.tar.bz2"; + md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; md5 = ""; - md5name = "-mDNSResponder-576.30.4.tar.gz"; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; - sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + name = "libmspub-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; + sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; md5 = ""; - md5name = "-libmspub-0.1.2.tar.bz2"; + md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; } { - name = "libmwaw-0.3.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; - sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + name = "libmwaw-0.3.13.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; + sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; md5 = ""; - md5name = "-libmwaw-0.3.11.tar.xz"; + md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -560,32 +602,32 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; - sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + name = "neon-0.30.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + md5 = ""; + md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; - sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; + name = "nss-3.33-with-nspr-4.17.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"; + sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4"; md5 = ""; - md5name = "-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; - md5name = "-libodfgen-0.1.6.tar.bz2"; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + md5 = ""; + md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -595,53 +637,46 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; - sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + name = "openldap-2.4.45.tgz"; + url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; - md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openldap-2.4.44.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; - sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; + name = "openssl-1.0.2m.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; + sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; md5 = ""; - md5name = "-openldap-2.4.44.tgz"; + md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; } { - name = "openssl-1.0.2k.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; - sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + name = "liborcus-0.13.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz"; + sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937"; md5 = ""; - md5name = "-openssl-1.0.2k.tar.gz"; - } - { - name = "liborcus-0.12.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; - sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = ""; - md5name = "-liborcus-0.12.1.tar.gz"; + md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; - md5name = "-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { - name = "libpagemaker-0.0.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; - sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; + name = "libpagemaker-0.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; - md5name = "-libpagemaker-0.0.3.tar.bz2"; + md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3064.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; - sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + name = "pdfium-3235.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; + sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; md5 = ""; - md5name = "-pdfium-3064.tar.bz2"; + md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -651,18 +686,18 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; - sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; + name = "libpng-1.6.34.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; + sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; md5 = ""; - md5name = "-libpng-1.6.28.tar.gz"; + md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.56.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; - sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + name = "poppler-0.59.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz"; + sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641"; md5 = ""; - md5name = "-poppler-0.56.0.tar.xz"; + md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -676,7 +711,14 @@ url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; md5 = ""; - md5name = "-Python-3.5.4.tgz"; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; + } + { + name = "libqxp-0.0.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; + sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + md5 = ""; + md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -704,7 +746,7 @@ url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; - md5name = "-librevenge-0.0.4.tar.bz2"; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -718,14 +760,14 @@ url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; - md5name = "-serf-1.2.1.tar.bz2"; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; - sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + name = "libstaroffice-0.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; + sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; md5 = ""; - md5name = "-libstaroffice-0.0.3.tar.xz"; + md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; } { name = "swingExSrc.zip"; @@ -742,32 +784,32 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; - sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + name = "libvisio-0.1.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; + sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; md5 = ""; - md5name = "-libvisio-0.1.5.tar.bz2"; + md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; - sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + name = "libwpd-0.10.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; + sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; md5 = ""; - md5name = "-libwpd-0.10.1.tar.bz2"; + md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; } { - name = "libwpg-0.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; - sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + name = "libwpg-0.3.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; + sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; md5 = ""; - md5name = "-libwpg-0.3.1.tar.bz2"; + md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; - sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + name = "libwps-0.4.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; + sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; md5 = ""; - md5name = "-libwps-0.4.6.tar.xz"; + md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -781,13 +823,13 @@ url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; - md5name = "-zlib-1.2.11.tar.xz"; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { - name = "libzmf-0.0.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; - sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; + name = "libzmf-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; - md5name = "-libzmf-0.0.1.tar.bz2"; + md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } ] diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 82133cdf68139e5eb59533db08166cc8c986402f..32abab8abf8ebc4aa170d489c78e6cb250f39bab 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,8 +2,8 @@ rec { major = "5"; - minor = "3"; - patch = "6"; + minor = "4"; + patch = "5"; tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -11,7 +11,7 @@ rec { version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 05c058960922376acb4b871c96e20ccdb4701900..8726d5130d7556ca813f7fa4087d12e1f05f5654 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -4,17 +4,18 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libzmf +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven -, libatomic_ops, graphite2, harfbuzz, libodfgen +, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses +, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true +, kdeIntegration ? false }: let @@ -28,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix)); translations = fetchSrc { name = "translations"; - sha256 = "0mvfc33pkyrdd7h4kyi6lnzydaka8b5vw0ns50rw08kg9iirig4i"; + sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0yflll24yd4nxqxisb6mx1qgqk4awkwwi41wxmdaiq8las59sk95"; + sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl"; }; }; @@ -64,16 +65,15 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + # And LO refers to gpgme++ by no-path name + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. configureScript = "./autogen.sh"; dontUseCmakeConfigure = true; - patches = [ - ./xdg-open.patch - ]; + patches = [ ./xdg-open-brief.patch ]; postUnpack = '' mkdir -v $sourceRoot/src @@ -83,6 +83,10 @@ in stdenv.mkDerivation rec { ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} ''; + postPatch = '' + sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + ''; + QT4DIR = qt4; # Fix boost 1.59 compat @@ -111,7 +115,7 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? @@ -119,11 +123,11 @@ in stdenv.mkDerivation rec { # rendering-dependent test 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@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -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 - # Segfault on DB access + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx @@ -133,6 +137,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -186,6 +191,8 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" + "--enable-release-build" + (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" @@ -235,7 +242,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 @@ -244,11 +251,13 @@ in stdenv.mkDerivation rec { gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib - mdds bluez5 glibc libcmis libwps libabw libzmf - libxshmfence libatomic_ops graphite2 harfbuzz - librevenge libe-book libmwaw glm glew ncurses + mdds bluez5 glibc libcmis libwps libabw libzmf libtool + libxshmfence libatomic_ops graphite2 harfbuzz gpgme + librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme - ]; + gdb + ] + ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook ]; passthru = { @@ -259,7 +268,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 6a741e0ab9eb1507ea4c3aabeeb2263104d37eaa..fbadd442ce7b99bb9849c36b97e56c4389c7a9a8 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, dpkg, which , makeWrapper , alsaLib -, desktop_file_utils +, desktop-file-utils , dbus , libcap , fontconfig @@ -129,7 +129,7 @@ stdenv.mkDerivation { # Patch up link handler script wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] } + --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] } ''; dontStrip = true; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 953499c21b91ef17b273f9b195239e25c2dd039f..14cde8415fd75c0acd4c5a0b438c46db40c7927f 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,6 +1,6 @@ { lib, python3Packages, fetchFromGitHub, gtk3, cairo , aspellDicts, buildEnv -, gnome3, hicolor_icon_theme, librsvg +, gnome3, hicolor-icon-theme, librsvg , xvfb_run, dbus, libnotify }: @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ xvfb_run dbus.daemon ]; buildInputs = [ - gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg + gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg ]; # A few parts of chkdeps need to have a display and a dbus session, so we not diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index b59d55d3ea088d08bdca2cb41c554aad734b7a58..680b3fd40d72cd144ac117b9a44682fd9974e11f 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst -, gdk_pixbuf, cairo, clutter_gtk }: +, gdk_pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { name = "pinpoint-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf - cairo clutter_gtk ]; + cairo clutter-gtk ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 6a43f6ea24e7081cef780d2fcededfcdcdbe24ab..b82531ea0348179249682df38eeadc09e3f9f92c 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -28,8 +28,8 @@ in stdenv.mkDerivation { autoconf libtool - gnome_common - gtk_doc + gnome-common + gtk-doc GConf gtk diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 436644ef247fde260e6252c86dadd9547391a1ef..de9bfe64e5cc5c5319d0696ec4e22cb513ed8bf7 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -2,20 +2,20 @@ cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, - kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared_mime_info + kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info }: mkDerivation rec { name = "skrooge-${version}"; - version = "2.10.5"; + version = "2.11.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1c1yihypb6qgbzfcrw4ylqr9zivyba10xzvibrmfkrilxi6i582n"; + sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq"; }; nativeBuildInputs = [ - cmake extra-cmake-modules kdoctools shared_mime_info + cmake extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index ddbc880690e72db7b3c976d4a62705050e43d182..e26471de5761eba9c880b243e0909e3c4ef9dd30 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -6,7 +6,7 @@ , gtk3 , granite , gnome3 -, json_glib +, json-glib , cmake , ninja , libgudev @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { gtk3 granite gnome3.libgee - json_glib + json-glib libgudev libevdev - gnome3.gnome_themes_standard + gnome3.gnome-themes-standard ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 31774b6b55c1e68ecbb1927e880f0f645733b951..51d5b083e6bd627b373a00e30b40b9b987b9d59d 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "tryton-${version}"; - version = "4.2.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://pypi/t/tryton/${name}.tar.gz"; - sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm"; + sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9"; }; propagatedBuildInputs = with python2Packages; [ chardet diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index e77287faae2541fb677a4fc8b3f7869d550504b6..efa7f2a410d75bc8adb353758eb8b22e09991a21 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "trytond-${version}"; - version = "4.2.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://pypi/t/trytond/${name}.tar.gz"; - sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7"; + sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda"; }; # Tells the tests which database to use diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index a957cd6eee684c8aa3f3306edc19aff624fc3984..dea3ea9731b0e8bbd0b68cf6fe8664d4c5afc497 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tudu-${version}"; - version = "0.10"; + version = "0.10.2"; src = fetchurl { url = "https://code.meskio.net/tudu/${name}.tar.gz"; - sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4"; + sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b259623bf91e87713049836bf31fe018b2d2ad71..8e2f6bce0b14ebac824b6c39b2d1cc7c753d819b 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }: +{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }: let version = "5.0.25"; @@ -18,7 +18,7 @@ zoteroSrc = stdenv.mkDerivation rec { sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k"; }; - buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; + buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; phases = [ "unpackPhase" "installPhase" "fixupPhase"]; installPhase = '' @@ -32,7 +32,7 @@ zoteroSrc = stdenv.mkDerivation rec { fhsEnv = buildFHSUserEnv { name = "zotero-fhs-env"; targetPkgs = pkgs: with pkgs; with xlibs; [ - gtk3 dbus_glib + gtk3 dbus-glib libXt nss ]; }; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 148963d64c08dc4de0f1389c7cc542005ac33a73..9bacf6d90417ffec94846ba5662f56abbe9333b0 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, pkgconfig -, gtk2-x11, glib, curl, goocanvas, intltool +{ stdenv, fetchurl, pkgconfig, intltool +, gtk3, glib, curl, goocanvas2, gpsd +, hamlib, wrapGAppsHook }: let - version = "1.3"; -in -stdenv.mkDerivation { + version = "2.2.1"; +in stdenv.mkDerivation { name = "gpredict-${version}"; src = fetchurl { - url = "https://sourceforge.net/projects/gpredict/files/Gpredict/${version}/gpredict-${version}.tar.gz"; - sha256 = "18ym71r2f5mwpnjcnrpwrk3py2f6jlqmj8hzp89wbcm1ipnvxxmh"; + url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; + sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; - buildInputs = [ curl glib gtk2-x11 goocanvas ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = with stdenv.lib; { description = "Real time satellite tracking and orbit prediction"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - homepage = "https://sourceforge.net/projects/gpredict/"; - maintainers = [ maintainers.markuskowa ]; + homepage = http://gpredict.oz9aec.net/; + maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; }; } diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index db12fc00c87cde0c0254fdad46ab1ee88ee1a008..5e899568a7dfd3099df68507bea82661d8f3212a 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; + sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index f04b81ea9795536972b836900a4409719f820822..829672d64cc2c4134dc254bf9a3bf9162996d4cc 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.4"; + version = "2.3.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "15k86ln1xgqkyk8ms09cgdhagz49jpvr6ij6mha1f9ga5fxnnp1m"; + sha256 = "07cvcy6483araayj41arjzpxjmf4fmn4iqyl6gp6zmrbzw72wwzj"; }; buildInputs = [ zlib tbb ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 13cb407391c020caebab7a252fdb8f834aea0683..7825da0100ada8f1c443f8c65b6164376a97ce72 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.6"; + version = "2.4.8"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "00p9xhfn6snzm31q9l3dxccsj7rhlci8n3pgpy3k67q91mi2hkna"; + sha256 = "1ca4lsb5j00066sd1gy8jr8jhzpd9142fhj4khb8nc45010wib0q"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 5578a41f4441b20ffe36aac2237b5a8368b02162..a065fdf4489ad8acaabbf71a65747c559bf9fb31 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.17.4"; + version = "2.17.10"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "00ffi8kkrlh72vjjkjpgi8zys3r9hkdk4xi82kcahch8pix4qzf2"; + sha256 = "0lf9appcs66mxmirzbys09xhq38kpa4ldxwwzrr9y2cklnxjn4hg"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 34bdd3d47c86b8b97781ef00bb084927f29287ee..b9bbcd695f1722cb3a81c8365848b08cb13d14d5 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex +, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined +, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg +}: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -10,7 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper libGLU_combined tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ + gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper + libGLU_combined tcl shared-mime-info tk + gnome2.gtkglext pangox_compat gd xorg.libXmu + ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index e34383865576c02781705325cb74a79f05c4e8bb..dade8296e996e9337e11bc126846838d6db3796a 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "3.900"; + version = "3.920"; src = fetchurl { url = "http://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b"; + sha256 = "1zs3d6h5sbz455fwpgg89h81hkfn92ary8bmhjinc1rd8fm3hp1b"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 47077c2e255b66aee764232f25f1a3914c5d2437..3257977f5b5a90d527f4a08dfae0d7ac6cdafe8f 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "1.22"; + version = "1.28"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "17fbmv0askgfnhs5a0ilhizvrr93jkmq82ybm3cgyxhh2zrk0rq1"; + sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b1eb171b20b1a4dbce88cc35b4ab1528ff69b8dd --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, jdk, jre, ant +}: + +stdenv.mkDerivation rec { + name = "tlaplus-${version}"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "tlaplus"; + repo = "tlaplus"; + rev = "refs/tags/v${version}"; + sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + }; + + buildInputs = [ makeWrapper jdk ant ]; + + buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + installPhase = '' + mkdir -p $out/share/java $out/bin + cp tlatools/dist/*.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/tlc2 \ + --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" + makeWrapper ${jre}/bin/java $out/bin/tla2sany \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY" + makeWrapper ${jre}/bin/java $out/bin/pcal \ + --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans" + makeWrapper ${jre}/bin/java $out/bin/tla2tex \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA" + ''; + + meta = { + description = "An algorithm specification language with model checking tools"; + homepage = http://lamport.azurewebsites.net/tla/tla.html; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 8dc3e3ce43dca2ad7b1bff6456cb5534b1c856c3..d7357c5048d52d1a070c294172a384c9ef1408be 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -7,17 +7,19 @@ , hdf5-cpp , leveldb , lmdb -, opencv +, opencv3 , protobuf , snappy -, atlas , doxygen +, openblas , cudaSupport ? true, cudatoolkit , cudnnSupport ? false, cudnn ? null +, ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null }: assert cudnnSupport -> cudaSupport; +assert ncclSupport -> cudaSupport; assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { @@ -35,14 +37,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ - "-DCUDA_ARCH_NAME=All" - (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") - ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; + cmakeFlags = + [ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + "-DBLAS=open" + ] ++ (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DCPU_ONLY=ON" ]) + ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] + buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn + ++ lib.optional ncclSupport nccl ++ lib.optionals pythonSupport [ python numpy ]; propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 7643c912db4b9a03e90e9cc9048f9899407378b5..6de77d81be6f89ff27591cbe30dc4eb10783e55d 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2 }: stdenv.mkDerivation { - name = "cbc-2.9.5"; + name = "cbc-2.9.9"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz"; - sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w"; + url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; + sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; configureFlags = "-C"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index bef695fc650a8f7f823b3a43e1abe87e8f14a6ba..07740f4c8aeac2b33479d0d7199a2b3913927c40 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -12,28 +12,22 @@ let cub = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; - rev = "1.4.1"; - sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc"; + rev = "1.7.4"; + sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; }; in stdenv.mkDerivation rec { name = "CNTK-${version}"; - version = "2.2"; + version = "2.4"; # Submodules src = fetchgit { url = "https://github.com/Microsoft/CNTK"; rev = "v${version}"; - sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9"; + sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y"; }; - patches = [ - # Fix "'exp' was not declared" - (fetchpatch { - url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch"; - sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7"; - }) - ]; + patches = [ ./fix_std_bind.patch ]; nativeBuildInputs = [ cmake ]; @@ -48,8 +42,10 @@ in stdenv.mkDerivation rec { "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" "--with-mpi=${openmpi}" + "--cuda=${if cudaSupport then "yes" else "no"}" + # FIXME + "--asgd=no" ] ++ lib.optionals cudaSupport [ - "--cuda=yes" "--with-cuda=${cudatoolkit}" "--with-gdk-include=${cudatoolkit}/include" "--with-gdk-nvml-lib=${nvidia_x11}/lib" @@ -85,16 +81,12 @@ in stdenv.mkDerivation rec { cp bin/cntk $out/bin ''; - hardeningDisable = [ "format" ]; - - # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with lib; { - homepage = "https://github.com/Microsoft/CNTK"; + homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; maintainers = with maintainers; [ abbradar ]; - broken = true; # Never succeeded to build. }; } diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch new file mode 100644 index 0000000000000000000000000000000000000000..df97a0c6666955f9bb722658461ecd3d478f60fd --- /dev/null +++ b/pkgs/applications/science/math/cntk/fix_std_bind.patch @@ -0,0 +1,11 @@ +diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h +--- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300 ++++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "CNTKLibrary.h" + #include "CNTKLibraryC.h" diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index ccdd666e90bd5013808380012ba9ba9e7cfd0b3f..7e5233180cc6a59cbfe8fe292d8ee8a62c0f65b2 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let - version = "1.3.1"; + version = "1.3.2"; name = "fricas-" + version; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2"; - sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx"; + sha256 = "17a3vfvsn2idydqslf5r6z3sk6a5bdgj6z1n3dmnwmpkc4z152vr"; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index efa0c1751d4c2dd9aa13de92c3520eea15147a2e..0cf834c8cdeac7e077153aebce95ce7177080c19 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lp_solve-${version}"; - version = "5.5.2.0"; + version = "5.5.2.5"; src = fetchurl { url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq"; + sha256 = "12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0"; }; patches = [ ./isnan.patch ]; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index d2f3d0c5f33748ad5b5adf6fe8e2497ab4fc76dc..ce9c214b3f0cb3de87f9d130bff3462450502a1c 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,7 +8,7 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "0.11.0"; + version = "1.1.0"; # Submodules needed src = fetchgit { @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; - cmakeFlags = [ - (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF") - ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + cmakeFlags = + (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DUSE_CUDA=OFF" ]) + ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; installPhase = '' install -Dm755 libmxnet.so $out/lib/libmxnet.so @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; - homepage = "https://mxnet.incubator.apache.org/"; + homepage = https://mxnet.incubator.apache.org/; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0bae807820591b1511c0c4f82b5c479d01871ba9..a1ddbd9ab17d4750c6de3e121a118fd8be94a7cb 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7"; + sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g"; }; buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 007cb68177e53ac57fff59e08a1141378a364c94..eed964e3fa5750c6fa0bedf3595812e3afd5bca9 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -30,6 +30,7 @@ , texinfo , hevea , buildDocs ? false +, optimize ? false # optimize sage to the current system (obviously impure) }: stdenv.mkDerivation rec { @@ -139,7 +140,6 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ]; preConfigure = '' export SAGE_NUM_THREADS="$NIX_BUILD_CORES" - export SAGE_ATLAS_ARCH=fast export HOME=/tmp/sage-home export SAGE_ROOT="$PWD" @@ -160,6 +160,9 @@ stdenv.mkDerivation rec { mkdir -p "$doc" export SAGE_DOC="$doc" export SAGE_DOCBUILD_OPTS="--no-pdf-links -k" + '' + + stdenv.lib.optionalString (!optimize) '' + export SAGE_FAT_BINARY=yes ''; buildFlags = if (buildDocs) then "doc" else "build"; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index c7f74071c24ffd23f2b9450e35bfbe9a3489fc06..67cdaa4055ac8c70d587198315806bc9d2bd81cd 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "wxmaxima-${version}"; - version = "17.10.1"; + version = "18.02.0"; src = fetchFromGitHub { owner = "andrejv"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "088h8dlc9chkppwl4ck9i0fgf2d1dcpi5kq8qbpr5w75vhwsb6qm"; + sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index a7b3d2292be0bd4317cc2530db1c927a599c4e84..00ca1d2c7abe88504e15bcccca81eb172dbd918c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.08"; + version = "6.12.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic"; + sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index d2590bc0b8d4ce486360919e14a7ad8837332a43..8560d900a4fa27e59168a5ae3b70bb32fa4791d9 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 , cmake, makeWrapper, libjpeg, python }: -let version = "4.9.0"; in +let version = "5.1.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; + sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; }; buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index c355b193dfd13cbaab7409c50908b11d1f48e326..79af80ea75f5f550d353c2bcaec48761182efcc1 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, file, which, intltool, gobjectIntrospection, - findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme, + findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, wrapGAppsHook }: @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.pyxdg pythonPackages.ptyprocess pythonPackages.pycairo - hicolor_icon_theme + hicolor-icon-theme ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 01669f3fd4094ad131ce91c031130d27bd221afc..ade8af254496bd42352165e90cf73eb6175f808c 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -7,45 +7,54 @@ assert stdenv.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.23.5"; + ver = "1.23.7"; name = "recoll-${ver}"; src = fetchurl { url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "0ps7ckrv63ydviqkqxs57hn04z53s2jnjnp94n1prs63xx0njswv"; + sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--with-inotify" ]; + configureFlags = [ "--enable-recollq" ] ++ + (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison]; + buildInputs = [ qt4 xapian file python bison ]; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in + ''; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword - substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk - substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused - substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt - substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep - substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff - substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv - substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext - substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii - substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed - substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar - substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip - substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc - substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf - substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex - substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html - substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + if [[ ! "$f" =~ \.zip$ ]]; then + substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"' + substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"' + substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"' + substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"' + substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"' + substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"' + substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"' + substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"' + substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"' + substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"' + substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"' + substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"' + substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"' + substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"' + substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"' + substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"' + substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"' + substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"' + substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"' + substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + fi done + '' + stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 80c4401f17085fdd9a71d28246bd2601f4f6a653..cadc72f0f87b90de688c5454bd894b12d00300f6 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.3"; + version = "2.5"; src = fetchurl { urls = @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh"; + sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index d613e97d550cb348b6822c2f94018dd505ccffe5..d00fdd0c29e07b09973b28abbc08f1778a81e15b 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, ruby, makeWrapper, git }: let - version = "2.3.2"; + version = "2.4.0"; in stdenv.mkDerivation { name = "svn2git-${version}"; src = fetchurl { url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; - sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y"; + sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41"; }; buildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 07ea2be7ad34ec3809aa1e248ad5c5fd41483098..597429c0cc7a83f09337159336ad293cc753da95 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.3.2"; + version = "2.3.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97"; + sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 6238cf9c97543e4a73894be9e6cc06c80409eb0c..d04f0d5792b283fd280090f9a485a02d56808b26 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "transcrypt-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc"; + sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz"; }; buildInputs = [ git makeWrapper openssl ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c7f7a4b02e4d172c221c01083c031b4d3e1d0317..ba525bacbc9b353e994139f3746086222f0e8837 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib +{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig -, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst +, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus , dpkg, makeDesktopItem }: @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.7.0"; + version = "3.3.4"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp"; + sha256 = "1djrbpm1f258cicf65ddvndpxi1izmnc12253k1zwl77z4jjbwls"; }; libPath = makeLibraryPath [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { libXext libXcursor libXi + libxcb glib libXScrnSaver libxkbfile @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { libXrender gtk2 gnome2.GConf - libgnome_keyring + libgnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -66,27 +67,25 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = "true"; + buildCommand = '' + mkdir -p $out + dpkg -x $src $out + substituteInPlace $out/usr/share/applications/gitkraken.desktop \ + --replace /usr/share/gitkraken $out/bin + cp -av $out/usr/* $out + rm -rf $out/etc $out/usr $out/share/lintian + chmod -R g-w $out - installPhase = '' - mkdir -p "$out/opt/gitkraken" - cp -r usr/share/gitkraken/* "$out/opt/gitkraken" + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true + done - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* "$out/share/applications" + find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \; - mkdir -p "$out/share/pixmaps" - cp usr/share/pixmaps/app.png "$out/share/pixmaps" - ''; - - postFixup = '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" - wrapProgram $out/opt/gitkraken/gitkraken \ - --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ - --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" - mkdir "$out/bin" - ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken" + rm $out/bin/gitkraken + ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken ''; meta = { diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index d5bd24cf93827df9f29ae6527748ccda3b6cb88d..e3cafe6b646494fff2b563d454ca17c7aabe7518 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -4,20 +4,20 @@ let - minor = "3.18"; - version = "${minor}.0"; + pname = "meld"; + version = "3.18.0"; inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { - name = "meld-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; }; buildInputs = [ intltool wrapGAppsHook itstool libxml2 - gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo + gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; @@ -43,6 +43,12 @@ in buildPythonApplication rec { doCheck = false; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meldmerge.org/; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 01369b9685dc23b652692b0a42affb96aed1ad7d..3ac52a5c440303e137bb5f8638da2dd4902a4a5d 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "peru-${version}"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; rev = "${version}"; - sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8"; + sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727"; }; propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 2d77a9c32656354df0ab9b0a3c5a90f1e7eef7c8..d3b027fada68b4c602fe0e8278780781690f1536 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { name = "rabbitvcs-${version}"; - version = "0.16"; + version = "0.17.1"; namePrefix = ""; src = fetchFromGitHub { owner = "rabbitvcs"; repo = "rabbitvcs"; rev = "v${version}"; - sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; + sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 5a4fdbe9316c5e0e6cf501de1e9b65de89222501..5c6e65915da5d5ccfa35cdfc6eee56f35d2d2380 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "0fvxv9x971s5qvhw6gpbw9ggsxynkwfy1fn5rln50gn9yrjf7612"; + sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h"; }; cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index ade81de2f04eb1306506926c8dc4fd883204393a..3dd0cc5adc291839865bac5c244191dd45643c5f 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # but they are linked against GPL'd softwares # - so the resulting program will be GPL maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/applications/video/avidemux/bootstrap_logging.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f45251d26c257b5022ee0ba3d811c6ebb32b426 --- /dev/null +++ b/pkgs/applications/video/avidemux/bootstrap_logging.patch @@ -0,0 +1,26 @@ +diff --git a/bootStrap.bash b/bootStrap.bash +index 646a5e048..6429199ba 100644 +--- a/bootStrap.bash ++++ b/bootStrap.bash +@@ -4,6 +4,7 @@ + # + # By default we use qt5 now + # ++set -e # hard fail if something fails + packages_ext="" + rebuild=0 + do_core=1 +@@ -66,10 +67,10 @@ Process() + fi + cd $BUILDDIR + cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ +- make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR" +- if [ "x$PKG" != "x" ] ; then ++ make $PARAL ++ if [ "x$PKG" != "x" ] ; then + $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package +- fi ++ fi + # we need the make install so that other packcges can be built against this one + make install DESTDIR=$FAKEROOT_DIR + } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 76b42acef3e151623cd4a7445bcc271bb15baaa6..62b819c600cc74901e97bebe3ba0b88e1bea2295 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite -, yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, yasm, freetype, fontconfig, fribidi +, makeWrapper, libXext, mesa_glu, qttools, qtbase , alsaLib , withX265 ? true, x265 , withX264 ? true, x264 @@ -12,9 +13,18 @@ , withFAAD ? true, faad2 , withOpus ? true, libopus , withVPX ? true, libvpx +, withQT ? true +, withCLI ? true +, default ? "qt5" +, withPlugins ? true }: -let +assert withQT -> qttools != null && qtbase != null; +assert default != "qt5" -> default == "cli"; +assert !withQT -> default != "qt5"; + +stdenv.mkDerivation rec { + name = "avidemux-${version}"; version = "2.7.0"; src = fetchurl { @@ -22,112 +32,54 @@ let sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; }; - common = { - inherit version src; - - patches = [ ./dynamic_install_dir.patch ]; - - enableParallelBuilding = false; - - nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ] - ++ lib.optional withX264 x264 - ++ lib.optional withX265 x265 - ++ lib.optional withXvid xvidcore - ++ lib.optional withLAME lame - ++ lib.optional withFAAC faac - ++ lib.optional withVorbis libvorbis - ++ lib.optional withPulse libpulseaudio - ++ lib.optional withFAAD faad2 - ++ lib.optional withOpus libopus - ++ lib.optional withVPX libvpx - ; - - meta = { - homepage = http://fixounet.free.fr/avidemux/; - description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - }; - }; - - core = stdenv.mkDerivation (common // { - name = "avidemux-${version}"; - - preConfigure = '' - cd avidemux_core - ''; - }); - - buildPlugin = args: stdenv.mkDerivation (common // { - name = "avidemux-${args.pluginName}-${version}"; - - buildInputs = (args.buildInputs or []) ++ common.buildInputs ++ [ lndir ]; - - cmakeFlags = [ "-DPLUGIN_UI=${args.pluginUi}" ]; - - passthru.isUi = args.isUi or false; - - buildCommand = '' - unpackPhase - cd "$sourceRoot" - patchPhase - - mkdir $out - lndir ${core} $out - - export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" - - for i in ${toString (args.buildDirs or [])} avidemux_plugins; do - ( cd "$i" - cmakeConfigurePhase - buildPhase - installPhase - ) - done - - fixupPhase - ''; - - meta = common.meta // args.meta or {}; - }); - -in { - avidemux_core = core; - - avidemux_cli = buildPlugin { - pluginName = "cli"; - pluginUi = "CLI"; - isUi = true; - buildDirs = [ "avidemux/cli" ]; - }; - - avidemux_qt4 = buildPlugin { - pluginName = "qt4"; - buildInputs = [ qt4 ]; - pluginUi = "QT4"; - isUi = true; - buildDirs = [ "avidemux/qt4" ]; - }; - - avidemux_gtk = buildPlugin { - pluginName = "gtk"; - buildInputs = [ gtk3 ]; - pluginUi = "GTK"; - isUi = true; - buildDirs = [ "avidemux/gtk" ]; - # Code seems unmaintained. - meta.broken = true; - }; - - avidemux_common = buildPlugin { - pluginName = "common"; - pluginUi = "COMMON"; - }; - - avidemux_settings = buildPlugin { - pluginName = "settings"; - pluginUi = "SETTINGS"; + patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch ]; + + nativeBuildInputs = [ yasm cmake pkgconfig ]; + buildInputs = [ + zlib gettext libvdpau libva libXv sqlite fribidi fontconfig + freetype alsaLib libXext mesa_glu makeWrapper + ] ++ lib.optional withX264 x264 + ++ lib.optional withX265 x265 + ++ lib.optional withXvid xvidcore + ++ lib.optional withLAME lame + ++ lib.optional withFAAC faac + ++ lib.optional withVorbis libvorbis + ++ lib.optional withPulse libpulseaudio + ++ lib.optional withFAAD faad2 + ++ lib.optional withOpus libopus + ++ lib.optionals withQT [ qttools qtbase ] + ++ lib.optional withVPX libvpx; + + buildCommand = '' + unpackPhase + cd "$sourceRoot" + patchPhase + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext}/lib" + ${stdenv.shell} bootStrap.bash \ + --with-core \ + ${if withQT then "--with-qt" else "--without-qt"} \ + ${if withCLI then "--with-cli" else "--without-cli"} \ + ${if withPlugins then "--with-plugins" else "--without-plugins"} + + mkdir $out + cp -R install/usr/* $out + + for i in $out/bin/*; do + wrapProgram $i \ + --set ADM_ROOT_DIR $out \ + --prefix LD_LIBRARY_PATH ":" "${libXext}/lib" + done + ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" + + fixupPhase + ''; + + meta = with stdenv.lib; { + homepage = http://fixounet.free.fr/avidemux/; + description = "Free video editor designed for simple video editing tasks"; + maintainers = with maintainers; [ viric abbradar ma27 ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix deleted file mode 100644 index 7f05b81baec77ea7d7e27553d177b08577030566..0000000000000000000000000000000000000000 --- a/pkgs/applications/video/avidemux/wrapper.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ symlinkJoin, avidemux_unwrapped, makeWrapper -# GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 -, withUi ? "qt4" -}: - -let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in - -assert ui.isUi; - -symlinkJoin { - name = "avidemux-${withUi}-${ui.version}"; - - paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ]; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - for i in $out/bin/*; do - wrapProgram $i --set ADM_ROOT_DIR $out - done - ''; - - meta = ui.meta; -} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index b00aae61d36d4a591026fe7324c13159e17137d3..ea8cb5aa3ffac9f5228f1ba765abf713dd7089a6 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] + buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index e59469c704cb633e9c7dba3c2d0f7ab5f27f40d4..f89aa04e01464c03725add3907e7ccb5fdf9a481 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "dvdstyler-${version}"; srcName = "DVDStyler-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; - sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q"; + sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 9f98d46d53bdd834b01a1b4d1eff3abfb8d630a9..fd8cc8d86306bf5a9f499b509d0556f1e2d69424 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib +{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ]; + buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ (substituteAll { diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index 0b4bd5851341b5c3deb3cdaa03481652dcde45cf..1bb77ffc4a8081868aee4fa0dad4c7818a4fad56 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja -, gettext, pkgconfig, desktop_file_utils, wrapGAppsHook +, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7d0cfb455306d881673fd0c105adbe54ca8000ff..3e796275907ca4f34275da4eca00767eb53d53c4 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -16,9 +16,9 @@ libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, lame, ffmpeg, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor_icon_theme, + fontconfig, freetype, hicolor-icon-theme, glib, gtk3, intltool, libnotify, - gst_all_1, dbus_glib, udev, libgudev, libvpx, + gst_all_1, dbus-glib, udev, libgudev, libvpx, useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx ] ++ (lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev ]); diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 8653305f908aa16a28e2da458b857415f013eb7f..862032572dcfec45699ecd5b80d9b4ea48fa0f0d 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: +, gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }: python3Packages.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./datadir.patch ./bug_1190693.patch ]; prePatch = '' rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play" ''; # no tests diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index ff5c590952ca4befa84d747ce493b74deea493ae..8a40912a1d688334fd51b7aa80af88b2f71da66e 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -18,7 +18,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp -, libplist, p11_kit, zlib +, libplist, p11-kit, zlib , dbusSupport ? true, dbus_libs ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -78,7 +78,7 @@ let preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; - buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ] + buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; nativeBuildInputs = [ cmake nasm pkgconfig ]; }; @@ -118,7 +118,7 @@ in stdenv.mkDerivation rec { src = kodi_src; buildInputs = [ - gnutls libidn libtasn1 nasm p11_kit + gnutls libidn libtasn1 nasm p11-kit libxml2 yasm python2 boost libmicrohttpd gettext pcre-cpp yajl fribidi libva diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 3a297abb15c4f27760fb4ac281581c6fbe82d4fc..b3cfe21b7d699b11272f5ee0523080b9aae95e09 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup , taglib, sqlite -, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas +, libtorrentRasterbar, glib-networking, gsettings-desktop-schemas , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg , enableBonjour ? false, avahi ? null }: @@ -65,13 +65,13 @@ in buildPythonApplication rec { mv "$out/bin/miro.real" "$out/bin/miro" wrapProgram "$out/bin/miro" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup - taglib gsettings_desktop_schemas sqlite + taglib gsettings-desktop-schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index 2c5d3d365c12b01dd2417dc4d98c608d943681ea..2d5d2d3b102c2ec016827cc616bf7e2981ab89a2 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin" + wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin" done rm -r screenkey/.bzr diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9324b08efd728451162fee8f3e9795e5e8972822..7afc3b502ad5c3c1380290bf4d86a2ee45c179bd 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,32 +1,36 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv -, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost +, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true + , qtbase ? null + , qtmultimedia ? null }: -assert withGUI -> qt5 != null; +assert withGUI -> qtbase != null && qtmultimedia != null; with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "20.0.0"; + version = "21.0.0"; src = fetchFromGitLab { - owner = "mbunkus"; - repo = "mkvtoolnix"; - rev = "release-${version}"; - sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc"; + owner = "mbunkus"; + repo = "mkvtoolnix"; + rev = "release-${version}"; + sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; + nativeBuildInputs = [ + pkgconfig autoconf automake gettext + drake ruby docbook_xsl libxslt + ]; buildInputs = [ - expat file xdg_utils boost libebml zlib libmatroska libogg - libvorbis flac cmark - ] - ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; + expat file xdg_utils boost libebml zlib + libmatroska libogg libvorbis flac cmark + ] ++ optional stdenv.isDarwin libiconv + ++ optionals withGUI [ qtbase qtmultimedia ]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..80ca213c06c1bfc16ab40667ddeebb4b7a7b6067 --- /dev/null +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: + +stdenv.mkDerivation rec { + name = "mpc-qt-${version}"; + version = "17.11"; + + src = fetchFromGitHub { + owner = "cmdrkotori"; + repo = "mpc-qt"; + rev = "v${version}"; + sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm"; + }; + + nativeBuildInputs = [ pkgconfig qmake qttools ]; + + buildInputs = [ mpv qtx11extras ]; + + qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ]; + + meta = with stdenv.lib; { + description = "Media Player Classic Qute Theater"; + homepage = https://github.com/cmdrkotori/mpc-qt; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index c42afa69c41fc499128aa2cd490c5e1ee6bb987e..b026da6a6325a287a509b001d859416e84631ab6 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, libiconv ? null, darwin +, lua, luasocket, libuchardet, libiconv ? null, darwin , x11Support ? true, libGLU_combined ? null, @@ -13,25 +13,25 @@ wayland ? null, libxkbcommon ? null -, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null +, rubberbandSupport ? true, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, alsaSupport ? true, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null -, dvdnavSupport ? dvdreadSupport, libdvdnav ? null +, dvdreadSupport ? true, libdvdread ? null +, dvdnavSupport ? true, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null -, drmSupport ? !stdenv.isDarwin, libdrm ? null +, drmSupport ? true, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -127,14 +127,15 @@ in stdenv.mkDerivation rec { python3 ${waf} configure --prefix=$out $configureFlags ''; - nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; + nativeBuildInputs = [ + docutils makeWrapper perl + pkgconfig python3 which + ]; buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - libiconv Cocoa CoreAudio ]) - ++ optional alsaSupport alsaLib + lua luasocket libuchardet + ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional xineramaSupport libXinerama @@ -157,7 +158,10 @@ in stdenv.mkDerivation rec { ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] - ++ optionals waylandSupport [ wayland libxkbcommon ]; + ++ optionals waylandSupport [ wayland libxkbcommon ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv Cocoa CoreAudio + ]); enableParallelBuilding = true; @@ -165,7 +169,14 @@ in stdenv.mkDerivation rec { python3 ${waf} build ''; - installPhase = '' + installPhase = + let + getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; + luaPath = getPath "lua"; + luaCPath = getPath "so"; + in + '' python3 ${waf} install # Use a standard font @@ -174,6 +185,8 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ --add-flags "--scripts=${concatStringsSep "," scripts}" \ + --prefix LUA_PATH : "${luaPath}" \ + --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' @@ -199,5 +212,3 @@ in stdenv.mkDerivation rec { ''; }; } -# TODO: investigate caca support -# TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index cf77e3dfe663def6d714735358a5be0d79415738..faa21326fc0e8945324b42cd9f906d014b921ef3 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, lib -, yad, mkvtoolnix, libnotify }: +, yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { name = "mpv-convert-script-2016-03-18.lua"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { substituteInPlace convert_script.lua \ ${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \ ${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \ - ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix}/bin/mkvmerge"} + ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"} ''; dontBuild = true; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 86b8dab7f1f290a499aca4d9fff759239cf78fd8..aa9643416485ddf684af9c6edda0b4ebad1e076e 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z"; + sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index d55f0aa1b35b683aab6523f165dd2c654c201a17..9858edf8238952933542bfa58f9eb4f1a7351924 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook -, gsettings_desktop_schemas, gtk3, keybinder3 +, gsettings-desktop-schemas, gtk3, keybinder3 }: stdenv.mkDerivation rec { name = "peek-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; rev = version; - sha256 = "04sc6gfrqvnx288rmgsywpjx9l6jcfn2qdbwjcbdvx4wl3gna0qm"; + sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh"; }; nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; - buildInputs = [ gsettings_desktop_schemas gtk3 keybinder3 ]; + buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c4d80344080def717c28c48404e93da257bb2f1a..48074a86b552f9abbb25ec49a10e1a755a463d8a 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook -, python3Packages, gst, gtk3, hicolor_icon_theme +, python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify # for gst-transcoder: , which, meson, ninja @@ -34,9 +34,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas libnotify + gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5638fad39e5dea180a4a240afcfbc5ec57910fcd --- /dev/null +++ b/pkgs/applications/video/screenkey/default.nix @@ -0,0 +1,60 @@ +{ lib +, substituteAll +, buildPythonApplication +, fetchFromGitHub +, distutils_extra +, setuptools-git +, intltool +, pygtk +, libX11 +, libXtst +, wrapGAppsHook +, defaultIconTheme +, hicolor_icon_theme +}: +buildPythonApplication rec { + pname = "screenkey"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "screenkey"; + rev = "screenkey-${version}"; + sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw"; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + inherit libX11 libXtst; + }) + ]; + + nativeBuildInputs = [ + distutils_extra + setuptools-git + intltool + + wrapGAppsHook + ]; + + buildInputs = [ + defaultIconTheme + hicolor_icon_theme + ]; + + propagatedBuildInputs = [ + pygtk + ]; + + # screenkey does not have any tests + doCheck = false; + + meta = with lib; { + homepage = https://www.thregr.org/~wavexx/software/screenkey/; + description = "A screencast tool to display your keys inspired by Screenflick"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.rasendubi ]; + }; +} diff --git a/pkgs/applications/video/screenkey/paths.patch b/pkgs/applications/video/screenkey/paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..7e5ed47fc19da889f91fc34240c947da5e7c72f7 --- /dev/null +++ b/pkgs/applications/video/screenkey/paths.patch @@ -0,0 +1,20 @@ +--- a/Screenkey/xlib.py ++++ b/Screenkey/xlib.py +@@ -6,7 +6,7 @@ + from ctypes import * + + ## base X11 +-libX11 = CDLL('libX11.so.6') ++libX11 = CDLL('@libX11@/lib/libX11.so.6') + + # types + Atom = c_ulong +@@ -278,7 +278,7 @@ + + + ## record extensions +-libXtst = CDLL('libXtst.so.6') ++libXtst = CDLL('@libXtst@/lib/libXtst.so.6') + + # types + XPointer = String \ No newline at end of file diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index e7deccee0d9f11351bb5dc5a255bf9b3148d1ddd..9e547a791a48d2c507ecb9b174369b52c7814950 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.9.0"; + name = "smplayer-18.2.2"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0s9856cmwl829d2xc2ycf97phpv4a2d39ybmnbhsrb07jq5hkw1a"; + sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 536b4ba0fac48feaf62b1a2331e5f1152c85c5e2..3683973824a3fe99266689cd0de06f2662460002 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, - desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, + desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - desktop_file_utils + desktop-file-utils enchant gnome3.gtk gnome3.gtkmm @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamermm gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - hicolor_icon_theme + hicolor-icon-theme libsigcxx libxmlxx xdg_utils diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bb519ef3dab041eceb8e2d1438fd4a44d2752727 --- /dev/null +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -0,0 +1,88 @@ +{ + alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype, + gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor, + libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, + libxcb, nspr, nss, stdenv, udev +}: + + let + rpath = stdenv.lib.makeLibraryPath ([ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + nspr + nss + stdenv.cc.cc + udev + ]); + in stdenv.mkDerivation rec { + name = "webtorrent-desktop-${version}"; + version = "0.19.0"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb"; + sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd"; + } + else + throw "Webtorrent is not currently supported on ${stdenv.system}"; + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + + mv ./usr/share $out/share + mv $out/opt/webtorrent-desktop $out/libexec + chmod +x $out/libexec/WebTorrent + rmdir $out/opt + + chmod -R g-w $out + + # Patch WebTorrent + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/WebTorrent + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/WebTorrent $out/bin/WebTorrent + + # Fix the desktop link + substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop/WebTorrent $out/bin/WebTorrent + ''; + + meta = with stdenv.lib; { + description = "Streaming torrent app for Mac, Windows, and Linux."; + homepage = https://webtorrent.io/desktop; + license = licenses.mit; + maintainers = [ maintainers.flokli ]; + platforms = [ + "x86_64-linux" + ]; + }; + } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b417489c14c0b5a1cd6dbd19edc9fc4cb0721df5..5e44116415ea509cf4b3adf0696477110422bcce 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl -, lirc, shared_mime_info, libjpeg }: +, lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { name = "xine-ui-0.99.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; - nativeBuildInputs = [ pkgconfig shared_mime_info ]; + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index d02d786065451398a661339e287dc6176484653b..e10d5414897762481b2705bee66a88cd35cc4684 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "cbfstool-${version}"; - version = "4.5"; + version = "4.7"; src = fetchgit { url = "http://review.coreboot.org/p/coreboot"; rev = "refs/tags/${version}"; - sha256 = "0sc2h440x4sfp1lqnmh3xfgymf7j0rqfx00v6jqf0svfbp8a6cq5"; + sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 86b6535e5396785f7f0a5f001b09463323abae15..8f456a2a49a80a18f02d35e82a3d939e50eb757a 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 339d3e8490d9b6c16317dd3e5e573cb7c4fb06b4..af15240dc12e8aa93305e188c8539296d2465c5d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,13 +198,13 @@ rec { # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits docker_17_12 = dockerGen rec { - version = "17.12.0-ce"; - rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit - sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps"; - runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; - runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; - containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; - containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + version = "17.12.1-ce"; + rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit + sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i"; + runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; + runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; + containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; + containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e9cee2503851d18eba242ba2d7c4174283366191..bd014dd60d37160842144acadf606c5947579414 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig +, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , libX11, freefont_ttf }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig + SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig libX11 freefont_ttf ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 694026d3bac2152784ec0acac4ffa40df8991f88..00303be12da2bb731956a39201cc218ab06fb886 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -9,7 +9,7 @@ , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , hostCpuOnly ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ]; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index cb84ad49aebdb2b0cf51bfc8b82d6838a0084342..40eadad68d09fd64b844b95591bfb1ae2187db1f 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5"; + sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 452f082e20e7f4989b5fb0846da5369f064b4ebe..947f4454362bdf76e5969cb7165dc7fe9b22a880 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \ + --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ --prefix PATH : ${iptables}/bin ''; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 6b40b1da3a0d90516e387aa6d748b74747e9212e..5aa73528e9d72f569ff0121ff390f9c08fac2b06 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "seabios-${version}"; - version = "1.9.3"; + version = "1.11.0"; src = fetchurl { url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz"; - sha256 = "13b7n20qfc2cc8v70jvl9r51m563rss9lbk1aflirvnd9705vs0s"; + sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2"; }; buildInputs = [ iasl python ]; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 74da6c4ab16731eefae78c8b35d5289d23c85abe..15ae244b3291a1c5a33faba32bc25ef5d4bc2792 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, +{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice_protocol glib + buildInputs = [ alsaLib spice-protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9e18a6738c386d653abe6ff0ff95b9e9478648e2..f913ab688cf89271676c7b70fc5be145994b1253 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, python2Packages, intltool, file , wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3 -, spiceSupport ? true, spice_gtk ? null +, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, spiceSupport ? true, spice-gtk ? null }: with stdenv.lib; @@ -24,8 +24,8 @@ python2Packages.buildPythonApplication rec { buildInputs = [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo gtk3 - ] ++ optional spiceSupport spice_gtk; + gsettings-desktop-schemas libosinfo gtk3 + ] ++ optional spiceSupport spice-gtk; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index e723cd02bd05884a27fb4b09cef742df9cf8a157..9316496a547efd893b3563ad20c34ac5f4f722f7 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg, qttools -, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { @@ -21,7 +21,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtsvg - libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol + libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2f5a6192c86c411f6d357ef9ddfc17ff2d2c8c29..eb48e1d3d300658bb39238be4a086f48ec48566c 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen -, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen +, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl , libapparmor , spiceSupport ? true -, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null +, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> - spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; with stdenv.lib; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info - libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen ] ++ optionals spiceSupport [ - spice_gtk spice_protocol libcap gdbm + spice-gtk spice-protocol libcap gdbm ]; postInstall = '' diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 22799a7af8e79a98cc58933eca2b4404e4424e3c..48f74ce72e5e3823791e15771d3e35bcd45a1f05 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -9,7 +9,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -29,7 +29,7 @@ let }); qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index b1fcf36a46c1fdc9189224f8b2b0fbe014a25ad3..be6c4e3fcc7a1b7ce766a93465a6e510bba0d28b 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -8,7 +8,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -30,7 +30,7 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; in diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2808c8552eff41cf6a4e54b6ce72f11febef9e85..c23284d0b527a296b3bf9801df2ab36a437e0338 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,7 +4,7 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, libxkbcommon, xcbutilxrm, hicolor_icon_theme +, libxkbcommon, xcbutilxrm, hicolor-icon-theme }: with luaPackages; stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ with luaPackages; stdenv.mkDerivation rec { docbook_xsl findXMLCatalogs ]; - propagatedUserEnvPkgs = [ hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 1c6b8a84c952346eea06808ec730c0129f532bfa..7aa604690f9a72e3b298914b7d09733dad807bac 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }: +{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation rec { name = "kbdd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ xorg.libX11 dbus_glib ]; + buildInputs = [ xorg.libX11 dbus-glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 27cb564d2c6b6025cfffbbffcc2b84b025514453..ed34e75f35dbb36499345d4d4e4b8c41ba31dd33 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation rec { - name = "lemonbar-1.2"; + name = "lemonbar-1.3"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.2.tar.gz"; - sha256 = "1smz8lh930bnb6a4lrm07l3z2k071kc8p2pljk5wsrch3x2xhimq"; + url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; + sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; }; buildInputs = [ libxcb perl ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 79752829e2a553f70a186eb7d339a25a37dfb8e9..f889bf29f71a04dbc11541a0feb70f082d5a2bec 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: let cairocffi-xcffib = python27Packages.cairocffi.override { - pythonPath = [ python27Packages.xcffib ]; + withXcffib = true; }; in diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 215b8c38ece4916fb033cd6e6c7836e86f7095e1..e7427fa7763a6c6bfe2015700c28b214a5f5f050 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit sbcl lispPackages; + inherit sbcl lispPackages contrib; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index 906ba0efda243a9ce8f38c62c87dbd8527dc3be8..def5766e5ee1ebb8f15296668c96ccb559d8c2cd 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus_glib +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib , desktopSupport , gtk2, gnome2_panel, GConf2 , libxfce4util, xfce4panel @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ glib dbus_glib ] + [ glib dbus-glib ] ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] # TODO: no idea where to find libpanelapplet-4.0 ++ optionals (desktopSupport == "gnome3") [ ] diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 48fd8665cb47d654022d9cf5f961a8a9cf4f40fc..8e94ccfa49bc2f5b42448c369d7a31f26c2a0b3b 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -58,7 +58,7 @@ let else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; @@ -171,13 +171,20 @@ stdenv.mkDerivation { else if targetPlatform.isWindows then "pe" else "elf" + toString targetPlatform.parsed.cpu.bits; endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; + sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isArm then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" + else if targetPlatform.isMips then { + "mips" = "btsmipn32"; # n32 variant + "mipsel" = "ltsmipn32"; # n32 variant + "mips64" = "btsmip"; + "mips64el" = "ltsmip"; + }.${targetPlatform.parsed.cpu.name} else throw "unknown emulation for platform: " + targetPlatform.config; - in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); + in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); depsTargetTargetPropagated = extraPackages; diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 4d178ac96c5d9bff4bc7a52240829ad185ff8cff..58d70b4b0631e1135f0a57fdd7fffe9d5fcb225e 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -4,55 +4,31 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, coreutils, jq, perl, pathsFromGraph }: +{ stdenv, coreutils, jq }: { rootPaths }: -#if builtins.langVersion >= 5 then -# FIXME: it doesn't work on Hydra, failing to find mkdir; -# perhaps .attrs.sh clobbers PATH with new nix? -if false then +assert builtins.langVersion >= 5; - # Nix >= 1.12: Include NAR hash / size info. +stdenv.mkDerivation { + name = "closure-info"; - stdenv.mkDerivation { - name = "closure-info"; + __structuredAttrs = true; - __structuredAttrs = true; + exportReferencesGraph.closure = rootPaths; - exportReferencesGraph.closure = rootPaths; + PATH = "${coreutils}/bin:${jq}/bin"; - PATH = "${coreutils}/bin:${jq}/bin"; + builder = builtins.toFile "builder" + '' + . .attrs.sh - builder = builtins.toFile "builder" - '' - if [ -e .attrs.sh ]; then . .attrs.sh; fi + out=''${outputs[out]} - out=''${outputs[out]} + mkdir $out - mkdir $out - - jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration - jq -r .closure[].path < .attrs.json > $out/store-paths - ''; - } - -else - - # Nix < 1.12 - - stdenv.mkDerivation { - name = "closure-info"; - - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) rootPaths; - - buildInputs = [ perl ]; - - buildCommand = - '' - mkdir $out - printRegistration=1 perl ${pathsFromGraph} closure-* > $out/registration - perl ${pathsFromGraph} closure-* > $out/store-paths - ''; - } + jq -r ".closure | map(.narSize) | add" < .attrs.json > $out/total-nar-size + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration + jq -r .closure[].path < .attrs.json > $out/store-paths + ''; +} diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix new file mode 100644 index 0000000000000000000000000000000000000000..c01288dbf53a0a394db6c9d404a350a300709c29 --- /dev/null +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -0,0 +1,38 @@ +# We provide three paths to get the credentials into the builder's +# environment: +# +# 1. Via impureEnvVars. This method is difficult for multi-user Nix +# installations (but works very well for single-user Nix +# installations!) because it requires setting the environment +# variables on the nix-daemon which is either complicated or unsafe +# (i.e: configuring via Nix means the secrets will be persisted +# into the store) +# +# 2. If the DOCKER_CREDENTIALS key with a path to a credentials file +# is added to the NIX_PATH (usually via the '-I ' argument to most +# Nix tools) then an attempt will be made to read credentials from +# it. The semantics are simple, the file should contain two lines +# for the username and password based authentication: +# +# $ cat ./credentials-file.txt +# DOCKER_USER=myusername +# DOCKER_PASS=mypassword +# +# ... and a single line for the token based authentication: +# +# $ cat ./credentials-file.txt +# DOCKER_TOKEN=mytoken +# +# 3. A credential file at /etc/nix-docker-credentials.txt with the +# same format as the file described in #2 can also be used to +# communicate credentials to the builder. This is necessary for +# situations (like Hydra) where you cannot customize the NIX_PATH +# given to the nix-build invocation to provide it with the +# DOCKER_CREDENTIALS path +let + pathParts = + (builtins.filter + ({path, prefix}: "DOCKER_CREDENTIALS" == prefix) + builtins.nixPath); +in + if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ae3ae4185e0537e9740a0503a0602367cc357a12 --- /dev/null +++ b/pkgs/build-support/fetchdocker/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }: +let + stripScheme = + builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; + stripNixStore = + s: lib.removePrefix "/nix/store/" s; +in +{ name +, registry ? "https://registry-1.docker.io/v2/" +, repository ? "library" +, imageName +, tag +, imageLayers +, imageConfig +, image ? "${stripScheme registry}/${repository}/${imageName}:${tag}" +}: + +# Make sure there are *no* slashes in the repository or container +# names since we use these to make the output derivation name for the +# nix-store path. +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository); +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); + +let + # Abuse `builtins.toPath` to collapse possible double slashes + repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}"); + repoTag1 = lib.removePrefix "/" repoTag0; + + layers = builtins.map stripNixStore imageLayers; + + manifest = + writeText "manifest.json" (builtins.toJSON [ + { Config = stripNixStore imageConfig; + Layers = layers; + RepoTags = [ "${repoTag1}:${tag}" ]; + }]); + + repositories = + writeText "repositories" (builtins.toJSON { + "${repoTag1}" = { + "${tag}" = lib.last layers; + }; + }); + + imageFileStorePaths = + writeText "imageFileStorePaths.txt" + (lib.concatStringsSep "\n" ((lib.unique imageLayers) ++ [imageConfig])); +in +stdenv.mkDerivation { + builder = ./fetchdocker-builder.sh; + buildInputs = [ coreutils ]; + preferLocalBuild = true; + + inherit name imageName repository tag; + inherit bash gnutar manifest repositories; + inherit imageFileStorePaths; + + passthru = { + inherit image; + }; +} diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fd813bfa575ac0817fef38ea6da848732dabcdf --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -0,0 +1,13 @@ +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +let + generic-fetcher = + import ./generic-fetcher.nix pkgargs; +in + +args@{ repository ? "library", imageName, tag, ... }: + +generic-fetcher ({ + fetcher = "hocker-config"; + name = "${repository}_${imageName}_${tag}-config.json"; + tag = "unused"; +} // args) diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix new file mode 100644 index 0000000000000000000000000000000000000000..869ba637429cdbeba2e498b08ddd34120a9dbfa3 --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -0,0 +1,13 @@ +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +let + generic-fetcher = + import ./generic-fetcher.nix pkgargs; +in + +args@{ layerDigest, ... }: + +generic-fetcher ({ + fetcher = "hocker-layer"; + name = "docker-layer-${layerDigest}.tar.gz"; + tag = "unused"; +} // args) diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh new file mode 100644 index 0000000000000000000000000000000000000000..7443591e6569b790e164f1b92a3a7a92bd3a34d7 --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -0,0 +1,28 @@ +source "${stdenv}/setup" +header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" +mkdir -p "${out}" + +cat < "${out}/compositeImage.sh" +#! ${bash}/bin/bash +# +# Create a tar archive of a docker image's layers, docker image config +# json, manifest.json, and repositories json; this streams directly to +# stdout and is intended to be used in concert with docker load, i.e: +# +# ${out}/compositeImage.sh | docker load + +# The first character follow the 's' command for sed becomes the +# delimiter sed will use; this makes the transformation regex easy to +# read. We feed tar a file listing the files we want in the archive, +# because the paths are absolute and docker load wants them flattened in +# the archive, we need to transform all of the paths going in by +# stripping everything *including* the last solidus so that we end up +# with the basename of the path. +${gnutar}/bin/tar \ + --transform='s=.*/==' \ + --transform="s=.*-manifest.json=manifest.json=" \ + --transform="s=.*-repositories=repositories=" \ + -c "${manifest}" "${repositories}" -T "${imageFileStorePaths}" +EOF +chmod +x "${out}/compositeImage.sh" +stopNest diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix new file mode 100644 index 0000000000000000000000000000000000000000..e051cee08432e1e1b2631a500deddb792ea13e1b --- /dev/null +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -0,0 +1,97 @@ +{ stdenv, lib, haskellPackages, writeText, gawk }: +let + awk = "${gawk}/bin/awk"; + dockerCredentialsFile = import ./credentials.nix; + stripScheme = + builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; +in +{ fetcher +, name + , registry ? "https://registry-1.docker.io/v2/" + , repository ? "library" + , imageName + , sha256 + , tag ? "" + , layerDigest ? "" +}: + +# There must be no slashes in the repository or container names since +# we use these to make the output derivation name for the nix store +# path +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository); +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); + +# Only allow hocker-config and hocker-layer as fetchers for now +assert (builtins.elem fetcher ["hocker-config" "hocker-layer"]); + +# If layerDigest is non-empty then it must not have a 'sha256:' prefix! +assert + (if layerDigest != "" + then !lib.hasPrefix "sha256:" layerDigest + else true); + +let + layerDigestFlag = + lib.optionalString (layerDigest != "") "--layer ${layerDigest}"; +in +stdenv.mkDerivation { + inherit name; + builder = writeText "${fetcher}-builder.sh" '' + source "$stdenv/setup" + header "${fetcher} exporting to $out" + + declare -A creds + + # This is a hack for Hydra since we have no way of adding values + # to the NIX_PATH for Hydra jobsets!! + staticCredentialsFile="/etc/nix-docker-credentials.txt" + if [ ! -f "$dockerCredentialsFile" -a -f "$staticCredentialsFile" ]; then + echo "credentials file not set, falling back on static credentials file at: $staticCredentialsFile" + dockerCredentialsFile=$staticCredentialsFile + fi + + if [ -f "$dockerCredentialsFile" ]; then + header "using credentials from $dockerCredentialsFile" + + CREDSFILE=$(cat "$dockerCredentialsFile") + creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1) + + # Prefer DOCKER_TOKEN over the username and password + # authentication method + if [ -z "''${creds[token]}" ]; then + creds[user]=$(${awk} -F'=' '/DOCKER_USER/ {print $2}' <<< "$CREDSFILE" | head -n1) + creds[pass]=$(${awk} -F'=' '/DOCKER_PASS/ {print $2}' <<< "$CREDSFILE" | head -n1) + fi + fi + + # These variables will be filled in first by the impureEnvVars, if + # those variables are empty then they will default to the + # credentials that may have been read in from the 'DOCKER_CREDENTIALS' + DOCKER_USER="''${DOCKER_USER:-''${creds[user]}}" + DOCKER_PASS="''${DOCKER_PASS:-''${creds[pass]}}" + DOCKER_TOKEN="''${DOCKER_TOKEN:-''${creds[token]}}" + + ${fetcher} --out="$out" \ + ''${registry:+--registry "$registry"} \ + ''${DOCKER_USER:+--username "$DOCKER_USER"} \ + ''${DOCKER_PASS:+--password "$DOCKER_PASS"} \ + ''${DOCKER_TOKEN:+--token "$DOCKER_TOKEN"} \ + ${layerDigestFlag} \ + "${repository}/${imageName}" \ + "${tag}" + + stopNest + ''; + + buildInputs = [ haskellPackages.hocker ]; + + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + outputHash = sha256; + + preferLocalBuild = true; + + impureEnvVars = [ "DOCKER_USER" "DOCKER_PASS" "DOCKER_TOKEN" ]; + + inherit registry dockerCredentialsFile; +} diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 5353ae8284107ea67b3ad8c2014e6128bd6fba5e..a4d162dc8b5197fc940053f986233ef83f048c57 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools +{ stdenv, closureInfo, cpio, contents, compressor, prepend, ubootTools , hostPlatform }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeUInitrd = hostPlatform.platform.kernelTarget == "uImage"; - nativeBuildInputs = [ perl cpio ] + nativeBuildInputs = [ cpio ] ++ stdenv.lib.optional makeUInitrd ubootTools; # !!! should use XML. @@ -30,10 +30,7 @@ stdenv.mkDerivation rec { symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - # For obtaining the closure of `contents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; - pathsFromGraph = ./paths-from-graph.pl; + closure = closureInfo { rootPaths = (map (x: x.object) contents); }; inherit compressor prepend; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 0aeaedeb372435202744fa4a097551cd32bbd5e6..2e64eeb81c1b12269bc529f70a2974d2c84f0a36 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -25,13 +25,9 @@ for ((n = 0; n < ${#objects[*]}; n++)); do done -# Get the paths in the closure of `object'. -storePaths=$(perl $pathsFromGraph closure-*) - - # Paths in cpio archives *must* be relative, otherwise the kernel # won't unpack 'em. -(cd root && cp -prd --parents $storePaths .) +(cd root && cp -prd --parents $(cat $closure/store-paths) .) # Put the closure in a gzipped cpio archive. diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl index 747e1edec81105d787ab65625799830b2bffb250..1465b73fddb6682a7a39256bb0d2a2e63affa9f4 100644 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ b/pkgs/build-support/kernel/paths-from-graph.pl @@ -1,3 +1,5 @@ +# NOTE: this script is deprecated. Use closureInfo instead. + # Parses a /nix/store/*-closure file and prints # various information. # By default, the nodes in the graph are printed to stdout. diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 346fd0e7908fdf7207c9f402d76d9e29e6ded9a4..488fcb943721ab17e4db28c789b8c4dd1706bf1b 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, + openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, libsodium, postgresql, ... }: let @@ -45,13 +45,13 @@ in buildInputs = [ pkgconfig dbus_libs ]; }; gobject-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gio-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gdk-pixbuf-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gdk-pixbuf = attrs: { buildInputs = [ gdk_pixbuf ]; diff --git a/pkgs/build-support/safe-discard-string-context.nix b/pkgs/build-support/safe-discard-string-context.nix deleted file mode 100644 index 293a15295d55486ca582c631ddf07c927530a5a3..0000000000000000000000000000000000000000 --- a/pkgs/build-support/safe-discard-string-context.nix +++ /dev/null @@ -1,14 +0,0 @@ -# | Discard the context of a string while ensuring that expected path -# validity invariants hold. -# -# This relies on import-from-derivation, but it is only useful in -# contexts where the string is going to be used in an -# import-from-derivation anyway. -# -# safeDiscardStringContext : String → String -{ writeText }: s: - builtins.seq - (import (writeText - "discard.nix" - "${builtins.substring 0 0 s}null\n")) - (builtins.unsafeDiscardStringContext s) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 0e6a0450bb47e25cba06f63350085921034eeddd..ec58dfd7749249de3204fdd1890d02325c87d0c0 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.14"; + version = "4.15"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih"; + sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index de2edad451b9760e04fd414656188b8257abda8f..9d002ef02ade2fb8b72a4cb7797e746f25a3b3cd 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: -stdenv.mkDerivation rec { - major = "0.0"; - minor = "25"; - name = "cantarell-fonts-${major}.${minor}"; +let + pname = "cantarell-fonts"; + version = "0.100"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz"; - sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81"; }; + nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 5cfd2ec1f4721797259b6d1b5b974cf08cfbfa5a..191e52c427a7dd0d4e342e7449294e3eab81d34b 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.204"; + version = "1.205"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad"; + sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix similarity index 100% rename from pkgs/data/fonts/font-awesome-ttf/default.nix rename to pkgs/data/fonts/font-awesome-4/default.nix diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6bb175f1ecac42a2a7b315b7063cfac2d1fbac1d --- /dev/null +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: + +let + version = "5.0.6"; +in fetchzip rec { + name = "font-awesome-${version}"; + + url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype + ''; + + sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4"; + + meta = with stdenv.lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the OTF font. For full CSS etc. see the project website. + ''; + homepage = http://fortawesome.github.io/Font-Awesome/; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ abaldeau ]; + }; +} diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 063de059ee56d36bfcdebd142b88c96e92abcf88..724f3a066cc857b9094c2ecec4c9b8174c3e3d15 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; }; - nativeBuildInputs = [ gtk3 hicolor_icon_theme ]; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' mkdir -p $out/share/icons diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 9cc14c7bc94c191218b092322b2a9c953c657fb9..03c5be143ded61555c656287e5cc8dc25238a0fb 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.15"; + name = "hicolor-icon-theme-0.17"; src = fetchurl { url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w"; + sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 3de3dbe110c45e271adbb4c04cb801c05a5c7f15..5982074991fa40970bc34a9da5cf5a623c187cdf 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "17-12-25"; + version = "18-02-16"; package-name = "numix-icon-theme-circle"; @@ -11,18 +11,22 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "10sn2w9xzmh7arbw0vn516p9nfym1bs8bf7i8zzvz7y09s61lkxh"; + sha256 = "0q08q1czsk6h0dxqscbgryr12xaakp4zbch37z0jxpwh087gnq4f"; }; - buildInputs = [ numix-icon-theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 numix-icon-theme ]; installPhase = '' install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ ''; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 503a66b736f67cf46abefef9253ee029e5ccb3d6..198229cce3711a7c2d49876722cef62849b15ae3 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchFromGitHub, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "17-12-25"; + version = "18-02-16"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "07rcfkz3c1z5fwqiib4r1bm964mpwf1f128xm8kz55xp6w1c7zgl"; + sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; }; - buildInputs = [ numix-icon-theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 numix-icon-theme ]; installPhase = '' mkdir -p $out/share/icons cp -a Numix-Square{,-Light} $out/share/icons/ ''; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Numix icon theme (square version)"; homepage = https://numixproject.org; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 205ebaa5c6626149192f86bfde8371401a0f1676..6b6b77ae5e8b563a94a70d22c6b635f0f6e5ffa5 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; - nativeBuildInputs = [ gtk3 hicolor_icon_theme ]; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' mkdir -p $out/share/icons diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ec3c671e2fd9fcd000769b2b4a5fe9455f6fa996..df974d8a0359c03f90b8e568cbf65e4bf220f338 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20171102"; + version = "20180214"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq"; + sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 02394471b1535548e34a8824e8120424d6fa2eae..8a29600f250dd51f031acfb44eb30a5ac60f4085 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/46704e06debe8b2c7c875d5e910fe168d7e49827.tar.gz"; - sha256 = "131ga0pz1h7f3zimrd7yn6v8q7j2wh6srjrvl97p9bx1cbg8xqgl"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f6344416728bff8b5279e0c45941fd8da361eb9.tar.gz"; + sha256 = "0zm53wxvm7z72605qvgv0dzsfq91lyffpr850cks23r979pjvkv8"; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 4d824e6e8d7700e84903276a5b8a8b5ec4e4c9f4..dbf92ad066f5598937d6bb1b3a55ac675f6cb6b3 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let - name = "media-player-info-22"; + name = "media-player-info-23"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy"; + url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; + sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9"; }; buildInputs = [ udev systemd ]; @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; - homepage = http://www.freedesktop.org/wiki/Software/media-player-info/; + homepage = https://www.freedesktop.org/wiki/Software/media-player-info/; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix similarity index 100% rename from pkgs/misc/themes/deepin/default.nix rename to pkgs/desktops/deepin/deepin-gtk-theme/default.nix diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a422beb9924df756a903391786cd74a42712ff5 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-icon-theme"; + version = "15.12.52"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l"; + + # Get rid of case collision in file names, which is an issue in + # darwin where file names are case insensitive. + extraPostFetch = '' + rm "$out"/Sea/apps/scalable/TeXmacs.svg + rm "$out"/deepin/apps/48/TeXmacs.svg + ''; + }; + + nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Deepin icon theme"; + homepage = https://github.com/linuxdeepin/deepin-icon-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix similarity index 92% rename from pkgs/applications/misc/deepin-terminal/default.nix rename to pkgs/desktops/deepin/deepin-terminal/default.nix index 12ceb0958f0d87cf491b4d3c7e5e21e48548a2b3..8e64fa6980582d86cf7f331664202028ee0f2cfa 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # For setup hook gobjectIntrospection ]; - buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; + buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ]; meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b03349ce2dff7758d83ec466a132ff9737372c83 --- /dev/null +++ b/pkgs/desktops/deepin/default.nix @@ -0,0 +1,19 @@ +{ pkgs, newScope }: + +let + callPackage = newScope self; + + self = rec { + + deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; + + deepin-icon-theme = callPackage ./deepin-icon-theme { }; + + deepin-terminal = callPackage ./deepin-terminal { + inherit (pkgs.gnome3) libgee vte; + wnck = pkgs.libwnck3; + }; + + }; + +in self diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 4fec962f16d8d007891c06010fab28462f82f28f..cc453678525135b705df5e81a7f6607749117b18 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -3,12 +3,17 @@ let overridden = set // overrides; set = with overridden; { # Backward compatibility. - gtkdoc = self.gtk_doc; + gtkdoc = self.gtk-doc; startup_notification = libstartup_notification; startupnotification = libstartup_notification; - gnomedocutils = self.gnome_doc_utils; + gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; gnomepanel = self.gnome_panel; + gnome_common = gnome-common; + gnome_keyring = gnome-keyring; + gnome_desktop = gnome-desktop; + gnome_settings_daemon = gnome-settings-daemon; + gnome_control_center = gnome-control-center; #### PLATFORM @@ -41,7 +46,7 @@ let overridden = set // overrides; set = with overridden; { libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; # for git-head builds - gnome_common = callPackage platform/gnome-common { }; + gnome-common = callPackage platform/gnome-common { }; gnome_mime_data = callPackage ./platform/gnome-mime-data { }; @@ -77,7 +82,7 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome_keyring = callPackage ./desktop/gnome-keyring { }; + gnome-keyring = callPackage ./desktop/gnome-keyring { }; libgweather = callPackage ./desktop/libgweather { }; @@ -97,15 +102,13 @@ let overridden = set // overrides; set = with overridden; { gnome_menus = callPackage ./desktop/gnome-menus { }; - gnome_desktop = callPackage ./desktop/gnome-desktop { }; + gnome-desktop = callPackage ./desktop/gnome-desktop { }; gnome_panel = callPackage ./desktop/gnome-panel { }; - gnome_session = callPackage ./desktop/gnome-session { }; + gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { }; - - gnome_control_center = callPackage ./desktop/gnome-control-center { }; + gnome-control-center = callPackage ./desktop/gnome-control-center { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index c07dc9730e6df02c717e5cc5c7c4859069abeebe..7202be8390823586abde7e08728477a7e8f198cb 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python -, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 -, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python +, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 +, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 , libSM }: @@ -14,9 +14,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils - gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils + gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 + libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon libSM ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index 63df026836fae2008b0969d8ec609edf9ce0b65f..b99f23555d38f162ff982c397fb3b0db03c8dbef 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome_doc_utils}: +, intltool, GConf, gnome-doc-utils}: stdenv.mkDerivation { name = "gnome-desktop-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome_doc_utils ]; + intltool GConf gnome-doc-utils ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix index 50f2cd081332399b1a1fa923383abc0738e56ab2..26f3f624a042b8cac1aa6e860b0254fbe689fbff 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome_keyring }: +gtk, intltool, GConf, libgnome-keyring }: stdenv.mkDerivation { name = "gnome-keyring-2.30.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; }; - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ]; + buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; propagatedBuildInputs = [ glib libtasn1 ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 514389c6faf8b7252e4bc862ac3e8d52fcf67c55..d85b5494da47a49b03d0a8b78c0b7629e6e136e5 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra_gtk2 -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: +{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python +, glib, gtk, pango, atk, libXau, libcanberra-gtk2 +, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop +, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; @@ -12,10 +12,10 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool + [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils - libtasn1 libtool libcanberra_gtk2 xorg.libICE xorg.libSM + gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils + libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM ]; nativeBuildInputs = [ pkgconfig intltool which ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix deleted file mode 100644 index 7678cb3a4b426a7806e516f313c622bb57d8d044..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower, libSM }: - -stdenv.mkDerivation { - name = "gnome-session-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2; - sha256 = "0sk8qclarpar27va1ahzwjh2wsafys0xsdjzdg7cgygw6gj3rn92"; - }; - - buildInputs = - [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower libSM - ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # gconf-sanity-check-2 not found - meta.broken = true; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 37f9953968612d945a49f5e15508f401c367f885..9712ce64841f01e633cb261f83bd8219c691c44d 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk +, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio , libSM }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = - [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit + [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit libpulseaudio libSM ]; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index bd8b71d0daca73d767c36a49b1e939b4f6d30a85..05da068464189cf53fcf5a95b439c037376686b0 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib -, gnome_common, gtk, pango +, gnome-common, gtk, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration }: with stdenv.lib; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pango libxml2Python perl intltool gettext ] ++ optionals stdenv.isDarwin [ - autoreconfHook gnome_common gtk-mac-integration + autoreconfHook gnome-common gtk-mac-integration ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix index f0882e39a8570d4a8c15d8d425128a45b83d2b24..b846ef888c43fffd6cfd45f93910accc37d42e30 100644 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}: +{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: stdenv.mkDerivation { name = "libgnomekbd-2.32.0"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ]; + buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 22604f214d488f7b62d7754b6100936842f08db0..d4935c498f136dde81d2c2f67239f8762fd9366f 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix index 10c790bc09ccbc5d33464020208127ad9828f5c1..95dd97568f464e7d6f58c82cfc6b0085e8242f80 100644 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra_gtk2, intltool, GConf, startup_notification, zenity, gnome_doc_utils -, gsettings_desktop_schemas }: +, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils +, gsettings-desktop-schemas }: stdenv.mkDerivation { name = "metacity-2.30.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra_gtk2 - intltool GConf startup_notification zenity gnome_doc_utils - gsettings_desktop_schemas + [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 + intltool GConf startup_notification zenity gnome-doc-utils + gsettings-desktop-schemas ]; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 3ab8838c97b61f386a1ea3ba217a631299af363b..55a5f9c0a2343bf2ed9007fef4da28dcef606a69 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk -, gnome_doc_utils, intltool, libglade, libX11, which }: +, gnome-doc-utils, intltool, libglade, libX11, which }: stdenv.mkDerivation { name = "zenity-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index afa27a93bad5940ca5b7d87e648a82aeea48aa54..778a1cc920f1cc6a40c438fda5b8e005bf6010ec 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 , polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: assert withGtk -> (gtk2 != null); @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] + buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index b0b669148ff314e04bde068527271f6745e702c1..9bcc9ab6cabe5b36b41af4d37340c151b7d1c8d4 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus_glib }: +, intltool, libbonobo, ORBit2, GConf, dbus-glib }: stdenv.mkDerivation { name = "at-spi-1.32.0"; @@ -13,5 +13,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus_glib ]; + intltool libbonobo ORBit2 GConf dbus-glib ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index c00f0a9c37b221d041a69896d3641a2fff0faa69..54a2bd526a945e29336dbfa208475d156b72f5a1 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; - propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome-common tends to require which patches = [(fetchurl { name = "gnome-common-patch"; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 06af8a63200a511f7db79b0f39782e133637058c..4ca0e791a2a9c1d48a8e14c4c843979ee5603e36 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus_glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib fam cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 49b8cc88f9de2880316058d40b7188275884a536..493f88290f3a1f5334dddd17841cebaa8c188c1b 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }: +GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; - propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index d93ef73ca986dbab73de64145ad12b9ec4f42fb8..ee0bf5f82a098bb9a8ece3508fab84088a3293d6 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 5a488e052c198d5cdd3a6f6f9e70ed7bcc3ca8f2..2dcb85235ee4c075c46c68f94e31c3880c4846d7 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2 +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg }: @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 24cd851eef6a895fa06ae22ce79eafce5d1710d0..838e513374531c4d8c4a64422b684feba6f5c919 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool -, gnome_vfs, libgnome_keyring, libglade }: +, gnome_vfs, libgnome-keyring, libglade }: stdenv.mkDerivation rec { name = "libgnomeui-${minVer}.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 545e89a85125bddc7b7435279777cdab13f83425..a96d4f7a8eafb795e0454222613bcdce19f6db1d 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,19 +1,32 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3Packages, at_spi2_core +, itstool, libxml2, python3Packages, at-spi2-core , dbus, intltool, libwnck3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) src name; + name = "accerciser-${version}"; + version = "3.22.0"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ]; buildInputs = [ - gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi + gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.defaultIconTheme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "accerciser"; + attrPath = "gnome3.accerciser"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Accerciser; description = "Interactive Python accessibility explorer"; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/apps/accerciser/src.nix deleted file mode 100644 index 20bd008396493302f4b63e8495551e311fa790da..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/accerciser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "accerciser-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz; - sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index ca266d73fd356efee5bbf78f29f15011204bf5e3..eaf8528b6ffb79555aab5aa87726f82bc510109d 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -1,11 +1,21 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, wrapGAppsHook, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist +, evolution-data-server, evolution, sqlite +, wrapGAppsHook, itstool, desktop-file-utils +, clutter-gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "bijiben-${version}"; + version = "3.27.1"; + + src = fetchurl { + url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "bijiben"; attrPath = "gnome3.bijiben"; }; + }; doCheck = true; @@ -18,23 +28,22 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook + meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist - gnome3.gsettings_desktop_schemas + buildInputs = [ glib clutter-gtk libuuid webkitgtk gnome3.tracker + gnome3.gnome-online-accounts zeitgeist + gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; + evolution-data-server evolution sqlite ]; enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Bijiben; description = "Note editor designed to remain simple to use"; - broken = true; maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/apps/bijiben/src.nix deleted file mode 100644 index ee573eaef8ebbc44be07f2ee24c41d110708d470..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/bijiben/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "bijiben-3.27.1"; - - src = fetchurl { - url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz; - sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index e94a89c7f27cd1637042f6dc6a91d498d1690a87..77ee086a950cc847b75a95270f7490a65e777bd9 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,27 +1,37 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 +, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib -, libxslt, yelp_tools, gnome_common, gtk_doc -, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: +, libxslt, yelp-tools, gnome-common, gtk-doc +, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "cheese-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; + }; nativeBuildInputs = [ pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib libxslt docbook_xml_dtd_43 docbook_xsl - autoreconfHook gtk_doc yelp_tools gnome_common + autoreconfHook gtk-doc yelp-tools gnome-common ]; buildInputs = [ gtk3 glib gnome-video-effects gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst - libcanberra_gtk3 libgudev ]; + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop + gst_all_1.gst-plugins-bad clutter-gtk clutter-gst + libcanberra-gtk3 libgudev ]; outputs = [ "out" "man" "devdoc" ]; patches = [ - gtk_doc.respect_xml_catalog_files_var_patch + gtk-doc.respect_xml_catalog_files_var_patch ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/cheese/src.nix b/pkgs/desktops/gnome-3/apps/cheese/src.nix deleted file mode 100644 index 0237606ae35ca86005f7cefd0cbb89acb1b05c50..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/cheese/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "cheese-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz; - sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 4996120d4935996b6e8aee8a3ccac3bee3299078..a1586754dbddb369f7213ac69d1f6d911f194ff1 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,42 +1,51 @@ -{ stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight +{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight , pkgconfig, gtk3, glib, libnotify, gtkspell3 -, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite +, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }: +, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - majVer = gnome3.version; + version = "3.26.5"; in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-${version}"; - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome3.evolution_data_server ]; + src = fetchurl { + url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1j748f3407zavrh3bqw0mpf8f1i6b788kfjvwkk5bg7mm3c65n2g"; + }; - buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 bogofilter gnome3.libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas - gnome3.libgnome_keyring gnome3.glib_networking openldap - ]; + propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; - nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu + gnome3.evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit + nss nspr libnotify procps highlight gnome3.libgweather + gnome3.gsettings-desktop-schemas + gnome3.libgnome-keyring gnome3.glib-networking openldap + ]; + nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; - configureFlags = [ "--disable-pst-import" "--disable-autoar" - "--disable-libcryptui" "--with-openldap"]; + cmakeFlags = [ + "-DENABLE_AUTOAR=OFF" + "-DENABLE_LIBCRYPTUI=OFF" + "-DENABLE_YTNEF=OFF" + "-DENABLE_PST_IMPORT=OFF" + ]; - cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF" - "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF" - ]; + doCheck = true; - NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; + checkPhase = "ctest"; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "evolution"; + attrPath = "gnome3.evolution"; + }; + }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix deleted file mode 100644 index 0c8155efde20696ca1a6506854d3b450f7d9b7ad..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/evolution/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/evolution/3.26/evolution-3.26.3.tar.xz; - sha256 = "091621f21827e2dfb8057f3b2c3a215c4e97a692c59d0a4ee33108af571de60e"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 181888293777d025d3c60745ed9fa99322a916ae..89f20ed6f150617dd4c105094fcff5e71e620332 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -2,7 +2,17 @@ , attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "file-roller-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "file-roller"; attrPath = "gnome3.file-roller"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/apps/file-roller/src.nix deleted file mode 100644 index 090c88e1d3e32750d461b6c0072750c4b11c0228..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/file-roller/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "file-roller-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz; - sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 69056e28c2607725dd6fb4edd316ec3589d1e393..d8f272931d9a40e3a8ab95043def50aea2128c0c 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -4,16 +4,26 @@ , gnome3, librsvg, gdk_pixbuf, file, gspell }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gedit-${version}"; + version = "3.22.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk3 glib intltool itstool enchant isocodes gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ]; + gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix deleted file mode 100644 index 7a68b75eb2a70a7f0e9dc1b1ef4c6fa37e8512e8..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gedit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gedit-3.22.1"; - - src = fetchurl { - url = mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz; - sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 1179b2fdc5cf8a3021d9ee3a374e15fabbd6efdb..1f8077ff4af8686f78c30c5d307559cdd7fd07f2 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -2,7 +2,17 @@ wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "ghex-${version}"; + version = "3.18.3"; + + src = fetchurl { + url = "mirror://gnome/sources/ghex/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/ghex/src.nix b/pkgs/desktops/gnome-3/apps/ghex/src.nix deleted file mode 100644 index edaa51d9478425578a7e34e15535b2f46843547f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/ghex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "ghex-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz; - sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 8b198b9c8797768eb42f1c9fd0b7edd37d4f77b0..3a294df3ffe3c3404b0ea175af738cba4a9b09ce 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -4,14 +4,24 @@ , gnome3, gdk_pixbuf, libxslt }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "glade-${version}"; + version = "3.20.4"; + + src = fetchurl { + url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1n9m4s81jd9fi60mrxsvlk4fi2vqrqmp95azsxp9jnqn6pkdz0jb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; + }; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix deleted file mode 100644 index b244d2434c9ea190bbe3664969207e726ad2dbe3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/glade/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "glade-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz; - sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 6126fed8e06fb7fe5f4e27af3f077b40cff0ac32..674aa84dbc271897804ce842f2fd560f5a1de3b0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala -, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk +, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala +, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret , libcap_ng, numactl, xen, libapparmor }: @@ -9,7 +9,17 @@ # TODO: ovirt (optional) stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-boxes-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-boxes"; attrPath = "gnome3.gnome-boxes"; }; + }; enableParallelBuilding = true; @@ -21,9 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc - libvirt spice_gtk spice_protocol libsoup libosinfo systemd + libvirt spice-gtk spice-protocol libsoup libosinfo systemd tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret + gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret libcap_ng numactl xen libapparmor ]; @@ -31,7 +41,7 @@ stdenv.mkDerivation rec { for prog in "$out/bin/"*; do wrapProgram "$prog" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" done ''; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix deleted file mode 100644 index b2c2f378bff4b3d5f62e9a7ef91f22d255376fd0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-boxes-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz; - sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index c13d7e976e5cd396328410e92d186d722ebc7561..4da7db42ab98dd4e83a7a18820f4b90821dc469e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook -, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup -, glib, gnome_online_accounts, gsettings_desktop_schemas }: +, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, glib, gnome-online-accounts, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-calendar-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1clnfvvsaqw9vpxrs6qrxzmgpaw9x2nkjik2x2vwvm07pdvhddxn"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; }; + }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; buildInputs = [ - gtk evolution_data_server libsoup glib gnome_online_accounts - gsettings_desktop_schemas gnome3.defaultIconTheme + gtk evolution-data-server libsoup glib gnome-online-accounts + gsettings-desktop-schemas gnome3.defaultIconTheme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix deleted file mode 100644 index 39f7f333495e22966cbb24d5c547a542c9190266..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calendar-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz; - sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index a354c4f6316efdcd8119a6554931d46f8977985c..5b36ea83ee13ea3f079ff1142161e301abf1b8be 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -2,12 +2,22 @@ , intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-characters-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-characters"; attrPath = "gnome3.gnome-characters"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ gtk3 gjs gdk_pixbuf gobjectIntrospection - librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix deleted file mode 100644 index d7ac2cd8829b98cac19eeccc6ae9c9cce65e9514..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-characters-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz; - sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 5441f1e5edc9d6dab21446934a15e12d972a8028..47fd071bf83978519a6b34f5837f0c82b2134cd6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,19 +1,29 @@ { stdenv, fetchurl -, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils +, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gtk3, glib, gsound , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-clocks-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-clocks"; attrPath = "gnome3.gnome-clocks"; }; + }; doCheck = true; nativeBuildInputs = [ - vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils + vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils ]; buildInputs = [ - gtk3 glib gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather gsound + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme + gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound ]; prePatch = "patchShebangs build-aux/"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix deleted file mode 100644 index ea7878f4869581267c8f368c8aae6ad477afdce0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-clocks-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz; - sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a3f6084c9f39910c6b2b59c03038b9ecc143ed3d..8e90c0c516a2d61c83521423cc54b5ad244b168e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -2,23 +2,33 @@ , pkgconfig, gtk3, glib, tracker, tracker-miners , itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: +, gobjectIntrospection, json-glib, inkscape, poppler_utils +, gmp, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-documents-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0q7bp0mvmhqmsvm5sjavm46y7sz43na62d1hrl62vg19hdqr9ir4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-documents"; attrPath = "gnome3.gnome-documents"; }; + }; doCheck = true; configureFlags = [ "--enable-getting-started" ]; - nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk3 glib inkscape poppler_utils - gnome3.gsettings_desktop_schemas gmp + gnome3.gsettings-desktop-schemas gmp gdk_pixbuf gnome3.defaultIconTheme librsvg evince libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ]; + tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts + gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix deleted file mode 100644 index de0332ea4037c289c9002662d232dcf9cf5011d0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-documents-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz; - sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 0c75ebd7c783274ef9ab4fd51068946995f9688a..8531fc1c7c04cd3a4679dc1ea883570a55811023 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-getting-started-docs-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; }; + }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix deleted file mode 100644 index 3f1341b7cab8cc515ab71ac199a39dd24d0dc849..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-getting-started-docs-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz; - sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 91d5f7d00e49707862a9e45aa8b0016a4c6706e1..9f6c3153afb2851ec0e20d54c2edcd0dd40668e8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -2,14 +2,24 @@ , intltool, itstool, libxml2, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-logs-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0cbzl38haz1m6y7gcbvvab0jcrva781izhp8xv2dzmma4xlzdw0k"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-logs"; attrPath = "gnome3.gnome-logs"; }; + }; configureFlags = [ "--disable-tests" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix deleted file mode 100644 index 951620986685df7a2fdc686da39f2e01e6af7779..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-logs-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz; - sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index bb8375d595ef16709ca9dcad0b0d8f964f2aef24..c03397a40d897482e2fe35e99550c426c86613f8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -4,17 +4,27 @@ , webkitgtk }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-maps-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-maps"; attrPath = "gnome3.gnome-maps"; }; + }; doCheck = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gobjectIntrospection wrapGAppsHook gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup + gnome3.geocode-glib libchamplain file libsoup gdk_pixbuf librsvg libgweather autoreconfHook - gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas gnome3.evolution-data-server + gnome3.gnome-online-accounts gnome3.defaultIconTheme webkitgtk ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix deleted file mode 100644 index 0fac7f865ca648ab58b29a38265f192135f3680a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-maps-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz; - sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index f5454c1c38690ddf5666bd6c185d9e3741d476f9..4053d287cc8cb34bc1d3af60162d7de31cab1643 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -4,9 +4,19 @@ , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-music-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0mam7d0lzl7ljd9lym9gkvqwvddic122sdmcgpjir58pmmg9bx8b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-music"; attrPath = "gnome3.gnome-music"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart @@ -15,7 +25,7 @@ stdenv.mkDerivation rec { python3Packages.pycairo python3Packages.dbus-python python3Packages.requests python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ]; + gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix deleted file mode 100644 index 3ac99e146d4654cf5207bb3acfc98646096d162f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-music-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz; - sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 0b19ba9f0f6dd6a3f06073f7823f5bdefb6d93a2..2837e1d093f5b6626051d3348d18ba3a493c39aa 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -1,12 +1,22 @@ { stdenv, intltool, fetchurl, exempi, libxml2 , pkgconfig, gtk3, glib, tracker, tracker-miners , makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib +, desktop-file-utils, gmp, libmediaart, wrapGAppsHook +, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib , dleyna-renderer }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-photos-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-photos"; attrPath = "gnome3.gnome-photos"; }; + }; # doCheck = true; @@ -14,12 +24,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart + gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils - wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; + gnome3.gnome-online-accounts gnome3.gnome-desktop + lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils + wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix deleted file mode 100644 index b9bba1ab6a4751cf597b37483f82db46db2e1b7a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-photos-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.3.tar.xz; - sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 2fd0dfa5ac91406431ae2d5498d8f8afdf8a6097..a295ef456df46b5a7f90bcdd2ccaea3602543a31 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -7,14 +7,24 @@ , meson , ninja , upower -, desktop_file_utils +, desktop-file-utils , wrapGAppsHook , gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-power-manager-${version}"; + version = "3.26.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-power-manager/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-power-manager"; attrPath = "gnome3.gnome-power-manager"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { # needed by meson_post_install.sh glib.dev - desktop_file_utils + desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix deleted file mode 100644 index bdffa453504fc0e42e33e57e6a9a4e6e143cf5bf..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-power-manager-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-power-manager/3.26/gnome-power-manager-3.26.0.tar.xz; - sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d6804e09a482b5bde68d82c01a61d76de417117d..9e43a3c52b45333f60e6503990596fbba5cdddd7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -2,12 +2,22 @@ , libgweather, intltool, itstool, geoclue2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-weather-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-weather/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-weather"; attrPath = "gnome3.gnome-weather"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas + libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix deleted file mode 100644 index d12db5132536df023a575603bcfdf05127eb02d5..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-weather-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz; - sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index dc75193e771ce1a7f3dbfb56276680c2af0ae051..f1d6dba21b088478976e9cdfe3cbba7af7d647da 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,17 +1,27 @@ { stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils +, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib -, gnome3, wrapGAppsHook, telepathy_logger, gspell }: +, gnome3, wrapGAppsHook, telepathy-logger, gspell }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "polari-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; + src = fetchurl { + url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "polari"; attrPath = "gnome3.polari"; }; + }; + + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 - desktop_file_utils gobjectIntrospection appstream-glib ]; - buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas - telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ]; + desktop-file-utils gobjectIntrospection appstream-glib ]; + buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; patches = [ (fetchpatch { diff --git a/pkgs/desktops/gnome-3/apps/polari/src.nix b/pkgs/desktops/gnome-3/apps/polari/src.nix deleted file mode 100644 index 8af7c33846dbe9f3a652d1af080f33031c7d008f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/polari/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "polari-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz; - sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 3bc69f67a4f8965a899a07d746754e0f2aeda453..1a8c2f55b1b0ab441fb8f0f591cfbf75b095a163 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -2,27 +2,37 @@ , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: +, libsecret, avahi, p11-kit, openssh }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "seahorse-${version}"; + version = "3.20.0"; + + src = fetchurl { + url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg + gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala + libsecret avahi libsoup p11-kit vala openssh ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/apps/seahorse/src.nix deleted file mode 100644 index 0ae195a0a7ba3a77150a8673e4d76b65002785ed..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/seahorse/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "seahorse-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz; - sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index e719fbf9f2197cf484e3c6c28548a5dd99b9f8c3..4f358cf0b4f67928b6d9fc36d8bb864de8d8a9fd 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -2,7 +2,17 @@ , libsecret, itstool, makeWrapper, librsvg }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vinagre-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vinagre/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret diff --git a/pkgs/desktops/gnome-3/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/apps/vinagre/src.nix deleted file mode 100644 index 3d1357c498982ae6ff94342d34e4658585d76b1c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/vinagre/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vinagre-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz; - sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 62cc4da6ba14aefee1ae34390690ae75a8965cee..2178004a43ace50ab54ebec68f99b1217008fc8d 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,11 +1,21 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: +, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "adwaita-icon-theme-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "adwaita-icon-theme"; attrPath = "gnome3.adwaita-icon-theme"; }; + }; # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix deleted file mode 100644 index 24f0955659ec17bb348d0d4e374d857ce63230df..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "adwaita-icon-theme-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz; - sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index f94cb3c57c46d65d0c6d25a170f842444341a8d6..1ff67e35f0fdbf42ed372e4114b2d0a799f267e7 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,7 +4,17 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "baobab-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "baobab"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix deleted file mode 100644 index d3e2f03feb8bf2ab06034d101f18c90be5a8f187..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/baobab/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "baobab-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz; - sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index e463fe0e03f0107d3604aaf4f319579dc1675650..48be01faf33f829ad9959d2ed727bb0527d64b9b 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,23 +1,23 @@ { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook +, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook }: let - majorVersion = "0.4"; + pname = "caribou"; + version = "0.4.21"; pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); -in -stdenv.mkDerivation rec { - name = "caribou-${majorVersion}.21"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = with gnome3; - [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3 + [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 libXtst gtk2 ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; @@ -27,8 +27,18 @@ stdenv.mkDerivation rec { substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "An input assistive technology intended for switch and pointer users"; + homepage = https://wiki.gnome.org/Projects/Caribou; platforms = platforms.linux; + license = licenses.lgpl21; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index bf39965bf779785d4b97b1f79275bcc0c76a8bca..47ddf6b6486106459bccd0d4d50e7469f43564f2 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,12 +1,22 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "dconf-editor-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix deleted file mode 100644 index b21630641d94ff75da171f5e29e106fce8312010..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "dconf-editor-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz; - sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9a836869ec6eceef15754ad28498f52250a9ed2e..a17228761216f5e0fb48c3de4ef7716d8635f9aa 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,29 +1,38 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: let - majorVersion = "0.26"; + pname = "dconf"; in stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "${majorVersion}.1"; + name = "${pname}-${version}"; + version = "0.26.1"; src = fetchurl { - url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym"; }; outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace client/Makefile \ --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/dconf; + license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index f9156053819a641d148d158576ebc26b66db8ed6..bf83c7aa8a15b1fa1383e86ceb11f5f10f5d8387 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,40 +1,50 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server, yelp_xsl -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info +, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts +, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control +, telepathy-logger, libnotify, clutter, libsoup, gnutls +, evolution-data-server, yelp-xsl +, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info , bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee -, isocodes, enchant, libchamplain, geoclue2, geocode_glib, cheese, libgudev }: +, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "empathy-${version}"; + version = "3.12.14"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "empathy"; }; + }; propagatedUserEnvPkgs = [ - gnome_online_accounts shared_mime_info + gnome-online-accounts shared-mime-info ]; propagatedBuildInputs = [ - folks telepathy_logger evolution_data_server telepathy_mission_control + folks telepathy-logger evolution-data-server telepathy-mission-control ]; nativeBuildInputs = [ pkgconfig libtool intltool itstool file wrapGAppsHook - libxml2 libxslt yelp_xsl + libxml2 libxslt yelp-xsl ]; buildInputs = [ - gtk3 glib webkitgtk icu gnome_online_accounts - telepathy_glib clutter_gtk clutter-gst cogl + gtk3 glib webkitgtk icu gnome-online-accounts + telepathy-glib clutter-gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base gcr libsecret libpulseaudio gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + libnotify clutter libsoup gnutls libgee p11-kit + libcanberra-gtk3 telepathy-farstream farstream + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes # Display maps, location awareness, geocode support - libchamplain geoclue2 geocode_glib + libchamplain geoclue2 geocode-glib # Cheese webcam support, camera monitoring cheese libgudev ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/src.nix b/pkgs/desktops/gnome-3/core/empathy/src.nix deleted file mode 100644 index 7e54ed38fd3613b4845bd44487dffafd118d243e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/empathy/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "empathy-3.12.14"; - - src = fetchurl { - url = mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz; - sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index ae0abfd7150241fd96add463b233f395ffb2e496..1acd6eb694251aec02592be0bf57c6f55d3a01c2 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,15 +1,25 @@ { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: +, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "eog-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; }; + }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; buildInputs = with gnome3; [ libxml2 libjpeg gtk glib libpeas librsvg - gsettings_desktop_schemas shared_mime_info adwaita-icon-theme - gnome_desktop libexif dconf ]; + gsettings-desktop-schemas shared-mime-info adwaita-icon-theme + gnome-desktop libexif dconf ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/EyeOfGnome; diff --git a/pkgs/desktops/gnome-3/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix deleted file mode 100644 index d0046d899bec287c2855900f9218e506f75f5b24..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/eog/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "eog-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz; - sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 6dafa160b1f8f5a1e7eb65cef3e9b48c68c1401c..a275040e1f4e15325977d62156094d270bf901df 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,25 +1,35 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, isocodes, desktop_file_utils, file -, gdk_pixbuf, gnome_common, gst_all_1, json_glib }: +, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit +, sqlite, gcr, isocodes, desktop-file-utils, file +, gdk_pixbuf, gnome-common, gst_all_1, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "epiphany-${version}"; + version = "3.26.6"; + + src = fetchurl { + url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1a1hyv326w4in4pl26gi2n3p9b38ih6zjdiigpqy0aiibnjnmc81"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "epiphany"; }; + }; # Tests need an X display mesonFlags = [ "-Dunit_tests=false" ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ]; + nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify - sqlite isocodes p11_kit icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr - glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + sqlite isocodes p11-kit icu gnome3.yelp-tools + gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr + glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav json_glib ]; + gst_all_1.gst-libav json-glib ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix deleted file mode 100644 index 3365261b7bcfa7eb580bccda5ca065c991e3f73a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/epiphany/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "epiphany-3.26.4"; - - src = fetchurl { - url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.4.tar.xz; - sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index fab46b35af663515919468801fa336d429107017..2d52e22c54cd3429f7471aed88d3d12bb7c0ac1a 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,22 +1,32 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 +, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook -, librsvg, gobjectIntrospection, yelp_tools +, librsvg, gobjectIntrospection, yelp-tools , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evince-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evince"; }; + }; nativeBuildInputs = [ - pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp_tools autoreconfHook + pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook ]; buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; @@ -35,7 +45,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix deleted file mode 100644 index 6627be55088445e060b13cf4f56123cc8362fd60..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/evince/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evince-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz; - sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index f6ee457dc63f2389bfe5d2727c0ad779ee818634..388553976f88aeeb0631994d9fdd586c8035a3cc 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,17 +1,27 @@ { fetchurl, stdenv, pkgconfig, gnome3, python3, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true -, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: +, p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true +, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-data-server-${version}"; + version = "3.26.5"; + + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0m0y4l5wrdxpb6bs929ml7ayicwygfvngrzxf88hn0vkw0crfa9z"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evolution-data-server"; }; + }; nativeBuildInputs = [ - cmake pkgconfig intltool python3 gperf makeWrapper + cmake ninja pkgconfig intltool python3 gperf makeWrapper ] ++ stdenv.lib.optional valaSupport vala; buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata libaccounts-glib json_glib + glib libsoup libxml2 gtk gnome-online-accounts + gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix deleted file mode 100644 index 906df1b2160aa08f26947d43c1411c6c141c12d9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-data-server-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.3.tar.xz; - sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6be27021023a993de649db9c5c1154ff065dc91a..776f76642222049aec9067492567ae34a6b463fb 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,35 +1,42 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends let - majorVersion = "0.11"; -in -stdenv.mkDerivation rec { - name = "folks-${majorVersion}.4"; + version = "0.11.4"; +in stdenv.mkDerivation rec { + name = "folks-${version}"; src = fetchurl { - url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/folks/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "folks"; + attrPath = "gnome3.folks"; + versionPolicy = "none"; + }; + }; + meta = { description = "Folks"; diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 99883c8a3f678e7873c7e6d0022029b858597fc7..3e7ba45b03ae080862c9f2bd4001f413f6f461dd 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2 , intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; + propagatedBuildInputs = [ glib dbus-glib ]; nativeBuildInputs = [ pkgconfig intltool ]; # ToDo: ldap reported as not found but afterwards reported as supported diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 2569b4e2c7ada2fb5787d3b1ed851a6d1f96c742..aa26c660768bb6e889005d5dc16625655c3b0e6a 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,9 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib +, libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gcr-${version}"; + version = "3.20.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; }; + }; outputs = [ "out" "dev" ]; @@ -12,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = let gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome in [ - gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk + gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk ]; - propagatedBuildInputs = [ glib gtk p11_kit ]; + propagatedBuildInputs = [ glib gtk p11-kit ]; #doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gcr/src.nix b/pkgs/desktops/gnome-3/core/gcr/src.nix deleted file mode 100644 index d166f033266c5f9d1bf5758a0e3536d9802b53c9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gcr/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gcr-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz; - sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 796e103fdb3cf3cf40cc0ed130dc859648224246..ef9439a30291bd176cb68c44610c3536de1caa44 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth +, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth , librsvg, coreutils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdm-${version}"; + version = "3.26.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; }; + }; # Only needed to make it build preConfigure = '' @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam plymouth librsvg ]; + libcanberra-gtk3 pam plymouth librsvg ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix deleted file mode 100644 index 8d92167a03915af3f61896189b3d11452bd907be..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdm-3.26.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz; - sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 4d75bdc499634a1b78d367dafe73a0ff1c5a5ea3..e97e557e87a02f55ca76dd5aed4bc60082506530 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -1,10 +1,20 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "geocode-glib-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; }; + }; buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; + [ intltool pkgconfig glib libsoup json-glib ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix deleted file mode 100644 index 394e3a68c35c4624ae2a897ada4bb21d8be61316..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "geocode-glib-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz; - sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index e2ae7493103093a59328e7f9a4ddf35da9bc125f..6e9f6c464df150ff62ccf1cdd67cea5e33bf3a43 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -3,7 +3,17 @@ , makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gjs-${version}"; + version = "1.50.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; }; + }; outputs = [ "out" "installedTests" ]; diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix deleted file mode 100644 index d42b2e8455859c928703b41ec122f28aed9a6721..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gjs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gjs-1.50.4"; - - src = fetchurl { - url = mirror://gnome/sources/gjs/1.50/gjs-1.50.4.tar.xz; - sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index eb801caf5657df1a65076ef73a205f1c72f23dc4..0aea3c4eac487a99fbabeb1d951e3c73f6d3bf07 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-backgrounds-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; + }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix deleted file mode 100644 index 9d86b7168ad0cc01398c09e25020a10f7ffee907..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-backgrounds-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz; - sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 3dbb4e32654f37ae96bec802a08a3f8d0d226c8f..11816f68ff4847c96ed95c3611e923d93a17257b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-bluetooth-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; + }; nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; + buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix deleted file mode 100644 index 31aab6649d75ab5be68f37cd8c0c6a5ca2f17f04..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-bluetooth-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz; - sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 12b8af206ea07a308cf15bf07700995c0d69a7a7..8376bea1a038ada95259d6d763c19d631598a23c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -3,18 +3,28 @@ , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-calculator-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; }; + }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ bash gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ]; + gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix deleted file mode 100644 index 517220c9457250b918abab18da424ff08065ea4a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calculator-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz; - sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f9261e183ef17466fb9a0cc16c9758caad0777dc..23fd157a528a4fdafc5b8f2bb259dbac83d30699 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-common-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + }; patches = [(fetchurl { name = "gnome-common-patch"; @@ -9,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; })]; - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/core/gnome-common/src.nix deleted file mode 100644 index 8ffe7e20e1a9904c7beb59729ec5adc140a1e537..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-common/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-common-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9078b9e051cdb8b0d1f4f059516748c786518f31..6c485bcbd3ff09c29f8081dacdd9fcd02f84d668 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -1,41 +1,49 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib -, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake, autoconf }: +{ stdenv, gettext, fetchurl, evolution-data-server +, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, gtk3, glib, cheese +, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts +, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib +, vala, meson, ninja }: + +let + version = "3.26.1"; +in stdenv.mkDerivation rec { + name = "gnome-contacts-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1jszv4b8rc5q8r460wb7qppvm1ssj4733b4z2vyavc95g00ik286"; + }; -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + propagatedUserEnvPkgs = [ evolution-data-server ]; - doCheck = true; + nativeBuildInputs = [ + meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 wrapGAppsHook + ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; + buildInputs = [ + gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas + folks gnome-desktop telepathy-glib + libxml2 gnome-online-accounts cheese + gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib + ]; - # force build from vala - preBuild = '' - touch src/*.vala + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ]; - buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) - ''; - - patches = [ ./gio_unix.patch ]; + doCheck = true; - patchFlags = "-p0"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-contacts"; + attrPath = "gnome3.gnome-contacts"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; + description = "GNOME’s integrated address book"; maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch deleted file mode 100644 index f1b3d3c94ac26c3b2f64a945edd1ae24b0cb6d56..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 -+++ configure.ac 2015-04-09 18:45:59.744280137 +0200 -@@ -54,6 +54,7 @@ - champlain-0.12 - clutter-gtk-1.0 - geocode-glib-1.0 >= 3.15.3 -+ gio-unix-2.0 - " - PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) - diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix deleted file mode 100644 index bf3df1bc84feae62d2547760fc6ae353b09bd5b0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-contacts-3.26"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz; - sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 9d20eb750ab9128b393b6fe1bd18e97b24128638..8774de41c4b25ddfc58f0f4fe951ae74b1bd1b43 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,29 +1,39 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook -, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk +, libwacom, samba, shared-mime-info, tzdata, libtool +, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk , fontconfig, sound-theme-freedesktop, grilo }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-control-center-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-control-center"; attrPath = "gnome3.gnome-control-center"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns - shared_mime_info + shared-mime-info ]; buildInputs = with gnome3; [ - ibus gtk glib glib_networking upower gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libgtop - gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk + ibus gtk glib glib-networking upower gsettings-desktop-schemas + libxml2 gnome-desktop gnome-settings-daemon polkit libgtop + gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify - grilo libpwquality cracklib vino libcanberra_gtk3 libgudev - gdk_pixbuf defaultIconTheme librsvg clutter clutter_gtk + grilo libpwquality cracklib vino libcanberra-gtk3 libgudev + gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk networkmanager modemmanager gnome-bluetooth tracker ]; @@ -39,7 +49,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix deleted file mode 100644 index 948768904aea45684083da5568afc83ac696fdf3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-control-center-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz; - sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 99ff1b6f3a168b69a799d7aedd076b915bcf8490..7e85e27d6be9e97e7343bda33b04c660342aa60f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,9 +1,19 @@ { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, xkeyboard_config, isocodes, itstool, wayland +, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland , libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-desktop-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; + }; # this should probably be setuphook for glib NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -11,14 +21,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection + pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland gtk3 glib libseccomp ]; - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; patches = [ ./bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix deleted file mode 100644 index f3c0d446d3f180bb78fe3873e08add42dec16f73..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-desktop-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz; - sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 6cfdd45c2f9c700058600ba3d6a4770660cf668e..95fcfac1d7511b77204b83ba7b542bc71f855a9f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt +{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk, glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-dictionary-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gnome3.defaultIconTheme ]; nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool - desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; - buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ]; + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; + buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix deleted file mode 100644 index 92a50430bd1fe30bf839412a07bcf7de242a827b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-dictionary-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz; - sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 188ad99b73cd6d7bb9c364fa924ad6dac5dcb8dd..0937f5c3082354d7a36d0a028f2f40278e542a72 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,18 +1,28 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk, glib, wrapGAppsHook, libnotify , itstool, gnome3, gdk_pixbuf, libxml2 -, libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }: +, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-disk-utility-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook libxml2 ]; - buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3 + buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 gdk_pixbuf udisks2 gnome3.defaultIconTheme - gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ]; + gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix deleted file mode 100644 index e3241153a9307da886ce9d6c9f7412a73d89dab4..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-disk-utility-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz; - sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index dade56158fb16b887810ee3c46c4b6e938286955..3774ff32db04d74ab4b5ced60ae9d67110172778 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -3,12 +3,22 @@ , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-font-viewer-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; + }; doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix deleted file mode 100644 index c31f09938c926a6a3bad9dcbe3d865dd55dee45c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-font-viewer-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz; - sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index d4f5835ed3a2add7c562df3e6e6f176ef43ef1ed..f7f06e35d3acefe21481e72974f891ed8b0a6786 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook +, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-keyring-${version}"; + version = "3.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; }; + }; outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit + dbus libgcrypt pam gtk3 libgnome-keyring + pango gcr gdk_pixbuf atk p11-kit ]; # In 3.20.1, tests do not support Python 3 diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix deleted file mode 100644 index ffee6211232ef21d6d4683620d119abf7a1a32fd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-keyring-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz; - sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index c6fa6cb1658493aeab0b001a2752a17c22b6d697..2abe8b28c0399708a88c188e2e379a5337320286 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc -, telepathy_glib, intltool, dbus_libs, icu, glib_networking +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc +, telepathy-glib, intltool, dbus_libs, icu, glib-networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-accounts-${version}"; + version = "3.26.2"; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; }; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -22,11 +32,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig vala gnome_common intltool wrapGAppsHook - libxslt docbook_xsl_ns docbook_xsl gtk_doc + pkgconfig vala gnome-common intltool wrapGAppsHook + libxslt docbook_xsl_ns docbook_xsl gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup + glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup gcr kerberos ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix deleted file mode 100644 index c43183c7c57dc25832a1dbf572877b5246f27b3f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-accounts-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.2.tar.xz; - sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index d8e878715602974935a838999ebd816d30accf51..1df5465382a9cc02dfd4772806b22f127b345fc0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-miners-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest + gnome3.gnome-online-accounts gnome3.libmediaart + gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest dleyna-server ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix deleted file mode 100644 index 3b8306c6a1a5af015d52a87cf03f0fd5c93f4423..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-miners-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz; - sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 5986b07229f54391e776b9f845bf3dac83a3d999..1f7aa4d874ad5e076a3415ac134581be66b33f82 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,9 +1,19 @@ -{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 +{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-screenshot-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; }; + }; doCheck = true; @@ -12,12 +22,12 @@ stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; - buildInputs = [ bash gtk3 glib libcanberra_gtk3 - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ bash gtk3 glib libcanberra-gtk3 + gnome3.gsettings-desktop-schemas ]; patches = [ ./prevent-cache-updates.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix deleted file mode 100644 index 72b1e662545267ff69f3d347e4c1673146bf01d0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-screenshot-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz; - sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2cd92ce39ca136bc531edd9ca545507dfa92caff..c8bc61462213d887c44d93febfe97ed1476e0ab8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,15 +1,25 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower +{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower , libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-session-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; }; + }; configureFlags = "--enable-systemd"; buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd + [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt + gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme + gsettings-desktop-schemas upower intltool gconf makeWrapper systemd epoxy ]; @@ -24,8 +34,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \ + --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix deleted file mode 100644 index bb9dec1efc230808ef71cdc3a2adb23c75b2a5c6..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-session-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz; - sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6de97f3dea26c0b95bee3e8d7ce7c7728a462e18..e3c84dfa9fd8a56fffffce448c400efbc696dc2a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,20 +1,30 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager , docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-settings-daemon-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-settings-daemon"; attrPath = "gnome3.gnome-settings-daemon"; }; + }; # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ]; + [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager + libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio + libcanberra-gtk3 upower colord libgweather xkeyboard_config + polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ]; postPatch = '' substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix deleted file mode 100644 index 1c3fbbfc2efa50366e3c874fc26714450f62683f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-settings-daemon-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz; - sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index fd90b8867d7b05b48a48b9a95f93ef0f0e49b2d8..a76dd35711a8c8b76b96cb23e0833569def11c64 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -2,7 +2,17 @@ , bash, makeWrapper, itstool, gnome3, file }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-extensions-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix deleted file mode 100644 index 150a15d0a5f31753c896ef7a14d24fb68ca6d9cd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-extensions-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz; - sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 693560454b17c8bc11aa380c55818995cece2ed1..026f5436237a03b6f70079bd8d8efe303cf238fe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret -, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales -, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core +, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales +, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , gst_all_1 }: @@ -12,7 +12,13 @@ let pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; + }; # Needed to find /etc/NetworkManager/VPN mesonFlags = [ "--sysconfdir=/etc" ]; @@ -21,17 +27,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice + [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf (librsvg.override { enableIntrospection = true; }) - clutter networkmanager libstartup_notification telepathy_glib - libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server + clutter networkmanager libstartup_notification telepathy-glib + libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server libical nss gtk gstreamer gdm - libcanberra_gtk3 gnome_control_center geoclue2 + libcanberra-gtk3 gnome-control-center geoclue2 defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobjectIntrospection (stdenv.lib.getLib dconf) ]; propagatedUserEnvPkgs = [ @@ -70,6 +76,7 @@ in stdenv.mkDerivation rec { passthru = { mozillaPlugin = "/lib/mozilla/plugins"; + updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; }; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix deleted file mode 100644 index 83cdd0682fda460233c868583c974ee5ce2ce861..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz; - sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 37650ae5a142837e57a3aa15c6bfcbc2e47ea1e7..8996a4cc3e93f77c1f7646fa615ea99021eea552 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree -, glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt -, json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }: +{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree +, glib, appstream-glib, libsoup, polkit, isocodes, gtkspell3, libxslt +, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-software-${version}"; + version = "3.26.7"; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 - valgrind-light docbook_xsl gtk_doc desktop_file_utils ]; - buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gtkspell3 json_glib libsecret ostree - polkit attr acl libyaml ]; - propagatedBuildInputs = [ isocodes ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "00lfzvlicqd8gk5ijnjdi36ikmhdzvfjj993rpf7mm04ncw4k0za"; + }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit isocodes; + }) + ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 + valgrind-light docbook_xsl gtk-doc desktop-file-utils + ]; + + buildInputs = [ + gnome3.gtk glib packagekit appstream-glib libsoup + gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtkspell3 json-glib libsecret ostree + polkit + ]; - postPatch = '' - patchShebangs meson_post_install.sh - ''; + # https://gitlab.gnome.org/GNOME/gnome-software/issues/320 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; mesonFlags = [ "-Denable-flatpak=false" @@ -28,18 +42,18 @@ stdenv.mkDerivation rec { "-Denable-gudev=false" ]; - postInstall = '' - mkdir -p $out/share/xml/ - ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes - ''; - - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-software"; + attrPath = "gnome3.gnome-software"; + }; + }; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; + description = "Software store that lets you install and update applications and system extensions"; + homepage = https://wiki.gnome.org/Apps/Software; license = licenses.gpl2; - description = "GNOME Software lets you install and update applications and system extensions."; + maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..239e1781bb1b1a603216eb2b767631cfc6538fc9 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/gs-language.c ++++ b/src/gs-language.c +@@ -95,7 +95,7 @@ + g_autoptr(GMarkupParseContext) context = NULL; + + /* find filename */ +- filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); ++ filename = g_build_filename ("@isoCodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { + g_free (filename); + filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix deleted file mode 100644 index 99c6415e83dc56b784e89dd52c14c8e4a8e45c44..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-software/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-software-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz; - sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index d66efca66d9cb6f25119128579d98758cabef56a..673140c3e1b60a95340dba2118a2d3efff94dbdf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; + gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index c32d9d95d88f74e7ad90569bda7c60bf435641e2..0e64bc4362c73c29a28d5d85c6087003c5319b2f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -3,21 +3,31 @@ , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-system-monitor-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-system-monitor"; attrPath = "gnome3.gnome-system-monitor"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bash gtk3 glib intltool itstool libxml2 gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas systemd ]; + gnome3.gsettings-desktop-schemas systemd ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix deleted file mode 100644 index b5d527632efe7c8e5779f174ab33054e1530dac3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-system-monitor-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz; - sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index b28c3a4c45d8ba42ec2c77cd3187f6cdf4a5b19b..703bb6fe110eafd3fc1edec21f50b7ea171dcb99 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3 -, gnome_doc_utils, intltool, which, libuuid, vala -, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: +, gnome-doc-utils, intltool, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-terminal-${version}"; + version = "3.26.2"; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; }; + }; + + buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools gnome3.dconf itstool gnome3.nautilus ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - vala desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2 + vala desktop-file-utils wrapGAppsHook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; # FIXME: enable for gnome3 diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix deleted file mode 100644 index a6072ba7ca5e6830e679e411971db8d91e31d6cd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-terminal-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz; - sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix index 3db252d063f22d4d7b8dc9e4a820ec2ed081f66f..720120b392deb3dcbb1cb2a399c10bcdfdf88b4b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix @@ -2,7 +2,17 @@ , gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-themes-standard-${version}"; + version = "3.22.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix deleted file mode 100644 index dcda746c8dd1102033d7d9727b16738a2faf762b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-themes-standard-3.22.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz; - sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 6ab72ab7826de0f6d412ccad13cdf9ada48e0583..8854e7a2d0c32c399b52bf6289dce33c8245cbbb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-docs-${version}"; + version = "3.26.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-docs"; attrPath = "gnome3.gnome-user-docs"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnome3.yelp itstool libxml2 intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix deleted file mode 100644 index c18bad6b4cd8a045a84a39b5db7dadab919bf10b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-docs-3.26.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.1.tar.xz; - sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 0b83f6eb2267b5394e36c58242b61411509cc168..642ee0badf1ea5c13579fe8ff68a00715ea84789 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,10 +1,20 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus , pkgconfig, gtk3, glib, libxml2, gnused, systemd , bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: +, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-share-${version}"; + version = "3.18.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; + }; doCheck = true; @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool libxml2 libtool wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra_gtk3 systemd ]; + nautilus libnotify libcanberra-gtk3 systemd ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix deleted file mode 100644 index 2d06f9e7a7cf7ff2e7203e0894d2446320b9b50e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.18"; - minor = "3"; - name = "gnome-user-share-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz"; - sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index eb600770e0ac7ea77ea2ccc84003a81a990233fd..c6000352ab06c4b64d2431b59260ac0cc1440666 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,27 +1,39 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, dleyna-server, itstool }: +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +, gmime, json-glib, avahi, tracker, dleyna-server, itstool }: -stdenv.mkDerivation rec { - major = "0.3"; - minor = "5"; - name = "grilo-plugins-${major}.${minor}"; +let + pname = "grilo-plugins"; + version = "0.3.5"; + major = gnome3.versionBranch version; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9"; }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker dleyna-server intltool itstool ]; + nativeBuildInputs = [ pkgconfig intltool itstool ]; + buildInputs = [ + gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts + gnome3.totem-pl-parser gnome3.rest gmime json-glib + avahi gnome3.libmediaart tracker dleyna-server + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + homepage = https://wiki.gnome.org/Projects/Grilo; description = "A collection of plugins for the Grilo framework"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index ffa489927e2f10c7cbd29e70a60aaa7bedd130ce..08a6b784e9bd18d208708b0d49184e268bc1d233 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib , libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }: -stdenv.mkDerivation rec { - major = "0.3"; # if you change this, also change ./setup-hook.sh - minor = "4"; - name = "grilo-${major}.${minor}"; +let + pname = "grilo"; + version = "0.3.4"; # if you change minor, also change ./setup-hook.sh +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw"; }; @@ -28,8 +29,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + homepage = https://wiki.gnome.org/Projects/Grilo; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 977dd7ffd6fb3b166a7306177b9e3d81b64e2119..89614a327a6a6dd2baaf822d9ad1ed34e928c1d6 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,9 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: +, gnome3, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gsettings-desktop-schemas-${version}"; + version = "3.24.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; + }; preInstall = '' mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix deleted file mode 100644 index 1eca56c509bf5afdcb1e23580cfd5cb85ebe9cf2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gsettings-desktop-schemas-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz; - sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix index c8a65bfb48f5fa1f5a45635df9aefaf9ce50ac07..4978223c9b2ba27088c4440beaf6428eb14e7004 100644 --- a/pkgs/desktops/gnome-3/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/core/gsound/default.nix @@ -1,18 +1,26 @@ { stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: let - majVer = "1.0"; + pname = "gsound"; + version = "1.0.2"; in stdenv.mkDerivation rec { - name = "gsound-${majVer}.2"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ]; buildInputs = [ glib libcanberra ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; description = "Small library for playing system sounds"; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 45001e5512735a61b4347e5590319d4f6838e5dc..b3948942c12bc37fa9734f92deb14adeaef6126b 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: let checkInputs = [ xvfb_run dbus ]; in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceview-${version}"; + version = "3.24.6"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; }; + }; propagatedBuildInputs = [ # Required by gtksourceview-3.0.pc gtk3 # Used by gtk_source_language_manager_guess_language - shared_mime_info + shared-mime-info ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix deleted file mode 100644 index ec7a8a6aaa57627e600eb85952064c9cdbb6e040..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceview-3.24.6"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz; - sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix index 7763867bcbffaf45c20c1c6a67151d9a9fbeb4e7..ae4f75bf76a7b32f73042c66cafd262d4c31b347 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix @@ -1,7 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: +{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceviewmm-${version}"; + version = "3.21.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; attrPath = "gnome3.gtksourceviewmm"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glibmm gtkmm gtksourceview ]; diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix deleted file mode 100644 index 21618c45e051f9bf0386fd617f7aab46bff450ef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceviewmm-3.21.2"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceviewmm/3.21/gtksourceviewmm-3.21.2.tar.xz; - sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 731ff7e2688ee96953797d462dc4c56f5947186f..ff9b232cb7a8adbabf4edf30ba52924978331584 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools +, glib, desktop-file-utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: @@ -7,20 +7,30 @@ # use packaged gnome3.adwaita-icon-theme stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gucharmap-${version}"; + version = "10.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gucharmap"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools - gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection + gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix deleted file mode 100644 index fb38e3bf386b05d669d556ba15808b2dd0d7fd93..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gucharmap-10.0.3"; - - src = fetchurl { - url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz; - sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 744ec3c2fe62aa2bd66f22fc1a4d7933ae59db87..7df5165d238c79bcf2ab2eead7a0d556b0af628a 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.12"; +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch, gnome3 }: +let + pname = "libcroco"; + version = "0.6.12"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; @@ -29,6 +31,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "GNOME CSS2 parsing and manipulation toolkit"; homepage = https://git.gnome.org/browse/libcroco; diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix index ddf245f49e06aa60a31984f047fe90cb1b077199..f430986cc474a583c64747b3061f71dc7114f66a 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }: +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib +, gobjectIntrospection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: let - majorVersion = "0.17"; + pname = "libgdata"; + version = "0.17.9"; in stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.9"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; @@ -16,12 +17,21 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ]; + liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; - propagatedBuildInputs = [ json_glib ]; + propagatedBuildInputs = [ json-glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; # Stable version has not been updated for a long time. + }; + }; meta = with stdenv.lib; { description = "GData API library"; + homepage = https://wiki.gnome.org/Projects/libgdata; maintainers = with maintainers; [ raskin lethalman ]; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index aaf104532eba6ef3ca3ac459ace3013db10798ec..a5ce9ee5e10528971626a05ca03900a23b87df62 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: let - ver_maj = "0.20"; - ver_min = "0"; + pname = "libgee"; + version = "0.20.1"; in stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; }; doCheck = true; @@ -18,8 +18,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + homepage = https://wiki.gnome.org/Projects/Libgee; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix index 10d676d11d630a72aa824c66a60e50e72c19fe11..cb771fc1989fc91bb3d20499f6f2aca1fdf18f2f 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: -stdenv.mkDerivation rec { - name = "libgepub-${version}.2"; - version = "0.5"; + +let + pname = "libgepub"; + version = "0.5.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz"; - sha256 = "0f1bczy3b00kj7mhm80xgpcgibh8h0pgcr46l4wifi45jacji0w4"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0gn14k1qnkfj0677i2wc42ig4m8biqib9apk23dnl92m3h1f2lmb"; }; doCheck = true; @@ -14,6 +17,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index 689ece9ad788d602a9f255fd7e61445082afd6f9..d46cf489620a803cfaf767327840f5bf89748317 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: +let + pname = "libgnome-keyring"; + version = "3.12.0"; +in stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -13,9 +17,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = { description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; + homepage = https://wiki.gnome.org/Projects/GnomeKeyring; license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix index 319f089b92065f6456ebe6bfe7e473e0fd16c6fc..6301f6f4ab659ad293802792aee039c2d460235a 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgnomekbd-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomekbd/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgnomekbd"; attrPath = "gnome3.libgnomekbd"; }; + }; nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; buildInputs = [ glib gtk3 libxklavier ]; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix deleted file mode 100644 index 431006daf4fb06dacd3751dc8fb2a0962728aa5e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgnomekbd-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz; - sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 01b3c9bc09301267ef5050efbe5a891bb85f7114..ad14abb100083a07f0e93b35c9be19669124207d 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -2,10 +2,20 @@ , pango, gdk_pixbuf, atk, tzdata, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgweather-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgweather"; attrPath = "gnome3.libgweather"; }; + }; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; + propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ]; nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; # Prevent building vapi into ${vala} derivation directory diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix deleted file mode 100644 index 799713c28a4a7e6bca015c58f3c7bc4ff96fb6a2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgweather-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.1.tar.xz; - sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index 9e1e4588918f098d4860716b7278ec017354c4e0..65f8090e4ead9f65024bcfae517c516c5465e098 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo -, libarchive, freetype, libjpeg, libtiff +, libarchive, freetype, libjpeg, libtiff, gnome3 }: -stdenv.mkDerivation rec { - name = "libgxps-0.3.0"; +let + pname = "libgxps"; + version = "0.3.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; @@ -19,7 +22,19 @@ stdenv.mkDerivation rec { "-Dwith-liblcms2=false" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "A GObject based library for handling and rendering XPS documents"; + homepage = https://wiki.gnome.org/Projects/libgxps; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 998a1a02b3f97308f67d4d88cc00ffabd4a6fd29..8eaa927ac7b9f716dc559d14e167aa1b62a448cd 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -3,7 +3,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libpeas-${version}"; + version = "1.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libpeas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; }; + }; configureFlags = [ "--enable-python3" ]; diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix deleted file mode 100644 index 6f2cd82fb215f519767331822596224c21bb6aef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libpeas/src.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "1.22"; - minor = "0"; - version = "${major}.${minor}"; - name = "libpeas-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index dab1a0fea8a09650ce81f6ad09461d9eacc55950..11761bd3412ba2088f833d13a9301a5f01886fb2 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts, gnome3 }: +let + pname = "libzapojit"; + version = "0.0.3"; +in stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ glib json-glib rest libsoup gtk gnome-online-accounts ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index e1343d9977d7bb2c2b4e87c6eccee5062654b3ba..dc89c8c674ab71373cd298bfd251da788b9a8207 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,10 +1,20 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3 +, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "mutter-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; + }; configureFlags = [ "--with-x" @@ -36,10 +46,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; buildInputs = with gnome3; [ - glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode_glib libinput libgudev libwacom - libcanberra_gtk3 zenity xkeyboard_config libxkbfile + glib gobjectIntrospection gtk gsettings-desktop-schemas upower + gnome-desktop cairo pango cogl clutter zenity libstartup_notification + gnome3.geocode-glib libinput libgudev libwacom + libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; diff --git a/pkgs/desktops/gnome-3/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix deleted file mode 100644 index b3d0841a2e5ce509ca01b9463c4f5c33a343e399..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "mutter-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz; - sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 0a7cd139d2cca700d4f5d2f8dcb4f6accbd6307e..8ed7bb2f01a076643c219d95aa18785b76749c95 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,15 +1,25 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook -, gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook +, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif , exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "nautilus-${version}"; + version = "3.26.2"; - nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ]; + src = fetchurl { + url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "nautilus"; attrPath = "gnome3.nautilus"; }; + }; + + nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux - tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux + tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ gnome-autoar ]; @@ -21,6 +31,7 @@ stdenv.mkDerivation rec { # Thumbnailers --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix deleted file mode 100644 index 1cc14391e39440fccf5b56537b3fb0e76b80b3a8..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nautilus-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz; - sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index 59f7a53e3e3ec6b8bd60c3d5161bc9964476e7d1..9cd36cd775033f166acbd59d32798635f8e52ded 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: -stdenv.mkDerivation rec { - name = "rest-${version}"; - major = "0.8"; - version = "${major}.1"; +let + pname = "rest"; + version = "0.8.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/rest/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; @@ -15,7 +16,16 @@ stdenv.mkDerivation rec { configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Librest; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index e4213b240a2811befcf97471a5a9abc08e01cda3..a40a8fe8f81ae07ac165f53f29bee2c9415d47a6 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,7 +3,17 @@ , libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "simple-scan-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0galkcc76j0p016fvwn16llh0kh4ykvjy4v7kc6qqnlp38g174n3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "simple-scan"; }; + }; buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb gtk libwebp packagekit sane-backends vala ]; @@ -51,6 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = https://launchpad.net/simple-scan; license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix deleted file mode 100644 index fb430db7d8445eb956645c6551e2644312734af0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/simple-scan/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "simple-scan-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz; - sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 37b311256bd9bf32433151d975df8808fb8f135e..00cec2f93b9f5f90a5c4f2bd112b13ec3cc3e3ed 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "sushi-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "sushi"; attrPath = "gnome3.sushi"; }; + }; propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper harfbuzz ]; diff --git a/pkgs/desktops/gnome-3/core/sushi/src.nix b/pkgs/desktops/gnome-3/core/sushi/src.nix deleted file mode 100644 index a713aef6f7f0b730e45c6e9aaba78cca6dcac393..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/sushi/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "sushi-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz; - sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index c763621564c7e21b09f78c569ecca528887f9c7c..ef6bc97b1c676652cd33aefb8cecb0781e7de332 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-pl-parser-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; }; + }; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; buildInputs = [ gmime libxml2 libsoup ]; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix deleted file mode 100644 index 2935111df27deb4a51ebb1f430d0545b88489fb1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-pl-parser-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; - sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index c26b9b45dfdfb817a58d188bf46c8bcc2918742c..a9d8b2ad11cb1f4a4e021350782d0866cf0f29c4 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,11 +1,21 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter -, clutter_gtk, clutter-gst, python3Packages, shared_mime_info +, clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg +, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg , gdk_pixbuf, file, tracker, nautilus }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; }; + }; doCheck = true; @@ -16,14 +26,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared_mime_info dbus_glib - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas tracker nautilus ]; + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; diff --git a/pkgs/desktops/gnome-3/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix deleted file mode 100644 index e051b13dee8d14a79bb0c8ee03c02d7e341fc06b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/totem/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem/3.26/totem-3.26.0.tar.xz; - sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index baff249a03a3c547d83cf4fb65096cac7f00b4e4..56292330e0133982d5d1fc5cfe77ee7a174d4d88 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,16 +1,26 @@ { stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib +, substituteAll, pkgconfig, gtk3, glib, gexiv2 , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, libnotify -, evolution_data_server, gst_all_1, poppler +, evolution-data-server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue , libvorbis, flac, exempi, networkmanager , libpng, libexif, libgsf, libuuid, bzip2 -, libsoup, json_glib, libseccomp +, libsoup, json-glib, libseccomp , libiptcdata }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tracker-miners-${version}"; + version = "2.0.4"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tracker-miners"; attrPath = "gnome3.tracker-miners"; }; + }; NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; @@ -19,21 +29,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; # TODO: add libgrss, libenca buildInputs = [ - bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser + bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu - json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup - libtiff libuuid libvorbis libxml2 poppler taglib upower + json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup + libtiff libuuid libvorbis libxml2 poppler taglib upower gexiv2 ]; LANG = "en_US.UTF-8"; # for running tests doCheck = true; - postPatch = '' - substituteInPlace src/libtracker-common/tracker-domain-ontology.c --replace \ - 'SHAREDIR, "tracker", "domain-ontologies"' \ - '"${gnome3.tracker}/share", "tracker", "domain-ontologies"' - ''; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit (gnome3) tracker; + }) + ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ed93fbcca93e82d5adee98c7cf502be6c4c66ae --- /dev/null +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/libtracker-miners-common/tracker-domain-ontology.c ++++ b/src/libtracker-miners-common/tracker-domain-ontology.c +@@ -372,7 +372,7 @@ + if (!priv->ontology_location) { + gchar *ontology_path; + +- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies", ++ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies", + priv->ontology_name, NULL); + + if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) { diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix deleted file mode 100644 index 1c5ee9b35fa11e7a9ab6561212dc2c14b634762e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-miners-2.0.3"; - - src = fetchurl { - url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.3.tar.xz; - sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 59455f320b53865d0b449354b96d77bbb0df2740..61ae06ec0664b291505ad0c43c369af3b73a646d 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,19 +1,29 @@ { stdenv, fetchurl, intltool, pkgconfig , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt -, gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tracker-${version}"; + version = "2.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tracker"; attrPath = "gnome3.tracker"; }; + }; enableParallelBuilding = true; nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ]; # TODO: add libstemmer buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib ]; - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas configureFlags = [ "--disable-unit-tests" ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix deleted file mode 100644 index 887ae9a865a9c9798e9e8b70274ce25b9747bdd8..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-2.0.2"; - - src = fetchurl { - url = mirror://gnome/sources/tracker/2.0/tracker-2.0.2.tar.xz; - sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index bd446623fc255db25898bf83968aaa7bededa565..4365451636ae140f4055afbfbc0e85a9bc859ce3 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,24 +1,34 @@ { stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup -, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null , zlib ? null, libjpeg ? null , libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , networkmanager ? null }: with lib; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vino-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vino/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; }; + }; doCheck = true; buildInputs = [ wrapGAppsHook pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] - ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ] + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ filter (p: p != null) [ libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager diff --git a/pkgs/desktops/gnome-3/core/vino/src.nix b/pkgs/desktops/gnome-3/core/vino/src.nix deleted file mode 100644 index 8cf55272da97ccb64a6ca5b88874d42fecfc0721..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/vino/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vino-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz; - sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 251e27334b11c200677987c6f4be8d45348d4756..4abeb2ba961848311a0b9c0f011c18c26630711b 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, intltool, pkgconfig , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 +, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vte-${version}"; + version = "0.50.2"; + + src = fetchurl { + url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; + }; nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index c40972e955fa07df3aa864ea0b8429f2b8f9565c..e6dc005fe58eee2ef32636e2767bdbce7bbb383a 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -1,4 +1,4 @@ -{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }: +{ gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: gnome3.vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -14,5 +14,5 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] - ++ [ gtk_doc autoconf automake gettext libtool gperf ]; + ++ [ gtk-doc autoconf automake gettext libtool gperf ]; }) diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix deleted file mode 100644 index c63873767dc43b2e1faedda979330efa2745c229..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vte-0.50.2"; - - src = fetchurl { - url = mirror://gnome/sources/vte/0.50/vte-0.50.2.tar.xz; - sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index eaceadcc85c4fc2bfbb17de5297c441d5985252d..28e89cad9fb8b6729a85e336e9654297e2b9237b 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-tools-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; }; + }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ]; + buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix deleted file mode 100644 index f03c6d1bc311300e642dbc10bf707e8fcb7c97ef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-tools-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 353b9ccb55e3f4f3e214b26fb046d33c491fb8ee..341a7d7582ca15ca7edb7720b95414609ce2b021 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,7 +2,17 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-xsl-${version}"; + version = "3.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix deleted file mode 100644 index de5d68d1fab1fc4a2e359c7b2cc46a4cd2f49f29..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-xsl-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz; - sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 6b458598c2999a1cf9a161ee27264274af048f33..661ddc1f12f40ab12916d6b2a2c4a10fca971e6b 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -4,17 +4,27 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-${version}"; + version = "3.26.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl librsvg gdk_pixbuf gnome3.defaultIconTheme groff - gnome3.gsettings_desktop_schemas wrapGAppsHook + gnome3.gsettings-desktop-schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix deleted file mode 100644 index dd06a6bf1ebb7b01095fa2b7a13579c656d7e890..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/yelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp/3.26/yelp-3.26.0.tar.xz; - sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 80f2dde534ecabda45d83ec4013dcba8d5a7ba2c..fd55fd9f87a65839ef646c726a91581364894abc 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,8 +1,18 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }: +, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "zenity-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; + }; preBuild = '' mkdir -p $out/include @@ -10,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix deleted file mode 100644 index ad0ce2f4d733663aa02a0cd6d771eda34e3cf932..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/zenity/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "zenity-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/3.26/zenity-3.26.0.tar.xz; - sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 0650ddf04eaec2dbba2c5b2c392ac7c26861b32c..b79b04565fee4ce8dfab3100ab346155aa4aa323 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, lib }: let @@ -13,25 +13,31 @@ let callPackage = pkgs.newScope self; + # Convert a version to branch (3.26.18 → 3.26) + # Used for finding packages on GNOME mirrors + versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); + + updateScript = callPackage ./update.nix { }; + version = "3.26"; maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ]; corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database + pkgs.desktop-file-utils + pkgs.shared-mime-info # for update-mime-database glib # for gsettings gtk3.out # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme gnome-shell-extensions - pkgs.hicolor_icon_theme + glib-networking gvfs dconf gnome-backgrounds gnome-control-center + gnome-menus gnome-settings-daemon gnome-shell + gnome-themes-standard defaultIconTheme gnome-shell-extensions + pkgs.hicolor-icon-theme ]; optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor simple-scan - gnome_terminal gnome-user-docs evolution file-roller gedit + gnome-terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool @@ -46,8 +52,8 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 - clutter clutter-gst clutter_gtk cogl gtkvnc; + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 + clutter clutter-gst clutter-gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -81,11 +87,11 @@ let evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - evolution_data_server = callPackage ./core/evolution-data-server { }; + evolution-data-server = callPackage ./core/evolution-data-server { }; gconf = callPackage ./core/gconf { }; - geocode_glib = callPackage ./core/geocode-glib { }; + geocode-glib = callPackage ./core/geocode-glib { }; gcr = callPackage ./core/gcr { }; # ToDo: tests fail @@ -93,8 +99,8 @@ let gjs = callPackage ./core/gjs { }; - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; + glib-networking = pkgs.glib-networking.override { + inherit gsettings-desktop-schemas; }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -103,13 +109,13 @@ let gnome-contacts = callPackage ./core/gnome-contacts { }; - gnome_control_center = callPackage ./core/gnome-control-center { }; + gnome-control-center = callPackage ./core/gnome-control-center { }; gnome-calculator = callPackage ./core/gnome-calculator { }; - gnome_common = callPackage ./core/gnome-common { }; + gnome-common = callPackage ./core/gnome-common { }; - gnome_desktop = callPackage ./core/gnome-desktop { }; + gnome-desktop = callPackage ./core/gnome-desktop { }; gnome-dictionary = callPackage ./core/gnome-dictionary { }; @@ -119,27 +125,27 @@ let gnome-menus = callPackage ./core/gnome-menus { }; - gnome_keyring = callPackage ./core/gnome-keyring { }; + gnome-keyring = callPackage ./core/gnome-keyring { }; - libgnome_keyring = callPackage ./core/libgnome-keyring { }; + libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnomekbd = callPackage ./core/libgnomekbd { }; folks = callPackage ./core/folks { }; - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; - gnome_session = callPackage ./core/gnome-session { }; + gnome-session = callPackage ./core/gnome-session { }; - gnome_shell = callPackage ./core/gnome-shell { }; + gnome-shell = callPackage ./core/gnome-shell { }; gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; gnome-screenshot = callPackage ./core/gnome-screenshot { }; - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; gnome-software = callPackage ./core/gnome-software { }; @@ -147,9 +153,9 @@ let gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - gnome_terminal = callPackage ./core/gnome-terminal { }; + gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + gnome-themes-standard = callPackage ./core/gnome-themes-standard { }; gnome-user-docs = callPackage ./core/gnome-user-docs { }; @@ -159,7 +165,7 @@ let grilo-plugins = callPackage ./core/grilo-plugins { }; - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; gsound = callPackage ./core/gsound { }; @@ -193,36 +199,36 @@ let nautilus = callPackage ./core/nautilus { }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { inherit gnome3; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { + networkmanager-pptp = pkgs.networkmanager-pptp.override { inherit gnome3; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { inherit gnome3; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { inherit gnome3; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { inherit gnome3; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { inherit gnome3; }; - networkmanager_iodine = pkgs.networkmanager_iodine.override { + networkmanager-iodine = pkgs.networkmanager-iodine.override { inherit gnome3; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; + inherit gnome3 gsettings-desktop-schemas glib-networking; }; rest = callPackage ./core/rest { }; @@ -249,9 +255,9 @@ let yelp = callPackage ./core/yelp { }; - yelp_xsl = callPackage ./core/yelp-xsl { }; + yelp-xsl = callPackage ./core/yelp-xsl { }; - yelp_tools = callPackage ./core/yelp-tools { }; + yelp-tools = callPackage ./core/yelp-tools { }; zenity = callPackage ./core/zenity { }; @@ -401,6 +407,34 @@ let gnome-packagekit = callPackage ./misc/gnome-packagekit { }; +#### Legacy aliases + + evolution_data_server = evolution-data-server; # added 2018-02-25 + geocode_glib = geocode-glib; # added 2018-02-25 + glib_networking = glib-networking; # added 2018-02-25 + gnome_common = gnome-common; # added 2018-02-25 + gnome_control_center = gnome-control-center; # added 2018-02-25 + gnome_desktop = gnome-desktop; # added 2018-02-25 + gnome_keyring = gnome-keyring; # added 2018-02-25 + gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 + gnome_session = gnome-session; # added 2018-02-25 + gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 + gnome_shell = gnome-shell; # added 2018-02-25 + gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 + libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 + libgnome_keyring = libgnome-keyring; # added 2018-02-25 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 + networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + yelp_xsl = yelp-xsl; # added 2018-02-25 + yelp_tools = yelp-tools; # added 2018-02-25 + }; in self; # pkgsFun diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix index c6927111ed4826d0d8c76c4f015fe8c05bd88911..484e58568721042cfb33981bb228234e7c71c0f4 100644 --- a/pkgs/desktops/gnome-3/desktop/rarian/default.nix +++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix @@ -1,9 +1,12 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +let + pname = "rarian"; + version = "0.8.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.gz"; sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; @@ -11,7 +14,18 @@ stdenv.mkDerivation rec { buildInputs = [ perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "Documentation metadata library based on the proposed Freedesktop.org spec"; + homepage = https://rarian.freedesktop.org/; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 4347f72cc5f61d9b819d0c8b986020b5ac414daa..419588f86842c4f547edb825afd28b00ea8a61cc 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -2,7 +2,17 @@ itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "anjuta-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; + }; enableParallelBuilding = true; @@ -14,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl gnome3.libgda gnome3.gtksourceview - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix deleted file mode 100644 index 32843b14d8e452037bcc2ffb7a27c7db623b6568..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "anjuta-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/anjuta/3.26/anjuta-3.26.0.tar.xz; - sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 08dbade67fbf432c352d32fb7b467b601231c939..321e887cba6d896d3c62070047b2914440f56209 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, gsettings_desktop_schemas }: +, webkitgtk, intltool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "devhelp-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "devhelp"; attrPath = "gnome3.devhelp"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - gsettings_desktop_schemas + gsettings-desktop-schemas ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix deleted file mode 100644 index 15c4671e31fb0433f18ee76c1afbd3fb2fa9494f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "devhelp-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.1.tar.xz; - sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix index f12bbb0ca41d2b1cf28e92951e68f445214103b7..07fc15f0d55321fafc915989962ee72e881fee4a 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdl-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdl"; attrPath = "gnome3.gdl"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk3 intltool ]; diff --git a/pkgs/desktops/gnome-3/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix deleted file mode 100644 index 6475b36508cb5a22de963fca42a23cb73d7259c9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/gdl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdl-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gdl/3.26/gdl-3.26.0.tar.xz; - sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 50960f41a3126fe901975b508890cc77129f69a7..3949e29089c8127d9e1aea972d5ca4a2717190cd 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-devel-docs-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; + }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix deleted file mode 100644 index 4838b8f9d09eeceac53ad579bff85cabc15ee0aa..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-devel-docs-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-devel-docs/3.26/gnome-devel-docs-3.26.0.tar.xz; - sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index cf200cb3292553d49bda27772998c4e409b8e501..19853b19fcae2527f5c3dcab1bfe63faf7f125f4 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -3,7 +3,17 @@ gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "nemiver-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "mirror://gnome/sources/nemiver/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix deleted file mode 100644 index 2fcf639fe1b4ea72ef90b38fc699d2925318c0bd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nemiver-0.9.6"; - - src = fetchurl { - url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz; - sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; - }; -} - diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 11d891b674344302dd931a41eb98c2bb68960431..3064b62f2a4a90b07a38dd5cb55a33889b3a0a25 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: let - version = "9"; + version = "10"; inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; - sha256 = "0j6lzlp3jvkpnkk8s99y3m14xiq94rjwjzy2pbfqgv084ahzmz8i"; + sha256 = "1wp6qvcp758yfj8xlj15sk1d3jsb1p8136y8xxwpi9wfdjpzjs8j"; }; nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; - buildInputs = [ gnome3.gnome_shell python pygobject3 requests ]; + buildInputs = [ gnome3.gnome-shell python pygobject3 requests ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" @@ -24,8 +24,15 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXTENSION=OFF" ]; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "chrome-gnome-shell"; + }; + }; + meta = with stdenv.lib; { description = "GNOME Shell integration for Chrome"; + homepage = https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome; longDescription = '' To use the integration, install the browser extension, and then set to true. For Firefox based browsers, you will also need to build the wrappers with set to true. ''; diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py new file mode 100644 index 0000000000000000000000000000000000000000..d9155fe23930caed9f6f8543537e4e5a7a74c3a6 --- /dev/null +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -0,0 +1,60 @@ +import argparse +import json +import requests +import sys + +def version_to_list(version): + return list(map(int, version.split('.'))) + +def odd_unstable(version_str, selected): + version = version_to_list(version_str) + if len(version) < 2: + return True + + even = version[1] % 2 == 0 + prerelease = version[1] >= 90 + stable = even and not prerelease + if selected == 'stable': + return stable + else: + return True + +def no_policy(version, selected): + return True + +version_policies = { + 'odd-unstable': odd_unstable, + 'none': no_policy, +} + +def make_version_policy(version_predicate, selected): + return lambda version: version_predicate(version, selected) + +parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.') +parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.') +parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable') +parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable') + + +if __name__ == '__main__': + args = parser.parse_args() + + package_name = getattr(args, 'package-name') + requested_release = getattr(args, 'requested-release') + version_predicate = version_policies[getattr(args, 'version-policy')] + version_policy = make_version_policy(version_predicate, requested_release) + + # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 + cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text) + if type(cache) != list or cache[0] != 4: + print('Unknown format of cache.json file.', file=sys.stderr) + sys.exit(1) + + versions = cache[2][package_name] + versions = sorted(filter(version_policy, versions), key=version_to_list) + + if len(versions) == 0: + print('No versions matched.', file=sys.stderr) + sys.exit(1) + + print(versions[-1]) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 40e1473b59e25972b75e077de79b6b1a9bf1ca86..b194ac42bf2457c92fc241264d29f1920ed53f39 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile_2_0, libcanberra_gtk3 }: +, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils +, guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "aisleriot-${version}"; + version = "3.22.4"; + + src = fetchurl { + url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; }; + }; configureFlags = [ "--with-card-theme-formats=svg" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ]; + librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; diff --git a/pkgs/desktops/gnome-3/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix deleted file mode 100644 index 7fee97bae1dfbc04d5da493375e7e66b87885ae7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/aisleriot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "aisleriot-3.22.4"; - - src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.4.tar.xz; - sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 48b2b3823729844d2e88ccf8717fc4b7096572e0..8806344f3b38c8f6106cfddc2e9d7b7430307ccf 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "five-or-more-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "five-or-more"; attrPath = "gnome3.five-or-more"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/games/five-or-more/src.nix deleted file mode 100644 index 676e1a7d75a33c653676e223fd718720857306a2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/five-or-more/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "five-or-more-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.26/five-or-more-3.26.0.tar.xz; - sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 486fe5c486e060b5398617ad71058ff6b315fb3d..22032f16f477b5c3ea3fc56fcf2ef5de683d65ce 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: +, intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "four-in-a-row-${version}"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "four-in-a-row"; attrPath = "gnome3.four-in-a-row"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix deleted file mode 100644 index 9e2b23f3996bd718b12af74842e9491be382a73b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "four-in-a-row-3.22.2"; - - src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.2.tar.xz; - sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index bfa345c4a40b458d565b23921260b2dc75ef369f..f50542770c4fe99f54dc0561d2a701b8456654da 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -2,7 +2,17 @@ , intltool, itstool, librsvg, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-chess-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-chess"; attrPath = "gnome3.gnome-chess"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix deleted file mode 100644 index ee682d3801bd02586d84b9beea937a9b94c3b15c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-chess-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-chess/3.26/gnome-chess-3.26.0.tar.xz; - sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 13afae2eb2cb32a6e5652b1867a179a7af1c5cb9..c1f91092bb0dc83d6e12ceba0610f9b65e48ccec 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -2,7 +2,17 @@ , librsvg, libxml2, intltool, itstool, libgee, libgames-support }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-klotski-${version}"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-klotski/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-klotski"; attrPath = "gnome3.gnome-klotski"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix deleted file mode 100644 index e37f3642c82ecede8d3bd80eb83ce283048cd36a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-klotski-3.22.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.2.tar.xz; - sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 3d0d5d6df4672d11c403f7523b7b7580df445834..b9a4638a947c9f9e47b8253c857b54ce3c0f3c49 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-mahjongg-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix deleted file mode 100644 index c021136ee304a7b529a63a18cd36a99abe0b3f74..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mahjongg-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.0.tar.xz; - sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index d76e585bb4ebff5a42999a2f4b8e0f4736a7fc8e..ce5dc8bc14c0bf3035f9959c9c747e8435a098b9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2, libgames-support, libgee }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-mines-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-mines"; attrPath = "gnome3.gnome-mines"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix deleted file mode 100644 index 39096f00e42c4c46e4c4f6c5ab6743d588b3373a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mines-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.26/gnome-mines-3.26.0.tar.xz; - sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 90fdccc11860fd168ac45bc6892c228ba0ef1773..302d8fb2101001540bceb46cb247ed088a002ade 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool +, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool , libxml2, libgee, libgames-support }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-nibbles-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-nibbles"; attrPath = "gnome3.gnome-nibbles"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme + librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme libgee libgames-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix deleted file mode 100644 index 133e9651fa74d0faabe5c654a5023728a9f85883..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-nibbles-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz; - sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index cd13e6ab9585dba9cda6fc3aeed57c6dccdb55ac..aa5e00606c7a90b2e77f95edfe41b8956404f912 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support , libgee}: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-robots-${version}"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix deleted file mode 100644 index 09e4ad6c9673f92446aeaab1cbec079cda487f3d..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-robots-3.22.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.2.tar.xz; - sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index a0f83d48c3daf89659a3559ba534a85cfc99cf68..b3380e6bb96c96bb3606c199c1847052723e71e1 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: +, json-glib, qqwing, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-sudoku-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-sudoku"; attrPath = "gnome3.gnome-sudoku"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; + json-glib qqwing itstool libxml2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Sudoku; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix deleted file mode 100644 index f19142cf251ed0c5a8382abb71d9f2d69461a2e3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-sudoku-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-sudoku/3.26/gnome-sudoku-3.26.0.tar.xz; - sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index d456abe6dc1fed2dcce174d812e5ce7500b6392e..4f87fb50d6195f8cd28faa9699d341f44acbbe69 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-taquin-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook librsvg libcanberra-gtk3 intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix deleted file mode 100644 index 30a33e28e2de645bf25c25976edf5b5c05073969..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-taquin-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-taquin/3.26/gnome-taquin-3.26.1.tar.xz; - sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 37218776f1235afd94a0704a40654fbe06868a36..f456b7ee68311ea2cd528a1977e5e1724dfa2c90 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -2,7 +2,17 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-tetravex-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-tetravex/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix deleted file mode 100644 index e79b18263b995b5454e5e5ee76015e941457a350..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tetravex-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz; - sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 857aec9700f395896f664dc96d79382ecc32907a..db01eb86f1732684556efe9364ff729d91355b0d 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -2,7 +2,17 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "hitori-${version}"; + version = "3.22.4"; + + src = fetchurl { + url = "mirror://gnome/sources/hitori/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "hitori"; attrPath = "gnome3.hitori"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix deleted file mode 100644 index 93dcd5de62e32c5b6e4ff90e8ae2e86d41328067..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/hitori/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "hitori-3.22.4"; - - src = fetchurl { - url = mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz; - sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 3836548b3ab25b08a7240b980b1a465698b23776..d31457f868c4ece3cfba5dec244676dd82c8f014 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: +, intltool, itstool, libcanberra-gtk3, libxml2, dconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "iagno-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "iagno"; attrPath = "gnome3.iagno"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; + dconf libxml2 libcanberra-gtk3 wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/iagno/src.nix b/pkgs/desktops/gnome-3/games/iagno/src.nix deleted file mode 100644 index 86c1f30e5d6620879731cd2d339636feea010f15..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/iagno/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "iagno-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/iagno/3.26/iagno-3.26.1.tar.xz; - sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 7bd3ca95de941df8a95a596b2bbfeba2d73574ae..1a163352cfc80af93d3caddf27afb5c7b61b2e0f 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: +, intltool, itstool, clutter, clutter-gtk, libxml2, dconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "lightsoff-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "lightsoff"; attrPath = "gnome3.lightsoff"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; + libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/games/lightsoff/src.nix deleted file mode 100644 index 18528df24a3841313750dae2a45287b32744166f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/lightsoff/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "lightsoff-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/lightsoff/3.26/lightsoff-3.26.0.tar.xz; - sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 514b2a035575ba52bccd918f9a67e879a6a1d41a..b0572f981dedee1d842899eafb7a896668d0f744 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: +, librsvg, libcanberra-gtk3 +, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "quadrapassel-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/quadrapassel/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "quadrapassel"; attrPath = "gnome3.quadrapassel"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; + libcanberra-gtk3 itstool intltool clutter + libxml2 clutter-gtk wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/games/quadrapassel/src.nix deleted file mode 100644 index 57bdb4771ddf895bf02ce3e002e99a5920584137..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/quadrapassel/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "quadrapassel-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz; - sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index c6416960b7aadf1c84a31c1008cc404c9bc5722c..92da14fb55972f1b8e5806f4938407e03e3b8f68 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: +, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "swell-foop-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "swell-foop"; attrPath = "gnome3.swell-foop"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; + dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/games/swell-foop/src.nix deleted file mode 100644 index 082081ca36c7228c30b15f1ba4c52b590968f6a9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/swell-foop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "swell-foop-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/swell-foop/3.26/swell-foop-3.26.0.tar.xz; - sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 6f6beee89615f927b5389b00bfff32d1d160bf31..f8d799b69141904097de37c76132f14bf4d808d0 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tali-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tali/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg diff --git a/pkgs/desktops/gnome-3/games/tali/src.nix b/pkgs/desktops/gnome-3/games/tali/src.nix deleted file mode 100644 index 108144cc3eef2e21f989a4f6aa961361f2bf838e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/tali/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tali-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/tali/3.22/tali-3.22.0.tar.xz; - sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index b33488e34fce974ee04dbd3e239cf58eeebe8e3b..73d3b555ba9f9e9a5cb0f7b2843d2e8db4dfcbc8 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; + libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server + sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ]; preFixup = '' wrapProgram "$out/bin/california" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index a912fb1c98b2cea5467bc2a2aec296121d62131e..f8c296252617760d737200c6e15fcba138c6784a 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra_gtk3, libsecret, gmime +, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils +, libnotify, libcanberra-gtk3, libsecret, gmime , libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: +, gnome3, librsvg, gnome-doc-utils, webkitgtk }: let majorVersion = "0.12"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; - buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ]; + buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index 852ed00ed902536176ca593a112caa27ca4202ae..045dc2ffc33116d3098bccba099fca899f56dab0 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -1,30 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }: let - majorVersion = "0.10"; + pname = "gexiv2"; + version = "0.10.8"; in stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "${majorVersion}.7"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "1f7312zygw77ml37i5qilhfvmjm59dn753ax71rcb2jm1p76vgcb"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0088m7p044n741ly1m6i7w25z513h9wpgyw0rmx5f0sy3vyjiic1"; }; - patches = [ - # Darwin compatibility (https://bugzilla.gnome.org/show_bug.cgi?id=791941) - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=365969; - sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj"; - }) - # GIR & Vala bindings fix (https://bugzilla.gnome.org/show_bug.cgi?id=792431) - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=366662; - sha256 = "1ljb2pap5v9z3zhx69ghfyrbl2b62ck35nyn7h5h410d008lcb4v"; - }) - ]; - preConfigure = '' patchShebangs . ''; @@ -33,9 +20,17 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; + license = licenses.gpl2; platforms = platforms.unix; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 364a52ee5cdfdb60e181652213ec3947d9e5ebf5..94a29546fb972d78fd34ab545c565a60c99c1d48 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,20 +1,30 @@ { stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: +, gnome3, libsoup, json-glib }: -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.3"; +let + pname = "gfbgraph"; + version = "0.2.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; + buildInputs = [ glib gnome3.gnome-online-accounts ]; + propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 4180cd3b8ea19efe07abe5aaf2f05c7eec77c1f9..314539b7f9e6850d8f411aae803f2a590879e206 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib -, json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret +, json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , libsoup }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gitg-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gitg"; }; + }; preCheck = '' substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" @@ -13,11 +23,11 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ shared-mime-info + gnome3.gnome-themes-standard ]; - buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas + buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix deleted file mode 100644 index c72e2830ad1ee6b11a36be5001442e8f3170d74c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gitg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gitg-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz; - sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 3a35a87ceafc4f55878bae4733d3472a09dead04..b1251f5111a4b02b844e129c931d60b1b395b2a4 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -3,7 +3,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-autoar-${version}"; + version = "0.2.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-autoar/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix deleted file mode 100644 index ee2ade83ee6c345f86c1d6a38eaed7b44fd91e5f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-autoar-0.2.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz; - sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index cce734b474e464fd6dbf701692a9209513580ecf..ecc0711482fa37e454440e14eca5280d63c96bcf 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }: +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-packagekit-${version}"; + version = "3.26.0"; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ]; + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; + libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; prePatch = "patchShebangs meson_post_install.sh"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix deleted file mode 100644 index 5448eb8a83a7b6b6989cc8f874eda5ff0b411be9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-packagekit-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-packagekit/3.26/gnome-packagekit-3.26.0.tar.xz; - sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix index 4e8eaffde4353712bb3d0bc7c468a9e51664474e..35c3a678e843f28d7e7ad4936b308407cb219a84 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix @@ -4,19 +4,29 @@ , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-tweak-tool-${version}"; + version = "3.26.4"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-tweak-tool"; attrPath = "gnome3.gnome-tweak-tool"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.gsettings_desktop_schemas + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell python3Packages.pygobject3 - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.mutter gnome3.gnome_desktop gobjectIntrospection + libnotify gnome3.gnome-shell python3Packages.pygobject3 + libsoup gnome3.gnome-settings-daemon gnome3.nautilus + gnome3.mutter gnome3.gnome-desktop gobjectIntrospection ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix deleted file mode 100644 index 8af28e17dcd171bd6ae34192df3aeaf54eb1dbfb..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tweak-tool-3.26.4"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.4.tar.xz; - sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix index 486898a4e1f2db91c3d6f02aace28089bd5f0956..38b33ff66671b49123b4435bbf7f867abe4ecdd5 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix @@ -1,17 +1,26 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-video-effects-${version}"; +let + pname = "gnome-video-effects"; version = "0.4.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; }; nativeBuildInputs = [ pkgconfig intltool ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 3e1c897ffff9a5ab1cea4d117376e704a75767e8..aaedd6ef632d30907abf4f96e1a7eed471a6a9ce 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme - gtk3 gnome3.gnome_control_center dbus + gtk3 gnome3.gnome-control-center dbus clutter pango appstream-glib systemd gobjectIntrospection ]; configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings" diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 2bbf219e3f3a26d1a3ad26c3d585a9f6e70d07c8..5d2dc08e7e359edad1bbf588f2a066060ea697fa 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,7 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gspell-${version}"; + version = "1.6.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gspell/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gspell"; attrPath = "gnome3.gspell"; }; + }; propagatedBuildInputs = [ enchant ]; # required for pkgconfig @@ -9,6 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 isocodes ]; meta = with stdenv.lib; { + description = "A spell-checking library for GTK+ applications"; + homepage = https://wiki.gnome.org/Projects/gspell; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix deleted file mode 100644 index 9ae78f39e4e1c2e7cdec27c152eb19f7a1e1af8b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gspell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gspell-1.6.1"; - - src = fetchurl { - url = mirror://gnome/sources/gspell/1.6/gspell-1.6.1.tar.xz; - sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 3f65ab36b0bb7e881719602258eac8f1740e0992..1b912109cfd5261c2dfec4318e6276a92ad2e286 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -2,11 +2,21 @@ , gnome3, enchant, isocodes }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtkhtml-${version}"; + version = "4.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix deleted file mode 100644 index 21876ec9c399f6744c4cacaa5d1c83d722ecfb6f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtkhtml-4.10.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; - sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix index 107200d0895bffb1ce15c59fc5e3eebd5607964f..29fdd31765617bb7c6eca65db008de6f7741d619 100644 --- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix @@ -1,20 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3 }: -stdenv.mkDerivation rec { +let + pname = "libgnome-games-support"; version = "1.2.3"; - name = "libgnome-games-support-${version}"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgnome-games-support/1.2/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk3 libgee intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ glib gtk3 libgee ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.libgames-support"; + }; + }; meta = with stdenv.lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = https://github.com/GNOME/libgames-support; - license = licenses.gpl3; + homepage = https://wiki.gnome.org/Apps/Games; + license = licenses.lgpl3; + maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index edb34996867b9f6acd54a45571d17be66e991d5f..ce7bb6f75b5cd71926671a8bd2a7b30836b2f7ef 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,7 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null +}: + +assert mysqlSupport -> mysql != null; +assert postgresSupport -> postgresql != null; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgda-${version}"; + version = "5.2.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; }; + }; patches = [ (fetchurl { @@ -11,21 +27,24 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ - "--enable-gi-system-install=no" - ]; + configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] + ++ (optional (mysqlSupport) "--with-mysql=yes") + ++ (optional (postgresSupport) "--with-postgres=yes"); enableParallelBuilding = true; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool libxml2 gtk3 openssl ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ]; + buildInputs = with stdenv.lib; [ gtk3 openssl ] + ++ optional (mysqlSupport) mysql.connector-c + ++ optional (postgresSupport) postgresql; meta = with stdenv.lib; { description = "Database access library"; homepage = http://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgda/src.nix b/pkgs/desktops/gnome-3/misc/libgda/src.nix deleted file mode 100644 index 8812ccc8ccd9018f5dc1d8173b6dde9eeef0feda..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/libgda/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgda-5.2.4"; - - src = fetchurl { - url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz; - sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 3c9652de4990764d1815d32de38dc581f5469375..13d34c1c25801cd136340f8ab886058ddac1018c 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,11 +1,28 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2 -, gtk_doc, gobjectIntrospection, libgit2, glib }: +{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2 +, gtk-doc, gobjectIntrospection, libgit2, glib, python3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgit2-glib-${version}"; + version = "0.26.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgit2-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0nhyqas110q7ingw97bvyjdb7v4dzch517dq8sn8c33s8910wqcp"; + }; + + postPatch = '' + for f in meson_vapi_link.py meson_python_compile.py; do + chmod +x $f + patchShebangs $f + done + ''; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgit2-glib"; attrPath = "gnome3.libgit2-glib"; }; + }; nativeBuildInputs = [ - gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection + meson ninja pkgconfig vala gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ @@ -13,9 +30,16 @@ stdenv.mkDerivation rec { libgit2 glib ]; - buildInputs = [ libssh2 ]; + buildInputs = [ + libssh2 + python3.pkgs.pygobject3 # this should really be a propagated input of python output + ]; meta = with stdenv.lib; { + description = "A glib wrapper library around the libgit2 git access library"; + homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix deleted file mode 100644 index d233dc3a401599936b1d1a65494e6fc6e24960fc..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgit2-glib-0.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.2.tar.xz; - sha256 = "2ad6f20db2e38bbfdb6cb452704fe8a911036b86de82dc75bb0f3b20db40ce9c"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix index 2ea7a58ab6655a686f2833fcc0dc8ade84d29120..74a4cdca722e3ac8d43fa462d03877452d63e812 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix @@ -1,19 +1,28 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: let - majorVersion = "1.9"; + pname = "libmediaart"; + version = "1.9.4"; in stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.4"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; buildInputs = [ glib gdk_pixbuf ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 5634d2a48d54600005a77bc4420ed544720c071c..82e56d3f96c418bef402cda25207c1913c58195c 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, + dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, glib, gobjectIntrospection, libpeas }: @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra gst_all_1.gstreamer + dbus-glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas - gnome3.gnome_shell gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas + gnome3.gnome-shell gtk3 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix new file mode 100644 index 0000000000000000000000000000000000000000..b7a6ce16d11f210d088be3926a267b44f62206ae --- /dev/null +++ b/pkgs/desktops/gnome-3/update.nix @@ -0,0 +1,11 @@ +{ lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: + +let + python = python3.withPackages (p: [ p.requests ]); +in writeScript "update-${packageName}" '' + set -o errexit + PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} + latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable") + update-source-version "${attrPath}" "$latest_tag" +'' diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index da33999087ed7ba55d9325a13ed8bf411063a05b..0ada9af3b5e02a2c1491a96da0926715f564f589 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, poppler_qt5, wrapGAppsHook }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { poppler_qt5 fluxbox xscreensaver - desktop_file_utils + desktop-file-utils numlockx ]; diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index e3cb02e8b8afed921d032e7b13fa483c9a360441..c40b9c4e9f94f6bf90ef965e0818c61f654e5a7e 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libSM openbox - hicolor_icon_theme + hicolor-icon-theme ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c6607dad29021d01aba9a6ea98bfb8528f2b24dc..05b9d966fc4367017678f08579a2ce60297da047 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor_icon_theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { poppler mate.caja mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 1aef8d3d184f1c45a1cddadf867fb3ad25dc5e87..3383847f16c61c56392912b2820008a31eb55331 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib gupnp mate.caja mate.mate-desktop diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index a80f89feff293ef15b25c990ccb5e254e1c15324..070808504d14decd160529687eb575d1f9d32b74 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libexif exempi mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; patches = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 8e46102cf5a6dc9235c7d7960442dffa42fddfc9..74d32ce1f216b1ee3fbf146eff7148658e77d750 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libxml2 gnome3.gtk mate.caja - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c3af73282e5c346761d43e704c9ce173c08bfae7..23e167412919dcb321019e51f97ae6474f45fb94 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib exempi lcms2 libexif libjpeg librsvg libxml2 - shared_mime_info + shared-mime-info gnome3.gtk gnome3.libpeas mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 9a926b78c3d7e07128edefb1a841c01e97f6c0a6..e5a544ae33e5ee42903102cd151baf4ec498eb23 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 libgtop gnome2.startup_notification gnome3.gtk diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index f56d594303c9f75ffc1bbad6c5147e7b1fef272f..0be643c97189e0e8097d5e779433113025c3996f 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wirelesstools mate.libmateweather mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; configureFlags = [ "--enable-suid=no" ]; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index e9b789bdc4e988bcd5e95afd84d72b1cd1d58a6e..fdee351aeed5a9b08062178ed61a96109580a435 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, - libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3, - desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, + libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, + desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool - desktop_file_utils + desktop-file-utils wrapGAppsHook ]; buildInputs = [ libxml2 - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 librsvg libappindicator-gtk3 gnome3.gtk gnome3.dconf - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop mate.libmatekbd mate.mate-menus diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 6e1f9778e3136857500b4e790ad0592c8470e361..2d868d2e0821f86d98991fcf8b8eada58e620141 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mate, hicolor_icon_theme }: +{ stdenv, fetchurl, autoreconfHook, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ]; + buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; meta = { description = "Faenza icon theme from MATE"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index a42116a63af5ec9a8f0fee3818c99befacb1063d..93ad93b07b98a565748ea52b85d89f819b093ef7 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3, mate }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3, mate }: stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; - buildInputs = [ librsvg hicolor_icon_theme ]; + buildInputs = [ librsvg hicolor-icon-theme ]; postInstall = '' for theme in "$out"/share/icons/*; do diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 4ff636c3c734015a5daa45a0881c5625aaf92b79..512327c0620844aaf446cfce5c061366a6922f73 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-indicator-applet-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { gtk3 libindicator-gtk3 mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index f4ee94b4bd3763f5a109b4f62743406300becd0e..514da3a1172407317ea86c6a32381f25a3656efe 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra_gtk3, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-media-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk mate.libmatemixer mate.mate-desktop diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 53b441a293a670e79aabcd0a58c3fa2ec32fca02..59df2b7d59bde142d2bfc1be422025db9b3e0ab4 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3, +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib - libcanberra_gtk3 + dbus-glib + libcanberra-gtk3 libnotify libwnck3 gnome3.gtk diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index b05a9a68af0439bd51a4521acbff9179fe897275..0adcb58758c36250f407bd3601a6f14856ae2fb1 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - dbus_glib + dbus-glib libwnck3 librsvg libxml2 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mate.libmateweather mate.mate-desktop mate.mate-menus - hicolor_icon_theme + hicolor-icon-theme ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index df38485fbc757bcf33fe3d3d9001a28112ed4b55..ddde6acf0e0e711d5e743714dfcfc9863993c388 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { glib itstool libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk - gnome3.libgnome_keyring + gnome3.libgnome-keyring libnotify - dbus_glib + dbus-glib upower mate.mate-panel ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index e1ae6b4ae1dc6d9914fbea787e19917705730998..3b5d303816ba6c012d9a07ae16ecc4ddd93f344d 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib libXScrnSaver libnotify pam diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 130db2420ef12ac807d94be2e474fae2db0446d6..dfd3766df297742d70ece5ac0d8f57f2c97b667b 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus-glib, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { libxslt libatasmart libnotify - dbus_glib + dbus-glib lm_sensors mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index d154b80263c69a6775650a2e1868ba6fc4581a42..97c80cdc2e4ed4bb262345d2536b77498f78406c 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd, - libSM, libXtst, gtk3, hicolor_icon_theme, mate, +{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, + libSM, libXtst, gtk3, hicolor-icon-theme, mate, wrapGAppsHook }: @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib systemd libSM libXtst gtk3 mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index dc1272115b8e72f4a84dac29a6e9703c2b7a5a94..b97b5294d39b4153f715d442a8d919c00ec62bc6 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 libnotify nss polkit diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index f5393cad0b8881942a42e9fae2a773501e0bd90a..23123fd2db1a73d7c72d56aaffccce695bb8aabd 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-user-share-${version}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib libnotify - libcanberra_gtk3 + libcanberra-gtk3 libxml2 mate.caja - hicolor_icon_theme + hicolor-icon-theme # Should mod_dnssd and apacheHttpd be runtime dependencies? # In gnome-user-share they are not. #mod_dnssd diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 946dc3efd25338f66bbb701d5b5e766c7d12e9ae..f96eecb0a4e63f875227fbd18008d33c5a5a9b7d 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-utils-${version}"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgtop - libcanberra_gtk3 + libcanberra-gtk3 libxml2 mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 13a34f90fcdda1503d1a6bae04b8079f8c5d4c02..22e790784d5727dda46c50a99054ed12bf012335 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = with gnome3; [ glib gtk3 granite libnotify gettext vte_290 libgee - gsettings_desktop_schemas defaultIconTheme + gsettings-desktop-schemas defaultIconTheme ]; meta = { description = "Elementary OS's terminal"; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 44e8a26eee15c0dd6753cffcc8989ee60da5431d..4be84589080ce166e799a78f7ddb2f3390a9dbfd 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,12 +1,12 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: mkDerivation { name = "bluedevil"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 5bb8b0f9ef80042fd1b79cfa41d1901608eed653..6da0ad22d11548973db245331355bee94764dba2 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, gsettings_desktop_schemas, + gconf, gsettings-desktop-schemas, debug ? false, }: @@ -105,7 +105,7 @@ let breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; }; + kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; kdecoration = callPackage ./kdecoration.nix {}; kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; kgamma5 = callPackage ./kgamma5.nix {}; diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index f792f3b939f4c134d1000a8fae245e043c2b3e04..35d90a246bc6c7b62829f74ddf08f09324be985f 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings_desktop_schemas + knewstuff, gsettings-desktop-schemas }: mkDerivation { @@ -10,12 +10,12 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings_desktop_schemas + knewstuff gsettings-desktop-schemas ]; patches = [ ./0001-follow-symlinks.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/" + "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch index 79b5cfb437e265c78fd7fea28f59e45c97801fe6..75144d352223ed9e2923331cfbb9cae3a74eb0bc 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index 568cb34..98a5992 100644 #include -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; -+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; ++const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"; bool localeAwareCompare(const QString & one, const QString & two) { return one.localeAwareCompare(two) < 0; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index cc1dcb7ee9f744a1f27625ecf19969462d96e4da..214dbd9cc042f8f35cbe61432f9969d0b73f356f 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -4,7 +4,7 @@ kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, - mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt, + mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt, openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid }: @@ -15,13 +15,13 @@ mkDerivation { kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect + mobile-broadband-provider-info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; patches = [ (substituteAll { src = ./0001-mobile-broadband-provider-info-path.patch; - inherit mobile_broadband_provider_info; + inherit mobile-broadband-provider-info; }) (substituteAll { src = ./0002-openvpn-binary-path.patch; diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 0bfad2b5c8e4350f0716a7ac5f6ec0c60c0635f9..b60b5298d6dbba974235859abaab25bcb2e1b28e 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem + libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem }: mkDerivation { @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem + libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 65912083a4cf6a251ce641ff5c138c8bb953b2ae..6becf3bf420b79e3d0cf8b0b85324fc5d52779c1 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,5 +1,5 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, libpthreadstubs, libXcursor, libXdmcp, qtquickcontrols2, qtx11extras, karchive, ki18n, kio, knewstuff @@ -7,7 +7,7 @@ mkDerivation { name = "sddm-kcm"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs libXcursor libXdmcp qtquickcontrols2 qtx11extras diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 54b112927690c12c1bd64928a1b0fe9d971df9df..65e4463600a992b279169f04959ec7bfe3bc7e09 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }: +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info, hicolor-icon-theme }: let version = "2.11"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ]; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index a2b91aaaa79ec2063267349a02e4cf715f29f569..d66fa2049e6522cb5e17298b6d981f2e7b330531 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util -, gtk, gtksourceview, dbus, dbus_glib, makeWrapper +, gtk, gtksourceview, dbus, dbus-glib, makeWrapper , dconf }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool libxfce4util - gtk gtksourceview dbus dbus_glib makeWrapper + gtk gtksourceview dbus dbus-glib makeWrapper dconf ]; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index c26327f4d9206d510652aef529c23aceb5155246..f376b743c824795d90b7c3c432a181bf4a2a9136 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib +{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool bison flex ]; - buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index 598c503809285b4ed38e9af6c300f586c7cc680e..3b27456d78a37710ad20fcbaed2201daf7f53865 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1 -, gtk, dbus_glib, libxfce4ui, libxfce4util, xfconf +, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf , taglib, libnotify , withGstPlugins ? true }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - gtk dbus_glib libxfce4ui libxfce4util xfconf + gtk dbus-glib libxfce4ui libxfce4util xfconf taglib libnotify ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index b38b97b90438d4a6896b2078a5512776d7bcb309..f849fbd20a733df0f453237d83636fa2a6ef6766 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk -, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf -, hicolor_icon_theme, makeWrapper +, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf +, hicolor-icon-theme, makeWrapper }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util - libxfce4ui xfconf hicolor_icon_theme makeWrapper + [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util + libxfce4ui xfconf hicolor-icon-theme makeWrapper ]; postInstall = '' wrapProgram "$out/bin/ristretto" \ - --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" ''; meta = { diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index ad1727da3b93f1f5dd4ebc07bc348e147d8e35df..773a8274f341e8d4ea57577afb6f768dbb86ff72 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib +{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib , exo, libxfce4util, libxfce4ui }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ]; meta = { homepage = http://www.xfce.org/projects/terminal; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index ffcdf483577972351966dbaee74e0fd8ecc431d6..4c855b8ddeb6ade3ad741fa092447bbc002d511f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }: +, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking + xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking ]; meta = { diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index a213b27a76191fd16c46555244950d3690535991..6b5ee4b313288d09bb94d5f26f3ee3e294da9493 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util -, hicolor_icon_theme }: +, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "exo"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ]; + buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ]; meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 58fc6c3fe4be0d13b773f6c8914fb6d9de94a47a..e8d5b4acd76908dfeef214f93de3667ac49dfe5e 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf -, libglade, libstartup_notification, hicolor_icon_theme +, libglade, libstartup_notification, hicolor-icon-theme , withGtk3 ? false, gtk3 }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ] ++ optional withGtk3 gtk3; propagatedBuildInputs = [ xorg.libICE xorg.libSM ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 106cda6b97577328c16e37b879fff7400603206d..7fe76057c93002fde0fe416b5e2d710274837059 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk -, libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }: +, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }: let p_name = "libxfcegui4"; ver_maj = "4.10"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index bfc55f87b5cd3dbcdfd657f486e8c234871b64fa..bf44fc0adbba548039da862ca095779c64b8645d 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool -, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev +, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev , exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ intltool - gtk dbus_glib libstartup_notification libnotify libexif pcre udev + gtk dbus-glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4panel ]; # TODO: optionality? diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 6e785c9438bb65b800f2a49f9da0a4a4f7b27a11..3e1d2be2b5313f8054e5543d8e419abb80b00add 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype , libgsf, poppler, bzip2 }: let p_name = "tumbler"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - intltool dbus_glib gdk_pixbuf curl freetype + intltool dbus-glib gdk_pixbuf curl freetype poppler libgsf bzip2 ]; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e9f6240cbdfe3b5611bc75acbd3030733e1e868f..26548f6daa42ca77006d8c8db27249ee0cc366f5 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext, glib_networking +, makeWrapper, xfce4mixer, hicolor-icon-theme +, withGtk3 ? false, gtk3, gettext, glib-networking }: let inherit (stdenv.lib) optional; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme + garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme ] ++ xfce4mixer.gst_plugins ++ optional withGtk3 gtk3; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index c72061e577e8a64d0d8212c127ef73eccd7f2729..9425c4d8884b6cadab29d8aecdf74f6528d26841 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus_glib, upower, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme +{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf +, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }: let p_name = "xfce4-power-manager"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool glib dbus_glib upower xfconf libxfce4util - libnotify hicolor_icon_theme + [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util + libnotify hicolor-icon-theme ] ++ (if withGtk3 then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ] diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index edc810d389722cfe4cdea35bd335af5f309be619..73939d535872c50e63176ed00751a520b00d3afb 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit -, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg -, hicolor_icon_theme +, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg +, hicolor-icon-theme }: let @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib + [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib xfconf xfce4panel libglade xorg.iceauth xorg.libSM - polkit hicolor_icon_theme + polkit hicolor-icon-theme ]; #TODO: upower-glib, gconf (assistive?), gnome keyring preBuild = '' diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index fbf03cc4a81d4c5724443a531bf4929ca910c820..9aa66a1343f65c019a80b12a0fc254f7390437cd 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }: let p_name = "xfconf"; ver_maj = "4.12"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib libxfce4util ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus-glib ]; meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfconf/start; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 1653814514254136ddf660c31c53f5a6edfdb580..491185ff2c0903d00d1bda71904d56ec8676038c 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify -, hicolor_icon_theme }: +, hicolor-icon-theme }: let p_name = "xfdesktop"; ver_maj = "4.12"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme + libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme ]; patches = [(fetchpatch { diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index d27f498842e3fb0d3b85f7e76cf4e6704781297f..968c845a011969729f02964c10734d9837ae6c96 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk2 +, shared-mime-info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - mono makeWrapper nant shared_mime_info gtksourceview + mono makeWrapper nant shared-mime-info gtksourceview gtk2 ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 696728e6f32c1607303b9e124b4dcbcf22d60c5b..087f74700214e396e2b3c5868d4bd740a0ba138a 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -2,7 +2,7 @@ let options = rec { - /* TODO: there are also MacOS, FreeBSD and Windows versions */ + /* TODO: there are also FreeBSD and Windows versions */ x86_64-linux = { arch = "linuxx86"; sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q"; @@ -21,6 +21,18 @@ let runtime = "armcl"; kernel = "linuxarm"; }; + x86_64-darwin = { + arch = "darwinx86"; + sha256 = "5adbea3d8b4a2e29af30d141f781c6613844f468c0ccfa11bae908c3e9641939"; + runtime = "dx86cl64"; + kernel = "darwinx8664"; + }; + i686-darwin = { + arch = "darwinx86"; + sha256 = x86_64-darwin.sha256; + runtime = "dx86cl"; + kernel = "darwinx8632"; + }; armv6l-linux = armv7l-linux; }; cfg = options.${stdenv.system}; @@ -37,12 +49,22 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = [ gcc glibc m4 ]; + buildInputs = if stdenv.isDarwin then [ m4 ] else [ gcc glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = '' + postPatch = if stdenv.isDarwin then '' + substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ + --replace "M4 = gm4" "M4 = m4" \ + --replace "dtrace" "/usr/sbin/dtrace" \ + --replace "mig" "/usr/bin/mig" \ + --replace "/bin/rm" "${coreutils}/bin/rm" \ + --replace "/bin/echo" "${coreutils}/bin/echo" + + substituteInPlace lisp-kernel/m4macros.m4 \ + --replace "/bin/pwd" "${coreutils}/bin/pwd" + '' else '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/echo" "${coreutils}/bin/echo" @@ -63,7 +85,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index fd8930bc8547fbbc98bc1892730999bfdc62519d..d569e2401b6dd9b25496375127cbfd0f8f8b01df 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -11,11 +11,12 @@ let , name ? "" , developerProgram ? false , python ? python27 + , runPatches ? [] }: stdenv.mkDerivation rec { name = "cudatoolkit-${version}"; - inherit (args) version; + inherit version runPatches; dontPatchELF = true; dontStrip = true; @@ -27,7 +28,7 @@ let This nix expression requires that ${args.name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory: - nix-prefetch-url file://${args.name} + nix-prefetch-url file://\$PWD/${args.name} ''; inherit (args) name sha256; } @@ -48,35 +49,34 @@ let rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + unpackPhase = '' sh $src --keep --noexec + cd pkg/run_files sh cuda-linux*.run --keep --noexec sh cuda-samples*.run --keep --noexec - cd pkg - ''; - - buildPhase = '' - chmod -R u+w . - while IFS= read -r -d ''$'\0' i; do - if ! isELF "$i"; then continue; fi - echo "patching $i..." - if [[ ! $i =~ \.so ]]; then - patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i - fi - if [[ $i =~ libcudart ]]; then - rpath2= - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - fi - patchelf --set-rpath $rpath2 --force-rpath $i - done < <(find . -type f -print0) + mv pkg ../../$(basename $src) + cd ../.. + rm -rf pkg + + for patch in $runPatches; do + sh $patch --keep --noexec + mv pkg $(basename $patch) + done ''; installPhase = '' mkdir $out + cd $(basename $src) perl ./install-linux.pl --prefix="$out" + cd .. + for patch in $runPatches; do + cd $(basename $patch) + perl ./install_patch.pl --silent --accept-eula --installdir="$out" + cd .. + done rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -117,6 +117,23 @@ let echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; + preFixup = '' + while IFS= read -r -d ''$'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libcudart ]]; then + rpath2= + else + rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 + fi + patchelf --set-rpath $rpath2 --force-rpath $i + done < <(find $out $lib $doc -type f -print0) + ''; + passthru = { cc = gcc; majorVersion = @@ -163,16 +180,28 @@ in { }; cudatoolkit8 = common { - version = "8.0.61"; + version = "8.0.61.2"; url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run"; + sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; + }) + ]; gcc = gcc5; }; cudatoolkit9 = common { - version = "9.0.176"; - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; - sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + version = "9.1.85.1"; + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; + sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; + sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; + }) + ]; gcc = gcc6; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 094cdb06b69805bf424aef57a6df395c47cc85c7..6522b12b13102f8d374fca96808831be6b288099 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -3,10 +3,10 @@ , curl, tzdata, gdb, darwin , callPackage , bootstrapVersion ? false -, version ? "2.078.2" -, dmdSha256 ? "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls" -, druntimeSha256 ? "0nfqjcmwqc490bzi3582x1c3zigkf306g4nyd1cyd3vs8lfm6x66" -, phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8" +, version ? "2.079.0" +, dmdSha256 ? "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y" +, druntimeSha256 ? "183pqygj5w4105czs5kswyjn9mrcybx3wmkynz3in0m3ylzzjmvl" +, phobosSha256 ? "0y9i86ggmf41ww2xk2bsrlsv9b1blj5dbyan6q6r6xp8dmgrd79w" }: let @@ -80,17 +80,6 @@ let "phobos/std/datetime/timezone.d"; phobosPatches = '' - substituteInPlace ${datetimePath} \ - --replace "import core.time;" "import core.time;import std.path;" - - substituteInPlace ${datetimePath} \ - --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" - - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace ${datetimePath} \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - # Ugly hack so the dlopen call has a chance to succeed. # https://issues.dlang.org/show_bug.cgi?id=15391 substituteInPlace phobos/std/net/curl.d \ @@ -102,15 +91,29 @@ let '' + + stdenv.lib.optionalString (!bootstrapVersion) '' + # Can be removed when https://github.com/dlang/phobos/pull/6224 is included. + substituteInPlace ${datetimePath} \ + --replace "foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))" "import std.path : baseName; foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))" + + substituteInPlace ${datetimePath} \ + --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" + '' + + stdenv.lib.optionalString (bootstrapVersion) '' substituteInPlace ${datetimePath} \ --replace "import std.traits;" "import std.traits;import std.path;" substituteInPlace ${datetimePath} \ --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" + + # Ugly hack to fix the hardcoded path to zoneinfo in the source file. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace ${datetimePath} \ + --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ '' - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isLinux) '' # See https://github.com/dlang/phobos/pull/5960 substituteInPlace phobos/std/path.d \ --replace "\"/root" "\"${ROOT_HOME_DIR}" @@ -122,9 +125,6 @@ let "dmd"; postPatch = '' - # Use proper C++ compiler - substituteInPlace ${dmdPath}/posix.mak \ - --replace g++ $CXX '' + stdenv.lib.optionalString (!bootstrapVersion) '' @@ -132,6 +132,12 @@ let --replace "DFLAGS:=" "DFLAGS:=${usePIC} " '' + + stdenv.lib.optionalString (bootstrapVersion) '' + # Use proper C++ compiler + substituteInPlace ${dmdPath}/posix.mak \ + --replace g++ $CXX + '' + + phobosPatches + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' @@ -145,9 +151,9 @@ let '' + stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin && bootstrapVersion) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace ${dmdPath}/root/port.c --replace __inline_isnanl __inline_isnan + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace ${dmdPath}/root/port.c --replace __inline_isnanl __inline_isnan ''; nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] @@ -176,7 +182,7 @@ let cd ../druntime make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ cd .. ''; @@ -260,7 +266,7 @@ let buildPhase = '' cd phobos - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${dmdBuild}/bin/dmd BUILD=release + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${dmdBuild}/bin/dmd BUILD=release TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ ''; installPhase = '' diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index e645ecb41bd282c4099eceeaba3025fde32f962d..7376aec27501e8e307b61b227bf6a971d484bfa7 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gambit-bootstrap-${version}"; - version = "4.8.8"; - tarball_version = "v4_8_8"; + version = "4.8.9"; + tarball_version = "v4_8_9"; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz"; - sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz"; + sha256 = "b7f86c794711792ca556ce41f8bc7043dffc395c01bb6d8d119bc2f454f89fbf"; }; buildInputs = [ autoconf ]; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 7466c85ca6ed37dfbefaf320808c2aa0a86c1cc2..95e8dba762a25971ec4df8f2f805f14b3f70bf78 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.8-435-gd1991ba7"; + version = "4.8.9"; bootstrap = import ./bootstrap.nix ( pkgs ); src = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "d1991ba7e90ed0149964320f7cafa1a8289e61f0"; - sha256 = "02harwcsqxxcxgn2yc1y9kyxdp32mampyvnbxrzg2jzfmnp5g6cm"; + rev = "dd54a71dfc0bd09813592f1645d755867a02195d"; + sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc"; }; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 6b2718f5e692329448f154f3669e98ad72f16ffa..c63867a1d2db0a69853d58700b14f1c15f86ea83 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -317,8 +317,8 @@ stdenv.mkDerivation ({ # Platform-specific flags optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ - # Trick that should be taken out once we have a mips64el-linux not loongson2f - optional (targetPlatform == hostPlatform && stdenv.system == "mips64el-linux") "--with-arch=loongson2f" + # Trick that should be taken out once we have a mipsel-linux not loongson2f + optional (targetPlatform == hostPlatform && stdenv.system == "mipsel-linux") "--with-arch=loongson2f" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index f67582385e6f867acc74fc00d5359658b514f6de..c1a411120d03373cee259d52b08464ad62c7c0da 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.12-DEV-1404-g0a266db"; + version = "0.12-RELEASE"; src = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "0a266db5e2e241272711bc150cc2607204bf2b78"; - sha256 = "1lvawqn8havfyxkkgfqffc213zq2pgm179l42yj49fy3fhpzia4m"; + rev = "5618892d7939e1cb4ef5247912e0bc1ec99f6b52"; + sha256 = "0b2valahf5k81r4sp6y12d44fb286p92s7k6dphij0kmvg0dp818"; }; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 51dd24671bdd322a806c622ecf22c44649b672ef..8758ee59d384173625918edf0485524a5ef3004a 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 54323458d9bd560d6da8dd21e64f3b89507f7c8f..5bd05b257ca5bcc270b354a07a02209a20c7365b 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index c4780690f6787a8bceb363892d772c8fa560e3b8..e4bf23c6e9e2db14f74ed059d9949750582ad255 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.10.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4f00ef8fb751e0528c2e871281aec0e317e388b7..988392e74b9ee53a57616e76310ed5c2fddc0141 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 7f636284c68dac5196a88099cc1b1b93e627d186..86925c406cfc91ae3298f48ea1e4d911e457609e 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 481b8d90918c41db9368e06c05f911b234caa78c..982008563a06185ca5e5d963086991bba64c8bbb 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.6.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 15f105946f5177214a55519c19c2be2ad28b71ce..47fc090c1ff175c54c5241a1f333b2d3ff9fd25e 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.8.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 011822994ed349dfd4c8c49e2fb8aa8d53c8959f..7d11ffb66c60760d8827530832698e4dc931f514 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.0.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f4aa2de3241e26c80e02d96ee219653d6cd128b6..1c3f260da1c14ebe45e8bc8508f1059cb5116a34 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.2.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index e7ec9be16b697986adc938598a84db446e0afd80..8f7cdc9568e4cb76a75f6f67245066c54a04bc1f 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.0.20180204" +, version ? "8.4.0.20180224" , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "111737cd218751f06ea58d3cf2c7c144265b5dfc"; - sha256 = "0ksp0k3sp928aq2cv6whgbfmjnr7l2j10diha13nncksp4byf0s9"; + rev = "a1e15c8f59092ef2d11be7966bd20688d8dc01e6"; + sha256 = "1pimf5ryl76r3vwnc2n0qzk4yh7zckp2r2g5rlz8nbddsws2v893"; }; enableParallelBuilding = true; @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.4.1"; }; meta = { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 82cef10ce3bec62d44a82371186556a29a611d6f..bc3ccbdcdf51ccc6fa055c6345c33a47019a139f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.5"; }; meta = { diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ce324b353ec5aa77aeae78b29e6db488b882be6c --- /dev/null +++ b/pkgs/development/compilers/graalvm/default.nix @@ -0,0 +1,206 @@ +{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: + +let + # pre-download some cache entries ('mx' will not be able to download under nixbld1) + makeMxCache = list: + stdenv.mkDerivation { + name = "mx-cache"; + buildCommand = '' + mkdir $out + ${lib.concatMapStrings ({url, name, sha1}: '' + ln -s ${fetchurl { inherit url sha1; }} $out/${name} + echo -n ${sha1} > $out/${name}.sha1 + '') list} + ''; + }; + + jvmci8-mxcache = [ + rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } + rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } + rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } + rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } + rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } + rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } + rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } + rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } + rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so"; url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; } + ]; + + graal-mxcache = jvmci8-mxcache ++ [ + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } + rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar"; url = mirror://maven/org/json/json/20160810/json-20160810.jar; } + rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } + rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } + rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; } + rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; } + ]; + +in rec { + + mx = stdenv.mkDerivation { + name = "mx"; + src = fetchFromGitHub { + owner = "graalvm"; + repo = "mx"; + rev = "22557cf7ec417c49aca20c13a9123045005d72d0"; # HEAD at 2018-02-16 + sha256 = "070647ih2qzcssj7yripbg1w9bjwi1rcp1blx5z3jbp1shrr6563"; + }; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' + substituteInPlace mx --replace /bin/pwd pwd + ''; + installPhase = '' + mkdir -p $out/bin + cp -dpR * $out/bin + wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} + ''; + meta = with stdenv.lib; { + homepage = https://github.com/graalvm/mx; + description = "Command-line tool used for the development of Graal projects"; + license = licenses.unfree; + platforms = python27.meta.platforms; + }; + }; + + # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) + jvmci8 = stdenv.mkDerivation rec { + version = "0.41"; + name = let + n = "jvmci8u161-${version}"; + in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then + n + else + throw "length of string `${n}' must be equal to the length of `${oraclejdk8.name}'"; + src = fetchFromGitHub { + owner = "graalvm"; + repo = "graal-jvmci-8"; + rev = "jvmci-${version}"; + sha256 = "0pajf114l8lzczfdzz968c3s1ardiy4q5ya8p2kmwxl06giy95qr"; + }; + buildInputs = [ mx mercurial ]; + postUnpack = '' + # a fake mercurial dir to prevent mx crash and supply the version to mx + ( cd $sourceRoot + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg src.rev} + hg checkout ${lib.escapeShellArg src.rev} + ) + ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-overflow" # newly detected by gcc7 + ]; + buildPhase = '' + cp -dpR ${oraclejdk8} writable-copy-of-jdk + chmod +w -R writable-copy-of-jdk + + export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild + export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} + mx --java-home $(pwd)/writable-copy-of-jdk build + ''; + installPhase = '' + mv jdk1.8.0_*/linux-amd64/product $out + find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \; + ''; + dontStrip = true; # why? see in oraclejdk derivation + inherit (oraclejdk8) meta; + }; + + graalvm8 = stdenv.mkDerivation rec { + version = "0.31"; + name = let + n = "graal-vm-8-${version}"; + in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then + n + else + throw "length of string `${n}' must be equal to the length of `${jvmci8.name}'"; + src = fetchFromGitHub { + owner = "oracle"; + repo = "graal"; + rev = "vm-enterprise-${version}"; + sha256 = "0rhd6dk2jpbxgdprqvdk991b2k177jrjgyjabdnmv5lzlhczy676"; + }; + buildInputs = [ mx zlib mercurial jvmci8 ]; + postUnpack = '' + # a fake mercurial dir to prevent mx crash and supply the version to mx + ( cd $sourceRoot + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg src.rev} + hg checkout ${lib.escapeShellArg src.rev} + ) + ''; + buildPhase = '' + # make a copy of jvmci8 + cp -dpR ${jvmci8} $out + chmod +w -R $out + find $out -type f -exec sed -i "s#${jvmci8}#$out#g" {} \; + + export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild + export MX_CACHE_DIR=${makeMxCache graal-mxcache} + ( cd substratevm; mx --java-home $out build --no-daemon ) + ''; + installPhase = '' + # add graal files + mkdir -p $out/jre/tools/{profiler,chromeinspector} + cp -pR substratevm/svmbuild/native-image-root/linux-amd64/bin/* $out/jre/bin/ + cp -pLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks + cp -pLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ + cp -pR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ + cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ + cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ + echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties + ln -s --relative $out/jre/bin/native-image $out/bin/native-image + cp $out/jre/tools/nfi/bin/libtrufflenfi.so $out/jre/lib/amd64/ + cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + ''; + dontStrip = true; # why? see in oraclejdk derivation + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image -no-server HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + ''; + meta = with stdenv.lib; { + homepage = https://github.com/oracle/graal; + description = "High-Performance Polyglot VM"; + license = licenses.unfree; + maintainers = with maintainers; [ volth ]; + platforms = [ "x86_64-linux" ]; + }; + }; +} diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 108fefca86366ea6724cb76b2828208abeeb8ed0..b6374908757cebacad3d4250913cbc7581b62080 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.21"; + version = "1.2.30"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "08mg0xl6n5kl71rn4ix6innqa7dlirmw1rlj9qwmqv5abp9wpwn5"; + sha256 = "0wg08cncwfajxfx8860wdf5dr4h92j069qvdr90l5m01ff3nasad"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index b913d169e97abad56c417a87cd79d83a2ff506ac..b54b8a6288feac5df87cc0ae157d1e50f23317cf 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "06"; - patch_version = "0"; - sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj"; + patch_version = "1"; + sha256 = "1n3pygfssd6nkrq876wszm5nm3v4605q4k16a66h1nmq9wvf01vg"; # If the executable is stipped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 360f96e124273e860d16ae95810fc40e39947af6..fc142a4026bd06f1bcbad2df1477e36133e11124 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -145,7 +145,6 @@ let url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff"; sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m"; }; - in stdenv.mkDerivation rec { name = "swift-${version_friendly}"; @@ -247,6 +246,9 @@ stdenv.mkDerivation rec { # https://bugs.swift.org/browse/SR-5779 sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake + # https://bugs.swift.org/browse/SR-4838 + sed -i -e '30i#include ' lldb/include/lldb/Utility/TaskPool.h + substituteInPlace clang/lib/Driver/ToolChains.cpp \ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' @@ -287,7 +289,7 @@ stdenv.mkDerivation rec { # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ - ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar + ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar wrapProgram $out/bin/swift \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 39ffd364c813385833c4a0a378c548902eaea8eb..08443de111dd267730111400d019458580cde58c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -80,7 +80,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0vvh1k7i6y4bqy6fn8z5i6ndqv6x94hvk2zh5gw99na8kfri7sxq"; + sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 5837c592186b5b3dd748cdf80e77730b2aefe5d5..bad0d642b06c0b475f07332dc19508108766c5b3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,16 +42,6 @@ self: super: { unix = null; xhtml = null; - # Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: - # Distribution/Simple/CCompiler.hs:64:10: error: - # • No instance for (Semigroup CDialect) - # arising from the superclasses of an instance declaration - # • In the instance declaration for ‘Monoid CDialect’ - # | - # 64 | instance Monoid CDialect where - # | ^^^^^^^^^^^^^^^ - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal; - ## Shadowed: ## Needs bump to a versioned attribute @@ -66,7 +56,7 @@ self: super: { ## Setup: Encountered missing dependencies: ## ghc >=7.0 && <8.4 ## - ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) + ## uncaught exception: IOException of type NoSuchThing (cabal: rawSystem: runInteractiveProcess: exec: does not exist (No such file or directory)) doCheck = false; }); @@ -77,6 +67,8 @@ self: super: { free = super.free_5; ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## base >=3 && <4.11 ## Needed for (<>) in prelude funcmp = super.funcmp_1_9; @@ -107,9 +99,8 @@ self: super: { }); ## Needs bump to a versioned attribute - ## breaks hspec: ## Setup: Encountered missing dependencies: - ## hspec-discover ==2.4.7 + ## hspec-discover ==2.4.8 hspec-discover = super.hspec-discover_2_4_8; ## Needs bump to a versioned attribute @@ -117,9 +108,6 @@ self: super: { ## free ==4.*, template-haskell >=2.4 && <2.13 lens = super.lens_4_16; - ## Needs bump to a versioned attribute - QuickCheck = super.QuickCheck_2_11_3; - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## doctest >=0.11.1 && <0.14 @@ -212,6 +200,22 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release + http-api-data = overrideCabal super.http-api-data (drv: { + ## • No instance for (Semigroup Form) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "fizruk"; + repo = "http-api-data"; + rev = "83aac9540f4a304927c601c5db12f4dc2bf93816"; + sha256 = "14hy13szr09vsisxi25a4qfajqjwznvn222bqk55dcdlnrgf0zi9"; + }; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + ## Upstreamed, awaiting a Hackage release lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { ## Setup: Encountered missing dependencies: @@ -266,6 +270,19 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release + tar = overrideCabal super.tar (drv: { + ## • No instance for (Semigroup (Entries e)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Entries e)’ + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "tar"; + rev = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8"; + sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny"; + }; + }); + ## Upstreamed, awaiting a Hackage release th-desugar = overrideCabal super.th-desugar (drv: { ## • Could not deduce (MonadIO (DsM q)) @@ -356,6 +373,23 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/sol/hpack/pull/277 + ## Issue: https://github.com/sol/hpack/issues/276 + hpack = overrideCabal super.hpack (drv: { + ## • No instance for (Semigroup Dependencies) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "hpack"; + rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6"; + sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y"; + }; + ## Setup: Encountered missing dependencies: + ## http-client -any, http-client-tls -any, http-types -any + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ http-client http-client-tls http-types ]); + }); + ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -435,6 +469,32 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-tls/pull/270 + tls = overrideCabal super.tls (drv: { + ## • No instance for (Semigroup Credentials) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Credentials’ + src = pkgs.fetchFromGitHub { + owner = "ocheron"; + repo = "hs-tls"; + rev = "763656fbc6c2edabb43fc63d8717960f4b26e6e7"; + sha256 = "0v7f9b78w6prkbscdx5ggjixll9z1zfqzm5x0ap4wvynnflkspqb"; + }; + prePatch = "cd core; "; + }); + + ## Unmerged. PR: https://github.com/Soostone/uri-bytestring/pull/0 + uri-bytestring = overrideCabal super.uri-bytestring (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.9 && <2.13 + src = pkgs.fetchFromGitHub { + owner = "koenigmaximilian"; + repo = "uri-bytestring"; + rev = "105d5855bbf9c78d1e48394677b42a058e242fc9"; + sha256 = "144hr12k0d61zpgxv62vwlzy6bfs01fqh7qr4qsbv457sznmbb9d"; + }; + }); + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { ## Ambiguous occurrence ‘<>’ @@ -448,6 +508,34 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-certificate/pull/89 + x509 = overrideCabal super.x509 (drv: { + ## • No instance for (Semigroup DistinguishedName) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid DistinguishedName’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "hs-certificate"; + rev = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9"; + sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf"; + }; + prePatch = "cd x509; "; + }); + + ## Unmerged. PR: https://github.com/vincenthz/hs-certificate/pull/89 + x509-store = overrideCabal super.x509-store (drv: { + ## • No instance for (Semigroup CertificateStore) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid CertificateStore’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "hs-certificate"; + rev = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9"; + sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf"; + }; + prePatch = "cd x509-store; "; + }); + ## Non-code, configuration-only change @@ -475,6 +563,13 @@ self: super: { jailbreak = true; }); + cabal2nix = super.cabal2nix.override { + ## • No instance for (Semigroup (List a)) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + hpack = self.hpack; + }; + cabal-doctest = overrideCabal super.cabal-doctest (drv: { ## Setup: Encountered missing dependencies: ## Cabal >=1.10 && <2.1, base >=4.3 && <4.11 @@ -488,6 +583,8 @@ self: super: { }); deepseq-generics = overrideCabal super.deepseq-generics (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 ## https://github.com/haskell-hvr/deepseq-generics/pull/4 jailbreak = true; }); @@ -535,6 +632,14 @@ self: super: { jailbreak = true; }); + jailbreak-cabal = super.jailbreak-cabal.override { + ## • No instance for (Semigroup CDialect) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid CDialect’ + ## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: + Cabal = self.Cabal; + }; + kan-extensions = overrideCabal super.kan-extensions (drv: { ## Setup: Encountered missing dependencies: ## free ==4.* @@ -571,13 +676,6 @@ self: super: { jailbreak = true; }); - ## Issue: https://github.com/pcapriotti/optparse-applicative/issues/288 - optparse-applicative = overrideCabal super.optparse-applicative (drv: { - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.8 && <2.11 - doCheck = false; - }); - quickcheck-instances = overrideCabal super.quickcheck-instances (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11 @@ -604,7 +702,7 @@ self: super: { tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: { ## Setup: Encountered missing dependencies: - ## base >=4.8 && <4.11, tasty ==0.11.* + ## base >=4.8 && <4.11 jailbreak = true; }); @@ -615,18 +713,19 @@ self: super: { jailbreak = true; }); + ## Issue: https://github.com/ChrisPenner/rasa/issues/54 text-lens = overrideCabal super.text-lens (drv: { + ## Failures: + ## test/Spec.hs:136: + ## 1) TextLens.range gets "" if invalid range + ## uncaught exception: ErrorCall (Data.Text.Array.new: size overflow + ## CallStack (from HasCallStack): + ## error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array) + ## Randomized with seed 2114194349 + ## Finished in 0.0017 seconds + doCheck = false; ## Setup: Encountered missing dependencies: - ## base >=4.9.0.0 && <4.10, - ## extra >=1.4.10 && <1.5, - ## hspec >=2.2.4 && <2.3, - ## lens ==4.14.* - jailbreak = true; - }); - - th-abstraction = overrideCabal super.th-abstraction (drv: { - ## Setup: Encountered missing dependencies: - ## template-haskell >=2.5 && <2.13 + ## extra >=1.4.10 && <1.5, lens ==4.14.* jailbreak = true; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 52fafec10f83475d5c9644287a2189c4bda78efd..827c5d72a342873e30d26db6acc56b30e1044f1b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.6 + # LTS Haskell 10.7 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -351,7 +351,7 @@ default-package-overrides: - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-rpm ==0.12 + - cabal-rpm ==0.12.1 - cabal-toolkit ==0.0.5 - cache ==0.1.0.1 - cairo ==0.13.4.2 @@ -673,7 +673,7 @@ default-package-overrides: - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - emailaddress ==0.2.0.0 - - email-validate ==2.3.2.1 + - email-validate ==2.3.2.2 - enclosed-exceptions ==1.0.2 - EntrezHTTP ==1.0.4 - entropy ==0.3.8 @@ -724,7 +724,7 @@ default-package-overrides: - extensible ==0.4.7.1 - extensible-effects ==2.1.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.3 + - extra ==1.6.4 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - fail ==4.9.0.0 @@ -865,7 +865,7 @@ default-package-overrides: - giphy-api ==0.5.2.0 - git ==0.2.1 - github ==0.18 - - github-release ==1.1.3 + - github-release ==1.1.4 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -1167,8 +1167,8 @@ default-package-overrides: - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1301,8 +1301,8 @@ default-package-overrides: - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - - interpolation ==0.1.0.2 - Interpolation ==0.3.0 + - interpolation ==0.1.0.2 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - intro ==0.3.1.0 @@ -1704,7 +1704,7 @@ default-package-overrides: - opml-conduit ==0.6.0.4 - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.14.0.0 + - optparse-applicative ==0.14.1.0 - optparse-generic ==1.2.3 - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 @@ -1831,7 +1831,7 @@ default-package-overrides: - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - prettyprinter ==1.1.1 - - prettyprinter-ansi-terminal ==1.1.1.1 + - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 @@ -1886,7 +1886,7 @@ default-package-overrides: - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.3.2 + - quickcheck-classes ==0.3.3 - quickcheck-combinators ==0.0.2 - quickcheck-instances ==0.3.16.1 - quickcheck-io ==0.2.0 @@ -2008,8 +2008,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.6 - sbv ==7.4 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -2078,7 +2078,7 @@ default-package-overrides: - set-monad ==0.2.0.0 - sets ==0.0.5.2 - SHA ==1.6.4.2 - - shake ==0.16.2 + - shake ==0.16.3 - shake-language-c ==0.11.0 - shakespeare ==2.0.15 - shell-conduit ==4.6.1 @@ -2087,7 +2087,7 @@ default-package-overrides: - shikensu ==0.3.8 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-prettyprint ==0.2 + - show-prettyprint ==0.2.0.1 - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 @@ -2410,8 +2410,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.2 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2448,7 +2448,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.9 - validate-input ==0.4.0.0 - - validation ==0.6.2 + - validation ==0.6.3 - validationt ==0.2.0.0 - validity ==0.4.0.4 - validity-aeson ==0.1.0.0 @@ -2612,7 +2612,7 @@ default-package-overrides: - YampaSynth ==0.2 - yeshql ==3.0.1.3 - yesod ==1.4.5 - - yesod-alerts ==0.1.1.0 + - yesod-alerts ==0.1.2.0 - yesod-auth ==1.4.21 - yesod-auth-basic ==0.1.0.2 - yesod-auth-fb ==1.8.1 @@ -2658,7 +2658,7 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==0.2.0 - - zip-archive ==0.3.2.3 + - zip-archive ==0.3.2.4 - zippers ==0.2.5 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bac5210953e965c98bc739620a24585e4fc0d233..28ccb81f2dc219174ba1ebae4bdda1590aef2d49 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -471,10 +471,6 @@ self: super: builtins.intersectAttrs super { ''; }); - # Fails to link against with newer gsl versions because a deprecrated function - # was removed - hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; - # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { @@ -492,11 +488,8 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); - # Haskell OpenCV bindings need contrib code enabled in the C++ library. - opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; - # Without this override, the builds lacks pkg-config. - opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3; # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8303162b93c750e93faedee1ee11a573af40b86c..6bd18f713647ac412682009e76e062caab20fbc5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2883,6 +2883,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "Clash-Royale-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Clash-Royale-Hack-Cheats"; + version = "1.0.1"; + sha256 = "19cvhy78s7vl9b6pdi04nrf4iqxb7a2yivmq5fymdxxvdxg9ykds"; + revision = "2"; + editedCabalFile = "0lhljmc8nn7mrdxyx3645m8gkwkpqvcdkfp5dal9pi90in9kd4wp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ClassLaws" = callPackage ({ mkDerivation, base, ChasingBottoms, mtl, QuickCheck }: mkDerivation { @@ -4764,6 +4786,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Eight-Ball-Pool-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Eight-Ball-Pool-Hack-Cheats"; + version = "1.0.1"; + sha256 = "0k620c0ia441rfvxaw2q5n43g5pnml4sn1cr1vzclc9iz0mfdy72"; + revision = "2"; + editedCabalFile = "13dkqc5pa7sjf3xfwgs7kajb7f1ai187w35p8pzni5is0hnaxfmz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "EitherT" = callPackage ({ mkDerivation, base, monad-control, transformers , transformers-base @@ -5268,6 +5312,8 @@ self: { pname = "Facebook-Password-Hacker-Online-Latest-Version"; version = "1.0.1"; sha256 = "0xvr2bj800i7ssbn6gbz4pknhakrgifkirf3rsn6ln4g35h29m07"; + revision = "1"; + editedCabalFile = "0p70xim6ay9ffs5s69nw64znridyb7fzdfawh3gp0fzlybzmjypy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -5277,8 +5323,7 @@ self: { servant-auth-docs servant-docs template-haskell text ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/"; - description = "Hack Lab"; + description = "spam"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -5793,6 +5838,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Fortnite-Hack-Cheats-Free-V-Bucks-Generator"; + version = "1.0.1"; + sha256 = "02qj2lmf74m0d58fr09grylcmzzygi06rkn37bzpaiqr8fb032js"; + revision = "4"; + editedCabalFile = "1k976a5lnjzxgy486c7msh0d35zj4l3w671n4rivqzr9xfwhmb8d"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Foster" = callPackage ({ mkDerivation, array, base, cmdtheline, containers, criterion , random, strict @@ -6658,6 +6725,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_9_2" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.9.2"; + sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -9214,6 +9305,8 @@ self: { pname = "HarmTrace-Base"; version = "1.6.0.0"; sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b"; + revision = "1"; + editedCabalFile = "0fldc14b2lj8pvkmxly0ld9mmx33yvswh7sg85g62w4yixsr6fdl"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -9221,7 +9314,7 @@ self: { base binary containers ghc-prim ListLike QuickCheck random uu-parsinglib ]; - homepage = "https://bitbucket.org/bash/harmtrace-base"; + homepage = "https://github.com/chordify/HarmTrace-Base"; description = "Parsing and unambiguously representing musical chords"; license = stdenv.lib.licenses.lgpl3; }) {}; @@ -10891,6 +10984,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-stbir" = callPackage + ({ mkDerivation, base, c2hs, data-default-class, JuicyPixels + , vector + }: + mkDerivation { + pname = "JuicyPixels-stbir"; + version = "0.1.0.0"; + sha256 = "0jlb72hbiqbnjm5q63ywrw5dljfzpgbw91xk7ijrsfm209pprcqz"; + libraryHaskellDepends = [ + base data-default-class JuicyPixels vector + ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/mtolly/JuicyPixels-stbir"; + description = "Scale JuicyPixels images with stb_image_resize"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "JuicyPixels-util" = callPackage ({ mkDerivation, base, JuicyPixels, vector }: mkDerivation { @@ -11530,8 +11640,8 @@ self: { ({ mkDerivation, base, containers, hmatrix, vector }: mkDerivation { pname = "Learning"; - version = "0.0.2"; - sha256 = "0gp8c2xwpsnwbhvdwnpiv3pzmg2i12fv4h1x1fna9q4smgnpfjpb"; + version = "0.1.0"; + sha256 = "14hlr86c605bpfcawvi4vy0hcwph4ji38ql8pic6bawyvcn7pybn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hmatrix vector ]; @@ -12151,8 +12261,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Mapping"; - version = "0.1.0.1"; - sha256 = "14gjly5dlz5bdi9niqdg6gzf9hin87xnl9hsqlzdpgbk6hzg0az8"; + version = "2.0.0.0"; + sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zaoqi/Mapping.hs"; description = "Mapping"; @@ -12464,6 +12574,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Mobile-Legends-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Mobile-Legends-Hack-Cheats"; + version = "1.0.1"; + sha256 = "1alyhdrliyy6hi88svbnmwf76vl6ipd92r835r2j1qyvbadi63fl"; + revision = "2"; + editedCabalFile = "1vcysv7jsik7i6s8a5jw3fzan0zv8104yv9ggvmlbq5n8sg9yjgq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Modulo" = callPackage ({ mkDerivation, base, numeric-prelude }: mkDerivation { @@ -13204,6 +13336,27 @@ self: { license = "unknown"; }) {}; + "Network-NineP_0_4_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, convertible + , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl + , network, NineP, regex-posix, stateref, transformers + }: + mkDerivation { + pname = "Network-NineP"; + version = "0.4.2"; + sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers convertible exceptions hslogger + monad-loops monad-peel mstate mtl network NineP regex-posix + stateref transformers + ]; + description = "High-level abstraction over 9P protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "NewBinary" = callPackage ({ mkDerivation, array, base, integer }: mkDerivation { @@ -21293,6 +21446,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-zalgo" = callPackage + ({ mkDerivation, array, base, random }: + mkDerivation { + pname = "acme-zalgo"; + version = "0.1.2.1"; + sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz"; + libraryHaskellDepends = [ array base random ]; + description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-zero" = callPackage ({ mkDerivation }: mkDerivation { @@ -22121,6 +22285,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-options" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-options"; + version = "0.0.0"; + sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0"; + libraryHaskellDepends = [ aeson base ]; + homepage = "https://github.com/serokell/aeson-options"; + description = "Options to derive FromJSON/ToJSON instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-parsec-picky" = callPackage ({ mkDerivation, aeson, base, parsec, scientific, text , unordered-containers, vector @@ -28956,6 +29132,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "async-combinators" = callPackage + ({ mkDerivation, async, base, hedgehog, HUnit, safe-exceptions + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, universum + , unliftio-core + }: + mkDerivation { + pname = "async-combinators"; + version = "0.0.0"; + sha256 = "1rj9fahpch74ygkx3lv4282lb775cklxi3c5wys544binnya9v7b"; + libraryHaskellDepends = [ + async base safe-exceptions universum unliftio-core + ]; + testHaskellDepends = [ + base hedgehog HUnit safe-exceptions tasty tasty-discover + tasty-hedgehog tasty-hunit universum + ]; + homepage = "https://github.com/serokell/async-combinators"; + description = "Async combinators"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "async-dejafu" = callPackage ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit , hunit-dejafu @@ -29117,6 +29314,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-timer_0_2_0_0" = callPackage + ({ mkDerivation, async, base, containers, criterion + , safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core + }: + mkDerivation { + pname = "async-timer"; + version = "0.2.0.0"; + sha256 = "1q6f0ig8m1ij1yz07b36799gavppb7dkwyvlc724gaj1q72bych6"; + libraryHaskellDepends = [ + async base safe-exceptions unliftio unliftio-core + ]; + testHaskellDepends = [ + async base containers criterion tasty tasty-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer#readme"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asynchronous-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29524,29 +29741,31 @@ self: { }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary - , bytestring, bzlib, Cabal, cli-setup, composition-prelude - , containers, cpphs, dependency, dhall, directory, file-embed - , http-client, http-client-tls, lens, lzma, optparse-applicative - , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary - , text, unix, zip-archive, zlib + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib + , Cabal, cli-setup, composition-prelude, containers, dependency + , dhall, directory, file-embed, filemanip, http-client + , http-client-tls, lzma, microlens, microlens-th + , optparse-applicative, parallel-io, process, shake, shake-ats + , shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.5.0.3"; - sha256 = "1is5x18pscn318jc9nql8fx29aail71vl8j790ayzrs49228bsdj"; + version = "2.6.1.16"; + sha256 = "0wbdndrc6vwac8qyihz52cbhd6nv5sjvw7ssrl8g92gziwjbrgf3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint ats-setup base binary bytestring bzlib + ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed http-client http-client-tls lens lzma - optparse-applicative parallel-io process shake shake-ats shake-ext - tar temporary text unix zip-archive zlib + file-embed filemanip http-client http-client-tls lzma microlens + microlens-th parallel-io process shake shake-ats shake-ext tar text + unix zip-archive zlib + ]; + executableHaskellDepends = [ + base composition-prelude directory microlens optparse-applicative + shake shake-ats temporary text ]; - libraryToolDepends = [ cpphs ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; @@ -29560,8 +29779,8 @@ self: { }: mkDerivation { pname = "ats-setup"; - version = "0.3.1.1"; - sha256 = "0bzycyq6w87sdbvbkp2m95dcf28hv11kg5lr604q29wszvnq69rh"; + version = "0.4.0.2"; + sha256 = "13sv7wwz6m6s9x3mr4phsf62ayyn95bdpj6cv93kyzadyi3vfvd6"; libraryHaskellDepends = [ base bytestring Cabal composition-prelude dependency directory filemanip http-client http-client-tls parallel-io process tar unix @@ -29572,14 +29791,17 @@ self: { }) {}; "ats-storable" = callPackage - ({ mkDerivation, base, bytestring, composition-prelude, text }: + ({ mkDerivation, base, bytestring, composition-prelude, hspec + , microlens, microlens-th, text + }: mkDerivation { pname = "ats-storable"; - version = "0.2.1.0"; - sha256 = "1d374jkiifyn6hqr584waqhk4kirqibycs0fszf1v21dkk14jyvx"; + version = "0.3.0.1"; + sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns"; libraryHaskellDepends = [ - base bytestring composition-prelude text + base bytestring composition-prelude microlens microlens-th text ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com//ats-generic#readme"; description = "Marshal ATS types into Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32285,12 +32507,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "basement_0_0_6" = callPackage + "basement_0_0_7" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.6"; - sha256 = "1xszp4nf55hr6iglqf1dx1yb9pgm3gpw81wwpjkwdn0602a3p8lw"; + version = "0.0.7"; + sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -33369,6 +33591,8 @@ self: { pname = "bifunctors"; version = "5.5.2"; sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; + revision = "2"; + editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell th-abstraction transformers transformers-compat @@ -35176,8 +35400,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.3.2"; - sha256 = "1zgvn1zkajslg221fk345vfgbi9pi9lr5ki3m4qpwgr3pvlz2h10"; + version = "0.4.0"; + sha256 = "18m799psijcj81hxyrnwjvwgb9z92pw5qk5hb7yny905f0wbbar1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing @@ -37992,7 +38216,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_34" = callPackage + "brick_0_34_1" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -38000,8 +38224,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.34"; - sha256 = "1n835ma8a73zcb4q0r066d9ql4071qf1d30cpv2xhwqc5p4c2i41"; + version = "0.34.1"; + sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40468,25 +40692,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.12"; - sha256 = "05k5rqwcdz6aq1jidf03dsrjd3rgisw6r2vq1gz6z49ps5sj628f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_12_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, process, time, unix }: @@ -40503,7 +40708,6 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -41478,8 +41682,8 @@ self: { ({ mkDerivation, arithmoi, array, base, containers, polynomial }: mkDerivation { pname = "canon"; - version = "0.1.0.2"; - sha256 = "1x4vn72m724cq2ilhkn1jr1lhlxnwsslsv164gn55h7snj27xvby"; + version = "0.1.0.4"; + sha256 = "0hy28s1rgzsqcbs600ppj74ls1xvm39fdjjba4p3f1cfw7g5ai1f"; libraryHaskellDepends = [ arithmoi array base containers polynomial ]; @@ -42050,8 +42254,8 @@ self: { pname = "case-insensitive"; version = "1.2.0.10"; sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; - revision = "1"; - editedCabalFile = "153x2i7gw7lyhydlf0924vfxmkk53r65c40104bbha2bhp1vj7fi"; + revision = "2"; + editedCabalFile = "197c93pa4lq6rgv59s9q9m11lziyyy6jlizvqap4lz0ijfnmj1gx"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -42410,6 +42614,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-conduit_0_4_0_2" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, cassava + , conduit, containers, criterion, mtl, QuickCheck, text + }: + mkDerivation { + pname = "cassava-conduit"; + version = "0.4.0.2"; + sha256 = "0kqa91m4ihs3jsp4d22q9qvsanfigawkc3i98p7zns54g0qckgiz"; + libraryHaskellDepends = [ + array base bifunctors bytestring cassava conduit containers mtl + text + ]; + testHaskellDepends = [ + base bytestring cassava conduit QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/domdere/cassava-conduit"; + description = "Conduit interface for cassava package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-embed" = callPackage ({ mkDerivation, base, bytestring, cassava, template-haskell , vector @@ -43448,23 +43674,24 @@ self: { }) {}; "cgrep" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, bytestring - , cmdargs, containers, directory, dlist, either, filepath, ghc-prim - , mtl, process, regex-base, regex-pcre, regex-posix, safe, split - , stm, stringsearch, transformers, unicode-show, unix-compat - , unordered-containers, utf8-string + ({ mkDerivation, aeson, ansi-terminal, array, async, base + , bytestring, cmdargs, containers, directory, dlist, either + , filepath, ghc-prim, mtl, process, regex-base, regex-pcre + , regex-posix, safe, split, stm, stringsearch, transformers + , unicode-show, unix-compat, unordered-containers, utf8-string + , yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.22"; - sha256 = "0nh8smbhwkqygxdv61yd82n26q6d4sdh4zzixcq5pczzacfzp8j9"; + version = "6.6.24"; + sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal array async base bytestring cmdargs containers + aeson ansi-terminal array async base bytestring cmdargs containers directory dlist either filepath ghc-prim mtl process regex-base regex-pcre regex-posix safe split stm stringsearch transformers - unicode-show unix-compat unordered-containers utf8-string + unicode-show unix-compat unordered-containers utf8-string yaml ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -43687,7 +43914,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chart-unit_0_6_0_2" = callPackage + "chart-unit_0_6_1_0" = callPackage ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens , generic-lens-labels, lens, linear, mwc-probability, mwc-random @@ -43697,8 +43924,8 @@ self: { }: mkDerivation { pname = "chart-unit"; - version = "0.6.0.2"; - sha256 = "1xdnjdhm20nfp6gypz01rj7i0dz9f3ds5sdacynsmvvj3gi2zimr"; + version = "0.6.1.0"; + sha256 = "07aiw8n7b23k9n1g4inpmdbkmmahl7vdvqr575rc7n0bnwwfyvi0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45896,6 +46123,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clexer" = callPackage + ({ mkDerivation, base, containers, mtl, parsec }: + mkDerivation { + pname = "clexer"; + version = "0.1.0.0"; + sha256 = "1x2q496jqvgqjbwncszl1h9ylkq6rn8h2fsp7w771xkyslfq46xy"; + libraryHaskellDepends = [ base containers mtl parsec ]; + description = "Lexes C++ code into simple tokens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cli" = callPackage ({ mkDerivation, base, directory, mtl, QuickCheck, tasty , tasty-quickcheck, terminfo, transformers @@ -46363,8 +46601,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.2"; - sha256 = "1w6rdmb5a50vdski2k4xwysrbxaycybijgak0hvpsjhnf16yb04f"; + version = "1.7.3"; + sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -48785,8 +49023,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.3.0.3"; - sha256 = "050w2h7all9r9rd68xq2d8cxg78ca8xh5b2ys17apla3amm9a7xi"; + version = "1.3.0.4"; + sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -49213,14 +49451,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_4_0_0" = callPackage + "concurrency_1_4_0_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.4.0.0"; - sha256 = "0rpljvcswb1smidvxh7nwb6ms2gr8wf0gzs0kapiqc9g3wlr1r9r"; + version = "1.4.0.1"; + sha256 = "17i50sxfir5nf6ldc14h6wfa03ap7z4lmihd8qpl2mb0px5ak7b9"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -49345,6 +49583,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_4" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.4"; + sha256 = "0zq50g3l9f55vhwjw6s6jf1nqyi0a7f1ih7vas686ckj2z33z9ay"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50453,6 +50708,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "connection-string" = callPackage + ({ mkDerivation, base, containers, doctest, megaparsec + , parser-combinators, text + }: + mkDerivation { + pname = "connection-string"; + version = "0.1.0.0"; + sha256 = "0hkszhms7n6vp9w8agik0qndz2a3f8l56yxidw9l9mjn3sx769g2"; + revision = "1"; + editedCabalFile = "0zirgds0ha3245cagx3fhssz58bpyzci7zv4mw9rfnc1k48v69b2"; + libraryHaskellDepends = [ + base containers megaparsec parser-combinators + ]; + testHaskellDepends = [ base doctest text ]; + homepage = "https://github.com/Porges/connection-string-hs"; + description = "A library for parsing connection strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "consistent" = callPackage ({ mkDerivation, base, lifted-async, lifted-base, monad-control , stm, transformers, transformers-base, unordered-containers @@ -50527,6 +50801,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "constaparser" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, vector }: + mkDerivation { + pname = "constaparser"; + version = "0.1.0.0"; + sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + libraryHaskellDepends = [ attoparsec base bytestring vector ]; + homepage = "https://github.com/chessai/constaparser"; + description = "Parse ByteStrings of a constant length"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "constrained-categories" = callPackage ({ mkDerivation, base, tagged, void }: mkDerivation { @@ -50582,6 +50868,8 @@ self: { pname = "constrained-normal"; version = "1.0.2"; sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac"; + revision = "1"; + editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj"; libraryHaskellDepends = [ base ]; homepage = "http://dx.doi.org/10.1145/2500365.2500602"; description = "Normalised Deep Embeddings for Constrained Type-Class Instances"; @@ -51035,6 +51323,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_4" = callPackage + ({ mkDerivation, base, base-prelude, contravariant, semigroups + , template-haskell, tuple-th + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.4"; + sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n"; + libraryHaskellDepends = [ + base base-prelude contravariant semigroups template-haskell + tuple-th + ]; + homepage = "https://github.com/nikita-volkov/contravariant-extras"; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control-bool" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -52709,8 +53015,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "9.1"; - sha256 = "1rhwbwhaxx15jpy9jacdxcrqfxh8nm84w5jadsrb947nhjjwczj6"; + version = "9.3"; + sha256 = "1w1mb43hb6zn8n8r261j623jrgxx54h8jifhcby8nnfyl3h97c69"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -52935,6 +53241,8 @@ self: { pname = "criterion"; version = "1.2.6.0"; sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc"; + revision = "1"; + editedCabalFile = "094z5gbgnsbfwwn5qsila3bfg0dqg63zq6rmhsf973dca00b8syz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -52968,6 +53276,8 @@ self: { pname = "criterion"; version = "1.3.0.0"; sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; + revision = "1"; + editedCabalFile = "1yfv8c3azrdba8nsw9za3flklryn7490hgcjqxjal3m9xbh7g1pn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53616,8 +53926,8 @@ self: { }: mkDerivation { pname = "cryptoconditions"; - version = "0.2.2.2"; - sha256 = "1j7acphhas2pg3sbc368qp9i46phwa0nk213751yxh37r6lbv3h2"; + version = "0.2.3.0"; + sha256 = "1gwq1527n6xf19xzcqzhgg6cl85albq3sgp25dxm3pvi45dvinas"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base64-bytestring bytestring containers cryptonite memory text @@ -53783,8 +54093,8 @@ self: { pname = "cryptoids"; version = "0.5.0.0"; sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2"; - revision = "2"; - editedCabalFile = "1qzyqy4kjw174pm7jrwivdl5bcwkakv7dw36dpmrjm3bwsadqygh"; + revision = "3"; + editedCabalFile = "0px43xzijabkf727gfza6nm3p8v8higa9nl71vvadvyp7jm4hbnl"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -53799,8 +54109,8 @@ self: { pname = "cryptoids-class"; version = "0.0.0"; sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; - revision = "1"; - editedCabalFile = "1dirfpjyxipw4pj32x4ipgf9yiwr2jfy6bagag4f4dibhhr1z7lc"; + revision = "2"; + editedCabalFile = "1y2qav6izihivhxzv8fn4d7vrp0cvbfv84k8l4x6av6iwfbak5s8"; libraryHaskellDepends = [ base cryptoids-types exceptions ]; description = "Typeclass-based interface to cryptoids"; license = stdenv.lib.licenses.bsd3; @@ -54220,6 +54530,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "csv-conduit_0_6_8" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl + , primitive, resourcet, test-framework, test-framework-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "csv-conduit"; + version = "0.6.8"; + sha256 = "1rb2dkci33gmqr82a4fc74lrdvxrcn0aibh3arlylklhm15y7w7y"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default exceptions ghc-prim mmorph + monad-control mtl primitive resourcet text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers directory HUnit mtl primitive + test-framework test-framework-hunit text transformers vector + ]; + homepage = "http://github.com/ozataman/csv-conduit"; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csv-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, directory, enumerator, safe, transformers @@ -54498,6 +54835,8 @@ self: { pname = "cue-sheet"; version = "1.0.1"; sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; + revision = "1"; + editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec @@ -56652,8 +56991,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-list-zigzag"; - version = "0.1.1.0"; - sha256 = "1pywxmwjlhf81vcb6ivcnf341hlmilgf77pi5kj5iad1hdznkp1y"; + version = "0.1.1.1"; + sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/data-list-zigzag"; description = "A list but with a balanced enumeration of Cartesian product"; @@ -58240,6 +58579,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dde" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "dde"; + version = "0.0.1"; + sha256 = "1mv3i56l3al386g6jr1dpkjx0mwpq25maqkw7zv8qdnshkg1x33f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vector ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ base vector ]; + homepage = "https://github.com/masterdezign/dde#readme"; + description = "Delay differential equations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dead-code-detection" = callPackage ({ mkDerivation, base, containers, directory, filepath , getopt-generics, ghc, ghc-paths, gitrev, Glob, graph-wrapper @@ -58933,14 +59288,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_0_0_2" = callPackage + "dejafu_1_1_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, profunctors, random, ref-fd, transformers }: mkDerivation { pname = "dejafu"; - version = "1.0.0.2"; - sha256 = "0j98kvqi746swpw6jsg8vfjw16y7d0nmiysxfsl7yrnqzma9nyx6"; + version = "1.1.0.1"; + sha256 = "0mhzij16sqgckk62n4mdwnkmrv2vp7884ivr24wnl73xwcyw6v15"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck profunctors random ref-fd transformers @@ -59532,6 +59887,8 @@ self: { pname = "deriving-compat"; version = "0.4.1"; sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4"; + revision = "1"; + editedCabalFile = "12pzj7ng66xyyj6aixd0mds8vf0p9syivngrjz9xcsi63d76dsbn"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -59819,32 +60176,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_9_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring - , bytestring, case-insensitive, charset, containers, contravariant - , cryptohash, deepseq, exceptions, http-client, http-client-tls - , lens-family-core, optparse-generic, parsers, prettyprinter - , system-fileio, system-filepath, tasty, tasty-hunit, text - , text-format, transformers, trifecta, unordered-containers, vector + "dhall_1_10_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base + , base16-bytestring, bytestring, case-insensitive, containers + , contravariant, cryptohash, deepseq, directory, exceptions + , filepath, haskeline, http-client, http-client-tls + , insert-ordered-containers, lens-family-core, mtl + , optparse-generic, parsers, prettyprinter + , prettyprinter-ansi-terminal, repline, scientific, tasty + , tasty-hunit, text, text-format, transformers, trifecta + , unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.9.1"; - sha256 = "1kwv5mhcabg3bwnp9j7z01xxv1a0xnpc6n0yw02k8xhrhdz60hdq"; + version = "1.10.0"; + sha256 = "1z9z9f0qw0p7nywpgamkgfz3h3ikhkshrphsviz94vwhnrflq1wf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring case-insensitive - charset containers contravariant cryptohash exceptions http-client - http-client-tls lens-family-core parsers prettyprinter - system-fileio system-filepath text text-format transformers - trifecta unordered-containers vector + containers contravariant cryptohash directory exceptions filepath + http-client http-client-tls insert-ordered-containers + lens-family-core parsers prettyprinter prettyprinter-ansi-terminal + scientific text text-format transformers trifecta + unordered-containers vector ]; executableHaskellDepends = [ - base optparse-generic prettyprinter system-filepath text trifecta + ansi-terminal base haskeline mtl optparse-generic prettyprinter + prettyprinter-ansi-terminal repline text trifecta ]; testHaskellDepends = [ - base containers deepseq prettyprinter tasty tasty-hunit text vector + base deepseq insert-ordered-containers prettyprinter tasty + tasty-hunit text vector ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; @@ -59873,20 +60236,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_7" = callPackage + "dhall-bash_1_0_9" = callPackage ({ mkDerivation, base, bytestring, containers, dhall - , neat-interpolation, optparse-generic, shell-escape, text - , text-format, trifecta, vector + , insert-ordered-containers, neat-interpolation, optparse-generic + , shell-escape, text, text-format, trifecta, vector }: mkDerivation { pname = "dhall-bash"; - version = "1.0.7"; - sha256 = "1mwxzrr5dmlm1892a4akgs52jl0bwiyf2qpl2mnr91y7fnmn00qs"; + version = "1.0.9"; + sha256 = "1knnljzh7gccma1xbj3ahrj6cyqfp7lisiv51nnwpxizb7vdfnx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dhall neat-interpolation shell-escape - text text-format vector + base bytestring containers dhall insert-ordered-containers + neat-interpolation shell-escape text text-format vector ]; executableHaskellDepends = [ base bytestring dhall optparse-generic text trifecta @@ -59934,14 +60297,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_0_10" = callPackage + "dhall-json_1_0_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall , optparse-generic, text, trifecta, vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.10"; - sha256 = "0zqb5hh3520l75walfnyr1i9dqphjxcawchvm12shjz2vqpi6wpq"; + version = "1.0.11"; + sha256 = "14jkf3j9iwnhkyz4wl6lvvci8ad21s20rk9kr7hr3fcmzv39alwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base dhall text vector ]; @@ -59976,20 +60339,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-nix_1_0_10" = callPackage + "dhall-nix_1_1_0" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text, text-format, trifecta - , vector + , insert-ordered-containers, neat-interpolation, optparse-generic + , scientific, text, text-format, trifecta, vector }: mkDerivation { pname = "dhall-nix"; - version = "1.0.10"; - sha256 = "09iy1a0nc2mwbsly58na9lw4jh7wv7zq0lspdcynhsxj3xv2q23n"; + version = "1.1.0"; + sha256 = "0g2wyr79krbfdv1z6c8w78kz3w1y0jbx8778qgxbjp70inkwq5gl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text - text-format vector + base containers data-fix dhall hnix insert-ordered-containers + neat-interpolation scientific text text-format vector ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -60012,6 +60375,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text_1_0_6" = callPackage + ({ mkDerivation, base, dhall, optparse-generic, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.6"; + sha256 = "0r08x1s75qsfmn6gnfm0ikh80cq3dbgj7bp4jb8f5pz7p2azh72v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base dhall optparse-generic text ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -61532,6 +61909,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direct-sqlite_2_3_22" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, temporary, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.22"; + sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit temporary text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "directed-cubical" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , parallel, QuickCheck, unordered-containers, vector @@ -62274,8 +62669,8 @@ self: { }: mkDerivation { pname = "distributed-process-lifted"; - version = "0.3.0.0"; - sha256 = "1n0jic03x959rnkaavcywhz0zbqhaya53y0ydh13qs83a1y13m7i"; + version = "0.3.0.1"; + sha256 = "1074f1wblsmx89hkblds3npf2ha3p8ighdq0kjywb5522addbxrk"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -63115,7 +63510,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "docker_0_5_0_1" = callPackage + "docker_0_5_1_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , conduit-combinators, conduit-extra, connection, containers , data-default-class, directory, exceptions, filemanip, filepath @@ -63123,22 +63518,20 @@ self: { , lens-aeson, monad-control, mtl, network, process, QuickCheck , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck , temporary, text, time, tls, transformers, transformers-base - , unordered-containers, uuid, vector, x509, x509-store, x509-system - , zlib + , unliftio-core, unordered-containers, uuid, vector, x509 + , x509-store, x509-system, zlib }: mkDerivation { pname = "docker"; - version = "0.5.0.1"; - sha256 = "0357d9hnrr990ysp87c17a8brnkp1w2w666m5jxhkap53n2dji4v"; - revision = "1"; - editedCabalFile = "1rrhgk3g33ppzxp3yqwdsj7l9nrmxl2xssb97slm7l81vypvs5z5"; + version = "0.5.1.0"; + sha256 = "1g1bmz185hibm0n23yxkili4v8768yascd8mc8z2pil9bky7lvww"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions filemanip filepath http-client http-conduit http-types monad-control mtl network resourcet scientific tar temporary text - time tls transformers transformers-base unordered-containers uuid - vector x509 x509-store x509-system zlib + time tls transformers transformers-base unliftio-core + unordered-containers uuid vector x509 x509-store x509-system zlib ]; testHaskellDepends = [ aeson base bytestring connection containers directory http-client @@ -66300,6 +66693,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-core_0_1_1_4" = callPackage + ({ mkDerivation, base, containers, ghc-prim, text + , unordered-containers + }: + mkDerivation { + pname = "ekg-core"; + version = "0.1.1.4"; + sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36"; + libraryHaskellDepends = [ + base containers ghc-prim text unordered-containers + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/tibbe/ekg-core"; + description = "Tracking of system metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-elastic" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname , http-client, lens, text, time, unordered-containers, wreq @@ -67122,23 +67533,6 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.1"; - sha256 = "0qvxysiap3r4mi3xff5nsk9qv6diqxfgwj186bypbamzvzlz0lav"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - homepage = "https://github.com/Porges/email-validate-hs"; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec , QuickCheck, template-haskell }: @@ -67153,7 +67547,6 @@ self: { homepage = "https://github.com/Porges/email-validate-hs"; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -68402,6 +68795,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_2_4" = callPackage + ({ mkDerivation, base, exceptions, safe, text, transformers + , transformers-compat, unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.2.4"; + sha256 = "0v5jdjh6k3wys2m1ff6pgiydy6fzd0r0pn2k3bsisrj6nf6gff7a"; + libraryHaskellDepends = [ + base exceptions safe text transformers transformers-compat + unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "errors-ext" = callPackage ({ mkDerivation, base, errors, exceptions, HUnit, monad-control , mtl, transformers @@ -68706,6 +69116,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eternity" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, foldl, potoki + , potoki-cereal, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "eternity"; + version = "0.1"; + sha256 = "04pcfnr1vl1s85gi2bqqca3frwjljw3307mw2psh8aa9h9qrf21b"; + libraryHaskellDepends = [ + attoparsec base cereal directory foldl potoki potoki-cereal text + ]; + testHaskellDepends = [ + cereal directory potoki potoki-cereal QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/metrix-ai/eternity"; + description = "Native event-sourcing database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eternity-timestamped" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, eternity + , foldl, generic-random, hashable, potoki, QuickCheck, text, time + }: + mkDerivation { + pname = "eternity-timestamped"; + version = "0.2.1"; + sha256 = "0pqihqhq2jh1sr30wkk6sy3p5zyw62i3fqqac48lciggzpmajaa2"; + libraryHaskellDepends = [ + attoparsec base cereal directory eternity foldl generic-random + hashable potoki QuickCheck text time + ]; + homepage = "https://github.com/metrix-ai/eternity-timestamped"; + description = "Automatic timestamping for Eternity"; + license = stdenv.lib.licenses.mit; + }) {}; + "ether" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged @@ -69804,8 +70252,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; - revision = "4"; - editedCabalFile = "18iip6wffnrp1jgnf09gxg4v17ymjank50kjshxvcy9s9l9g13ln"; + revision = "5"; + editedCabalFile = "1kfgp41i6mfz9gjczp3flvqxfhnznd81rwldv8j05807n6mnqqii"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -69818,6 +70266,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_9_0" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.9.0"; + sha256 = "1k66qq82srx62hmfqis5x7p2cjyq218rg9xks2sl960x5p4jvl8g"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "execs" = callPackage ({ mkDerivation, base, directory, process, text }: mkDerivation { @@ -70608,8 +71079,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.3"; - sha256 = "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m"; + version = "1.6.4"; + sha256 = "02i4wjp9wgnp2f89d7fj3jnc2pkkcnw068qh85sim3pfabz0a9hw"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -71024,22 +71495,24 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, ats-setup, base, Cabal, combinat - , composition-prelude, criterion, gmpint, hspec, QuickCheck + ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat + , composition-prelude, criterion, gmpint, hspec, numbertheory + , QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.2.5"; - sha256 = "0sln2am6xrm73y3731gy1wabc8cdvnrksgzvrl0qwlinshc4pd74"; - setupHaskellDepends = [ ats-setup base Cabal ]; + version = "0.3.3.1"; + sha256 = "1xbhg1qvd8zilmcc58dci4kk5l44wd0shdz11ssacf0pg2hpqc3n"; + setupHaskellDepends = [ ats-pkg base Cabal ]; libraryHaskellDepends = [ base composition-prelude gmpint ]; + librarySystemDepends = [ numbertheory ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {numbertheory = null;}; "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion @@ -71161,8 +71634,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "1.3"; - sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq"; + version = "1.4"; + sha256 = "17gnpf5w9a3k4wjwzj6qrsn5fm508pqq8wy4zsqjy3pfprm3239z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -71671,6 +72144,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcg" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "fcg"; + version = "0.0.0"; + sha256 = "07qbka3fkkmc18crafh6c5ahs7fv1a1kfhga8mxfkm75k3h15h3l"; + isLibrary = false; + isExecutable = true; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fckeditor" = callPackage ({ mkDerivation, base, cgi, HaXml, xhtml }: mkDerivation { @@ -72693,14 +73178,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filecache_0_3_0" = callPackage + "filecache_0_3_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time }: mkDerivation { pname = "filecache"; - version = "0.3.0"; - sha256 = "0lizyqksip8vw7gf0zi4ggfh07ql43avim25dwdlk9blv7kyxng4"; + version = "0.3.1"; + sha256 = "199npfbnnbf01ygwj559ikz51bfz23pggnvgdmj2azscbd80mbq7"; libraryHaskellDepends = [ base containers directory exceptions filepath fsnotify mtl stm strict-base-types time @@ -72800,8 +73285,8 @@ self: { pname = "filepath-crypto"; version = "0.1.0.0"; sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; - revision = "1"; - editedCabalFile = "1v6h4c3pv9jrj5wfcf2pvvjzhx673gmwdyig2g3gfvnhl5zkj5xb"; + revision = "2"; + editedCabalFile = "00wjrwssdz98v2hafq271132bs766npgycqd5v2b5k0cd3mdk9lv"; libraryHaskellDepends = [ base binary bytestring case-insensitive cryptoids cryptoids-class cryptoids-types exceptions filepath sandi template-haskell @@ -73345,8 +73830,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "1.0.5"; - sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb"; + version = "1.1.0"; + sha256 = "1w2j7l6515khp0zl3cf6pyxsv55c65qqfcxi94vikd8fk88sswd9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -73787,6 +74272,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; + revision = "1"; + editedCabalFile = "1hl2dgf4ccbk0qk6yqdwr1qbdjp4yi25dhs595lmnf7wrhk7662f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -74067,6 +74554,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flip-cmd" = callPackage + ({ mkDerivation, base, process, safe-exceptions }: + mkDerivation { + pname = "flip-cmd"; + version = "0.1.0.0"; + sha256 = "1pl31lfsfsc1qlnkrvif3j9imz6pac325bgys7x7365xy46zkad6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process safe-exceptions ]; + homepage = "https://github.com/aiya000/hs-flip-cmd"; + description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`"; + license = stdenv.lib.licenses.mit; + }) {}; + "flippers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -74186,6 +74687,8 @@ self: { pname = "flow"; version = "1.0.11"; sha256 = "11cgab1wyqdjzyx6ygh91yl03w70aivspmlavl4if6p9yr5z9rw7"; + revision = "2"; + editedCabalFile = "13gyzkk29qkq8pnfnxvq2ymag2r3f6h1hpxk7yhy1r3k9hmp5469"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; @@ -75633,12 +76136,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foundation_0_0_19" = callPackage + "foundation_0_0_20" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.19"; - sha256 = "053g5fdg9p74irvdh3g19hkb6g28h0sngkh2zqwplbxwy59dhfxq"; + version = "0.0.20"; + sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; @@ -75975,6 +76478,8 @@ self: { pname = "free"; version = "5"; sha256 = "1s4avwm4lnscmxv3fy0zws3vbg61sczgxm1m3cdnqxp95bd6p4c7"; + revision = "1"; + editedCabalFile = "13kxrs6097cwh80hawdmdrz4l5cqmrwkxh667spx8hx390102ddf"; libraryHaskellDepends = [ base bifunctors comonad containers distributive exceptions mtl profunctors semigroupoids semigroups template-haskell transformers @@ -79751,8 +80256,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.1.1"; - sha256 = "0z4kqlgqg016233f8smj6jzjd6n7cgsvyff0npnghv1gdlr9pfwc"; + version = "0.1.1.2"; + sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -80461,8 +80966,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.9"; sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; - revision = "2"; - editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk"; + revision = "3"; + editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -82353,14 +82858,14 @@ self: { , sandi, securemem, shakespeare, socks, split, stm, stm-chans , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unordered-containers, utf8-string, uuid, wai + , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core , yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20180112"; - sha256 = "0662780hzv2afajphjmgglm01d5w5vs4rp7xa1px1bznk67yjdxw"; + version = "6.20180227"; + sha256 = "11p77510vcg7sjd1y5grpgbm1299qviilf4d7xw2pr0vk5qn5mgp"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -82387,8 +82892,8 @@ self: { securemem shakespeare socks split stm stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time torrent transformers unix unix-compat unordered-containers - utf8-string uuid wai wai-extra warp warp-tls yesod yesod-core - yesod-form yesod-static + utf8-string uuid vector wai wai-extra warp warp-tls yesod + yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -82920,8 +83425,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.1.3"; - sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0"; + version = "1.1.4"; + sha256 = "0jnxlvs69jc5d60s266f5clsfx1jr517b7yzl08hnka5km8qqdkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83021,6 +83526,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.9.0"; + sha256 = "1gzks7l39il0g9maj2hkfwpz8rnrnmc05fhcsr27a6c08962gn0f"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + homepage = "https://github.com/onrock-eng/github-webhooks#readme"; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -83358,8 +83882,8 @@ self: { ({ mkDerivation, base, linear }: mkDerivation { pname = "gjk2d"; - version = "0.1.0.1"; - sha256 = "0yvbh660p65njr33py743ifjlm4njmb15b5sghbhhdi5g1b9qn6w"; + version = "0.1.0.2"; + sha256 = "163av54lmkqbayx9vkvviv3mdqq60zwkk9kjn75j7mk13d0iwpp3"; libraryHaskellDepends = [ base linear ]; testHaskellDepends = [ base linear ]; homepage = "https://github.com/suzumiyasmith/gjk2d#readme"; @@ -84248,16 +84772,17 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, recursion-schemes }: + ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.4"; - sha256 = "023acr1a69b9r380zlk8bsgfjw0l4h381pk7bwar7mbv3zzsnmxn"; + version = "0.1.0.5"; + sha256 = "1xi840k962nz3mkf48sc08z4lbdmx8rmix00gzxywyjyia33zg3r"; libraryHaskellDepends = [ base recursion-schemes ]; + librarySystemDepends = [ gmp ]; homepage = "https://github.com/vmchale/gmpint#readme"; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) gmp;}; "gnome-desktop" = callPackage ({ mkDerivation, base, directory, gconf, glib, gtk, random }: @@ -84290,7 +84815,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_keyring;}; + }) {gnome_keyring = null;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -87317,6 +87842,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphs_0_7_1" = callPackage + ({ mkDerivation, array, base, containers, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "graphs"; + version = "0.7.1"; + sha256 = "02g21jpz8jm8j1kpszk8vglw1733z2jp32dc650z40nxlmxpmlxc"; + libraryHaskellDepends = [ + array base containers transformers transformers-compat void + ]; + homepage = "http://github.com/ekmett/graphs"; + description = "A simple monadic graph library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "graphted" = callPackage ({ mkDerivation, base, indexed }: mkDerivation { @@ -93207,6 +93749,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; + revision = "1"; + editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -94164,18 +94708,19 @@ self: { "haskell-dap" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, filepath, ghc, ghc-boot, ghc-paths, ghci, haskeline - , process, time, transformers, unix + , process, text, time, transformers, unix }: mkDerivation { pname = "haskell-dap"; - version = "0.0.2.0"; - sha256 = "1wxidyga0abxyxwiy9qxjl8qj456rlcflav18jz3227yc6y4ziwz"; + version = "0.0.3.0"; + sha256 = "0l09s90mfwnyc3nz3xpgja6dh99qm2yvim4r0fxyvh0adfzkmiwn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghci haskeline process time transformers unix + ghc-boot ghc-paths ghci haskeline process text time transformers + unix ]; homepage = "https://github.com/phoityne/haskell-dap"; description = "haskell-dap is a GHCi having DAP interface"; @@ -96226,16 +96771,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec3, pretty - , process + ({ mkDerivation, base, containers, directory, filepath, parsec + , pretty, process }: mkDerivation { pname = "haskelzinc"; - version = "0.3.0.9"; - sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s"; + version = "0.3.1.0"; + sha256 = "0k3rsqassxjjwxn0cs2g8jl7hl3qmvdvrfdcclc3bf9pjf93jvwh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers filepath parsec3 pretty process + base containers directory filepath parsec pretty process ]; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; @@ -99087,21 +99632,23 @@ self: { "hedgehog-gen-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hedgehog, lens, protolude, regex-genex, regex-posix, scientific - , tasty, tasty-hedgehog, text, unordered-containers, vector + , hedgehog, lens, protolude, regex-genex, regex-pcre, scientific + , tasty, tasty-hedgehog, text, time, timerep, tz + , unordered-containers, vector }: mkDerivation { pname = "hedgehog-gen-json"; - version = "0.1.0"; - sha256 = "1b2sb33ah8df2v36hq1axf8dc5d3kflvpb70fcs2pbr44wzrv8x4"; + version = "0.2.0"; + sha256 = "1irr4lniz5s176r6fnhd7sjnxbs627yif1yd8nd8jrq9p1rwc5jm"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude - regex-genex scientific text unordered-containers vector + regex-genex scientific text time timerep tz unordered-containers + vector ]; testHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude - regex-genex regex-posix scientific tasty tasty-hedgehog text - unordered-containers vector + regex-genex regex-pcre scientific tasty tasty-hedgehog text time + timerep tz unordered-containers vector ]; homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; description = "JSON generators for Hedgehog"; @@ -99839,6 +100386,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "here_1_2_13" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, parsec + , template-haskell + }: + mkDerivation { + pname = "here"; + version = "1.2.13"; + sha256 = "001wfyvigl2xswqysnpignkl124hybf833875mkcsn8yp8krqvs0"; + libraryHaskellDepends = [ + base haskell-src-meta mtl parsec template-haskell + ]; + homepage = "https://github.com/tmhedberg/here"; + description = "Here docs & interpolated strings via quasiquotation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heredoc" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -100243,6 +100807,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hex-text" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, doctest, text + }: + mkDerivation { + pname = "hex-text"; + version = "0.1.0.0"; + sha256 = "0if46jkzd67jwp56vmvd021qq2vfzpmaf1v2w07cy0w61icfvjxr"; + libraryHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/typeclasses/hex-text"; + description = "ByteString-Text hexidecimal conversions"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hexchat" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -103245,6 +103823,23 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_18_2_0" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.18.2.0"; + sha256 = "0gvghbyavlk808826qwy4r667i9mxf2ml5xjsbna5slx4sbj7jfs"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector @@ -106951,12 +107546,15 @@ self: { }: mkDerivation { pname = "hs-rs-notify"; - version = "0.1.0.3"; - sha256 = "0nrhks103kcj8m0f20gp3bgg21pvi4v1vaif275pra4bv0bzl3nh"; + version = "0.1.0.18"; + sha256 = "0ffs9bbs076i3a44zszhv8kdxalz2m2yfg0fham971jil33gx2pc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base filepath process protolude text unix ]; - librarySystemDepends = [ notifier ]; + executableHaskellDepends = [ base protolude ]; + executableSystemDepends = [ notifier ]; testHaskellDepends = [ base protolude ]; homepage = "https://github.com/NoRedInk/hs-rs-notify#readme"; description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify"; @@ -107118,8 +107716,8 @@ self: { }: mkDerivation { pname = "hs2ats"; - version = "0.2.1.6"; - sha256 = "0i953zw2745067qmw06nw6cddjlg7snirbszncjb3d9gv0wpm90k"; + version = "0.2.1.7"; + sha256 = "01hinvxj9v04kzvyck01z4ky3b1gmffwxvl7wri2ggps26h2d5gf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108580,6 +109178,29 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_0_9_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, fail + , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "0.9.5.1"; + sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8"; + configureFlags = [ "-fsystem-lua" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -109769,24 +110390,19 @@ self: { }) {}; "hspkcs11" = callPackage - ({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes - , crypto-api, RSA, testpack, unix, utf8-string + ({ mkDerivation, base, base64-bytestring, bytestring, c2hs + , cipher-aes, cprng-aes, crypto-api, RSA, unix, utf8-string }: mkDerivation { pname = "hspkcs11"; - version = "0.3"; - sha256 = "1cgp0fqwh4r33c4g7pm95cim78kjr9yyq7z1n79f3c30lnvsany9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring crypto-api RSA unix utf8-string - ]; + version = "0.6"; + sha256 = "12jjz5r6pcqqlalxagi1bv1igjfwz7npbdr8vm4kznhv44bkhlp7"; + libraryHaskellDepends = [ base bytestring unix utf8-string ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix - utf8-string + testHaskellDepends = [ + base base64-bytestring bytestring cipher-aes cprng-aes crypto-api + RSA unix utf8-string ]; - executableToolDepends = [ c2hs ]; homepage = "https://github.com/denisenkom/hspkcs11"; description = "Wrapper for PKCS #11 interface"; license = stdenv.lib.licenses.mit; @@ -112547,12 +113163,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_0_1_0" = callPackage + "hunit-dejafu_1_0_1_2" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.0.1.0"; - sha256 = "1vnxxyjycbz5xcfyyrl2hi2xkfqdqajlx1jbxvmq3d0w76p3zvdk"; + version = "1.0.1.2"; + sha256 = "1lnw8rr0lf43rzsv3c5knm96kpnsxmpijqh7njhrgbx9wzy81mg7"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -113071,6 +113687,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hspec-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.2"; + sha256 = "1rafrpys347qc60van79y55n13pjdhdx64j495g4hhvyzf32az67"; + libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testHaskellDepends = [ base hedgehog hspec ]; + homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114640,6 +115270,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hzenity" = callPackage + ({ mkDerivation, base, containers, data-default, process + , process-extras, text, time + }: + mkDerivation { + pname = "hzenity"; + version = "0.1"; + sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk"; + libraryHaskellDepends = [ + base containers data-default process process-extras text time + ]; + homepage = "https://github.com/emilaxelsson/hzenity"; + description = "Haskell interface to Zenity dialogs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hzk" = callPackage ({ mkDerivation, base, bytestring, resource-pool, tasty , tasty-hunit, time, zookeeper_mt @@ -115048,6 +115694,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "identicon-style-squares" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, identicon + , JuicyPixels, polyvariadic + }: + mkDerivation { + pname = "identicon-style-squares"; + version = "0.1.0.0"; + sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9"; + libraryHaskellDepends = [ + base identicon JuicyPixels polyvariadic + ]; + testHaskellDepends = [ + base bytestring cryptohash identicon JuicyPixels + ]; + homepage = "https://github.com/fgaz/identicon-styles"; + description = "Squares style for the identicon package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "identifiers" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , criterion, deepseq, hashable, ListLike, QuickCheck @@ -117157,6 +117822,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "inline-java_0_8_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc + , hspec, jni, jvm, language-java, mtl, process, template-haskell + , temporary, text + }: + mkDerivation { + pname = "inline-java"; + version = "0.8.2"; + sha256 = "0f38w4p29xzrzqjdn2r3yfh2m9iai6dwbj52jhrliiy87gnvwwmy"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath ghc jni jvm language-java + mtl process template-haskell temporary text + ]; + testHaskellDepends = [ base hspec jni jvm text ]; + homepage = "http://github.com/tweag/inline-java#readme"; + description = "Java interop via inline Java code in Haskell modules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default-class, deepseq, directory, exceptions, filepath @@ -117694,6 +118379,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "intern_0_9_2" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "intern"; + version = "0.9.2"; + sha256 = "081fyiq00cvx4nyagr34kwnag9njv65wdps5j4ydin6sjq7b58wk"; + libraryHaskellDepends = [ + array base bytestring hashable text unordered-containers + ]; + homepage = "http://github.com/ekmett/intern/"; + description = "Efficient hash-consing for arbitrary data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "internetmarke" = callPackage ({ mkDerivation, base, explicit-exception, HPDF, parsec, process , transformers, utility-ht @@ -118711,7 +119413,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-client_1_1_0_0" = callPackage + "irc-client_1_1_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -118719,8 +119421,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.0"; - sha256 = "0xg4carlcrzjh8igvnqwmxp64ha7x2wjp5d5lvadbml36zvq189y"; + version = "1.1.0.1"; + sha256 = "01p3p6x1ww5hcwq25nr7czm5z8xiz3sr998krdwfj94nl6z4n2ag"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -119075,9 +119777,9 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.4"; - sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz"; - libraryHaskellDepends = [ base ]; + version = "0.4.1"; + sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a"; + libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; @@ -120052,8 +120754,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.3.2"; - sha256 = "0wym2mz4bvcmwg10v90dx14n41qhmn58bgccnxy7li9ahqwvj0f0"; + version = "0.5.4"; + sha256 = "0bqvxnysynpznhibwlcmcg849psjm0q158mh50w0bcwa7jx6v441"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120568,6 +121270,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) jdk;}; + "jni_0_6_0" = callPackage + ({ mkDerivation, base, bytestring, choice, constraints, containers + , cpphs, deepseq, inline-c, jdk, singletons + }: + mkDerivation { + pname = "jni"; + version = "0.6.0"; + sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba"; + libraryHaskellDepends = [ + base bytestring choice constraints containers deepseq inline-c + singletons + ]; + librarySystemDepends = [ jdk ]; + libraryToolDepends = [ cpphs ]; + homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; + description = "Complete JNI raw bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) jdk;}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -122117,6 +122839,54 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jvm_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, choice, constraints, criterion + , deepseq, distributed-closure, exceptions, hspec, jni, singletons + , text, vector + }: + mkDerivation { + pname = "jvm"; + version = "0.4.2"; + sha256 = "1z3lk2f7bmhi8bj4v32fymjr2bf9czjd73qm6gk33z4mxknddwbh"; + libraryHaskellDepends = [ + base bytestring choice constraints distributed-closure exceptions + jni singletons text vector + ]; + testHaskellDepends = [ base bytestring hspec jni text ]; + benchmarkHaskellDepends = [ + base criterion deepseq jni singletons + ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; + description = "Call JVM methods from Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "jvm-batching" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, singletons + , split, text, vector + }: + mkDerivation { + pname = "jvm-batching"; + version = "0.1.1"; + sha256 = "06vxhlpvb8ilj0xm5k7chzpsn0f7m48l7728g2m7likh55rs2dxq"; + setupHaskellDepends = [ base Cabal inline-java ]; + libraryHaskellDepends = [ + base bytestring distributed-closure inline-java jni jvm singletons + text vector + ]; + testHaskellDepends = [ + base bytestring hspec inline-java jvm text vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm split vector + ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme"; + description = "Provides batched marshalling of values between Java and Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jvm-binary" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, filepath, tasty, tasty-discover, tasty-hspec @@ -122157,17 +122927,23 @@ self: { }) {}; "jvm-streaming" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming + ({ mkDerivation, base, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, jvm-batching + , singletons, streaming, vector }: mkDerivation { pname = "jvm-streaming"; - version = "0.2.2"; - sha256 = "1s0bla6yhw1ic637h2ss8f3aihc26ca5bndhsi5g02fn0gzw644m"; + version = "0.3"; + sha256 = "02qnfs06knia1c2r5hglhf4ahrls7i6q352dykyns4x1ps5kks5r"; + setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ - base distributed-closure inline-java jni jvm singletons streaming + base distributed-closure inline-java jni jvm jvm-batching + singletons streaming vector ]; testHaskellDepends = [ base hspec inline-java jvm streaming ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm streaming vector + ]; homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; @@ -122434,6 +123210,8 @@ self: { pname = "kan-extensions"; version = "5.1"; sha256 = "019jyrilk97i5bj8v044ig03m66h02q4b073m1fksrk7y9c8wgqr"; + revision = "1"; + editedCabalFile = "1xaam291gxmsbibi2ai4l6c36iwkpmfy6vik1916j6jp326pa3z9"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive fail free mtl profunctors semigroupoids tagged @@ -124093,6 +124871,8 @@ self: { pname = "kure"; version = "2.16.12"; sha256 = "1n95f1ijxjxgbq8a33jzmd91yk15bgxx8damxs04y99kzih7sgjc"; + revision = "2"; + editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3"; libraryHaskellDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -125087,6 +125867,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; + revision = "1"; + editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -125121,6 +125903,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lang" = callPackage + ({ mkDerivation, base, bytestring, http-streams, Mapping }: + mkDerivation { + pname = "lang"; + version = "0.2.1"; + sha256 = "1pzj4iyrhlvgbk68d68xmfi75l2nz9ya1nm6iqz1qvmpj9rd3fsy"; + libraryHaskellDepends = [ base bytestring http-streams Mapping ]; + homepage = "语.ml"; + description = "A Lisp"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "language-asn1" = callPackage ({ mkDerivation, base, parsec, syb }: mkDerivation { @@ -125136,19 +125930,19 @@ self: { }) {}; "language-ats" = callPackage - ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base + ({ mkDerivation, alex, ansi-wl-pprint, array, base , composition-prelude, containers, criterion, deepseq, happy, hspec - , hspec-dirstream, lens, mtl, recursion-schemes, system-filepath - , transformers + , hspec-dirstream, microlens, microlens-th, mtl, recursion-schemes + , system-filepath, transformers }: mkDerivation { pname = "language-ats"; - version = "1.0.1.1"; - sha256 = "0ypk9ic7q7v1mbsqzckhb27wm3ra6kignfgvk0ak8wmf31rcr82l"; + version = "1.2.0.0"; + sha256 = "072a37nd9ngis8m1kx7xlr13kd8v24j3cnzllval2ygy9siw4p1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base composition-prelude - containers deepseq lens mtl recursion-schemes transformers + ansi-wl-pprint array base composition-prelude containers deepseq + microlens microlens-th mtl recursion-schemes transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -125204,26 +125998,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c_0_7_0" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.7.0"; - sha256 = "1j4slggwj5g0rnrdxafgn2savv14sl2nqk7lfy3qj73vmpn1d86d"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-c" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb @@ -131162,8 +131936,8 @@ self: { ({ mkDerivation, base, containers, text, transformers }: mkDerivation { pname = "localization"; - version = "1.0.0.20180213"; - sha256 = "1dpmlmpmb4hbv9b5010l5fypjmas3hb4vfmcnfnrajm7wp7qzg2y"; + version = "1.0.1.20180226"; + sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd"; libraryHaskellDepends = [ base containers text transformers ]; description = "Library for localization (l10n)"; license = stdenv.lib.licenses.gpl3; @@ -131693,6 +132467,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.4"; + sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -136742,21 +137540,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14_14" = callPackage + "memory_0_14_16" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, foundation - , ghc-prim, tasty, tasty-hunit, tasty-quickcheck + , ghc-prim }: mkDerivation { pname = "memory"; - version = "0.14.14"; - sha256 = "03lnb7nqshddiwqbz1vpba7mb6l80nav896rr77vlp8m41b9h6qx"; + version = "0.14.16"; + sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v"; libraryHaskellDepends = [ base basement bytestring deepseq foundation ghc-prim ]; - testHaskellDepends = [ - base basement bytestring foundation tasty tasty-hunit - tasty-quickcheck - ]; + testHaskellDepends = [ base basement bytestring foundation ]; homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; @@ -138727,6 +139522,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmorph_1_1_1" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.1"; + sha256 = "17hhfvdr2cclrhslsph3jaly7gfn7caajbzh7xr2prgvxmjhsdg3"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-msgpack , hspec, QuickCheck, text @@ -138900,7 +139709,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "modern-uri_0_2_0_0" = callPackage + "modern-uri_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-megaparsec , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged @@ -138908,10 +139717,10 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.2.0.0"; - sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; + version = "0.2.1.0"; + sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; revision = "1"; - editedCabalFile = "1svq0ndnv5jfz3nhxwdx4vxim5sahfcryj5ik4l4x704jsjbl4bm"; + editedCabalFile = "1rir55ccx5y377mdl7hfzk2n31nv18mdfxw6a0l2jjw7y0w5kpyi"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -139355,6 +140164,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control_1_0_2_3" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.2.3"; + sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/monad-control"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -139387,6 +140213,23 @@ self: { license = "GPL"; }) {}; + "monad-coroutine_0_9_0_4" = callPackage + ({ mkDerivation, base, monad-parallel, transformers + , transformers-compat + }: + mkDerivation { + pname = "monad-coroutine"; + version = "0.9.0.4"; + sha256 = "1rsxzry8qk5229vx4iw4jrzbbc82m80m1nlxlq73k5k20h9gzq0k"; + libraryHaskellDepends = [ + base monad-parallel transformers transformers-compat + ]; + homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; + description = "Coroutine monad transformer for suspending and resuming monadic computations"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-dijkstra" = callPackage ({ mkDerivation, base, free, hlint, mtl, psqueues, tasty , tasty-hspec, transformers @@ -139676,6 +140519,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "monad-logger-prefix_0_1_8" = callPackage + ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec + , monad-control, monad-logger, mtl, QuickCheck, resourcet, text + , transformers, transformers-base + }: + mkDerivation { + pname = "monad-logger-prefix"; + version = "0.1.8"; + sha256 = "1p8sqynxl898vf2fq5lw8j7r50jrxp8npbsw6sc2mbsi336j79xj"; + libraryHaskellDepends = [ + base exceptions monad-control monad-logger mtl resourcet text + transformers transformers-base + ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion monad-logger ]; + homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; + description = "Add prefixes to your monad-logger output"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers @@ -139794,6 +140658,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-metrics_0_2_1_1" = callPackage + ({ mkDerivation, base, clock, ekg-core, exceptions, hashable + , microlens, mtl, text, transformers, unordered-containers + }: + mkDerivation { + pname = "monad-metrics"; + version = "0.2.1.1"; + sha256 = "11gr6ir4678alscv9m6w33l6nbn0k1xspy4lzlgdqpfq5narl5zy"; + libraryHaskellDepends = [ + base clock ekg-core exceptions hashable microlens mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sellerlabs/monad-metrics#readme"; + description = "A convenient wrapper around EKG metrics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-mock" = callPackage ({ mkDerivation, base, constraints, exceptions, haskell-src-exts , haskell-src-meta, hspec, monad-control, mtl, template-haskell @@ -139893,6 +140776,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-parallel_0_7_2_3" = callPackage + ({ mkDerivation, base, parallel, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-parallel"; + version = "0.7.2.3"; + sha256 = "12ahni860pfkdj70f9d0dg2h93gl0d9qav8llcmgh5z7dg1vi3qj"; + libraryHaskellDepends = [ + base parallel transformers transformers-compat + ]; + homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; + description = "Parallel execution of monadic computations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-parallel-progressbar" = callPackage ({ mkDerivation, base, monad-parallel, monadIO , terminal-progress-bar @@ -140359,6 +141258,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monadcryptorandom_0_7_2" = callPackage + ({ mkDerivation, base, bytestring, crypto-api, exceptions, mtl + , tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "monadcryptorandom"; + version = "0.7.2"; + sha256 = "12inwjh1smgrp62hvrca7608vjaff576503xi7ymbkq9szk8rkj9"; + libraryHaskellDepends = [ + base bytestring crypto-api exceptions mtl tagged transformers + transformers-compat + ]; + homepage = "https://github.com/TomMD/monadcryptorandom"; + description = "A monad for using CryptoRandomGen"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monadfibre" = callPackage ({ mkDerivation, base, monadbi }: mkDerivation { @@ -141833,6 +142750,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mtl_2_2_2" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "mtl"; + version = "2.2.2"; + sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/haskell/mtl"; + description = "Monad classes, using functional dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mtl-c" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -143319,6 +144249,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mxnet;}; + "my-package-testing" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "my-package-testing"; + version = "1.0.6"; + sha256 = "188f5k556z8pxg67l16si99n4h4c408za8n123p3y0c95ixnvr4h"; + revision = "1"; + editedCabalFile = "03x6fh9c0d9l0klv67v3kwy5qf78cmy3qxwvmyz2pmrknc4cmkvs"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "my-test-docs" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec , hspec-discover, lens, QuickCheck, servant, servant-auth @@ -143328,6 +144282,8 @@ self: { pname = "my-test-docs"; version = "1.0.12"; sha256 = "1q3fzwqyams7748cy8q7adkn93jh4dds83x0ns44n9ca4myjvrxj"; + revision = "1"; + editedCabalFile = "0mzmqcz800pacp1h4qwz6ynjqr7jsjgq3xkrzvxkx7s32gmqkzyn"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -143337,8 +144293,7 @@ self: { servant-auth-docs servant-docs template-haskell text ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/"; - description = "Nill"; + description = "spam"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -145850,8 +146805,8 @@ self: { pname = "network-msgpack-rpc"; version = "0.0.4"; sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; - revision = "1"; - editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2"; + revision = "2"; + editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -148666,20 +149621,27 @@ self: { "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, crypto-random, cryptohash, either - , exceptions, http-client, http-types, mtl, network, network-uri - , text, time, transformers + , bytestring, case-insensitive, crypto-random, cryptohash + , exceptions, hspec, hspec-expectations, http-client + , http-client-tls, http-types, mtl, network, network-uri, text + , time, transformers }: mkDerivation { pname = "oauthenticated"; - version = "0.1.3.4"; - sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm"; + version = "0.2.0.0"; + sha256 = "01rfx9zc1d9pwqc66axkrl2bi0jnyw4l39kn0nh4q8j63laszc1h"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive crypto-random cryptohash either exceptions - http-client http-types mtl network network-uri text time - transformers + case-insensitive crypto-random cryptohash exceptions http-client + http-types mtl network network-uri text time transformers + ]; + testHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + case-insensitive crypto-random cryptohash exceptions hspec + hspec-expectations http-client http-client-tls http-types mtl + network network-uri text time transformers ]; + homepage = "https://github.com/tel/oauthenticated.git#readme"; description = "Simple OAuth for http-client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -149068,8 +150030,8 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "4.0"; - sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k"; + version = "5.0"; + sha256 = "19lgfgsfkfk51dbjimc45yclxfh7ncmh21gnc6f7dihsyhkdfsx7"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text @@ -149224,6 +150186,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "om-elm" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-types, safe, safe-exceptions, template-haskell, text, unix + , wai + }: + mkDerivation { + pname = "om-elm"; + version = "1.0.0.1"; + sha256 = "1fvpsiv5xdc7jamhdsaw2kzm32qrbg7c2b5s5zhhhcd7j4vgn3xq"; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-types safe + safe-exceptions template-haskell text unix wai + ]; + homepage = "https://github.com/owensmurray/om-elm"; + description = "Haskell utilities for building embedded Elm programs"; + license = stdenv.lib.licenses.mit; + }) {}; + "omaketex" = callPackage ({ mkDerivation, base, optparse-applicative, shakespeare-text , shelly, text @@ -150723,8 +151703,25 @@ self: { }: mkDerivation { pname = "optparse-applicative"; - version = "0.14.0.0"; - sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm"; + version = "0.14.1.0"; + sha256 = "19q1q1z2mrwqp6r2vp3q46qb2j1awzn7mawpjhp6rk36bhijp07f"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optparse-applicative_0_14_2_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, process + , QuickCheck, transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.14.2.0"; + sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -150732,6 +151729,7 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-applicative-simple" = callPackage @@ -150780,6 +151778,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-generic_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , semigroups, system-filepath, text, time, transformers, void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.3.0"; + sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative semigroups + system-filepath text time transformers void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -151798,6 +152813,8 @@ self: { pname = "pagination"; version = "0.2.1"; sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; + revision = "1"; + editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -152032,7 +153049,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_1_4" = callPackage + "pandoc-citeproc_0_14_1_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -152041,8 +153058,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.1.4"; - sha256 = "1agc7qh9sfhqy329w0ccbfx081001k93qk9h6br5gx2yqizwbdd0"; + version = "0.14.1.5"; + sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -152147,8 +153164,8 @@ self: { }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.2"; - sha256 = "05vf3fli3glq013c9w9bbjggndfwhjb1rqxqspxyfh8pi14sbj9v"; + version = "0.2.3"; + sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154107,6 +155124,8 @@ self: { pname = "path-io"; version = "1.3.3"; sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; + revision = "1"; + editedCabalFile = "16jfcjpqbzj6jr0sqxq2ys1z9qd2d8xr9k9vyij08ywynmwwvvzm"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -154535,6 +155554,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcf-font-embed_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, pcf-font, template-haskell + , vector + }: + mkDerivation { + pname = "pcf-font-embed"; + version = "0.1.2.0"; + sha256 = "0lgx62ig2rvxcv9sgk53pfr8gkfimb1xm6lxpc2rr74mdzp52pf5"; + libraryHaskellDepends = [ + base bytestring pcf-font template-haskell vector + ]; + homepage = "https://github.com/michael-swan/pcf-font-embed"; + description = "Template Haskell for embedding text rendered using PCF fonts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pcg-random" = callPackage ({ mkDerivation, base, bytestring, doctest, entropy, primitive , random @@ -155054,6 +156090,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pem_0_2_3" = callPackage + ({ mkDerivation, base, bytestring, HUnit, memory, mtl, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "pem"; + version = "0.2.3"; + sha256 = "1c8383b5zcwmv88qhfnqcrwpi5md89iqsrfblcdxl8czyvc5x973"; + libraryHaskellDepends = [ base bytestring memory mtl ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/vincenthz/hs-pem"; + description = "Privacy Enhanced Mail (PEM) format reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc @@ -155474,6 +156529,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_1" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.1"; + sha256 = "1jjydxzjvkw3jzm968ngj0v531fly0h4f7621fjzgbkdcjfgkgm1"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql @@ -156025,7 +157100,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-sqlite_2_8_1" = callPackage + "persistent-sqlite_2_8_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, temporary, text @@ -156033,8 +157108,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.1"; - sha256 = "19iqpa99r4s14r2qmimqpv3b8qz3wm9arbkniccrj8bxlw1c8a4d"; + version = "2.8.1.2"; + sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156623,8 +157698,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.21.0"; - sha256 = "190gqa5zi99a9rrazbcg2xmzx5bl304vb95w8z4qilggngq1y7df"; + version = "0.0.22.0"; + sha256 = "0ala51fps5yd1lk47blsbfby6sysnz2v39frmc53ggqzzlsls2q7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -157257,6 +158332,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_8" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.8"; + sha256 = "1wlppz7vlkmbrrvjv6cjrp8x39lhvdqp2sgc9w6hv25y3qirz9wi"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -158562,8 +159661,8 @@ self: { pname = "plan-b"; version = "0.2.1"; sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv"; - revision = "1"; - editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh"; + revision = "2"; + editedCabalFile = "03vi68kp16lcly2rv6nq5a64k00hd4a5zvdf8pbz76450fik2c1j"; libraryHaskellDepends = [ base exceptions path path-io transformers ]; @@ -161018,8 +162117,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.7.3"; - sha256 = "1wki03b3kfw6sy5fv1zk4dvnprwapqg0bnkr6cmxdl2dvjz61946"; + version = "0.9"; + sha256 = "1sxzxg1dpm3280x5vp47pc6faik9dpfn7qp4pwvbkvwq90l32pv8"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors text unagi-chan unordered-containers vector @@ -161028,7 +162127,7 @@ self: { attoparsec QuickCheck quickcheck-instances random rerebase tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/nikita-volkov/potoki"; + homepage = "https://github.com/metrix-ai/potoki"; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161040,32 +162139,32 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.1.3"; - sha256 = "1r7plcki29gr9jx61qjx752zc9zh9yy47kznrs36q7jgjhnj6mqx"; + version = "0.1.4"; + sha256 = "0502ipxxdlmk4akc2fpsij3y91fi6q3rhrlzm3bf4kl5jfddvz7s"; libraryHaskellDepends = [ base base-prelude bytestring cereal potoki potoki-core text ]; - homepage = "https://github.com/nikita-volkov/potoki-cereal"; + homepage = "https://github.com/metrix-ai/potoki-cereal"; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "potoki-core" = callPackage - ({ mkDerivation, base, deque, profunctors, QuickCheck + ({ mkDerivation, base, profunctors, QuickCheck , quickcheck-instances, rerebase, stm, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "potoki-core"; - version = "1.3"; - sha256 = "0z6ld13kmkvamn8y39zqw0z4mkg5wi9mmh7kdav31wy46im03b9l"; - libraryHaskellDepends = [ base deque profunctors stm ]; + version = "1.5.1"; + sha256 = "1c357c5a34k9nd3wjyg246kcc4lfwrrfl01pki2ksdidw9xwclij"; + libraryHaskellDepends = [ base profunctors stm ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/nikita-volkov/potoki-core"; + homepage = "https://github.com/metrix-ai/potoki-core"; description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161334,14 +162433,14 @@ self: { }) {}; "pragmatic-show" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck - , vector-space + ({ mkDerivation, base, containers, tasty, tasty-hunit + , tasty-quickcheck, vector-space }: mkDerivation { pname = "pragmatic-show"; - version = "0.1.1.0"; - sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7"; + libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space ]; @@ -162123,22 +163222,6 @@ self: { }) {}; "prettyprinter-ansi-terminal" = callPackage - ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text - }: - mkDerivation { - pname = "prettyprinter-ansi-terminal"; - version = "1.1.1.1"; - sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl"; - revision = "1"; - editedCabalFile = "1giafm5d5yjdkm7fxf208a4scsa2z1sh73zwvfrycgrhqp746brf"; - libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/quchen/prettyprinter"; - description = "ANSI terminal backend for the »prettyprinter« package"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "prettyprinter-ansi-terminal_1_1_1_2" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: mkDerivation { @@ -162150,7 +163233,6 @@ self: { homepage = "http://github.com/quchen/prettyprinter"; description = "ANSI terminal backend for the »prettyprinter« package"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-compat-annotated-wl-pprint" = callPackage @@ -162492,6 +163574,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prints" = callPackage + ({ mkDerivation, base, hscolour, pretty-show, pretty-simple, text + , transformers + }: + mkDerivation { + pname = "prints"; + version = "0.1.0.1"; + sha256 = "09l6kvcpfjafjihcnljnhr0gi5wclbaskqh9hslig5bzldjyd331"; + libraryHaskellDepends = [ + base hscolour pretty-show pretty-simple text transformers + ]; + homepage = "https://github.com/evturn/prints"; + description = "The Artist Formerly Known as Prints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "printxosd" = callPackage ({ mkDerivation, base, xosd }: mkDerivation { @@ -163155,6 +164253,8 @@ self: { pname = "progress-reporting"; version = "1.1.0"; sha256 = "02j1i28hcd54w1j9p0d8xzc1bns7swd8js5f6d6ppikc82hlb9bj"; + revision = "1"; + editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; license = stdenv.lib.licenses.lgpl3; @@ -163585,8 +164685,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.2"; - sha256 = "1jv4yzls8l4blnvmrrbwljx999g92gklpj52pn1r48sh40sqa7l1"; + version = "5.3.3"; + sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165594,8 +166694,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.5"; - sha256 = "1csgghcv093g8hmkaxyj2vm0ym28yw37d7crj4rgk8fs8qhr5ib4"; + version = "1.0.1.6"; + sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory either haskell-qrencode jose-jwt JuicyPixels microlens optparse-applicative process split @@ -166218,23 +167318,6 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck - , transformers, vector - }: - mkDerivation { - pname = "quickcheck-classes"; - version = "0.3.2"; - sha256 = "10z65dxm0jply0zbx1kpxpiir3z85c9133hkiqnra6sqz13njdz4"; - libraryHaskellDepends = [ - aeson base prim-array primitive QuickCheck transformers - ]; - testHaskellDepends = [ aeson base primitive QuickCheck vector ]; - homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; - description = "QuickCheck common typeclasses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-classes_0_3_3" = callPackage ({ mkDerivation, aeson, base, containers, prim-array, primitive , QuickCheck, transformers, vector }: @@ -166249,7 +167332,6 @@ self: { homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -166606,15 +167688,19 @@ self: { }) {}; "quickspec" = callPackage - ({ mkDerivation, array, base, containers, ghc-prim, QuickCheck - , random, spoon, transformers + ({ mkDerivation, base, constraints, containers, data-lens-light + , dlist, QuickCheck, random, reflection, template-haskell + , transformers, twee-lib, uglymemo }: mkDerivation { pname = "quickspec"; - version = "0.9.6"; - sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21"; + version = "2"; + sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r"; + revision = "1"; + editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb"; libraryHaskellDepends = [ - array base containers ghc-prim QuickCheck random spoon transformers + base constraints containers data-lens-light dlist QuickCheck random + reflection template-haskell transformers twee-lib uglymemo ]; homepage = "https://github.com/nick8325/quickspec"; description = "Equational laws for free!"; @@ -167436,12 +168522,15 @@ self: { }) {}; "rando" = callPackage - ({ mkDerivation, base, tf-random }: + ({ mkDerivation, base, containers, microspec, tf-random, vector }: mkDerivation { pname = "rando"; - version = "0.0.0.1"; - sha256 = "09pra2w97jhayzwws8133xvjnrsb0iqzl3cx676pawnlknc1dkkg"; - libraryHaskellDepends = [ base tf-random ]; + version = "0.0.0.2"; + sha256 = "0c12z3nd9g30chlz3ylcajxjbwm868nnsnlj6xc803gyficw2vdp"; + libraryHaskellDepends = [ base tf-random vector ]; + testHaskellDepends = [ + base containers microspec tf-random vector + ]; description = "Easy-to-use randomness for livecoding"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -168535,6 +169624,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rc" = callPackage + ({ mkDerivation, base, dde, hmatrix, Learning, random, vector }: + mkDerivation { + pname = "rc"; + version = "0.1.0.1"; + sha256 = "0hcivi8lpf8qfsanxqhxbjyrhhkx4aa5lzwgwir0zq08fakbxadm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dde hmatrix Learning random vector + ]; + executableHaskellDepends = [ + base dde hmatrix Learning random vector + ]; + testHaskellDepends = [ base dde hmatrix Learning random vector ]; + homepage = "https://github.com/masterdezign/rc#readme"; + description = "Reservoir Computing, fast RNNs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rclient" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , network, QuickCheck, split @@ -169775,12 +170884,12 @@ self: { }) {}; "redland" = callPackage - ({ mkDerivation, base, raptor2, redland }: + ({ mkDerivation, base, deepseq, raptor2, redland }: mkDerivation { pname = "redland"; - version = "0.1.0.0"; - sha256 = "0c73rfvgrhwvph3zgn04mk79mhx8pbn0jznmwmb0ansd0mg9piy7"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.1"; + sha256 = "080bp01x6vlfw116zcl75vr7pb753mn8892rkh7aqgaf8ajkhb2c"; + libraryHaskellDepends = [ base deepseq ]; libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; license = stdenv.lib.licenses.bsd3; @@ -170811,6 +171920,8 @@ self: { pname = "regex-tdfa"; version = "1.2.2"; sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb"; + revision = "1"; + editedCabalFile = "0m2i94gm6a1m6sn3mj47jbnmjp5ksiqmdn6v4pdr7xsv5a15gfwn"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -172536,6 +173647,8 @@ self: { pname = "resolv"; version = "0.1.1.1"; sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; + revision = "1"; + editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -173181,6 +174294,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_6_1" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog + , tasty-hunit, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.6.1"; + sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hedgehog HUnit mtl + random stm tasty tasty-hedgehog tasty-hunit time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -173690,22 +174825,22 @@ self: { "rio" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , text, time, typed-process, unix, unliftio, unordered-containers - , vector + , process, text, time, typed-process, unix, unliftio + , unordered-containers, vector }: mkDerivation { pname = "rio"; - version = "0.0.2.0"; - sha256 = "0iyfbqrgj0kcs72ibd5wm4gr51agvmqr5jg0vhay5srg86wc248l"; + version = "0.0.3.0"; + sha256 = "1mbxd2v0n0hbrmb1xh27snxxp1r8k87g4ijqsp99hnis8vmqmz84"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive text time typed-process unix - unliftio unordered-containers vector + hashable microlens mtl primitive process text time typed-process + unix unliftio unordered-containers vector ]; testHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive text time typed-process unix - unliftio unordered-containers vector + hashable hspec microlens mtl primitive process text time + typed-process unix unliftio unordered-containers vector ]; homepage = "https://github.com/commercialhaskell/rio#readme"; description = "A standard library for Haskell"; @@ -175568,6 +176703,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; + revision = "1"; + editedCabalFile = "12rv8mjrchpx9xaw87ph1hccr5hs6mb0g1imxjr8adw45prnvrw4"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -177392,8 +178529,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "8"; - editedCabalFile = "1jjpaiksvdhsmvv6p267w5grkiv4xmd59xsgwhhyhp5v2503p8sn"; + revision = "9"; + editedCabalFile = "0cdvv4qsda5rkdj93400i8n3lzkxmz9xci7i38pri9axmics28qa"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -177800,8 +178937,8 @@ self: { }: mkDerivation { pname = "scuttlebutt-types"; - version = "0.3.0"; - sha256 = "015pg2y2k0s88wgjjv3h1h8gl3f07lbj2v8s9i1cqk5qzrs7jhrm"; + version = "0.4.0"; + sha256 = "17srdak7xbwwagm3mv7wyqff27yi217a6pjkzl2gz3n5z3h210ri"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite ed25519 memory text vector @@ -177891,6 +179028,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_3_0_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 + , StateVar, text, transformers, vector + }: + mkDerivation { + pname = "sdl2"; + version = "2.3.0.1"; + sha256 = "1cyp3afs89xsqn3hxzk1223vpbifr1w2faczqfkii3irdgpqjl6k"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -178407,6 +179565,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "securemem_0_1_10" = callPackage + ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: + mkDerivation { + pname = "securemem"; + version = "0.1.10"; + sha256 = "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j"; + libraryHaskellDepends = [ + base byteable bytestring ghc-prim memory + ]; + homepage = "https://github.com/vincenthz/hs-securemem"; + description = "abstraction to an auto scrubbing and const time eq, memory chunk"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sednaDBXML" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, containers , iteratee, mtl, sedna, text @@ -178432,6 +179605,25 @@ self: { pname = "selda"; version = "0.1.12"; sha256 = "1pbf141p3j2gj91lz4ilfc75kf2b0mzfnzxpjn220knkzianm2d9"; + revision = "1"; + editedCabalFile = "06j1yv9w46nm5hrs15na1bisv63kkscifq01c8qq66li4vm79l8z"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + }) {}; + + "selda_0_1_12_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.12.1"; + sha256 = "1iq0fnk17qn74vwl8mjv7zr1y90f3x1hwniy0dmg3h0s5clpcqa9"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -178439,6 +179631,7 @@ self: { homepage = "https://selda.link"; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-postgresql" = callPackage @@ -178449,6 +179642,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.1"; sha256 = "1izc27wdi9ldhjmmhwjw99g8pgbcayldwn65p5lsad173nc2rd22"; + revision = "1"; + editedCabalFile = "0nkhzbkvhfcp9nsq6w45ag2l7w848iw7hfllfian16vfhqc4qpld"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -178457,6 +179652,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_7_2" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.7.2"; + sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -178465,6 +179677,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.0"; sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; + revision = "1"; + editedCabalFile = "0yf1n9iaaafnllkb2yi38ncyd3q062g4p7ln9ypb6h8gcym8s8m1"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -178682,8 +179896,8 @@ self: { pname = "semigroupoids"; version = "5.2.2"; sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "1"; - editedCabalFile = "16pf83y17jbjbqv6rqlz4icdzsv6b10vjci6pf92y7cpizzjw0sy"; + revision = "2"; + editedCabalFile = "1ps5v8c9w39jbcakg4vignza5mr4cjanxwh9y0hslwpm5mhh7326"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -178886,8 +180100,8 @@ self: { }: mkDerivation { pname = "sensei"; - version = "0.3.0"; - sha256 = "0ya5pb7plr3qgh2vh8yqffwcb6alk2k581wv3yfp0zwxpflwppvh"; + version = "0.4.0"; + sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -179969,21 +181183,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions_1_0_0_0" = callPackage + "servant-checked-exceptions_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob , hspec-wai, http-media, http-types, profunctors, servant - , servant-client, servant-docs, servant-server, tagged, tasty - , tasty-hspec, tasty-hunit, text, wai + , servant-client, servant-client-core, servant-docs, servant-server + , tagged, tasty, tasty-hspec, tasty-hunit, text, wai }: mkDerivation { pname = "servant-checked-exceptions"; - version = "1.0.0.0"; - sha256 = "1kdjhjgk9m6giygvpd2b79qs08phjy72q2bh07f7wxkiwjbkq1k6"; + version = "1.1.0.0"; + sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring deepseq http-media http-types profunctors - servant servant-client servant-docs servant-server tagged text wai + servant servant-client servant-client-core servant-docs + servant-server tagged text wai ]; testHaskellDepends = [ base bytestring doctest Glob hspec-wai http-types servant @@ -180409,8 +181624,7 @@ self: { description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {github-webhooks = null;}; + }) {}; "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring @@ -181490,8 +182704,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.4.0"; - sha256 = "12nwj81hwlqmmr4d0vgi4a5gd2zcnndn5rhkx33b0cflfrqcwyp3"; + version = "0.4.1"; + sha256 = "1r0amp80g3lz31l1hb138dyqfh29nb7f0yq20xzh4hccr600liw1"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring lens text time unix unordered-containers @@ -182358,8 +183572,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.16.2"; - sha256 = "07drp370pd794f0lbs2512dhkr3himndafyfngvxad6m4m6nri18"; + version = "0.16.3"; + sha256 = "11rgb0lh8q6alr13in7156dwr44rag0ldynbd5wmlg7073q2g8zc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182385,15 +183599,15 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hs2ats - , language-ats, lens, shake, shake-ext, text + , language-ats, microlens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.5.0.3"; - sha256 = "0gyj9v5ls44548zjzmk4bq6q8v9g84zadk5db8j60q14aiv300mb"; + version = "1.5.0.6"; + sha256 = "166i9v8d4fdbmriakndwkjgx10c4rags141ky0nw6x2ydziyn7n0"; libraryHaskellDepends = [ - base binary dependency directory hs2ats language-ats lens shake - shake-ext text + base binary dependency directory hs2ats language-ats microlens + shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -182419,15 +183633,16 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, directory, mtl, shake - , template-haskell, text + ({ mkDerivation, base, Cabal, composition-prelude, directory, mtl + , shake, template-haskell, text }: mkDerivation { pname = "shake-ext"; - version = "2.5.0.0"; - sha256 = "0bsl49x7y1mif4h3yp4k8p5n39d410nm0awxdpiwvan9pnz692df"; + version = "2.7.0.0"; + sha256 = "1jv5hcmv29ynr5asc4mpz4kh4ip5gd16b8h5qlcfac2f7m7njbwl"; libraryHaskellDepends = [ - base Cabal directory mtl shake template-haskell text + base Cabal composition-prelude directory mtl shake template-haskell + text ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -183135,8 +184350,8 @@ self: { }: mkDerivation { pname = "shimmer"; - version = "0.1.1"; - sha256 = "10n9dq9445anb2n85xasl1l8qx40p5bnm12xj47n6wbmxhd75fvh"; + version = "0.1.2"; + sha256 = "0d4jllvqkswhxmjczvj2pcfwgdsd8xpvjx60pvw7m06jwslh99dl"; libraryHaskellDepends = [ base bytestring containers filepath haskeline text vector ]; @@ -183305,6 +184520,21 @@ self: { license = "GPL"; }) {}; + "show-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "show-combinators"; + version = "0.1.0.0"; + sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; + revision = "1"; + editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/Lysxia/show-combinators#readme"; + description = "Combinators to write Show instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "show-please" = callPackage ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans , time @@ -183327,10 +184557,8 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2"; - sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w"; - revision = "1"; - editedCabalFile = "1hkfq59kpx3p4rgka49l3hvim80xlqf5h3q8f1xb4arysrq3pvi4"; + version = "0.2.0.1"; + sha256 = "0nkp1qjm017j3pmih9qnymi361wq1f45vr2pqi6y3wbspi0gq029"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -183340,14 +184568,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "show-prettyprint_0_2_0_1" = callPackage + "show-prettyprint_0_2_0_2" = callPackage ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter , trifecta }: mkDerivation { pname = "show-prettyprint"; - version = "0.2.0.1"; - sha256 = "0nkp1qjm017j3pmih9qnymi361wq1f45vr2pqi6y3wbspi0gq029"; + version = "0.2.0.2"; + sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -185463,21 +186691,27 @@ self: { }) {}; "slate" = callPackage - ({ mkDerivation, base, directory, filepath, optparse-applicative }: + ({ mkDerivation, base, directory, filepath, htoml + , optparse-applicative, process, string-conversions + , unordered-containers + }: mkDerivation { pname = "slate"; - version = "0.5.0.0"; - sha256 = "07cjb3qndsgmjgc890v4g4smdc67gbci4yrqq5m7wa4g6sc5dasl"; + version = "0.8.0.0"; + sha256 = "096v0aai5c7adpa5y15yscs6w8c7c0vz667a0ibr33m0rmnyiqlm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory filepath optparse-applicative + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers ]; executableHaskellDepends = [ - base directory filepath optparse-applicative + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers ]; testHaskellDepends = [ - base directory filepath optparse-applicative + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers ]; homepage = "https://github.com/evuez/slate#readme"; description = "A note taking CLI tool"; @@ -185652,6 +186886,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; + revision = "1"; + editedCabalFile = "0xy0zcrnfpdbkhks15p1g2zxl7zmfb0b5511mfcsvzxl9q8salf6"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -185876,6 +187112,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "smcdel" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, containers + , criterion, cudd, directory, file-embed, filepath, graphviz, happy + , HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty + , tagged, template-haskell, temporary, text, time + }: + mkDerivation { + pname = "smcdel"; + version = "1.0.0"; + sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers cudd graphviz HasCacBDD lens process + QuickCheck tagged temporary text time + ]; + executableHaskellDepends = [ + ansi-terminal base directory file-embed filepath HasCacBDD + js-jquery process scotty template-haskell text + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion time ]; + homepage = "https://github.com/jrclogic/SMCDEL"; + description = "Symbolic Model Checking for Dynamic Epistemic Logic"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "sme" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -188515,23 +189779,23 @@ self: { "sparkle" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice , constraints, distributed-closure, filepath, inline-java, jni, jvm - , jvm-streaming, process, regex-tdfa, singletons, streaming, text - , vector, zip-archive + , jvm-streaming, process, regex-tdfa, singletons, streaming + , temporary, text, unix, vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.7.3"; - sha256 = "1wxp0wdmcvkypnayv128f2bgcdh7ka1b6ap7w5743v1gpxzkqb8b"; + version = "0.7.4"; + sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal inline-java ]; + setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; libraryHaskellDepends = [ base binary bytestring choice constraints distributed-closure inline-java jni jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ - base bytestring filepath process regex-tdfa text zip-archive + base bytestring filepath process regex-tdfa temporary text unix + zip-archive ]; homepage = "http://github.com/tweag/sparkle#readme"; description = "Distributed Apache Spark applications in Haskell"; @@ -190989,6 +192253,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "starter" = callPackage + ({ mkDerivation, base, fsnotify }: + mkDerivation { + pname = "starter"; + version = "0.1.0"; + sha256 = "1h3c9znrzyymd1bcgwhid6rchf9ai7nxr1ib0y70qzzrmifyh1mn"; + libraryHaskellDepends = [ base fsnotify ]; + homepage = "https://github.com/rkaippully/starter#readme"; + description = "Develop applications without restarts"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -192401,15 +193677,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_15_2" = callPackage + "stratosphere_0_17_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.15.2"; - sha256 = "00mna9w4021a1ydxyysx0wd333hby4sx3fpl1vygmcyjfibwiqmc"; + version = "0.17.0"; + sha256 = "1824fgv3jm25wa3sk53v7j76jpq8kqh9fm3jfpp8hlzwnb57zni9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192808,6 +194084,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "streaming-pcap" = callPackage + ({ mkDerivation, base, bytestring, pcap, streaming, tasty + , tasty-hunit + }: + mkDerivation { + pname = "streaming-pcap"; + version = "1.0.0"; + sha256 = "0xf7a9jpyhypfkjby2mqjv6fc4dhsl420q482nppdw7k65nsi85x"; + libraryHaskellDepends = [ base bytestring pcap streaming ]; + testHaskellDepends = [ + base bytestring pcap streaming tasty tasty-hunit + ]; + homepage = "https://github.com/fosskers/streaming-pcap"; + description = "Stream packets via libpcap"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-png" = callPackage ({ mkDerivation, base, bytestring, cereal, exceptions, JuicyPixels , mmorph, mtl, resourcet, streaming, streaming-bytestring @@ -196114,13 +197407,16 @@ self: { }) {}; "system-filepath" = callPackage - ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq - , QuickCheck, text + ({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck + , deepseq, QuickCheck, text }: mkDerivation { pname = "system-filepath"; version = "0.4.14"; sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; + revision = "1"; + editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text @@ -196146,8 +197442,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.3.0.0"; - sha256 = "05zp1kddydl9fqbhfpkjvxqfi6l9i1qhif5sziz3d0mymnyrzvpp"; + version = "0.4.0.0"; + sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -196639,6 +197935,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tabs" = callPackage + ({ mkDerivation, base, filepath, monadlist, mtl, tagged }: + mkDerivation { + pname = "tabs"; + version = "0.1.0.0"; + sha256 = "1188rjlq2s2azbjxwfp40j8aidn3hz2lhmcaghj2ig6n5w2jpg98"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base filepath monadlist mtl tagged ]; + executableHaskellDepends = [ base filepath monadlist mtl tagged ]; + description = "Indents source files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tabular" = callPackage ({ mkDerivation, base, csv, html, mtl }: mkDerivation { @@ -197000,6 +198310,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_6" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.6"; + sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; + homepage = "https://github.com/ndmitchell/tagsoup#readme"; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -197656,12 +198984,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_0_1_0" = callPackage + "tasty-dejafu_1_0_1_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.0.1.0"; - sha256 = "1japzchg9sxy08rjj9vvr3qxil1bzhn3i3qxr00pf0qpxnd5ssmc"; + version = "1.0.1.1"; + sha256 = "0khdm4v22n86vz3qgv9wi6yfd3yi61br089sxffhfwvr9g3fxjlf"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -197696,6 +199024,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-discover_4_1_5" = callPackage + ({ mkDerivation, base, containers, directory, filepath, Glob + , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "4.1.5"; + sha256 = "1v2g0jyfrcv04klxicp1z6p478ppq5l3szkx4f4hjqnim6kg8pgh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath Glob + ]; + executableHaskellDepends = [ + base containers directory filepath Glob + ]; + testHaskellDepends = [ + base containers directory filepath Glob hedgehog tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/lwm/tasty-discover#readme"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -201125,6 +202481,8 @@ self: { pname = "th-abstraction"; version = "0.2.6.0"; sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5"; + revision = "1"; + editedCabalFile = "0k4s4nbg9jlgaza38842jnzs8s01ig85fzmjgd10k9hl02gc3r44"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -202075,6 +203433,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-gui_0_8_2_2" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, file-embed, filepath, hashable + , network-uri, safe, snap-core, snap-server, stm, template-haskell + , text, transformers, unordered-containers, vault, vector + , websockets, websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.2.2"; + sha256 = "13s6n7pxbmr0j2g5xiqpacfnshqg0jq91y161rmmp3wix4bav6am"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions file-embed filepath hashable network-uri safe snap-core + snap-server stm template-haskell text transformers + unordered-containers vault vector websockets websockets-snap + ]; + homepage = "http://wiki.haskell.org/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { @@ -202607,14 +203991,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_9" = callPackage + "time_1_9_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9"; - sha256 = "13nfiwsh1bq4w9rwmqm1iy9kxwrqbi82qpqlpcd02ywklh21silx"; + version = "1.9.1"; + sha256 = "1nsvkxfm4gvmsmwd88ybpbpbny99b9k9z1f5cdkwlghvr0amg7s7"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -204855,6 +206239,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-compat_0_6_0_6" = callPackage + ({ mkDerivation, base, deriving-compat, ghc-prim, hspec, QuickCheck + , tagged, transformers + }: + mkDerivation { + pname = "transformers-compat"; + version = "0.6.0.6"; + sha256 = "0fdnc8qnm42llp3nyfmg7ij6wscrigb43x3f2w1d38dvjkycyags"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ + base deriving-compat hspec QuickCheck tagged transformers + ]; + homepage = "http://github.com/ekmett/transformers-compat/"; + description = "A small compatibility shim for the transformers library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-compose" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -206400,8 +207802,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.1.1"; - sha256 = "08mhq7yr66hgs6p01wx935xr59pm427qxyz8qd9f00lbgkhjbvzc"; + version = "2.1.3"; + sha256 = "08grsv9x9a289lh5w9vx401zshs6fa31756mdzmac0w9nk92229k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -206419,8 +207821,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.1.1"; - sha256 = "00c9qwx27qsljpvvywljssncw805qd2aq8vwcyqqawjcpbyrxf0d"; + version = "2.1.3"; + sha256 = "0yp6qdm189jhapx9y80yq9r97bv2v2w3n7q070i7hzczmg55rjqi"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive transformers vector ]; @@ -209748,6 +211150,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-time_0_3_8" = callPackage + ({ mkDerivation, base, binary, bytestring, doctest, hspec + , old-locale, old-time, QuickCheck, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.3.8"; + sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring doctest hspec old-locale old-time QuickCheck time + ]; + description = "Unix time parser/formatter and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -209755,8 +211174,8 @@ self: { }: mkDerivation { pname = "unjson"; - version = "0.14.1.3"; - sha256 = "18aclqjyqj7428yyal9hj32r290ipd77lnaf176sn8fk42gk5qj3"; + version = "0.15.0.0"; + sha256 = "0ib7y7a4ham90hzy5anrhry7c1w8c847v39ygjj8556pq6j47nyg"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific text time unordered-containers vector @@ -209812,6 +211231,8 @@ self: { pname = "unliftio-core"; version = "0.1.1.0"; sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; + revision = "1"; + editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; @@ -210342,6 +211763,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_3_1_1" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, blaze-builder + , bytestring, containers, criterion, deepseq, deepseq-generics + , fail, generics-sop, HUnit, network-uri, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, th-lift-instances + , transformers + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.3.1.1"; + sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers fail + template-haskell th-lift-instances + ]; + testHaskellDepends = [ + attoparsec base base-compat blaze-builder bytestring containers + generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-bytestring-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { @@ -211231,8 +212683,8 @@ self: { pname = "uuid-crypto"; version = "1.4.0.0"; sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; - revision = "1"; - editedCabalFile = "12skd8nifn9nazl1dm3lrlp63qbfc97xkl3dqzcsy848mzifvn9n"; + revision = "2"; + editedCabalFile = "0kw54wnzzxw6hjmj52735x9pya18ccmry2nf4nmlcv89ipb1vmly"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-class cryptoids-types exceptions uuid @@ -211570,20 +213022,38 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl - , semigroupoids, semigroups, transformers + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups }: mkDerivation { pname = "validation"; - version = "0.6.2"; - sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; + version = "0.6.3"; + sha256 = "07j4nxah790vbzn0jfkp9lgb4afr8zwi06a0xp5dw0xjdl0qja66"; libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers + base bifunctors deepseq lens semigroupoids semigroups + ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; + homepage = "https://github.com/qfpl/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "validation_1" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups + }: + mkDerivation { + pname = "validation"; + version = "1"; + sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; + libraryHaskellDepends = [ + base bifunctors deepseq lens semigroupoids semigroups ]; testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -216540,8 +218010,8 @@ self: { }: mkDerivation { pname = "webify"; - version = "0.1.8.0"; - sha256 = "031gim7g15ssjj3pzc5nk7r8dsfj35pf3kzjzaxfijklwzj0zj9q"; + version = "0.1.9.0"; + sha256 = "0gfdzxy7qsxpqqrkm3dy37d68xp8nvx0q9189msbfp3x4yalfb1z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -216851,8 +218321,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0"; - sha256 = "1s6xfzv49pism1z4qpid3745w8x06nddifzb9165j2h6n7fivgav"; + version = "1.0.1"; + sha256 = "03dmyfpv5h6l1f5vag3h3v3bn6c1j3335k8rywknnliyglvb6acw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218325,8 +219795,8 @@ self: { }: mkDerivation { pname = "wrecker-ui"; - version = "3.1.1.0"; - sha256 = "0lsgbjn4fcvk5qaldhlskyz3vq9g6w7an0sqbvndx7r1hvpaznrh"; + version = "3.3.1.0"; + sha256 = "08xlf26c45nir84ayss6zsjimabwa17yk55hzrdl1li9448wq89p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -220521,8 +221991,8 @@ self: { }: mkDerivation { pname = "xmlbf"; - version = "0.2"; - sha256 = "1jzh5xz4l3va58mqz11bh5ysavlr17jh7qd74qcqbmz2bsfav136"; + version = "0.3"; + sha256 = "0zvv7ajwj45wsm751951i37ncn2lh73d8h5vqhladi2g14pi9yjb"; libraryHaskellDepends = [ base bytestring containers text transformers unordered-containers ]; @@ -220542,8 +222012,8 @@ self: { }: mkDerivation { pname = "xmlbf-xeno"; - version = "0.1"; - sha256 = "0xg7v4jqrh2qnnh6cxqlaaq6ss0vav7182gm92bm6lw0pb9mj5lq"; + version = "0.1.1"; + sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xeno xmlbf ]; @@ -220564,8 +222034,8 @@ self: { }: mkDerivation { pname = "xmlbf-xmlhtml"; - version = "0.1"; - sha256 = "1f8q83jy45nqxmwmw6i47dq3v350cdlrz6c8w6r7dgsczgyda6vd"; + version = "0.1.1"; + sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xmlbf xmlhtml @@ -220900,8 +222370,8 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.6"; - sha256 = "1im97p6g7c7gvcm9an7nzv9k7yipvd5yv39zfgr26q7vnr6hj4dq"; + version = "0.1.1.8"; + sha256 = "17w7hj4bgz1xkirj9dwgkbif4vpqvjnp5g2dvjna7qg5rw2hk3zj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221798,17 +223268,17 @@ self: { "yampa-sdl2" = callPackage ({ mkDerivation, base, colour, linear, sdl2, sdl2-gfx, StateVar - , text, Yampa + , stm, text, Yampa }: mkDerivation { pname = "yampa-sdl2"; - version = "0.0.2.1"; - sha256 = "1hbc4b2qlm8hlnk57yf39qgs9c5hja5dpicwca8qm3drhl0yz5y2"; + version = "0.0.3.1"; + sha256 = "07wz2473i9z5rxpi6mb1m19fdps7fxl50hbp60b8ihbf2mck1br7"; libraryHaskellDepends = [ - base colour linear sdl2 sdl2-gfx StateVar text Yampa + base colour linear sdl2 sdl2-gfx StateVar stm text Yampa ]; testHaskellDepends = [ - base colour linear sdl2 sdl2-gfx StateVar text Yampa + base colour linear sdl2 sdl2-gfx StateVar stm text Yampa ]; homepage = "https://github.com/Simre1/YampaSDL2#readme"; description = "Yampa and SDL2 made easy"; @@ -222162,8 +223632,8 @@ self: { }: mkDerivation { pname = "yesod-alerts"; - version = "0.1.1.0"; - sha256 = "15vzc9ajq3jwmqfs9x4snp7msnj4gn15wh4qxm7dl4r12ha2rass"; + version = "0.1.2.0"; + sha256 = "0vqlkcb2q3wz6hp6ay6gj41vwlmq4x7flfbgq36ygnwwxjkwhllf"; libraryHaskellDepends = [ alerts base blaze-html blaze-markup safe text yesod-core ]; @@ -223464,8 +224934,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.0"; - sha256 = "0hqpshgjx3agci4wxgzi6v3s8y0q5d4x18gkqlf204a3fynm0fmh"; + version = "0.12.2"; + sha256 = "0bakc1znfqpjmm2yw7sd1gsqkq47bpr3alz6d2fp280qdxjb7hsx"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form @@ -224209,7 +225679,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-test_1_6_1" = callPackage + "yesod-test_1_6_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit @@ -224219,8 +225689,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.1"; - sha256 = "1lwckkbm5i0fj8ixa396v7h683kdvbmxdrwc62y3qbi7hlz2iars"; + version = "1.6.2"; + sha256 = "172m7nafq8w1j3cm6p110vlxzy14y6pgm8ica357b1qn0wvzd39x"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -224229,7 +225699,7 @@ self: { ]; testHaskellDepends = [ base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai xml-conduit yesod-core yesod-form + unliftio wai wai-extra xml-conduit yesod-core yesod-form ]; homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; @@ -225124,18 +226594,15 @@ self: { }) {}; "yu-auth" = callPackage - ({ mkDerivation, base, cryptonite, hspec, hspec-wai, memory - , MonadRandom, random, wai, yesod-core, yesod-test, yu-utils + ({ mkDerivation, base, cryptonite, memory, MonadRandom, random + , yu-utils }: mkDerivation { pname = "yu-auth"; - version = "0.1.0.0"; - sha256 = "139gbrwzbp9zyx8klqvp07lh1fngs6i17xbrrnkssr85q12s79f9"; + version = "0.1.1.10"; + sha256 = "165m0ppp60gh5c6wlyjbvqlsh5gbpr0xz173ivkprjalxivr4r6j"; libraryHaskellDepends = [ base cryptonite memory yu-utils ]; - testHaskellDepends = [ - base hspec hspec-wai MonadRandom random wai yesod-core yesod-test - yu-utils - ]; + testHaskellDepends = [ base MonadRandom random yu-utils ]; homepage = "https://github.com/Qinka/Yu"; description = "Auth module for Yu"; license = stdenv.lib.licenses.gpl3; @@ -225145,8 +226612,8 @@ self: { ({ mkDerivation, base, blaze-markup, hspec, yu-auth, yu-utils }: mkDerivation { pname = "yu-core"; - version = "0.1.0.0"; - sha256 = "1ly4vasf70lm8wns2s8daxd0hpnyjs1cc6vklafk6vvk6g2a01p1"; + version = "0.1.1.2"; + sha256 = "17wdvwa6hs38asvsysv2g0xzjc654479c0229hggpyq17flfzwjs"; libraryHaskellDepends = [ base yu-auth yu-utils ]; testHaskellDepends = [ base blaze-markup hspec yu-utils ]; homepage = "https://github.com/Qinka/Yu"; @@ -225159,8 +226626,8 @@ self: { ({ mkDerivation, base, cmdargs, yaml, yu-auth, yu-core, yu-utils }: mkDerivation { pname = "yu-launch"; - version = "0.1.0.6"; - sha256 = "0a4ckivwzgp46a8m68qal5mhblw4k84xnmlsi8701j6n5nmhsxzi"; + version = "0.1.1.0"; + sha256 = "0nh40iy79m6jc4z5x773sra7i6jr21w80809vbh5xvjhg9l4aym8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225178,8 +226645,8 @@ self: { }: mkDerivation { pname = "yu-tool"; - version = "0.1.0.0"; - sha256 = "181xqiwzhwaglgj9j307apdzmai5hk1dlrfl8njzy584rsrqjlqx"; + version = "0.1.1.30"; + sha256 = "00pkw78pfwl089608y6ambw522v6qgnp7fgky98jdb9p5kbv6nyi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225192,19 +226659,20 @@ self: { "yu-utils" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , cmdargs, conduit, fast-logger, gitrev, http-types, monad-control - , monad-logger, mongoDB, mtl, network, parsec, resource-pool - , shakespeare, signal, template-haskell, text, time, transformers - , wai, wai-extra, wai-logger, warp, xml-hamlet, yesod-core + , cmdargs, conduit, exceptions, fast-logger, gitrev, http-types + , monad-control, monad-logger, mongoDB, mtl, network, parsec + , resource-pool, shakespeare, signal, template-haskell, text, time + , transformers, wai, wai-extra, wai-logger, warp, xml-hamlet + , yesod-core }: mkDerivation { pname = "yu-utils"; - version = "0.1.0.0"; - sha256 = "0sr03639mb49s0s2wkl642x9fhvm5qjrrvpqgf08jay5ph6l51g6"; + version = "0.1.1.0"; + sha256 = "1njmfs0m1xj5vwqj8qmhblnnzqwdjxxf732bdinp4x9wv7x68vz6"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring cmdargs conduit - fast-logger gitrev http-types monad-control monad-logger mongoDB - mtl network parsec resource-pool shakespeare signal + exceptions fast-logger gitrev http-types monad-control monad-logger + mongoDB mtl network parsec resource-pool shakespeare signal template-haskell text time transformers wai wai-extra wai-logger warp xml-hamlet yesod-core ]; @@ -225783,8 +227251,8 @@ self: { pname = "zip"; version = "0.2.0"; sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; - revision = "1"; - editedCabalFile = "1lq4v58kq4mwqczbdly4xnhg0pwsn4a5jmsdm38l2svri3by1hbb"; + revision = "2"; + editedCabalFile = "0vwbgpk6arp1hfndsm9n0f91yhagyqa0byiwvpl77gbiirbzrlwj"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath monad-control @@ -225811,6 +227279,8 @@ self: { pname = "zip"; version = "1.0.0"; sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; + revision = "1"; + editedCabalFile = "0yplpja4gbfr8lkwvv5q8lx9bia2dzm178hyhlmw1s2hniqjxzkn"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest directory dlist exceptions filepath @@ -225828,32 +227298,6 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, unzip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.2.3"; - sha256 = "1b3zll9j3w57kxnng09c5xcj0d18ldj9i3f8qks4kyyrsgyviw9x"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - libraryToolDepends = [ unzip ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit old-time process temporary - time unix - ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip;}; - - "zip-archive_0_3_2_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty , process, temporary, text, time, unix, unzip, zlib @@ -225877,7 +227321,6 @@ self: { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unzip;}; "zip-conduit" = callPackage diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2c628eff56224024fc088fea5899eea909651647..2a96c66dced53f7c406c28dcf85be1450e186c6c 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -145,18 +145,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: - overrideCabal (self.callPackage (haskellSrc2nix { + callCabal2nix = name: src: args: let + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + baseNameOf path == "package.yaml"; + expr = haskellSrc2nix { inherit name; - src = pkgs.lib.cleanSourceWith - { src = if pkgs.lib.canCleanSource src - then src - else pkgs.safeDiscardStringContext src; - filter = path: type: - pkgs.lib.hasSuffix "${name}.cabal" path || - pkgs.lib.hasSuffix "package.yaml" path; - }; - }) args) (_: { inherit src; }); + src = if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src filter; } + else src; + }; + in overrideCabal (self.callPackage expr args) (orig: { + inherit src; + preConfigure = + "# Generated from ${expr}\n${orig.preConfigure or ""}"; + }); # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 16734c184eb8751aaaa904a61461d3e9c79c0899..14b9a78af46e1c4ab39de6b8b22486f81e8bff53 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -3,11 +3,11 @@ sbcl }: let hashes = { - "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1"; + "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "7.4"; + version = "8.0"; src = fetchFromGitHub { owner = "acl2-devel"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 2608388e1526189bec1d03333d615af9418d90f2..01348c753484857c8aab52c843de5f0805deddd4 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.31.2"; + version = "2.32.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1cl1yg36ad4wq0vks4xg0hv7iyvq6yzsd4y1jng5qdf8qybq02qc"; + sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl"; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/dhall/default.nix b/pkgs/development/interpreters/dhall/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e1df36e4127742311b28879410ae0d1727f61f0 --- /dev/null +++ b/pkgs/development/interpreters/dhall/default.nix @@ -0,0 +1,18 @@ +{ haskell, haskellPackages, stdenvNoCC }: + +let + static = haskell.lib.justStaticExecutables haskellPackages.dhall; + +in static.overrideAttrs (old: { + passthru = old.passthru or {} // { + prelude = stdenvNoCC.mkDerivation { + name = "dhall-prelude"; + inherit (old) src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir $out + cp -r Prelude/* $out/ + ''; + }; + }; +}) diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 673a4b6e51bb7e11a67995b393122ba007365a0a..32e5bb6b323436252d18bc732ffc6f947535f72b 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.0"; - sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx"; + version = "1.6.2"; + sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 41e5e3d93be671b13758703cd86cbe181df321de..3f08ca8f7c22bd7bbd80d644adc94790670d792a 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,15 +2,21 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx"; + sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98"; }; propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ]; + # The build generates a .json parser file in the home directory under .cache. + # This is needed to get it to not try and open files in /homeless-shelter + preConfigure = '' + export HOME=$TMP + ''; + meta = { description = "A LISP dialect embedded in Python"; homepage = http://hylang.org/; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index dff3c1b201fbe0f6ac450efb9cfc227aec9cee19..ea3974525a9616ae7df17211031999d94bd34804 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.8.7"; + version = "0.8.9"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1cmvja8qdrrzacdfn944f22mdg8177qkxfrb10ykq59c2yp1xn01"; + sha256 = "0ph5f3vc6x1qfh3zn3va2xqx3axv1i2ywbhxayk58p55fxblj5c9"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 2224a13ba7c06666a5dd247016df49ec928d1558..b9cc38ee68a334ed8111796e44aad09b1fa798f3 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.13.0"; + version = "9.1.16.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx"; + sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 14a4bac47f625293cb39381bae4e0effd33f0a92..f7324fc6d01abc58345882e947fda78275d61d51 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }: +{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc, fetchpatch }: with lib; @@ -133,10 +133,19 @@ let sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; }; - nativeBuildInputs = [ buildPackages.stdenv.cc ]; + # https://github.com/arsv/perl-cross/issues/60 + perl-cross-gcc7-patch = fetchpatch { + url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; + sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; postUnpack = '' unpackFile ${perl-cross-src} + cd perl-cross-* + patch -Np1 -i ${perl-cross-gcc7-patch} + cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6940485788e9d14ad4dd07cb22b91008cf3637c4..e87d4e89a4617d58226f41bc68d00713a0b6f154 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -319,7 +319,7 @@ let description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = licenses.php301; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ globin etu ]; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; @@ -338,22 +338,22 @@ let in { php56 = generic { - version = "5.6.33"; - sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7"; + version = "5.6.34"; + sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1"; }; php70 = generic { - version = "7.0.27"; - sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr"; + version = "7.0.28"; + sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f"; }; php71 = generic { - version = "7.1.14"; - sha256 = "1x41qmq66r0ff0573ln34d3qbzwg5z20nagsn1b6frfpkq9zvck3"; + version = "7.1.15"; + sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1"; }; php72 = generic { - version = "7.2.2"; - sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq"; + version = "7.2.3"; + sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa"; }; } diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 75c7c64e324d7bc89266a0a4eb0ed736e1abad4d..4992ea04f1105e955a7cea54c4cacff6d905ede7 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,61 +1,52 @@ -{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: -stdenv.mkDerivation rec { - version = "52.2.1gnome1"; +let + version = "52.6.0"; +in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; - # the release notes point to some guys home directory, see - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 - # probably it would be more ideal to pull a particular tag/revision - # from the mercurial repo src = fetchurl { - url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz"; - sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i"; + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q"; }; buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + patches = [ + # needed to build gnome3.gjs + (fetchpatch { + name = "mozjs52-disable-mozglue.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be; + sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; + }) + ]; preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out export PYTHON="${python2.interpreter}" + + cd js/src + + autoconf ''; configureFlags = [ - "--enable-threadsafe" "--with-system-nspr" "--with-system-zlib" "--with-system-icu" "--with-intl-api" "--enable-readline" - - # enabling these because they're wanted by 0ad. They may or may - # not be good defaults for other uses. - "--enable-gcgenerational" "--enable-shared-js" ]; - # This addresses some build system bug. It's quite likely to be safe - # to re-enable parallel builds if the source revision changes. enableParallelBuilding = true; - postFixup = '' - # The headers are symlinks to a directory that doesn't get put - # into $out, so they end up broken. Fix that by just resolving the - # symlinks. - for i in $(find $out -type l); do - cp --remove-destination "$(readlink "$i")" "$i"; - done - ''; - meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - + license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 19abfe1cea2714a8ae0c5b4e5ae37ad12922c2f0..13184ad50e862f24c115e218016b45f503fb49d3 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw"; + sha256 = "150fgnjcmb06r3pa3mbsvb4iwnqlimjwdxgbs6p55zz6g8wbln7a"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 42988e334b0719cb6755c43141fee0e3ba15c5a2..230a7e64dff32ba8bfef9e80443c3eb04b690c56 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.3"; + version = "6.4.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; + sha256 = "0xvdwk2505s615fgsy6g33ncxx70vszqspx0bg6lm8hfd3hb4qyj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index a185f19a9a16d08e3b4841a382015cd46fd07931..bcf819702da969b1f815e38418a27893ae0ae93c 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + sha256 = "1p5zd9kdwnrwg604bq79ianc5bw6mx6i5d7yc4r11xrbphlc9m1g"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index dc5de2b382a15af07b7f79e70d12760491bdaedc..1ccfa85591f45b986f2fc70a30815c1e7b43036e 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib -, gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant +, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 -, libuuid, json_glib, meson, gperf, ninja +, libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { name = "appstream-glib-0.7.6"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ glib gettext sqlite libsoup - gcab attr acl libuuid json_glib + gcab attr acl libuuid json-glib libarchive gobjectIntrospection gperf ]; propagatedBuildInputs = [ gtk3 ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 0d42ff9c680dc162118bc0d282111574015c02c0..a5ca79c0d82e9fbb3a5719d0f860fad75a06a643 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 = "8.300.0"; + version = "8.400.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0g6wcfrmb2hndz995wrlc80v6d39mhxf26lmycaqv5bjfq050ic5"; + sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 52c3a5f8c076d40d86f0bfa76ba6c98c3b7d99af..86f35d7f578e814ffe979f476d762617a9da7f93 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi -, intltool, dbus_glib, at_spi2_core, libSM }: +, intltool, dbus-glib, at-spi2-core, libSM }: stdenv.mkDerivation rec { versionMajor = "2.26"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - dbus_glib at_spi2_core libSM ]; + dbus-glib at-spi2-core libSM ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 1743faafa687a7729432c8c0a57c9366d3ac5b53..b717101b3e13d48a3b69763aa05726fb9a8e0874 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus_glib +{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; buildInputs = [ - python popt dbus_glib + python popt dbus-glib libX11 xextproto libSM libICE libXtst libXi ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index f7d3887cc180a4328aed7ef25c17f01e4d406521..eb2466590beba575aae0b0c17f0213e474d23ad1 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }: let - ver_maj = "2.26"; - ver_min = "1"; + pname = "atk"; + version = "2.26.1"; in stdenv.mkDerivation rec { - name = "atk-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g"; }; @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "Accessibility toolkit"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8b787855c4deee18be700508a95ad94552253c07 --- /dev/null +++ b/pkgs/development/libraries/avro-c/default.nix @@ -0,0 +1,30 @@ +{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }: + +let + version = "1.8.2"; +in stdenv.mkDerivation rec { + name = "avro-c-${version}"; + + src = fetchurl { + url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; + sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6"; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ jansson zlib ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A C library which implements parts of the Avro Specification"; + homepage = https://avro.apache.org/; + license = licenses.asl20; + maintainers = with maintainers; [ lblasc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f7788eb93cb314883834de8e9753ef05d2a4ec60..be4cf809f0c501b34728e041c845b728743a17dc 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.42"; + name = "babl-0.1.44"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "1wc7fyj9bfqfiwf1w33g3vv3wcl18pd9cxr9fc0iy391szrsynb8"; + sha256 = "0zfy1jrwdp4ja2f1rqa2m46vx6nilm73f72d4d1c8d65vshgsqzl"; }; doCheck = true; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 0f899e4324c1a131d56a652deef00147c5c1abe6..9ec27d3e9ebced05ed57ede074912ec2cb945885 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,11 +3,11 @@ let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.15"; + name = "boolstuff-0.1.16"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln"; + sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 6c20f4d6c91097e4d09cf46d89a45dd2b46cb0a1..116216d500e25367f999e619c03e1c26872ed5ee 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch"; rev = "v${version}"; - sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s"; + sha256 = "0hkcmycvyyazzi9dywnyiipnmbx399iirh5xk5g957c8zl0505kd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 93c187ec35ef2058648bedf7159a95c2e3119e49..dedcb80532772980378537d7132f669d8d0e4069 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation { - name = "cfitsio-3.41"; + name = "cfitsio-3.43"; src = fetchurl { - url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz"; - sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5"; + url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz"; + sha256 = "1rw481bv5srfmldf1h8bqmyljjh0siqh87xh6rip67ms59ssxpn8"; }; # Shared-only build diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 2b5f7069681c0253298a6f7896ab00ff246bf49f..b2d397e3d5582cc6706f80e66d2e49ecfa429946 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,12 +1,13 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }: -stdenv.mkDerivation rec { - major = "3.0"; - minor = "24"; - name = "clutter-gst-${major}.${minor}"; +let + pname = "clutter-gst"; + version = "3.0.24"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9"; }; @@ -15,6 +16,12 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "GStreamer bindings for clutter"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index bada2c2c709c3f1c0ed2b24609a4183d1ae89124..71789b45a283493f77c3d845c11af47a7aa6136a 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,12 +1,13 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - +{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }: +let + pname = "clutter-gtk"; + version = "1.8.4"; +in stdenv.mkDerivation rec { - major = "1.8"; - minor = "4"; - name = "clutter-gtk-${major}.${minor}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; @@ -15,6 +16,12 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "Clutter-GTK"; homepage = http://www.clutter-project.org/; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 19f6729e1fcac25bdce90c6de5c1d76bfbefb9d3..eba94288e8fe079b39a25f34a9654fb899711205 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, -gobjectIntrospection, gtk3 +, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, +gobjectIntrospection, gtk3, gnome3 }: let - ver_maj = "1.26"; - ver_min = "2"; + pname = "clutter"; + version = "1.26.2"; in stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; }; @@ -19,13 +19,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection libxcb + atk json-glib gobjectIntrospection libxcb ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK #doCheck = true; # no tests possible without a display + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "Library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 08d208fa1fe3e490c4163fcd3fbd2ee28cdc6106..48b38c22af59d910e8356ab55fc375e0f415d85d 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 , gstreamerSupport ? true, gst_all_1 }: let - ver_maj = "1.22"; - ver_min = "2"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; + pname = "cogl"; + version = "1.22.2"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; @@ -42,6 +41,12 @@ stdenv.mkDerivation rec { #doCheck = true; # all tests fail (no idea why) + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "A small open source library for using 3D graphics hardware for rendering"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 301b245a9f54b53f93cb6e9918c93d54fa3a472b..9933d1034af8c9f1facbf088d681deccdcc226dc 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.2.1"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk"; + sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index b9b8d8fbd75066edf34564816e67f04500a28d2e..176b05126b2be8652ca364554c4c6b1095ebda1f 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup, makeWrapper }: +{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: stdenv.mkDerivation rec { name = "dleyna-renderer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-renderer-service" \ diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 8668cff644ed24d2d7f4e4c105fd7e2ce7b4ddc0..d36e665bd85db101f362763ac3de5f9843796fdc 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup }: +{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: stdenv.mkDerivation rec { name = "dleyna-server"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-server-service" \ diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index bb150da67996bf7cefce23f2be60ca537043f03a..53ec9949f170576f86273fdda7680360fccf2d0a 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.8"; + version = "19.9"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0ras4dl1ws9f9680bi8wg0mnbqvrpn0l2xl5lrvq3jvnijb3cz9i"; + sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; }; postPatch = '' diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 47c165c1bad1acffebf5bb3301aafd1c09f7ec3d..c656220f76094ec2aed5c39e9635f9b76466293a 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; + sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 651878182dc1caa22a50c831e81588689064323c..eb197d117202d425002d492f287129f3a33989dc 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0kiff19gk0w7ij0kx5ydqpsmdq499ylxxxq79lrgss218jy49aqq"; + sha256 = "0pzibd3vdqmqsqsnfir6q66p6f3cmr9hrrixzpfhf7k62vv9y1ha"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5287db756094c182b871eabedc8b68bffb7703fc --- /dev/null +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: + +stdenv.mkDerivation { + name = "elementary-cmake-modules"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "cmake-modules"; + rev = "319ec5336e9f05f3f22b886cc2053ef3d4b6599e"; + sha256 = "191hhvdxyqvh9axzndaqld7vrmv7xkn0czks908zhb2zpjhv9rby"; + }; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" + ''; + + propagatedBuildInputs = [ cmake pkgconfig ]; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + platforms = platforms.linux ++ platforms.darwin; + homepage = https://github.com/elementary/cmake-modules; + license = licenses.gpl3Plus; + maintainers = [ maintainers.samdroid-apps ]; + }; +} diff --git a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..6408ac471577a18d2732d254d78d1f4e92bd50a2 --- /dev/null +++ b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh @@ -0,0 +1,4 @@ +_elementaryCMakeEnvHook() { + cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) +} +addEnvHooks "$targetOffset" _elementaryCMakeEnvHook diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index b486a327466d9048f2b4a21d5b05e6e77ba5bd1c..96f4af3226b48ebb17ddb1a1fa35790c51abec8f 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.2"; + name = "exempi-2.4.4"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"; + sha256 = "1c1xxiw9lazdaz4zvrnvcy9pif9l1wib7zy91m48i7a4bnf9mmd2"; }; configureFlags = [ diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 034738813395c08bc810b03854915db00af2af7e..ebb581bdbccd20956d1b8ac08d9686b88d8f26f6 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base -, gst-python, gupnp_igd +, gst-python, gupnp-igd , gst-plugins-good, gst-plugins-bad, gst-libav }: @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; - buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp-igd libnice ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index add520558ba9d657858f88f1e4ae896281faab2d..fb74c4ff4d2441f92ec2f10917cde25c04792e00 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "flatbuffers-${version}"; - version = "1.4.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "0jsqk49h521d5h4c9gk39a8968g6rcd6520a8knbfc7ssc4028y0"; + sha256 = "1qq8qbv8wkiiizj8s984f17bsbjsrhbs9q1nw1yjgrw0grcxlsi9"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index dd16ebd5c8864ab98bc4949b77bc2861d77e08de..6745bc1ecf5fae5b926261c500a82bcce3384326 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48"; + sha256 = "1qx2dp7y0haj6wfbbfw8hx8sxb8ww0igdfrmmaaxfl0vhckylrxh"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 38c1b6197a5f52416624dc350318cfa9b796b6d8..a1a9b10fca63ca93dd71e3e1d2eef602b3faff41 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11 +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: let - ver_maj = "2.36"; - ver_min = "7"; + pname = "gdk-pixbuf"; + version = "2.36.7"; # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared_mime_info files during runtime. + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { - name = "gdk-pixbuf-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; @@ -47,6 +47,13 @@ stdenv.mkDerivation rec { # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit (doCheck); + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gdk_pixbuf"; + }; + }; + meta = with stdenv.lib; { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index a0f3dc636f923a02ab7c62931dc43c752d2f9cef..db2b14d71fdb734cd7439e371ccabc4b8c5dc2b3 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { name = "gecode-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; - buildInputs = [ perl ]; + nativeBuildInputs = [ bash perl ]; + + preConfigure = "patchShebangs configure"; meta = with stdenv.lib; { license = licenses.mit; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 2bb773a17b8fe59fc25628108614b8c445a8c870..03f6054791e4d2eec85ba2489faa13920cbad1e6 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw +, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw , libwebp, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libraw libwebp gnome3.gexiv2 ]; - propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc + propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 483ee39c2da1b5123151e966dae25606bec02e5b..66aa3b4a2188546835e1f7f5824a465436769d37 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook +{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip +, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook }: with stdenv.lib; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ - [ glib json_glib libsoup geoip - dbus dbus_glib avahi + [ glib json-glib libsoup geoip + dbus dbus-glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; preConfigure = '' substituteInPlace configure --replace "-Werror" "" diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index ff65ca97eb7426cf648f563a0158a77f1bf0945c..bf0af502d017c7ac65a418b7a208b6a7a1e3f848 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib_networking }: +{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, + libxslt, glib-networking }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; + buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - propagatedBuildInputs = [dbus glib dbus_glib]; + propagatedBuildInputs = [dbus glib dbus-glib]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 363d0ec7484a014416e56375cfa7fee2775d5de7..12a8469868bd00c573db6692f8083b765a1334bf 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,33 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy, gnome3 +, gsettings-desktop-schemas }: let - ver_maj = "2.54"; - ver_min = "1"; + pname = "glib-networking"; + version = "2.54.1"; in stdenv.mkDerivation rec { - name = "glib-networking-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = if stdenv.isDarwin then "--without-ca-certificates" + else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + + LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; preBuild = '' sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) ''; nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ]; + propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; doCheck = false; # tests need to access the certificates (among other things) + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Network-related giomodules for glib"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f68bd138005295bb240741527146479f241c29af..e5163e933e1312f7a07c19416d9ff35bda9166b4 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,10 +1,10 @@ { stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python -, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf +, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false +, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -42,15 +42,14 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.54"; - ver_min = "3"; + version = "2.54.3"; in stdenv.mkDerivation rec { - name = "glib-${ver_maj}.${ver_min}"; + name = "glib-${version}"; src = fetchurl { - url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8"; }; @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre ] ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; + ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; @@ -124,7 +123,7 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" - export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" @@ -143,8 +142,9 @@ stdenv.mkDerivation rec { ''; passthru = { - gioModuleDir = "lib/gio/modules"; - inherit flattenInclude; + gioModuleDir = "lib/gio/modules"; + inherit flattenInclude; + updateScript = gnome3.updateScript { packageName = "glib"; }; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch index 1b3590db4fdd85ce224f9106a26e9f00876d858e..39312951fcf911cc8510ab5b755b746d104b498e 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch @@ -9,8 +9,8 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c +open_locale_archive (void) +{ + int fd = -1; -+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27"); -+ char *path = getenv ("LOCAL_ARCHIVE"); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); + if (versioned_path) + fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (path && fd < 0) @@ -54,8 +54,8 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l +open_locale_archive (void) +{ + int fd = -1; -+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27"); -+ char *path = getenv ("LOCAL_ARCHIVE"); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); + if (versioned_path) + fd = open64 (versioned_path, O_RDONLY); + if (path && fd < 0) @@ -92,8 +92,8 @@ diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/progra +open_locale_archive (const char * archivefname, int flags) +{ + int fd = -1; -+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27"); -+ char *path = getenv ("LOCAL_ARCHIVE"); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); + if (versioned_path) + fd = open64 (versioned_path, flags); + if (path && fd < 0) diff --git a/pkgs/development/libraries/glm/0954.nix b/pkgs/development/libraries/glm/0954.nix deleted file mode 100644 index 4eb3497b0392583451343906d0c911909142bf8d..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/glm/0954.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "glm-0.9.5.4"; - - src = fetchurl { - url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; - }; - - buildInputs = [ unzip ]; - - outputs = [ "out" "doc" ]; - - installPhase = '' - mkdir -p "$out/include" - cp -r glm "$out/include" - - mkdir -p "$doc/share/doc/glm" - cp -r doc/* "$doc/share/doc/glm" - ''; - - meta = with stdenv.lib; { - description = "OpenGL Mathematics library for C++"; - longDescription = '' - OpenGL Mathematics (GLM) is a header only C++ mathematics library for - graphics software based on the OpenGL Shading Language (GLSL) - specification and released under the MIT license. - ''; - homepage = http://glm.g-truc.net/; - license = licenses.mit; - branch = "0.9.5.4"; - platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - }; -} diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 904727ceae63d70b28a544517bf56cfbd9024a14..803f08a7a11c86b2639b335f9b432aa24ff4a3a7 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake }: +{ stdenv, fetchurl, fetchzip, cmake }: stdenv.mkDerivation rec { version = "0.9.8.5"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; + # fetch newer version of platform.h which correctly supports gcc 7.3 + gcc7PlatformPatch = fetchurl { + url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h"; + sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw"; + }; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' + cp ${gcc7PlatformPatch} glm/simd/platform.h ''; postInstall = '' diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 6691928c021ee4af0b26d1a7ea3c9ee166ff6af9..a46abe3b4f7cc564985ec27a86e3e90fa9702628 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=\${out}" - "CC=gcc" - "AS=as" - "LD=ld" - "AR=ar" - "RANLIB=ranlib" - "OBJCOPY=objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"; + "CC=${stdenv.cc.targetPrefix}gcc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" + "AR=${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { description = "GNU EFI development toolchain"; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index e7e0672490d0bc87e04df6661325f4e3125d285d..472ec83fb02c404d43f4cca272bcb10a5ab854fc 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake , yacc, texinfo @@ -52,7 +52,7 @@ stdenv.mkDerivation { # systemkey-args.h. enableParallelBuilding = false; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp + buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp autogen gperftools gperf gettext automake yacc texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index d2947cd7c6b52f40ad819ce939900db92e812a2f..8769584a9f21505fecfb3f0c97dee8e4f746e89c 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext @@ -40,7 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional stdenv.isDarwin gettext ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 870f77686b3e7944cfe8dc80379b2800733ab0da..474899d60d7742ff0c7fb528f8ecd3da4d344d2a 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python -, libintlOrEmpty, cctools, cairo +, libintlOrEmpty, cctools, cairo, gnome3 , substituteAll, nixStoreDir ? builtins.storeDir }: # now that gobjectIntrospection creates large .gir files (eg gtk3 case) @@ -7,15 +7,15 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.54"; - ver_min = "1"; + pname = "gobject-introspection"; + version = "1.54.1"; in with stdenv.lib; stdenv.mkDerivation rec { - name = "gobject-introspection-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq"; }; @@ -50,6 +50,13 @@ stdenv.mkDerivation rec { }) ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gobjectIntrospection"; + }; + }; + meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; homepage = http://live.gnome.org/GObjectIntrospection; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..026f58079f6d15ef9e117ab37e0a260300dea45f --- /dev/null +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobjectIntrospection, python2, gtk3, cairo, glib }: + +let + version = "2.0.4"; +in stdenv.mkDerivation rec { + name = "goocanvas-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; + }; + + nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + buildInputs = [ gtk3 cairo glib ]; + + configureFlags = [ + "--disable-python" + ]; + + meta = with stdenv.lib; { + description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + homepage = https://wiki.gnome.org/Projects/GooCanvas; + license = licenses.lgpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 3a115bbaf2c43aa80d80da7c8235d895d572c67b..d4cc2f43aaa6998be21c4fd80552bf8ca3f4e080 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -35,9 +35,13 @@ stdenv.mkDerivation rec { a real live maintainer, or some actual wide use. ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; + # TODO: Fix Cocoa build. The problem was ARC, which might be related to too + # old version of Apple SDK's. + configureFlags = optional stdenv.isDarwin "--disable-cocoa"; + patchPhase = '' sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* ''; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls libGLU_combined - mjpegtools libgme openssl x265 libxml2 + libgme openssl x265 libxml2 ] ++ libintlOrEmpty ++ optional faacSupport faac @@ -67,7 +71,9 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - ++ optional (!stdenv.isDarwin) wildmidi; + ++ optional (!stdenv.isDarwin) wildmidi + # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin + ++ optional (!stdenv.isDarwin) mjpegtools; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 3aa8eb886d7934f83fffe4d59c7afd5a37c0a9be..cdaa88ce350f9c9142991aca06e4cd299fde94f2 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python , gst-plugins-base, orc , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty +, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc a52dec libcdio libdvdread - lame libmad libmpeg2 x264 + lame libmad libmpeg2 x264 mpg123 ] ++ libintlOrEmpty; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 47eeb3d328434f5ededa703e42f8453d38f43cc7..1cb5e4f968ef4724392cca3217cf7e837de4c816 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobjectIntrospection, json_glib +, python, gobjectIntrospection, json-glib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python json_glib + python json-glib ]; propagatedBuildInputs = [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 4c377c73571726e8b59a6fd74c3535fe08b5c1d6..d2b32502d1df44bcbf1981919e5af3da2236946b 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xorg, epoxy, json_glib, libxkbcommon, gmp +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection +, xorg, epoxy, json-glib, libxkbcommon, gmp , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null @@ -12,15 +12,13 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - ver_maj = "3.22"; - ver_min = "26"; - version = "${ver_maj}.${ver_min}"; + version = "3.22.26"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz"; sha256 = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967"; }; @@ -38,9 +36,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json_glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ]; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) @@ -76,6 +74,13 @@ stdenv.mkDerivation rec { moveToOutput bin/gtk-launch "$out" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk+"; + attrPath = "gtk3"; + }; + }; + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index f9ce0aa4b81edb600247215d50b43c4bd7d33561..0171a4b6833b071db23143ca1374a35f257ed653 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gtk-mac-integration-2.0.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 15e7e736e0c6118021b821bc0011a90c6faeda02..0f8c9f3d34340368089c13b09eb8d1b0157cafe3 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool +{ stdenv, fetchurl, pkgconfig, intltool, libtool, gnome3 , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper }: let - ver_maj = "1.34"; - version = "${ver_maj}.1"; + pname = "gvfs"; + version = "1.34.2"; in stdenv.mkDerivation rec { - name = "gvfs-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0scn7bmfi27dnn764m090cj999dhda05pd9hnd9pcsfwygmcglv0"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup libgnome_keyring gconf gcr + libsoup libgnome-keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); @@ -43,9 +43,16 @@ stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; + license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers; }; } diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 37c00f3e2aa8cb3ca2504be6cf3cb1276ddcae0f..f30ec1872baeebf2b7550347edb8c0e2093b9267 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }: +{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -168,6 +168,42 @@ let }; }; + mkDictFromJ3e = + { shortName, shortDescription, dictFileName }: + stdenv.mkDerivation rec { + name = "hunspell-dict-${shortName}-j3e-${version}"; + version = "20161207"; + + src = fetchurl { + url = "https://j3e.de/ispell/igerman98/dict/igerman98-${version}.tar.bz2"; + sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; + }; + + buildInputs = [ ispell perl hunspell ]; + + phases = ["unpackPhase" "installPhase"]; + installPhase = '' + patchShebangs bin + make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 hunspell/${dictFileName}.dic "$out/share/hunspell/" + install -m644 hunspell/${dictFileName}.aff "$out/share/hunspell/" + # myspell dicts symlinks + install -dm755 "$out/share/myspell/dicts" + ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/" + ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" + ''; + + meta = with stdenv.lib; { + homepage = https://www.j3e.de/ispell/igerman98/index_en.html; + description = shortDescription; + license = with licenses; [ gpl2 gpl3 ]; + maintainers = with maintainers; [ timor ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -427,4 +463,24 @@ in { }) ]; }; + + /* GERMAN */ + + de-de = mkDictFromJ3e { + shortName = "de-de"; + shortDescription = "German (Germany)"; + dictFileName = "de_DE"; + }; + + de-at = mkDictFromJ3e { + shortName = "de-at"; + shortDescription = "German (Austria)"; + dictFileName = "de_AT"; + }; + + de-ch = mkDictFromJ3e { + shortName = "de-ch"; + shortDescription = "German (Switzerland)"; + dictFileName = "de_CH"; + }; } diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index b4fea7c1fa4aaa8fc9b084d5a0b465e01a96d562..36b637c62bb2f22a59dea38c381c3bc436d520e9 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk2 libindicator-gtk2 libdbusmenu-gtk2 libappindicator-gtk2 ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 03afd6f1e878993629153b1241e5f1e55f294d18..3d7c20691ab5d344a6a0eb8e72eb257433609135 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 ]; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 8ca3bf1cd34a0438f3614dbc5607f90dd43e9a74..23adfd80caac427d4bb0028b901bfa5625d2c6ff 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { sed -i -e "s|all: bin doc man|all: bin|" \ -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - maintainers = [ stdenv.lib.maintainers.sander ]; meta = { platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 3b28c3a2bd570d261842b80418277f0264ce36c4..8775353316989476c314d6365041ecebfee710d2 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation { JAVA_HOME=jdk; PREFIX=''''${out}''; buildInputs = [ jdk ]; - maintainers = [ stdenv.lib.maintainers.sander ]; meta = { platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 18ea6370634d058c9f7aff86b8e9619f9e479d57..1c62d79ed3287d28818a9347e53107e383f3b104 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { name = "jsoncpp-${version}"; - version = "1.8.0"; + version = "1.8.4"; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "1lg22zrjnl10x1bw0wfz72xd2kfbzynyggk8vdwd89mp1g8xjl9d"; + sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; }; /* During darwin bootstrap, we have a cp that doesn't understand the diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 6658e4dca1002a3697b9b2eba9cb6a10aeb8199c..cd5f2163dd955984833946c0f7113fb1f7cea6b1 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, writeScript, extra-cmake-modules, - qtbase, qttools, shared_mime_info + qtbase, qttools, shared-mime-info }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools shared_mime_info ]; + buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 3ac4f4dc2688dead3abce64bc71573a1be7b773e..356e6537a4fd2038160ca719c184a17ce63c5ce2 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, copyPathsToStore, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, - qtbase, shared_mime_info, + qtbase, shared-mime-info, }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { kcrash kdbusaddons ki18n kwindowsystem qtbase ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; - propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5 + propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 5ce1b8ec13ccc705dd8266bebc2a7f5de3430656..5110908e0f272f1d38b5914bc16d58b97da88844 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3 + autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3 python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index f4158f7edbb4b954059645256931a616ed3edc27..cf4b85043bb27d5464bd059e996f2284fc40d1c1 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc + autoconf automake libtool gnome3.gnome-common gtk-doc libX11 libXext libXrender gobjectIntrospection gtk3 ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 09001b6a6f088689ba65f161e8bd8d6358d67766..acd0d35a5f08e5c27af5253c9d41ca0abef5163d 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk_doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index be033c3860cf0752433d25dfba1e21d59b294cdb..44d527e1304b7c5c75da0d7e7a43252de003a401 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { - sha256 = "1pcbfgq9khlcvxjsqpdshjskwljzawryzps0ickazwm7l3m7hrln"; + sha256 = "0whlyzz0imv4lm69xkwhcd6jzh3s0rzlqjmwimbqz96p4771ivpd"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 31dfe6085ee16d5c9adac4cf007789e45f0a33ae..7de72ed73a65d9d54420bb463aa30e3a4c5dee1c 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libHX-3.21"; + name = "libHX-3.22"; src = fetchurl { - url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz"; - sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v"; + url = "mirror://sourceforge/libhx/libHX/3.22/${name}.tar.xz"; + sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c"; }; patches = []; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 71a28085541d2075e4a521ef8a0355cf4ee0acd3..187e06239c10418c59ca08defeb2d31f82b9d638 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libabw-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; - sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing"; + sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; # Boost 1.59 compatability fix diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 70d0e9faf845ab70b2d52e5e237248f4d1c9c4ad..4bb806b91d8ae25af4c3c2c3b0d3cec7563d6b73 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoconf, automake, glib -, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +, gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: let version = "1.23"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ]; postPatch = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7ebd14b51f523452544805aba61dff6401964ce2..6c87588fd3d70855fb8aadf632cab3160ff4680a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, gtkVersion +, glib, dbus-glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null , python2Packages, gobjectIntrospection, vala @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { else [ gtk3 libdbusmenu-gtk3 ]; buildInputs = [ - glib dbus_glib + glib dbus-glib python pygobject2 pygtk gobjectIntrospection vala ] ++ (if gtkVersion == "2" then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 94e8ea05e663efb90b87cade6db3f3d32b0e8ed1..a1a04a1dd7b2e1a05f3a1cf36434ada60f2c4db2 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = https://www.argon2.com/; license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index 81e32ab2c931290f1141d66e4b4c032957a81736..b81eba5252f856fb46eab5908bf1907113846488 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index a427bd99dd5874e421a24510ea191c8cdda440c8..54fb89df0451812fbde2e06e8824d972bb17b700 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libbap-${version}"; - version = "master-2017-02-08"; + version = "master-2018-03-01"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; - sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; + sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 28a6aee67c1e632fb343c992cc59c253fcce2a60..f3c58baf5a11a283f8df77fa84ca2b3eb8d046c6 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg"; + sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f49c449f9ea38c37a5ca68638eae2ac6b9d7ce07..76977b745197f93b702b83f6a5824676962fece1 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"; + sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index f7596b9c702bfdd0040f1b1701e3ddc4f3bd78ec..6817d1a888cc603ed94bc2632f2e3e242e58389a 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: stdenv.mkDerivation rec { - name = "libcdio-0.93"; + name = "libcdio-2.0.0"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.bz2"; - sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; + sha256 = "0jr8ppdm80c533nzmrpz3iffnpc6nhvsria1di9f4jg1l19a03fd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - # Disabled because one test (check_paranoia.sh) fails. - #doCheck = true; + # Disabled due to several spurious test failures. + # doCheck = true; meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 514a1fa8534352f5faf29c8cac653ac9cd5effec..74e5bbc952aec5e91f30bea277082a4d41c1981b 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,37 +1,43 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite -, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: +{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3 +, clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: +let + pname = "libchamplain"; + version = "0.12.16"; +in stdenv.mkDerivation rec { - major = "0.12"; - version = "${major}.16"; - name = "libchamplain-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; + propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { - inherit version; - homepage = http://projects.gnome.org/libchamplain/; + homepage = https://wiki.gnome.org/Projects/libchamplain; license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; - longDescription = - '' libchamplain is a C library providing a ClutterActor to display - maps. It also provides a Gtk+ widget to display maps in Gtk+ - applications. Python and Perl bindings are also available. It - supports numerous free map sources such as OpenStreetMap, - OpenCycleMap, OpenAerialMap, and Maps for free. - ''; + longDescription = '' + libchamplain is a C library providing a ClutterActor to display + maps. It also provides a Gtk+ widget to display maps in Gtk+ + applications. Python and Perl bindings are also available. It + supports numerous free map sources such as OpenStreetMap, + OpenCycleMap, OpenAerialMap, and Maps for free. + ''; - maintainers = [ ]; + maintainers = gnome3.maintainers; platforms = platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 0521ae8a04003333b3178ef5936aa366f10fb820..d3ef799ef605e7aca1826dcd908b6b47bab1c07b 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ name = "libchewing-${version}"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2"; - sha256 = "1j5g5j4w6yp73k03pmsq9n2r0p458hqriq0sd5kisj9xrssbynp5"; + sha256 = "0aqp2vqgxczydpn7pxi7r6xf3l1hgl710f0gbi1k8q7s2lscc24p"; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6f7a79f9eeac21ff892cc5fff52da0a04fb9bd29 --- /dev/null +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, meson, ninja, gtk-doc, docbook_xsl, glib }: + +# TODO: Add installed tests once https://gitlab.gnome.org/Incubator/libcloudproviders/issues/4 is fixed + +let + pname = "libcloudproviders"; + version = "0.2.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://gitlab.gnome.org/Incubator/${pname}/repository/archive.tar.gz?ref=${version}"; + sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g"; + }; + + outputs = [ "out" "dev" "devdoc" ]; + + mesonFlags = [ + "-Denable-gtk-doc=true" + ]; + + nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + description = "DBus API that allows cloud storage sync clients to expose their services"; + homepage = https://gitlab.gnome.org/Incubator/libcloudproviders; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index 1ef550238d15031e6260b89e8d549f9bc69a1aa5..d92492eb7f8c3cf0eaf3b75fdb5840ff84f41bb7 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libconfuse-${version}"; - version = "3.0"; + version = "3.2.1"; src = fetchFromGitHub { - sha256 = "0021768bxqdxn84yaipncgi64889zrhc0r4ifmlfxirwq101dgr5"; + sha256 = "1pb74wpg1cxz9hpp0p8i1qq6anaq06mh4xljd8dllm653fxvbjdz"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 2fccee0160b346ecc3de20f2abf7f97c59b96115..fb0c2e789f3672beb18daea904e662fbdddf06e7 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.7.6"; + version = "2.8.4"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "13g7r0mcmrj37mihj6g1x1ckpaps659c4qwnw3ixrg7p5mb3p41f"; + sha256 = "0i5kmv8grsnh2igvlkgjr8lz3h3yrxh82yxbbdsjfpslv61l0gpi"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index e217f5d96db1475dd7d64854aa31096208674b1c..fb0f0d3d3f9c0356b07573fabd3479580951afa1 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcue-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "lipnitsk"; repo = "libcue"; rev = "v${version}"; - sha256 = "14a84d6sq3yp8s8i05lxvifjpkgpjwfpchrqf3bbpbwa8gvrc0rj"; + sha256 = "0znn9scamy1nsz1dzvsamqg46zr7ldfvpxiyzi1ss9d6gbcm0frs"; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 57b56c372339ea8de11cec7a8537dc06625d2c7e..fc0221b93889f2c63271528f17140fd8c994dae0 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.18.3"; + version = "3.19.1"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c"; + sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index c7a6fcc587485b3dcd1ca3ac3d53a2e5f7b33584..220cc5a2eeb423dc8fb83bcf903eac67a44343bd 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool -, glib, dbus_glib, json_glib -, gobjectIntrospection, vala_0_38, gnome_doc_utils +, glib, dbus-glib, json-glib +, gobjectIntrospection, vala_0_38, gnome-doc-utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib dbus_glib json_glib - gobjectIntrospection vala_0_38 gnome_doc_utils + glib dbus-glib json-glib + gobjectIntrospection vala_0_38 gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index ecfa14a43c9a5d0a3da80f34fcda43e8575536ab..0984eb6e00bf654b0bcb3507816a4b3f5c332d5e 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvbpsi-${version}"; - version = "0.2.2"; + version = "1.3.2"; src = fetchurl { url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2"; - sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls"; + sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc"; }; meta = { diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 8281036e7491255ffc44483270694e143572567f..6a4078f92cf3a4d094ccd55b8b6b6b4f8449c01b 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.2.4"; name = "libebur128-${version}"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; + sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index a9b6394ed5bae2abd8e9faf4adbc6d7cb0722778..0ba703585bbbace402340b00da9c097c9d40ede8 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libexttextcat-3.4.1"; + name = "libexttextcat-3.4.5"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; - sha256 = "0g1spzpsfbv3y8k9m1v53imz18437q93iq101hind7m4x00j6wpl"; + sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; meta = { diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index c6482842cacd17116de4d6d03019edccf5429a41..513a4dc3d3844e2f8ab0f2e3d96b8d0eff56b9ff 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libffcall-${version}"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "0v0rh3vawb8z5q40fs3kr2f9zp06n2fq4rr2ww4562nr96sd5aj1"; + sha256 = "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0"; }; enableParallelBuilding = false; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 1339be451c294e516c317c6a954cac3894d3114e..50cf8526c36275dda9a73a350596020ad894c0f2 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false -, buildPlatform, hostPlatform +, buildPlatform, hostPlatform, autoreconfHook }: stdenv.mkDerivation rec { @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580"; sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2"; }) + ++ stdenv.lib.optional hostPlatform.isRiscV (fetchpatch { + name = "riscv-support.patch"; + url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch; + sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y"; + }) ++ stdenv.lib.optionals stdenv.isMips [ (fetchpatch { name = "0001-mips-Use-compiler-internal-define-for-linux.patch"; @@ -37,6 +42,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck dejagnu; + nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 84e3517835e3af75ec84776ddaaeac0517b5f11a..3b27ffc6d386e76da54ad381afba8852d57b3189 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.11.2"; + version = "0.12.1"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0wl42yxrha633dbh1vcbhrpsd7sv4zwskbmlpx549ygnzi39krcn"; + sha256 = "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 2f499d3af87f88222c32c91a78aa4c60dfeb3af1..fff760c55191b4b91a997fb344219498b19d17dd 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; + configureFlags = [ "--with-async-mode" ]; + + # allow async mode. from ubuntu. see: + # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff + patchPhase = '' + substituteInPlace ./src/ftdi.c \ + --replace "ifdef USB_CLASS_PTP" "if 0" + ''; meta = { description = "A library to talk to FTDI chips using libusb"; diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index 9e0510debd027d3a6a8cd6a8583be5a1c7714939..dec9676d5729fe18be1d0945d326b8c142e58921 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { name = "libgap-${version}"; - version = "4.8.3"; + version = "4.8.6"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz"; - sha256 = "0ng4wlw7bj63spf4vkdp43v3ja1fp782lxzdsyf51x26z21idrsq"; + sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v"; }; buildInputs = [gmp]; meta = { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 45564d64861d5b80ca9e84dc6f2c76afea3f824a..a02aefb0a742cfeadd278c53edff96bafcc65cf5 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap +, buildPackages +}: assert enableCapabilities -> stdenv.isLinux; @@ -19,10 +21,19 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc; + buildInputs = [ libgpgerror ] ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; + preConfigure = if stdenv.isCross then '' + # This is intentional: gpg-error-config is a shell script that will work during the build + mkdir -p "$NIX_BUILD_TOP"/bin + ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin" + export PATH="$NIX_BUILD_TOP/bin:$PATH" + '' else null; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/pkgs/development/libraries/libgee/0.6.nix b/pkgs/development/libraries/libgee/0.6.nix deleted file mode 100644 index 51487b41573f89fe9f5197476bd9192a4fbd1701..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libgee/0.6.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib }: - -let - ver_maj = "0.6"; - ver_min = "8"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - homepage = http://live.gnome.org/Libgee; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix deleted file mode 100644 index 747cb9d4b2373a4cf1583d0fc73d9077ce52d5dc..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libgee/0.8.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib }: - -let - ver_maj = "0.8"; - ver_min = "6"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - homepage = http://live.gnome.org/Libgee; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 7bd551e70d56671eec5fe0549831aeaf7e7a76da..8961afcd62077b8a21b5b77f1f2132fe2c72d733 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo + autoreconfHook, intltool, gtk-doc, docbook_xsl, xauth, sudo }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook + pkgconfig autoreconfHook intltool gtk-doc docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser + gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index e6cb62330c4e73b2b18d1c346b3eee4d46e02268..5c5824a9930ca7a9574a2af02e8034b68eb4c281 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,6 +1,21 @@ -{ stdenv, buildPackages, fetchurl, gettext }: +{ stdenv, buildPackages, fetchurl, gettext +, hostPlatform, genPosixLockObjOnly ? false +}: let + genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly { + buildPhase = '' + cd src + make gen-posix-lock-obj + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 gen-posix-lock-obj $out/bin + ''; -stdenv.mkDerivation rec { + outputs = [ "out" ]; + outputBin = "out"; + }; +in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; version = "1.27"; @@ -9,6 +24,8 @@ stdenv.mkDerivation rec { sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; }; + patches = if hostPlatform.isRiscV then ./riscv.patch else null; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' @@ -49,4 +66,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.fuuzetsu maintainers.vrthra ]; }; -} +} // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch new file mode 100644 index 0000000000000000000000000000000000000000..afc3b9993a4392d4fd0354df6dc22806c41f5a92 --- /dev/null +++ b/pkgs/development/libraries/libgpg-error/riscv.patch @@ -0,0 +1,54 @@ +commit b3e9ec5626d474c58e683a41d09576297d4acd3d +Author: Shea Levy +Date: Sat Feb 24 21:12:44 2018 -0500 + + syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. + + * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. + * src/Makefile.am (lock_obj_pub): Add it. + + Signed-off-by: Shea Levy + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4446612..5a8cc43 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -65,6 +65,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ ++ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ + syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ +diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +new file mode 100644 +index 0000000..8aab9d6 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +@@ -0,0 +1,25 @@ ++## lock-obj-pub.riscv64-unknown-linux-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[40]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index c498871956a852330d4a2a47f9643168cc7b8ae5..9c0ea4a3a73e0f80a350174a77dc4d9dd856cb81 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am"; + sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.12"; - tag = "libgphoto2-2_5_12-release"; + version = "2.5.16"; + tag = "libgphoto2-2_5_16-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix index eaf2eb170956be27ae3f855c50bba429e577249e..e29b3ed89dea479f3f953bc75a8db7274abedc24 100644 --- a/pkgs/development/libraries/libgsystem/default.nix +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , glib, attr, systemd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk_doc gobjectIntrospection + autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ glib attr systemd ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 49cd1d163a60d5b13d9e892ea523af488210d3b7..0a44eee90aa068bfb5c949d2aa4b4776c76c12d6 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,21 +1,32 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }: +{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintlOrEmpty, gnome3 }: +let + pname = "libgtop"; + version = "2.38.0"; +in stdenv.mkDerivation rec { - name = "libgtop-${version}"; - major = "2.38"; - version = "${major}.0"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; }; propagatedBuildInputs = [ glib ]; buildInputs = libintlOrEmpty; - nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig perl gettext gobjectIntrospection ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { - platforms = with stdenv.lib.platforms; linux ++ darwin; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A library that reads information about processes and the running system"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index a5f8f5036d0465555e84d68064322d9c23309a4c..1e1f3eeb4c73eb4fd7bb09c40ef4b6304b821fdd 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, udev, glib }: +{ stdenv, fetchurl, pkgconfig, udev, glib, gnome3 }: -stdenv.mkDerivation rec { +let + pname = "libgudev"; +in stdenv.mkDerivation rec { name = "libgudev-${version}"; version = "232"; src = fetchurl { - url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; }; @@ -15,9 +17,16 @@ stdenv.mkDerivation rec { # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. configureFlags = [ "--disable-umockdev" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/libgudev; - maintainers = [ maintainers.eelco ]; + maintainers = [ maintainers.eelco ] ++ gnome3.maintainers; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c3405148242c91ea9c89f306331d998e2277f6b5..f39cc2574c9fdb95d5edbae2590c5915f03e5a2b 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, valadoc -, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }: +, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }: -stdenv.mkDerivation rec { - major = "0.6"; - minor = "5"; - version = "${major}.${minor}"; - - name = "libhttpseverywhere-${version}"; +let + pname = "libhttpseverywhere"; + version = "0.8.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "0ksf6vqjyjii29dvy5147dmgqlqsq4d70xxai0p2prkx4jrwgj3z"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0igq7g84kfczips3ywhyprxc8v67yrg3kj8lbgny4yyll67kksj3"; }; nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ]; - buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ]; + buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; - mesonFlags = "-Denable_valadoc=true"; + mesonFlags = [ "-Denable_valadoc=true" ]; doCheck = true; @@ -24,11 +23,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; - meta = { - description = "library to use HTTPSEverywhere in desktop applications"; - homepage = https://git.gnome.org/browse/libhttpseverywhere; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Library to use HTTPSEverywhere in desktop applications"; + homepage = https://git.gnome.org/browse/libhttpseverywhere; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 21abf7f8c0795d61dcb13dfedb095a28e363f48d..b55fc18cb69b65cb2c34cc641cfffb434fd0cc98 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, lib , buildPlatform, hostPlatform +, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt }: # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross @@ -19,14 +20,8 @@ stdenv.mkDerivation rec { sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h ''; - configureFlags = - lib.optional stdenv.isFreeBSD "--with-pic"; - - crossAttrs = { - # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). - dontStrip = true; - dontCrossStrip = true; - }; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" + ++ lib.optional enableStatic "--enable-static"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 9c7e48f8f6a8357596889813385a9aa358a7b136..445a505b68c8f869480f8fbe487b83a0d163e41f 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,9 +2,9 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, pythonPackages, gobjectIntrospection, vala, gnome_doc_utils +, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -24,10 +24,10 @@ in stdenv.mkDerivation rec { sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; }; - nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome_doc_utils ]; + nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus_glib libdbusmenu-glib + glib dbus-glib libdbusmenu-glib python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 835c7d6f2262f055bbdc114e9877d4190c7e405f..9bbb8f0e129d28ab3420fa4f2e52cdf92c77db08 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -12,10 +12,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.6.5"; + name = "libinfinity-0.7.1"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 267d3097c997d2d04d76de10f3eb680fca15bd43..738c11161955649b36fe779353e92de247236b93 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: stdenv.mkDerivation rec { - name = "libiodbc-3.52.8"; + name = "libiodbc-3.52.12"; src = fetchurl { url = "mirror://sourceforge/iodbc/${name}.tar.gz"; - sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; + sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index e113d62c5f7d99aab4ae449d58e181df15e8ffc4..6e77641760919c574f1999a75962e503158a1643 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisoburn-${version}"; - version = "1.4.4"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "1mn2dwkwdrdcjnd59czxali7r5nlxdx92clyxnsfpmw20f9s20kv"; + sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi"; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index a0205fb234ca2fb085a5160e6afd76f61ae7618c..d0217a908b9f79d8482bd97802907bb6794f6058 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"; + sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"; }; buildInputs = [ attr zlib ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index eac919612f0b5c201b66097bba65a97295d41b37..ed595505fae1b9b06585a1e10802298b1dd87524 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libivykis-${version}"; - version = "0.41"; + version = "0.42.1"; src = fetchurl { url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc"; + sha256 = "0c90cfpxipw2m8i3ajr7vy7lb8gvcz2kh5n8sd542zphr4na8whq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index 9059fe8f84531aa06aaa6f5770ecf5fb2a526d99..ae1d458b0d52a04b3a6fc0634af505af90b9d3e7 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "liblo-0.26"; + name = "liblo-0.29"; src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/0.26/${name}.tar.gz"; - sha256 = "0n124fv9m8yjxs2yxnp3l1i30b8qgg1zx51y63ax12hpz04zndm6"; + url = "mirror://sourceforge/liblo/liblo/0.29/${name}.tar.gz"; + sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc"; }; meta = { diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 4667a6e76014c92c5486c583a8028434a2a916d7..dd852e1de85aec05d19dde8c88df2d8857b12458 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "liblogging-1.0.5"; + name = "liblogging-1.0.6"; src = fetchurl { url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; - sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; + sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index ec306e0f7c34f49526a7a18257b82de7e0e7bb3b..dfc2402a7ec6bb7fe4a115c1e29772eb76ed806d 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libltc-1.1.4"; + name = "libltc-1.3.0"; src = fetchurl { - url = https://github.com/x42/libltc/releases/download/v1.1.4/libltc-1.1.4.tar.gz; - sha256 = "0xas0zbi11nhq15al6cxn0iwa563s6fcz01hw0np1clh25h4773x"; + url = https://github.com/x42/libltc/releases/download/v1.3.0/libltc-1.3.0.tar.gz; + sha256 = "0p7fgp44i9d1lrgbk5zj3sm5yzavx428zn36xb3bl7y65c2xxcda"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 9355c43642a461645fef4078a272d2a235cf735e..f1b15a91ccac61ccd4034470098d3b93b91528e1 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmaxminddb-${version}"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; - sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z"; + sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 25a597ea4daff6051c0b4b714a028a3e0ae2fb35..7999cc1dff4d6b0a0be92f862b8ef1a11049fb0d 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "17.10"; + version = "17.12"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "00m1b4m37c9lm16yhh63p5pidg2sr3qvsw36672lklmcv3y1ic30"; + sha256 = "0lm4454ynp0msgqm3s0mnxqxql6i1ank35jvff5swnaxvwsbp0ml"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index f6a816ef96f6bfdd16554bbd45bd15e4a95ffef8..10bd7af7fadd48e25f2bbed1936b98bf7ba3efd2 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmodbus-3.0.6"; + name = "libmodbus-3.1.4"; src = fetchurl { url = "http://libmodbus.org/releases/${name}.tar.gz"; - sha256 = "1dkijjv3dq0c5vc5z5f1awm8dlssbwg6ivsnvih22pkm1zqn6v84"; + sha256 = "0drnil8bzd4n4qb0wv3ilm9zvypxvwmzd65w96d6kfm7x6q65j68"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 9cac26bf2be1e16b2ff7d2f075e111bddae6a501..dca80bbbe88157e5116f7ace3db8790f78c2cdc1 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.13"; + name = "libmtp-1.1.14"; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9"; + sha256 = "1s0jyhypxmj0j8s003ba1n74x63h1rw8am9q4z2ip3xyjvid65rq"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 897a769b014d5dbf428b128d90eef5eea33c3fc6..42bcf5b64740b015735eaaf361b5482a01e8644f 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libtool, pkgconfig, automake, autoconf, intltool -, glib, gobjectIntrospection, gtk2, gtk_doc -, clutter, clutter_gtk +, glib, gobjectIntrospection, gtk2, gtk-doc +, clutter, clutter-gtk }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { automake autoconf libtool intltool gobjectIntrospection glib - gtk2 gtk_doc clutter clutter_gtk + gtk2 gtk-doc clutter clutter-gtk ]; # patch to resolve GL errors diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 7e9ae1608d2b74f4d59a6dd1aeb60363528e1302..c7967c3fb6fc951c1a0d8fa169b8b19f27069abe 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { name = "libnice-0.1.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; - propagatedBuildInputs = [ glib gupnp_igd ]; + propagatedBuildInputs = [ glib gupnp-igd ]; meta = { homepage = https://nice.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 77c049949564752fa0c2c286e1065fca69f1ed9d..1c8f33d82f72d4d291bb0a6f91778959cd80baca 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.10"; + name = "libofx-0.9.12"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl"; + sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a0924e791e3bd35a49685bac9486af76e9627003..0175e21bbc72978c2b83e39a74746ef664d3e1e7 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl + pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl ] ++ stdenv.lib.optionals doCheck checkInputs; checkInputs = [ check curl perl ]; buildInputs = [ glib libsoup libxml2 libxslt ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 34b09d45044dd7ad2b69c320e75cf3bfbd013151..a74d838e2eb6cbff05e37db0356a479184a39d09 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.0"; + version = "4.9.0"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "0s6gcvrhj2h928cqc8399189annif7yl74k6wda446r0fdx7i4wi"; + sha256 = "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 51cb1c48e54c17eeaca27d2892734f5fde7d4f8e..97fb5f27d9ddb311e526100083f8c19deea7f135 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl, postgresql, python2, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2, gnused }: stdenv.mkDerivation rec { - name = "libpqxx-4.0.1"; + name = "libpqxx-${version}"; + version = "6.1.0"; - src = fetchurl { - url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz"; - sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09"; + src = fetchFromGitHub { + owner = "jtv"; + repo = "libpqxx"; + rev = version; + sha256 = "1dv96h10njg115216n2zm6fsvi4kb502hmhhn8cjhlfbxr9vc84q"; }; - buildInputs = [ postgresql python2 gnused ]; + nativeBuildInputs = [ gnused python2 ]; + buildInputs = [ postgresql doxygen xmlto ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index b1100d00f3e0b5cbe4875ad22526f5b84b6fc54f..f5c92e11c357566f870bc2216ead1b5b53baa136 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu , libxslt, pkgconfig, python2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index b19008449abe62bcb9c49f4873b3baffbe42ddc1..cb30a890f401b887dbe29e1356ab1f978b5f0fdf 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.70"; + name = "libpst-0.6.71"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r"; + sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix index 791e59cbc906a9a731b49a7008cf5eb698c4d640..3b84ead7cec15e4afdc64d0c53d9843a80ac3b72 100644 --- a/pkgs/development/libraries/librdmacm/default.nix +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "librdmacm-${version}"; - version = "1.0.21"; + version = "1.1.0"; src = fetchurl { url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; - sha256 = "0yx2wr5dvmf5apvc4f4r2f2mlvn05piwvxsqfb60p3rk4jfx56dx"; + sha256 = "1ic0qd5ayvkybh4pxc5qx7sqvny1fv4anhxlf1nmsn0h926q844g"; }; buildInputs = [ libibverbs ]; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index d65fdc8339603872b2757ddd63642a2bdb9c7424..ebe765a0d0d4df5e44e6ef2e14351aa40bd78c74 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.6"; + version = "0.5.7"; name = "libre-${version}"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0sfz5c7b05crahblanrrvwca092qaqzhjkbkva58jbqnmlk9h4d3"; + sha256 = "0f8h224xfzvnb2ngvhxz8gzxqjlkkfr6d0nj8zqivzr81ihibk2x"; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index adc00b56a287071ffd48aead68723c79f765b8fc..5db5d2b596511c22ebfe39d8c80bea88b76d5fa0 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.12"; + name = "librelp-1.2.14"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; + sha256 = "0marms2np729ck0x0hsj1bdmi0ly57pl7pfspwrqld9n8cd29xhi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index c74a7981458d58f437339ba524d3f910ca8ca59f..5b3beda1eb8bad2b60c55f7a377d7afe26105d1d 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "librep-${version}"; - version = "0.92.6"; + version = "0.92.7"; sourceName = "librep_${version}"; src = fetchurl { url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz"; - sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy"; + sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index cf43bb9519296db5cfc871c0e3ca84d271e405a6..31e9e06dacb5bf112a642adbb27e70595db77fc2 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,21 +1,19 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin, rust +, bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3 , withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big let + pname = "librsvg"; version = "2.42.2"; - releaseVersion = (lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." version))); - in stdenv.mkDerivation rec { - name = "librsvg-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/${releaseVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; }; @@ -66,7 +64,17 @@ stdenv.mkDerivation rec { rm $GDK_PIXBUF/loaders.cache.tmp ''; - meta = { - platforms = stdenv.lib.platforms.unix; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A small library to render SVG images to Cairo surfaces"; + homepage = https://wiki.gnome.org/Projects/LibRsvg; + license = licenses.lgpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 0ad02c190c11f86a81a5f9874622ecd48af54dd6..e1c50bee75abcc86fc66bef0ad7651a34fd0a59a 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0gq0mg42sq2nxiv25fh37frlr0iyqamh7shv83qixnqklqpkfi13"; + sha256 = "0f4mj91zzdzah7fxkdg3dnrimk9ip7czl4g26f32zgifz1nrqgjs"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 75438e00570e38e3f47789f5a90d153daf6e42cb..4ff00d777691cacda026c76f3d8b5a4f002e6609 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc -, libgcrypt, gobjectIntrospection, vala_0_38 }: +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc +, libgcrypt, gobjectIntrospection, vala_0_38, gnome3 }: let + pname = "libsecret"; version = "0.18.5"; in stdenv.mkDerivation rec { - name = "libsecret-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libsecret/0.18/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; }; @@ -20,6 +21,12 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "A library for storing and retrieving passwords and other secrets"; homepage = https://wiki.gnome.org/Projects/Libsecret; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 5e36d068869428efa77a0c3649968cf1fe395479..521391b1bef8246a70605171c80dc8e079a74172 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, libtool, gettext, pkgconfig, - vala, gnome_common, gobjectIntrospection, - libgee, json_glib, skk-dicts }: + vala, gnome-common, gobjectIntrospection, + libgee, json-glib, skk-dicts }: stdenv.mkDerivation rec { name = "libskk-${version}"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ skk-dicts ]; - nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ]; - propagatedBuildInputs = [ libgee json_glib ]; + nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json-glib ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 480891e98af924df73a1d58b7f54150bef3a3ddb..f775316a2a015182db5205e5d59d9760218b9b8b 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.23"; + rev = "0.6.32"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "08ba7yx0br421lk6zf5mp0yl6nznkmc2vbka20qwm2lx5f0a25xg"; + sha256 = "0gqvnnc1s5n0yj82ia6w2wjhhn8hpl6wm4lki2kzvjqjgla45fnq"; }; cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e8d48bf668b31339612dc1b5700f9cdb53abd43f..46b9273094a71306a98aaa9843348b670f005002 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection +{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig, gnome3 +, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection , valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: let - majorVersion = "2.60"; - version = "${majorVersion}.2"; + pname = "libsoup"; + version = "2.60.2"; in -stdenv.mkDerivation { - name = "libsoup-${version}"; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01"; }; @@ -37,17 +37,26 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; - passthru.propagatedUserEnvPackages = [ glib_networking.out ]; + ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ]; - # glib_networking is a runtime dependency, not a compile-time dependency + # glib-networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check" + " --enable-vala=${if valaSupport then "yes" else "no"}" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + passthru = { + propagatedUserEnvPackages = [ glib-networking.out ]; + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { + description = "HTTP client/server library for GNOME"; + homepage = https://wiki.gnome.org/Projects/libsoup; + license = stdenv.lib.licenses.gpl2; inherit (glib.meta) maintainers platforms; }; } diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 660d7e16310f6d1466c58269f4352260b87e88fb..fe0acbfc538d625d04ae5888219a170767f5040f 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "1.8.1"; in +let version = "1.8.5"; in stdenv.mkDerivation rec { name = "libspatialindex-${version}"; src = fetchurl { url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; - sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j"; + sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 429cc5d9f1801a8bd9167f7da80d28d264c2e75e..7261fb7b6b745a4f56415c40910b9f16c7707c89 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libtermkey-${version}"; - version = "0.19"; + version = "0.20"; src = fetchzip { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; - sha256 = "0v85h0zacd5lqwkykl2ms4009x8mfidzb6jr4dsq4gh7kwm54w56"; + sha256 = "1i5a2zangq61ba1vdkag34ig5g4gzccldccdbcmqmk93saa6lkbx"; }; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 46f3a982b0c7c8b797c02e8cbb7c56d7007f5a0c..e30f699f103dddc9eb4afce63e092222bed9ead7 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtomcrypt-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz"; - sha256 = "0ymqi0zf5gzn8pq4mnylwgg6pskml2v1p9rsjrqspyja65mgb7fs"; + sha256 = "053z0jzyvf6c9929phlh2p0ybx289s34g7nii5hnjigxzcs3mhap"; }; nativeBuildInputs = [ libtool ]; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b0066fa75f225738e715a49cddc31eb8494b0e91..1a4f16046fc16fb54fe08ab2b8a98be90c4ccf1c 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, dbus, dbus_glib, gtk3, gobjectIntrospection +, dbus, dbus-glib, gtk3, gobjectIntrospection , gtkdoc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 1bef76836542739d77e5ebf7b1251602dfeef63d..2bb53dd2b97f718f39515913606da04983a1528f 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ++ [ ./gcc7-bug.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus_glib ]; + buildInputs = [ glib gtk2 dbus-glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 0c88f9871041e4c7eea9a22508ed54b903586ad2..aa106baf8152ad5b270af62bff2f7494a0115e98 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.10.1"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "19iq7985rhvbrj99hlmbyq2wjrkhssvigh5454mhaprn3c7jaj6r"; + sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; }; nativeBuildInputs = stdenv.lib.optional doCheck perl; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 98f3ea1679cb20c9bbc7fef64c0cec58c74b667c..fa35f7546f566590bbb21d62a79634c7acaa0c9e 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libwebsockets-${version}"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy"; + sha256 = "0d3xqdq3hpk5l9cg4dqkba6jm6620y6knqqywya703662spmj2xw"; }; buildInputs = [ cmake openssl zlib libuv ]; diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index a119ae8795bef5569ec6755dd5b67a5282de23c7..880ebcc1e468fd6df8cbc99a7514af0046c7fcc9 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "libwhereami-${version}"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { - sha256 = "0mpy2rkxcm2nz1qvldih01czxlsksqfkzgh58pnrw8yva31wv9q6"; + sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; }; + # post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated"; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl leatherman ]; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 57dfe34132f51bf2a197e0688cc25384b1eb22f9..9d262910e14f878ddd167b7360419cd9cf550d1f 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.0"; + name = "libwpg-0.3.2"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g"; + sha256 = "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"; }; buildInputs = [ libwpd zlib librevenge ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 37ff9d098c5c2b9542ac64a60eb5238683eaa115..84748d601a64e5922d209d91603f6167d6c23b69 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.3"; + version = "0.4.8"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "0v1a0hj96i4jhb5833336s4zcslzb6md5cnmnrvgywx8cmw40c0c"; + sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 68f8c44a8ec800eeffd0c45fad8cd9a67ff1f1b2..7ed2d2fd6300ed2e37d9ba28b3dedd94bb64d3b5 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libxcomp-${version}"; - version = "3.5.0.32"; + version = "3.5.0.33"; src = fetchurl { - sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm"; + sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index e20aa514aa2a0f02af4a6d480d7307a3ba0e2ea5..6050a7080df9bbe1ae5f0611dd1ab001e1d7e353 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libzmf"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; - sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga"; + sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; buildInputs = [boost icu libpng librevenge zlib cppunit]; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index e0f84f5080df47693ed4204a514f0eb66318c8f3..5d63dd7706641b2c0f4c01f537e6a6368d25a2bd 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,14 +2,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let - version = "2016.02.09"; + version = "2018.02.12"; in stdenv.mkDerivation { name = "live555-${version}"; src = fetchurl { # the upstream doesn't provide a stable URL url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; - sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak"; + sha256 = "08860q07hfiln44d6qaasmfalf4hb9na5jsfd4yps6jn4r54xxwx"; }; postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 96cbbb770b4cc79b8913453cbb1f054ac45650f8..d2918c87f3351adf57c370b584aca1db0f993686 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "log4cpp-1.1.1"; + name = "log4cpp-1.1.3"; src = fetchurl { url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; - sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm"; + sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index a490aa1e4451e0169e2b85412e2f67c42a4a3aac..c92b6a4e7287d9335c042494f7c99c2a8d8d84fc 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, libfm-extra }: -let name = "menu-cache-1.0.2"; +let name = "menu-cache-1.1.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg"; + sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 6eee8df5a23eb9f99a688dc72d1450ac86946d74..59700669ba7cdb4a28f86e5587ed0b404b0ef2d5 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,28 +6,15 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; - buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig sox diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7111a78381d10070c80bec17ff6b897a53a2b8a7..27f7cf31cbf2a3db444ce0ea3b8f31aa280b8580 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , fftw, vid-stab, opencv3, ladspa-sdk }: @@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index c7d65f156b8b3dfcef54394ae89f05ed4572d046..cfb02ddbf9ddb5aa2b6371c66026a8c549208218 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: stdenv.mkDerivation rec { - name = "msilbc-2.0.3"; + name = "msilbc-2.1.2"; src = fetchurl { url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; - sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d"; + sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp"; }; propagatedBuildInputs = [ ilbc mediastreamer ]; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 387632a890f03b670a88c8aa26eb25bb37a2469d..b5d4ea0f4ebf7d93b9315dd334e40f053598e6ca 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.1.9"; + version = "1.2.3"; name = "nanoflann-${version}"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "1q588cf2aark45bp4ciqjiz3dkdv8dcijkhm1ybzs8qjdzz9fimn"; + sha256 = "1jrh73kjvdv7s7zc1sc3z254i17lpvn77b19wx32nvzsfxs4g44i"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 6c0e633459bfbbb3307e3f4ab5ddf63538c16d35..99c9c5f16001e6185354b141ef149c5805509017 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.2"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "1iqlmvz5k8m4srb120g3kfkmm1w2p16hyxmx2asvihd21j285fmw"; + sha256 = "1zvs91afsg61azfv5fldv84gnhf76w3yndkdvpvaprlacxbxdvf5"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index d63536e75f064a50ba5f4c8426001f8df1165aaa..f8a35e41cd61d53ec6426774b80659b22bb5a6c2 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -3,6 +3,8 @@ , abiVersion , mouseSupport ? false , unicode ? true +, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , gpm @@ -36,6 +38,8 @@ stdenv.mkDerivation rec { "--enable-pc-files" "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec" + ++ lib.optional enableStatic "--enable-static" + ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5"; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 9fb614cd071ac1cbc2665596c9c40886e8f060f4..d4699b1c5062c07136c91c38986a5ecca53ebda7 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "116309lx77m31x4krln0g7mra900g0knk9lbkxbpxnmamkagjyl9"; + sha256 = "0s5xiyvnvxc2k0zkyb12mm5cwn61lavyxlfpknlx5f243g1xi6f6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 9051d96eff79b1c2f98091028dcd45d02221bd73..969e7534eac43d33e86b74fff01755971e3b43a2 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.0.3"; + name = "nss_wrapper-1.1.3"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18"; + sha256 = "18rsaw8r8xwn5003arc7xw8iliwbmzxfxgacmp6lhsdwqla4rf69"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 5ce30b039696684a3049a48125cfe57280b3b968..af01c23fe1a8e632663109e750d8b50068ed74b1 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencollada-${version}"; - version = "1.6.59"; + version = "1.6.62"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; rev = "v${version}"; - sha256 = "0gpjvzcfyilb96x5ywajxgkw42ipwp4my36z9cq686bd9vpp3q0g"; + sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 22960d2c691fa339d26fcaf4da12d1e07a51eb6d..2724976c5ae8c276485484b886f22b6416ce9f8d 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.2"; name = "opencsg-${version}"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; - sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c"; + sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; }; buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 356e1e336ac23b8b3f8cf4ef9cb79057caa212bd..49574a4b421b5180b8c00458a543f36abffd1576 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, caffe, glog, boost, google-gflags, protobuf +, glog, boost, google-gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -12,12 +12,12 @@ , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas +, enableContrib ? true , enableCuda ? (config.cudaSupport or false), cudatoolkit , enableUnfree ? false , enableIpp ? false -, enableContrib ? false , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 @@ -25,6 +25,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica +, enableTbb ? false, tbb , enableOvis ? false, ogre , enableGPhoto2 ? false, libgphoto2 , enableDC1394 ? false, libdc1394 @@ -34,20 +35,20 @@ }: let - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1nc14kvsjwaisv7d1r6f0hn7na9zr2cm2zh3hd3r9qwm3g78xnac"; + sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1cxw7nra3f1hng057c6hi1ynsyqdazd69irjdgn8xjg6q9h76br0"; + sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3"; }; # Contrib must be built in order to enable Tesseract support: @@ -151,14 +152,6 @@ stdenv.mkDerivation rec { name = "opencv-${version}"; inherit version src; - patches = [ - # Fix for: https://github.com/opencv/opencv/issues/10474 - (fetchpatch { - url = "https://github.com/opencv/opencv/commit/ea5a3e557f93844fdb5e54e3e8acfc5f61c6fd9f.patch"; - sha256 = "1w7jmqlrx73ydh9jjsnnic5xz8r04kxbjpzkcfyb91v3az9132r1"; - }) - ]; - postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; @@ -188,7 +181,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre hdf5 glog boost google-gflags protobuf ] - ++ lib.optional (!stdenv.isDarwin) caffe ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -212,6 +204,7 @@ stdenv.mkDerivation rec { # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] + ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; @@ -222,11 +215,17 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + # Configure can't find the library without this. + OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; + cmakeFlags = [ "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" + "-DBUILD_TESTS=OFF" + "-DBUILD_PERF_TESTS=OFF" + "-DBUILD_DOCS=${printEnabled enableDocs}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -236,17 +235,18 @@ stdenv.mkDerivation rec { (opencvFlag "OPENEXR" enableEXR) (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) + (opencvFlag "TBB" enableTbb) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ] - ++ lib.optionals stdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" - - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" - ]; + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_OPENCL=OFF" + "-DWITH_LAPACK=OFF" + + # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 75d2b090e7118e429832ea5f6b1750379829d78f..528c19aea5b56a158a57d0c9551ef12b4c7003f6 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.3.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8"; + sha256 = "0zkxvs3vdlc4yzhfi2jh02bsnhh50fbfigqhnkmbx69lssnkyr05"; }; buildInputs = [ diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 2e63d0a8e88312ac563bec020e9b015f229878f1..712deff844487329954569807cd2360e745366f6 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { "-DNO_EXAMPLES=1" "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" - ] ++ lib.optional cudaSupport "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"; + ] ++ lib.optionals cudaSupport [ + "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 2940ab45eaaf603ce9f762d70180e4bf12a8431a..f9540d2c4d20c4ff18cb44e192f59b3e0f1592b6 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "4.0.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "0kqlsfa9rdpxpw7v61vfknvs11axh196ilqk6bnyyfkslmmcak45"; + sha256 = "162l1prgdyf571bgxc621gicl40b050ny64f0jmnhz0h5xq6sfrv"; }; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 63c882076b9d72c7c63c38d6dabfa30cec97cbff..febba5d5703f8e3fa54ae9a1f6b625cb45fd01cf 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobjectIntrospection ] ++ (with gnome3; [ - gnome_common gtk libsoup + gnome-common gtk libsoup ]); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 18df541d955ac43a00ab4c1f297c2cb0b2248199..b45ed296691621c5a939cbab020775307abfdf06 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -3,28 +3,26 @@ stdenv.mkDerivation rec { name = "partio-${version}"; - version = "1.1.0"; + version = "2018-03-01"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; - rev = "v${version}"; - sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + rev = "8b6ea0d20f1ab77cd7f18390999251e60932de4a"; + sha256 = "16sdj103v02l2dgq9y9cna9jakafabz9jxzdxsd737ir6wn10ksb"; }; outputs = [ "dev" "out" "lib" ]; - buildInputs = [ unzip cmake freeglut libGLU_combined zlib swig python doxygen xorg.libXi xorg.libXmu ]; + nativeBuildInputs = [ unzip cmake doxygen ]; + buildInputs = [ freeglut libGLU_combined zlib swig python xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; buildPhase = '' - sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt - CXXFLAGS="-std=c++11" cmake . make partio mkdir $dev - mkdir -p $lib/lib mkdir $out ''; @@ -32,19 +30,16 @@ stdenv.mkDerivation rec # Sexpr support installPhase = '' - mkdir $dev/lib - mkdir -p $dev/include/partio - - mv lib/libpartio.so $lib/lib - - mv ../src/lib/* $dev/include/partio + make install prefix=$out + mkdir $dev/include/partio + mv $dev/include/*.h $dev/include/partio ''; meta = with stdenv.lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.guibou ]; }; } diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 407be5c5e4a4dc702b0e1f0cfcfdbe53dfdbe9da..f3ba8a4a6ff66d2cf459e56a8459ab614b82b25f 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; + sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 94074f6dcb4503b180f746cd0b9c23a26666adfd..eca2807ce15315bcb642bbe7b4538597d32b848e 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.219"; + version = "8.226"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy"; + sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 7989eb518c7846ebceb292519bae55f666f83350..63db874d8480af48392859fd2870f5b9a143cded 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71"; + sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3bd94c977e842333fcf8d766f2f57e3cfdc1456d..304d5baa3aade54ec1452973d82f99af93c04e53 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,10 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind , glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xlibs -, sbc, SDL2 +, sbc, SDL2, makeFontsConf, freefont_ttf }: let - version = "0.1.8"; + version = "0.1.9"; + + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; in stdenv.mkDerivation rec { name = "pipewire-${version}"; @@ -12,7 +16,7 @@ in stdenv.mkDerivation rec { owner = "PipeWire"; repo = "pipewire"; rev = version; - sha256 = "1nim8d1lsf6yxk97piwmsz686w84b09lk6cagbyjr9m3k2hwybqn"; + sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm"; }; outputs = [ "out" "dev" "doc" ]; @@ -34,8 +38,9 @@ in stdenv.mkDerivation rec { "-Denable_gstreamer=true" ]; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + doCheck = true; - checkPhase = "meson test"; meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 4075591373700e7ed80162c749d30e13ced94a50..ae232cd531f905e175e48f09c90ee3b5b7aa87ad 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "poco-${version}"; - version = "1.7.8"; + version = "1.8.1"; src = fetchurl { url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; - sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf"; + sha256 = "1pg48kk0354vsc6j2wnrk893l5xcsr3bjmkgykd3harcnvfqs7l8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 6bf9bcb954c19e590ab587ccf2750e52c349ebc0..ef865529805f9e86f06e6b33223849d1496ed6f2 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl -, docbook_xml_dtd_412, gtk_doc +, docbook_xml_dtd_412, gtk-doc , useSystemd ? stdenv.isLinux, systemd }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ] + [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ glib expat pam spidermonkey_17 gobjectIntrospection ] diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 0ea58e6c434fae567122c32e7e8706464d806213..ee27d89f5635257151719e3ebead6670ed8544f8 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "qca-qt5-2.1.1"; + name = "qca-qt5-2.1.3"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; + url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"; + sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; }; buildInputs = [ openssl qtbase ]; diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh index 849e76d616df0be48f183bdcdbe3eee6613c81c6..4770644ae4e90c0d0c86b7bb9c8323e7517d3ddd 100644 --- a/pkgs/development/libraries/qt-5/5.10/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.10/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch index b79ce9fc3568958d541f0ce135005af5e67bc9a7..286dea2178b115b989960d18a30799ffce568a76 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -261,14 +261,13 @@ index 55c74aad66..0bbc8718eb 100644 set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index e645ba5803..a0e5c68b7e 100644 +index 50a1ec6764..d6368b769e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -24,166 +24,3 @@ qt { - } +@@ -25,188 +25,3 @@ qt { } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { @@ -291,6 +290,29 @@ index e645ba5803..a0e5c68b7e 100644 -} - -macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- !isEmpty(VERSION) { +- l = $$split(VERSION, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- } +- - !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { - debug_information_format.name = DEBUG_INFORMATION_FORMAT - debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT @@ -432,10 +454,10 @@ index e645ba5803..a0e5c68b7e 100644 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..3b01424e67 100644 +index f1a4ca77b2..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,2 @@ +@@ -1,67 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - @@ -492,6 +514,17 @@ index 44636f2288..3b01424e67 100644 -# feature, which allows Xcode to choose the Qt libraries to link to -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf @@ -676,10 +709,10 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..eb4840a0aa 100644 +index c9ce926b1a..f00868a031 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -82,7 +82,7 @@ sourcefiles += \ +@@ -88,7 +88,7 @@ sourcefiles += \ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -765,7 +798,7 @@ index 90d84cc535..387481bfc6 100644 INSTALLS += privpritarget } diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 62e1b69fde..abd63123f9 100644 +index 14fc5f9a94..2a0f2cd27f 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { @@ -851,10 +884,10 @@ index 706304cf34..546420f6ad 100644 set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 609e52d9d2..f0f29ce61f 100644 +index 3814894630..3c6468277c 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2580,6 +2580,15 @@ QStringList QCoreApplication::libraryPaths() +@@ -2601,6 +2601,15 @@ QStringList QCoreApplication::libraryPaths() QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -871,7 +904,7 @@ index 609e52d9d2..f0f29ce61f 100644 if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bcc1285472..a77eb472a3 100644 +index 6a5df6272a..a6136ca4cd 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; @@ -969,10 +1002,10 @@ index 07869efd7d..fb4183bada 100644 set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 1da00813ce..0bf877afcb 100644 +index ce1ec6442a..4f75655abe 100644 --- a/src/network/kernel/qdnslookup_unix.cpp +++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() +@@ -95,7 +95,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif { @@ -1013,10 +1046,10 @@ index b5a0a5bbeb..6c20305f4d 100644 QString TableGenerator::findComposeFile() diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index 3bc8590d36..2a78fde518 100644 +index a59dc15b0e..a13ee89b5a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) +@@ -584,7 +584,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix index 5369169aa67fc82fac8c760dff90853fca1649dc..025c7aa44e1390505fab27c374a363815da9c037 100644 --- a/pkgs/development/libraries/qt-5/5.10/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.10/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qt3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "1arlplfpqdk0qki7bs1pp16y9cwa0awn071p551jg4y74xr7wi8j"; - name = "qt3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0fvb346xhiyc0csxcvs5ifwkzs9wnza54vvsw6dvyax76qjv87q4"; + name = "qt3d-everywhere-src-5.10.1.tar.xz"; }; }; qtactiveqt = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtactiveqt-everywhere-src-5.10.0.tar.xz"; - sha256 = "0x6nbi5hlbr1pncbd8zzkwmqi04gcy64q3bjy5w45rg6zws41mzr"; - name = "qtactiveqt-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtactiveqt-everywhere-src-5.10.1.tar.xz"; + sha256 = "1r4i72i1pl9xnmcx8rr8g48fmym8mxs28pkg1nl302xi6izan8ch"; + name = "qtactiveqt-everywhere-src-5.10.1.tar.xz"; }; }; qtandroidextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtandroidextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "1ifb49px86abaf4znmlis9wyyxq132nlgj3fyqppbx1sranikygk"; - name = "qtandroidextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtandroidextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "03jmf7gw4abn5gj92b1ns0k75bbi4wycbc4bbb7c9mngzkv3nzkn"; + name = "qtandroidextras-everywhere-src-5.10.1.tar.xz"; }; }; qtbase = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz"; - sha256 = "0qpp56cbw1sfz5ayhj2mskb07cl6jd1ijayg29y624qa6b6phmgx"; - name = "qtbase-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz"; + sha256 = "0sd9cn3ywkjfswddcxhbfplkwk8snqld752q5laaapdakhc0wrnq"; + name = "qtbase-everywhere-src-5.10.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcanvas3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "11r98mdxy833kcnywlsjrfaqhax7m3b6yhb56072qvr30rpn52fj"; - name = "qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "1h5hpjwdyp824r2ajmaqjcshra06yfzz7dp991h4kf54da79m0ny"; + name = "qtcanvas3d-everywhere-src-5.10.1.tar.xz"; }; }; qtcharts = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcharts-everywhere-src-5.10.0.tar.xz"; - sha256 = "1vri3f7wyg84w6j84452g8h2p7sk7k01r0xszpn4klv7hi52rkhj"; - name = "qtcharts-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j8y683ainri9ma44ky6q87pjs1d794znb2wfsrbplixyxxmf3ag"; + name = "qtcharts-everywhere-src-5.10.1.tar.xz"; }; }; qtconnectivity = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtconnectivity-everywhere-src-5.10.0.tar.xz"; - sha256 = "19k9n6gzrbg0sbgyhhcl5gv0d4b2gjwmz5966gn6b424fblf4grf"; - name = "qtconnectivity-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j9ydlkwz3039yslaizz923h0qbszm4z2sqspk28wr8rd3f22a35"; + name = "qtconnectivity-everywhere-src-5.10.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdatavis3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "06363x449k7wkqrd7c0y6b5vqlpwssnkl0g5s1bhp8lkl3bw81lj"; - name = "qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdatavis3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0ny8j689jm2fghklzw894yc5hjqa23yf395yv17yvwi72kpiz0b3"; + name = "qtdatavis3d-everywhere-src-5.10.1.tar.xz"; }; }; qtdeclarative = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz"; - sha256 = "07kicxzbwiqwkg1x2k6447rwzvzn31cv1yyggc1m8r84lny4vjsw"; - name = "qtdeclarative-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwmg1qan886czzkzi4px36mqxlqiw0acrsa9kqcddg5pi8yvy9s"; + name = "qtdeclarative-everywhere-src-5.10.1.tar.xz"; }; }; qtdoc = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdoc-everywhere-src-5.10.0.tar.xz"; - sha256 = "01z4ikqrnnx9mzf5pvk4i2lqks4xai32fs9qqbqnsp0qrrcb1jfn"; - name = "qtdoc-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdoc-everywhere-src-5.10.1.tar.xz"; + sha256 = "1gl62acr346jrcfxla8vxlczf706a3md52zc0zaqbjw9rf2bgnqq"; + name = "qtdoc-everywhere-src-5.10.1.tar.xz"; }; }; qtgamepad = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgamepad-everywhere-src-5.10.0.tar.xz"; - sha256 = "1rl77rsfgs69cdv75nfjp9w66mndwi211wix5cwl46d7i3wm0xak"; - name = "qtgamepad-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgamepad-everywhere-src-5.10.1.tar.xz"; + sha256 = "1xs6adpnv5ymdmb7kcbvcc0vx2lp6wqz53pzr9amyzbgyl0jiiw5"; + name = "qtgamepad-everywhere-src-5.10.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; - sha256 = "0c2y0ixxncn5xslpxciigq1gfaxd3n7wkcf14k4iy5i15w8nkfcp"; - name = "qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; + sha256 = "0zw4n6s42w70r45gjg66ad0s9dpxil6wmwwrivshnqvrnlqhcfrz"; + name = "qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; }; }; qtimageformats = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtimageformats-everywhere-src-5.10.0.tar.xz"; - sha256 = "1z7lnw85apzf6ph3dgnbb6py17qzpgww92kz31n6vbv5z62bigwi"; - name = "qtimageformats-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz"; + sha256 = "10x248s4a6ij18awkdskk3g7zfw6gwyj63l2jr803blyfyibl118"; + name = "qtimageformats-everywhere-src-5.10.1.tar.xz"; }; }; qtlocation = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz"; - sha256 = "1iw5m9v5p6l6mivjvj7g1macpqf2n21mg4wg0hza36dwrz3wwkfq"; - name = "qtlocation-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jbjzl6gwxy4n43x6m55b86vkdpjvwyvw7xsxg4a40f72xaw0p2y"; + name = "qtlocation-everywhere-src-5.10.1.tar.xz"; }; }; qtmacextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmacextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "08n8na36j9c15hvicqfs7h915m2av5xd5v0azf7660z0q9lk9zb3"; - name = "qtmacextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmacextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jkzizsa8nr1dp5n9p81s6ylnqfh0vqwz8l72632fg68x229jfn7"; + name = "qtmacextras-everywhere-src-5.10.1.tar.xz"; }; }; qtmultimedia = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz"; - sha256 = "0vw0i5jgn4q63g5ijwwrb6835qdaxcw7sfcjffbqfbdwqgyk70q0"; - name = "qtmultimedia-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz"; + sha256 = "0j9nq8s2kzfc7zqs253pixqwd5xjv2cbqyik5lgvi9p5bq0riym1"; + name = "qtmultimedia-everywhere-src-5.10.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtnetworkauth-everywhere-src-5.10.0.tar.xz"; - sha256 = "1lnqi1qpy9j5pi2lcmdihf81lspxv6hgdg5jmbqqdqxwzblgpnpc"; - name = "qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtnetworkauth-everywhere-src-5.10.1.tar.xz"; + sha256 = "1p6wnma2nygqbjhrbiijjgkc8jq6lkdmq6xaxcgdh8ynkcqiq8wp"; + name = "qtnetworkauth-everywhere-src-5.10.1.tar.xz"; }; }; qtpurchasing = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtpurchasing-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mkxslc8qc6sclpngllby3bb86qq5csrsz0xrc14nwmbkhwksxwc"; - name = "qtpurchasing-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtpurchasing-everywhere-src-5.10.1.tar.xz"; + sha256 = "090gmxy5bp44rirl5yrb1ryn97z37ri4fmmclh9z7c4dvnmr2d3j"; + name = "qtpurchasing-everywhere-src-5.10.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols-everywhere-src-5.10.0.tar.xz"; - sha256 = "0ab19raip9828br21qqaglr4y0kqmxix882r13sfxlnm4ivyycx1"; - name = "qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz"; + sha256 = "1dw22sk2x5bk2mix06w8dv1b05dyq0gx088aqvdz18y67ncs2cfj"; + name = "qtquickcontrols-everywhere-src-5.10.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; - sha256 = "18d1b5aivaqgs1px61glkyclkky60xd7yzy1vwa1f89sg8j711w1"; - name = "qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; + sha256 = "0jk01vgzc78w45q8kys1hwri3jx0hzx5vxivzmv8nh8yj0dlmijx"; + name = "qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtremoteobjects-everywhere-src-5.10.0.tar.xz"; - sha256 = "01bf1ykqxb4d8wz58vxy15yj4jsaqhi258k05dhy7ygdvfgscdnz"; - name = "qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtremoteobjects-everywhere-src-5.10.1.tar.xz"; + sha256 = "052fa27rv4b9h6qbldrq013zxb69ysgmqnxbyv9c48s2ra50pnp9"; + name = "qtremoteobjects-everywhere-src-5.10.1.tar.xz"; }; }; qtscript = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscript-everywhere-src-5.10.0.tar.xz"; - sha256 = "1z6a14x9yj0p2znc0vny8y4zkdvm5fp42rnisnf9rynakkqg5wkc"; - name = "qtscript-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bakr5xcxc6j6l78fyazh7sgcz2hwf2g8k60jb9307qzrgvqlqg0"; + name = "qtscript-everywhere-src-5.10.1.tar.xz"; }; }; qtscxml = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscxml-everywhere-src-5.10.0.tar.xz"; - sha256 = "142qysd5s706r62gap62s89xm7334i1ys29dqsp09av9n7b1kfsb"; - name = "qtscxml-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz"; + sha256 = "00v1n86pyw9cm320qa2fpazvkfi6czd027x60k2g2sprwh0x4hhb"; + name = "qtscxml-everywhere-src-5.10.1.tar.xz"; }; }; qtsensors = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsensors-everywhere-src-5.10.0.tar.xz"; - sha256 = "0w9rzqc0hva4521i5j298lrsvys3jqddmqd80cxj9nsvnapwb66d"; - name = "qtsensors-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz"; + sha256 = "15jw2r6snhwi26b4ajp7m89l89kaf1j0kgqds4wjpksk1rngf3dv"; + name = "qtsensors-everywhere-src-5.10.1.tar.xz"; }; }; qtserialbus = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialbus-everywhere-src-5.10.0.tar.xz"; - sha256 = "06rr0191zy5yxqzxiv0c6dvshncjg8kdc33lszk41pajv624fn9z"; - name = "qtserialbus-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mr2j86mk1fm9z5iba3kav651231j9jv0805q8716h7ia1ws2l06"; + name = "qtserialbus-everywhere-src-5.10.1.tar.xz"; }; }; qtserialport = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialport-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mqlhdp20jl6agv58mszznsikmi1dflhalkpfbgpiafjzzczx075"; - name = "qtserialport-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz"; + sha256 = "17ja368ggl9aak64r8sqzx34j2i8zv7z60bkhncynrgipc9wpr08"; + name = "qtserialport-everywhere-src-5.10.1.tar.xz"; }; }; qtspeech = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtspeech-everywhere-src-5.10.0.tar.xz"; - sha256 = "1hashidb33f1215f0azjby1lh8iw7v2bvxp08mqvdk02jld9w5br"; - name = "qtspeech-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtspeech-everywhere-src-5.10.1.tar.xz"; + sha256 = "07clcy3bslq4fk7xb6cqlfsz5frhmy41hzpajdqjwj9h6dvmqxw5"; + name = "qtspeech-everywhere-src-5.10.1.tar.xz"; }; }; qtsvg = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsvg-everywhere-src-5.10.0.tar.xz"; - sha256 = "1c77wnpzjz4wwic5if876y5v1n44v2g2nhjmcs25cc8awz5afaja"; - name = "qtsvg-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz"; + sha256 = "0nkz3kxclk7s95fnh8xgljahk131mwb8pjllgp7n70ycmc20rq00"; + name = "qtsvg-everywhere-src-5.10.1.tar.xz"; }; }; qttools = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttools-everywhere-src-5.10.0.tar.xz"; - sha256 = "0cpybii2yznk6gwaa2cz83rk3cpzzm6l4wvn4n2xwdbrgdsdrx8z"; - name = "qttools-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwa0i6zspcrii0ak1dyxacif1fkv2vhmdp3dmp7af71bwg49spi"; + name = "qttools-everywhere-src-5.10.1.tar.xz"; }; }; qttranslations = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttranslations-everywhere-src-5.10.0.tar.xz"; - sha256 = "1gmrisf08nsrni7fyjlz5ggfgfzzkjpq3g7l2hc6vq5g04vbskgc"; - name = "qttranslations-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz"; + sha256 = "1za34rvn3bhzi4mxqm9lghdhaqcxpsi6xa61dfbhpc047l788v8z"; + name = "qttranslations-everywhere-src-5.10.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mqb9sgvq7djd2lz4q4p6p9f0c23cfhk447zx4axvv1mldjxsb9c"; - name = "qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bnmhy0kibvyra0i15qzwc9195s8wpfhg5gk0d6rfwd5d07gj6a3"; + name = "qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; }; }; qtwayland = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwayland-everywhere-src-5.10.0.tar.xz"; - sha256 = "14sb0227rzqzf5z8dz8b9nzkk5rwq6hrfxifz603iy4mdijzjmsn"; - name = "qtwayland-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mk3p8pkfia3z7v7phk0qdyzd1zkfpk92c995g851p5wbqx699zm"; + name = "qtwayland-everywhere-src-5.10.1.tar.xz"; }; }; qtwebchannel = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebchannel-everywhere-src-5.10.0.tar.xz"; - sha256 = "18rml5xyb9chz8wrfamsgx4z32kkjbk1rc47ynvhn49mcbf2897j"; - name = "qtwebchannel-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz"; + sha256 = "0r1p1ar4xh7g7lzi564hgw1ng5xkim4mkpgq29ymjlmhxjgl8b62"; + name = "qtwebchannel-everywhere-src-5.10.1.tar.xz"; }; }; qtwebengine = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebengine-everywhere-src-5.10.0.tar.xz"; - sha256 = "1yb7jpydxg0dwdrx0iv7i5dq4wb9ld1iff8zpjdj8yl4xy4mkgx8"; - name = "qtwebengine-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz"; + sha256 = "1ph1pinxn0dp44zall9gihbgziira4zpynixacm4ldd85f6lyr0j"; + name = "qtwebengine-everywhere-src-5.10.1.tar.xz"; }; }; qtwebglplugin = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebglplugin-everywhere-src-5.10.0.tar.xz"; - sha256 = "0hgwb5lll3275knnj3ms04y1n0i6gph9kac2246ixmcq8sc7a2k7"; - name = "qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebglplugin-everywhere-src-5.10.1.tar.xz"; + sha256 = "1hdzymwai5f6agkn4hz32aq5fjv2lqdac285fwrlk5gsff0j0yal"; + name = "qtwebglplugin-everywhere-src-5.10.1.tar.xz"; }; }; qtwebsockets = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebsockets-everywhere-src-5.10.0.tar.xz"; - sha256 = "00wlyhw7h2axyhinksfm912jfa3n73szxdccz5dlir8742i0zaqp"; - name = "qtwebsockets-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz"; + sha256 = "1sjkml5kqigvyxrkv5b7x1cy69d69dzma40yfg72vr7zal4pkkvf"; + name = "qtwebsockets-everywhere-src-5.10.1.tar.xz"; }; }; qtwebview = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebview-everywhere-src-5.10.0.tar.xz"; - sha256 = "1955fkc7a22d7a0y2n7kz7r1md56v2s5qvyb3h68szs60zjnk3xa"; - name = "qtwebview-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebview-everywhere-src-5.10.1.tar.xz"; + sha256 = "110mwc423cq1bwdz0vv78cjprzy03xawxnxhfcs4138gssfj0n0b"; + name = "qtwebview-everywhere-src-5.10.1.tar.xz"; }; }; qtwinextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwinextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "1mx5qihmh3awqcr9k3z2chxz8273bi5ha90v7f4fqr2vk3g6w4yd"; - name = "qtwinextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "05w9n8kry1mg3i14i4m98gm5hf20mlwxbagbk9xk11xykbm1wh0j"; + name = "qtwinextras-everywhere-src-5.10.1.tar.xz"; }; }; qtx11extras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtx11extras-everywhere-src-5.10.0.tar.xz"; - sha256 = "11jp0a40jqwcdq7isyip4f4mq2d58c9fx1kvg9g71m92n52ffyfb"; - name = "qtx11extras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1d4pvisxbcyb7ljl1lh2zg72kw44h9kk14l0xmvajb8bslgkg2n3"; + name = "qtx11extras-everywhere-src-5.10.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; - sha256 = "1hq3sbimbhaiw570d2cd84jhki0n2jw2x2s7iq92m53y4akbr2mh"; - name = "qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; + sha256 = "1zp9smsfdqyfiarxs7r8kfr7yq68cdn7biddwl36cybax6fgbpiw"; + name = "qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; }; }; qtwebkit = { diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index f1d9026b5f9227ff91d2ca504bdc2f49122791d4..bddda1dff552a4db5385ef894de40d6796f1576f 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "2017-01-30"; + version = "0.3.5"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; - rev = "bab29767cce120e11872d79a2537bc6f0be76963"; - sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi"; + rev = version; + sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/include - mv include/ $out/ - ''; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkTarget = "test"; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index ff017279dc64a25dd50f6fb1182adaa1f804d9b5..bb43a49235bd2e920a36c84987a56da8464190ab 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.9.5"; + version = "0.11.3"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; + sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index cabd89dc935050e9337647fa7a21db2cd7d12d7a..7faee7e69a2ebf30bda262f0cbbb8ee314d84eea 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.0.0b"; + name = "readosm-1.1.0"; src = fetchurl { url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "042pv31smc7l6y111rvp0hza5sw86wa8ldg2jyq78xgwzcbhszpd"; + sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; buildInputs = [ expat zlib geos libspatialite ]; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 4ec06d68a329ffd68152e0e94c04e03a72d1ee66..fff1d6498361dd1bf8789ca52775bcaac8f36079 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.3"; + name = "resolv_wrapper-1.1.5"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1h76155pnmd3pqxfyi00q0fg6v45ad9dhnjsqcsbzg18s626wyad"; + sha256 = "0v5hw5ipq2rrpraf4ck4r9w9xihmgwzkpf5wgppz7gc52fmgv2g9"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index b37a9bc04c39806f0c259f50234bdc42503e6a5f..562942f230fb4a635a370f8ddaa8b7456ba7d87e 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "5.10.2"; + version = "5.10.3"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "00qnd56v4qyzxg0b3ya3flf2jhbbfaibj1y53bd5ciaw3af6zxnd"; + sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; }; nativeBuildInputs = [ which perl ]; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 4455a9488c00f14f435070c4a6fca98d657ff5d2..9955af0465970c376e7360a3fd71800abbbed051 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "blas-${version}"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { url = "http://www.netlib.org/blas/${name}.tgz"; - sha256 = "1hvmwp488hd6sdxdbmhjhmyrrd4s1ds1cjzh5d86l10b3wsm99n5"; + sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d6e55e7bf73c44c94941eb2c4ba8ccf04abb8e6b..f5715157531e165c00404274781718fe8d45e306 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -40,6 +40,6 @@ in version = "7.0.5"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1a3e076447d5b9860c73d9bebe7087ffcb7b0c8814fd1e506096435a2ad9ab0e"; + sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y"; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 663b741e4748e05adaa892dd321d9a164200a6be..51bda19cf13914d08b69aa15357d79cce8d377cf 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { This nix expression requires that ${name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://${name} + nix-prefetch-url file://\$PWD/${name} ''; }; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 567ee7853f88f75ed765cd007026f7d367bd5c9d..f694f72f22b6fd2560cdd68a47521196ea994500 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.8"; + version = "3.12.9"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1"; + sha256 = "1fqdjgxh6l1xjvw1ffma7lg92xqg0l8sj02y0zqvbfnx8i47qs9a"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c4deccff5b7ef8ad80d0db93186398dfbebd3bf8..1d692f6316ffb7051c4eb26437d140be78f56992 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,41 +1,24 @@ -{ stdenv, fetchFromGitHub -, gcc5, eject, cudatoolkit -}: +{ callPackage, cudatoolkit8, cudatoolkit9 }: -stdenv.mkDerivation rec { - name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; - version = "1.3.4-1"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nccl"; - rev = "v${version}"; - sha256 = "0fvnrfn572lc6i2a3xyhbifm53ivcrr46z6cqr3b0bwb1iq79m7q"; +let + generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + inherit (args) cudatoolkit; }; - nativeBuildInputs = [ - gcc5 - eject - ]; - - propagatedBuildInputs = [ - cudatoolkit - ]; +in - makeFlags = [ - "PREFIX=$(out)" - "CUDA_HOME=${cudatoolkit}" - "CUDA_LIB=${cudatoolkit.lib}/lib" - ]; +{ + nccl_cudatoolkit8 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit8; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; + }; - meta = with stdenv.lib; { - description = '' - NVIDIA Collective Communications Library. - Multi-GPU and multi-node collective communication primitives. - ''; - homepage = https://developer.nvidia.com/nccl; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ hyphon81 ]; + nccl_cudatoolkit9 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit9; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; }; } diff --git a/pkgs/development/libraries/science/math/nccl/generic.nix b/pkgs/development/libraries/science/math/nccl/generic.nix new file mode 100644 index 0000000000000000000000000000000000000000..609a7df51e58a028c2611a1b40bc8bf404660a1a --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/generic.nix @@ -0,0 +1,57 @@ +{ version +, srcName +, sha256 +}: + +{ stdenv +, lib +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; + + inherit version; + + src = requireFile rec { + name = srcName; + inherit sha256; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library + at https://developer.nvidia.com/nccl, and run the following command in the download directory: + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + unpackCmd = "tar xJf $src"; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib/libnccl.so + + mkdir -p $out + cp -a include $out/include + cp -a lib $out/lib + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + passthru = { + inherit cudatoolkit; + }; + + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 989ad27055fa162d96be3853b487f24285f6636f..3a4c5a78438575f1481a785db871b3d6b6e25914 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation { - name = "openspecfun-0.4"; + name = "openspecfun-0.5.3"; src = fetchurl { - url = "https://github.com/JuliaLang/openspecfun/archive/v0.4.tar.gz"; - sha256 = "0nsa3jjmlhcqkw5ba5ypbn3n0c8b6lc22zzlxnmxkxi9shhdx65z"; + url = "https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz"; + sha256 = "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index bc5527a8e9705c0635a07117d61c19c7f52c1beb..efedbe725af18902d703156e49cabec8895d30c1 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "petsc-${version}"; - version = "3.7.6"; + version = "3.8.3"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0jfl35lrhzvv982z6h1v5rcp39g0x16ca43rm9dx91wm6i8y13iw"; + sha256 = "1b1yr93g6df8kx10ri2y26bp3l3w3jv10r80krnarbvyjgnw7y81"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index b481bd0cf6512087182f3b88ecefe60d66d50ac6..3234d1bb89bfe163589759e77879c864cc5fda20 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, proj }: stdenv.mkDerivation rec { - name = "shapelib-1.4.0"; + name = "shapelib-1.4.1"; src = fetchurl { url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; - sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; + sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4"; }; buildInputs = [ proj ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 4db4a07b4e56e0048e5aa7e421e89f189f0283dd..6d0ca4c1d67569f0a9aec7706650ec17b686adee 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.1.5"; + name = "socket_wrapper-1.1.9"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "01gn21kbicwfn3vlnnir8c11z2g54b532bj3qrpdrhgrcm3ifi45"; + sha256 = "1d7bbr4j1ybq2dm6q3f6ncv36qqxyjygq4z1q0hvadlcaw7pj79c"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 729967ea1b7f6ad18cd81432e6053556811a1208..c338d6762a4d39499eed045f88af2709c435ed04 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pName = "soundtouch"; - name = "${pName}-1.9.2"; + name = "${pName}-2.0.0"; src = fetchurl { url = "http://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "04y5l56yn4jvwpv9mn1p3m2vi5kdym9xpdac8pmhwhl13r8qdsya"; + sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; buildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 080dbc4510dd9013a0e2f1c3ebdee7a537ded959..05ddde9ddef77f86fd3e09abed435be63e126219 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup +, polkit, acl, usbutils, vala , gtk3, epoxy }: with stdenv.lib; @@ -16,24 +17,35 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection + spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy + polkit acl usbutils ]; - nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ]; + nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + # put polkit action in the $out/share/polkit-1/actions preAutoreconf = '' - substituteInPlace src/Makefile.am \ - --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' + substituteInPlace configure.ac \ + --replace 'POLICYDIR=`''${PKG_CONFIG} polkit-gobject-1 --variable=policydir`' "POLICYDIR=$out/share/polkit-1/actions" ''; configureFlags = [ - "--disable-maintainer-mode" "--with-gtk3" ]; + # usb redirection needs spice-client-glib-usb-acl-helper to run setuid root + # the helper then uses polkit to check access + # in nixos, enable this with + # security.wrappers.spice-client-glib-usb-acl-helper.source = + # "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper.real"; + postFixup = '' + mv $out/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper.real + ln -sf /run/wrappers/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper + ''; + dontDisableStatic = true; # Needed by the coroutine test enableParallelBuilding = true; @@ -49,7 +61,7 @@ in stdenv.mkDerivation rec { homepage = http://www.spice-space.org/; license = licenses.lgpl21; - + maintainers = [ maintainers.xeji ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index c8e98d3d28ed4b7bf8bb8b0c0d86903107f63ce4..1ab76340cc7c5516fa2fa6ffc48351892f301839 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama -, libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl +, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: with stdenv.lib; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libXrandr libXfixes libXrender libXext libXinerama python pyparsing glib cyrus_sasl lz4 ]; - nativeBuildInputs = [ pkgconfig spice_protocol ]; + nativeBuildInputs = [ pkgconfig spice-protocol ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index c1f624f8744d8bef7d39ae5ff3ec745128b999df..ed19814be34afc4c77ebebea94047e160faca42a 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { name = "sqlcipher-${version}"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "1lwc2m21sax3pnjfqddldbpbwr3b51s91fxz7dd7hf6ly8swnsvp"; + sha256 = "168wb6fvyap7y8j86fb3xl5rd4wmhiq0dxvx9wxwi5kwm1j4vn1a"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 8a8680a498a036608c922cc858ebed207568f467..fd9ab5a2036d20b8cd1afd96f8a1a126190203ec 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "stfl-0.22"; + name = "stfl-0.24"; src = fetchurl { url = "http://www.clifford.at/stfl/${name}.tar.gz"; - sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d"; + sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; }; buildInputs = [ ncurses libiconv ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { DESTDIR=$out prefix=\"\" make install # some programs rely on libstfl.so.0 to be present, so link it - ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0 + ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 ''; meta = { diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 276b279fc09e4d2442d57d2e80bdb2c5fbbb9efc..a92c7b74ebf78a128bbcf71cd9a0f8db8c33c69f 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.1"; + name = "tclap-1.2.2"; src = fetchurl { url = "mirror://sourceforge/tclap/${name}.tar.gz"; - sha256 = "1fzf7l1wvlhxnpwi15jvvfizn836s7r0r8vckgbqk2lyf7ihz7wz"; + sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; meta = { diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 75b811df30c38389cd4d6a6cd42a2edde65883d2..6ffbe5dc60c5ca5b18facc0d9644ad628eb16715 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcllib-${version}"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "05dmrk9qsryah2n17z6z85dj9l9lfyvnsd7faw0p9bs1pp5pwrkj"; + sha256 = "173abxaazdmf210v651708ab6h7xhskvd52krxk6ifam337qgzh1"; }; passthru = { diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 7ccd98856f628a5609e588a85f479f185b565f76..d372c61dbe28f9ca5ceb909a9fa59c99e7fc8519 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.11"; + name = "tdb-1.3.15"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; + sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index aed08435a149a954561bfa003260711177a1bd20..41308a7ef4ecb6c01c46607ad1e302818808a2e4 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, farstream, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; - propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ]; + propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index fffe677f6a71f5c7283b454cb6c90ada9d598eb2..df5c76abd7cdb2c6dcd1f311620c007394b0455a 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt +{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt , gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; + propagatedBuildInputs = [dbus-glib glib gobjectIntrospection]; nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; buildInputs = [ glibcLocales python2 ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 18888df5c52b1633c3ca3bcfd803a3c4d9e683ad..90dd47c11e2f66c314d051a91c8e8288a2edb9b2 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, fetchpatch }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +, telepathy-farstream, telepathy-glib, fetchpatch }: let inherit (python2Packages) python dbus-python; @@ -12,8 +12,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig python ]; - propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ]; - buildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; + buildInputs = [ dbus-glib ]; checkInputs = [ dbus_daemon dbus-python ]; patches = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2982d33e996264e7f0129b6a866c5db5916cd802..c5c064142db0fc5b732f8bb4037fd7f651159a18 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.30"; + name = "tevent-0.9.35"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; + sha256 = "1s8nbkmqz8dzdlsd6qynhvyl05pw93r151f3i2kgjfpbck9ak8r5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 55855d05d16ed8669b5ae1135071a0b811f720b7..45e5174ed573465cafc32ad1d4f37ddc52aaafa1 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "thrift-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; - sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; + sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; }; #enableParallelBuilding = true; problems on hydra diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 26c040721bdff1ac826705b72ae4bccdabf4f118..377ceba59e70da1c1947fe64fba78f2d2913d176 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk_doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ]; + buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 9a2f6eb203a16ad650a22f69582c31b458213c3c..ccd876dfefbd4a8f5cec2e06877f7b8f686fe676 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.2.0"; + name = "uid_wrapper-1.2.4"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0sfznk53kmz9m3rxwbv4pwwqs4bw3kr917y4n53h5jaxjym0m4c0"; + sha256 = "1yjhrm3rcyiykkrgpifmig117mzjxrms75kp8gpp8022f59zcq1w"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 09016bd9c2c7622e468bce4c2278a6eabe61c7ca..a0936310c42f97e4fcbb79a8e34c2eb4e3e6e865 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk_doc +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ automake autoconf libtool gtk_doc pkgconfig vala ]; + nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 97cffbf0f75bd89f5bccd4c355bca3706b66fd82..90a28df6a15a58485840ac1e0fc35f33e726b153 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "unittest-cpp-${version}"; - version = "1.6.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "unittest-cpp"; repo = "unittest-cpp"; rev = "v${version}"; - sha256 = "1sva2bm90z4vmwwvp0af82f7p4sdq5j2jjqzhs2ppihdkggn62d1"; + sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; buildInputs = [cmake]; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 99ab8a0561628849b2336918a3329a8bd5b1fa15..7d59866d043175dae09f906b69d3bcbaa094edf3 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f"; + sha256 = "0ns93daph4wmk92d7m2w48x0yki4m1yznxnn97p1ldn6bkh742bn"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 1dbbcf798c9fc839bb732acbb52e71fb58b457f8..e2a2af615b88706eac158d995402026ee88b6bfd 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "Vc-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9"; + sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index e93f071aefacf4a4d1e6acb8eb8ef357b299b676..48ad33424f60984b3e1ad21cb5f3b84b3aba9d56 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: -stdenv.mkDerivation { - name = "vcdimager-0.7.24"; +stdenv.mkDerivation rec { + name = "vcdimager-2.0.1"; src = fetchurl { - url = mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz; - sha256 = "1526jxynslg07i50v3c3afhc8swbd4si8y6s8m3h1wrz6mkplp87"; + url = "mirror://gnu/vcdimager/${name}.tar.gz"; + sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -14,9 +14,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libcdio ]; - meta = { + meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = stdenv.lib.platforms.gnu; # random choice + platforms = platforms.gnu; # random choice + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a51348812676a1753ff87460607e4ecb94acda76 --- /dev/null +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, mesa_noglu, epoxy, libX11 }: + + +stdenv.mkDerivation rec { + + name = "virglrenderer-${version}"; + version = "0.6.0"; + + src = fetchurl { + url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2"; + sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a"; + }; + + buildInputs = [ mesa_noglu epoxy libX11 ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; + homepage = https://virgil3d.github.io/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.xeji ]; + }; + +} diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index b62e83349053a1c630f4ecb2bd970a303a7dc38f..cecac45a3dc3bb704eeed05b762cd0eefb405004 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit +, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit , libidn, libedit, readline, libGLU_combined, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null @@ -88,8 +88,8 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty ++ [ libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index fdbef27705e8ee85579ac6f4e37911bd9827fca7..fa65a14121fc3a826247b19eed2bd2939311a805 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "0bjfzpgj50cd27lfz6vry9bdz0f0kvgq8plqdbhlk7kjp32nm2bv"; + sha256 = "0mvq7ifcpckfrg0zzcxqfbrv08pnz4a8g2z2j3s9h3cwns9ipn6h"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index e37991367e6f17b3059a92360700ef6797735e4b..6f296bb40b901c42bd040683340a5a2b74327398 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchgit }: +{ stdenv, lib, fetchgit, cmake +, avxSupport ? false +, cudaSupport ? false, cudatoolkit +, ncclSupport ? false, nccl +}: + +assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.60"; + version = "0.7"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "0536vfl59n9vlagl1cpdl06c9y19dscwhwdzvi27zk5nc5qb6rdq"; + sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l"; }; enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optional cudaSupport cudatoolkit + ++ lib.optional ncclSupport nccl; + + cmakeFlags = lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] + ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; + installPhase = '' mkdir -p $out - cp -r include $out - install -Dm755 lib/libxgboost.so $out/lib/libxgboost.so - install -Dm755 xgboost $out/bin/xgboost + cp -r ../include $out + install -Dm755 ../lib/libxgboost.so $out/lib/libxgboost.so + install -Dm755 ../xgboost $out/bin/xgboost ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/zeitgeist/dbus_glib.patch b/pkgs/development/libraries/zeitgeist/dbus_glib.patch deleted file mode 100644 index 872ea0db31b8ed172cd10b3286a0875c152e2139..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/zeitgeist/dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac 2014-01-27 22:45:42.000000000 +0100 -+++ configure.ac.new 2014-05-02 17:25:45.813491239 +0200 -@@ -151,6 +151,7 @@ - gio-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED -+ dbus-glib-1 - json-glib-1.0 >= $JSON_GLIB_REQUIRED" - - AC_ARG_ENABLE([datahub], diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 3c50de6cc6b735767f35ad39f991f2523c4eb6ab..33cf5dd4af84ae2c592071d452a6e148b51b9aa0 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 -, intltool, libtool, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, dbus_glib +{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 +, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.1"; name = "zeitgeist-${version}"; src = fetchgit { url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; rev = "v${version}"; - sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; + sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44"; }; - configureScript = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; - buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib - gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; + buildInputs = [ + glib sqlite dbus_libs telepathy-glib dbus-glib + gtk3 json-glib librdf_raptor2 python2Packages.rdflib + ]; prePatch = "patchShebangs ."; - patches = [ ./dbus_glib.patch ]; - - patchFlags = [ "-p0" ]; - enableParallelBuilding = true; - postFixup = '' - '' + stdenv.lib.optionalString pythonSupport '' + postFixup = stdenv.lib.optionalString pythonSupport '' moveToOutput lib/${python2Packages.python.libPrefix} "$py" ''; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 00973350e185730f20ecd28664513320b35ec6d6..f67964748dca18054cc229bbefc3f94077b6df3d 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7"; + version = "2.7.4"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m"; + sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 522d2c2526849b0f073be7c15185b915235ff05c..65fb6e615f5f3645b6a1bf10d56d4172d5814e13 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -13,7 +13,7 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" declare -a NIX_LISP_FINAL_PARAMETERS; diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index b13ddf8357f4817899008ebda3d7baef55f75c11..390e0e06112842081b2a9303f316676e49695e0d 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -33,7 +33,7 @@ let test -n "$LD_LIBRARY_PATH" && echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':')'" >> "$path_config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':' | sed -e 's/:$//')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! /bin/sh" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" + echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix new file mode 100644 index 0000000000000000000000000000000000000000..6dbff1d6e56c83607efdf63390c602e50b9dfbd9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -0,0 +1,49 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode-xhtml''; + version = ''buildnode-20170403-git''; + + description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode-xhtml"; + + asdFilesToKeep = ["buildnode-xhtml.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode-xhtml DESCRIPTION + Tool for building up an xml dom of an excel spreadsheet nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode-xhtml FILENAME + buildnode-xhtml DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop + closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test + cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger + trivial-features trivial-gray-streams) + VERSION buildnode-20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix new file mode 100644 index 0000000000000000000000000000000000000000..ecc1634bfce049b751a5aaa6bfa8c0f788336d56 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -0,0 +1,50 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode''; + version = ''20170403-git''; + + parasites = [ "buildnode-test" ]; + + description = ''Tool for building up an xml dom nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode"; + + asdFilesToKeep = ["buildnode.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode DESCRIPTION Tool for building up an xml dom nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode FILENAME buildnode DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams) + VERSION 20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml + buildnode-xul) + PARASITES (buildnode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1ce782e7f8496ba9f5c234871b1f4c4a22a88ee --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html5-parser''; + version = ''20171019-git''; + + description = ''A HTML5 parser for Common Lisp''; + + deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz''; + sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98''; + }; + + packageName = "cl-html5-parser"; + + asdFilesToKeep = ["cl-html5-parser.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 + 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL + http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz + MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME + cl-html5-parser DEPS + ((NAME cl-ppcre FILENAME cl-ppcre) + (NAME flexi-streams FILENAME flexi-streams) + (NAME string-case FILENAME string-case) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) + VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 572e3eb4cb38e9189e3a01d3faa6aff75a9363cc..3ca67723925e33966d24201e6f4d1a8860d8349a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -5,7 +5,7 @@ rec { description = ''Common Lisp smtp client.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; @@ -23,7 +23,7 @@ rec { MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl) + (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix similarity index 97% rename from pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix rename to pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 0243709f3fe14d8a567765b892266b5999bf0ab5..99aa768c8dfcce7a67b02ab4023763627554dfd7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,6 +1,6 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl+ssl''; + baseName = ''cl_plus_ssl''; version = ''cl+ssl-20171227-git''; parasites = [ "openssl-1.1.0" ]; @@ -22,7 +22,7 @@ rec { /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz - MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl+ssl DEPS + MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix new file mode 100644 index 0000000000000000000000000000000000000000..7375b8dd70948223f0cd474ea1f85c862e67638b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''collectors''; + version = ''20161204-git''; + + parasites = [ "collectors-test" ]; + + description = ''A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies''; + + deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; + sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + }; + + packageName = "collectors"; + + asdFilesToKeep = ["collectors.asd"]; + overrides = x: x; +} +/* (SYSTEM collectors DESCRIPTION + A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies + SHA256 0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf URL + http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz + MD5 59c8c885a8e512d4f09e73d3e0c97b1f NAME collectors FILENAME collectors + DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES (alexandria closer-mop iterate lisp-unit2 symbol-munger) + VERSION 20161204-git SIBLINGS NIL PARASITES (collectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix new file mode 100644 index 0000000000000000000000000000000000000000..2ad018e5549c1d28dff9237b6b0770ed7c6f3e4f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -0,0 +1,52 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-selectors''; + version = ''20160628-git''; + + parasites = [ "css-selectors-test" ]; + + description = ''An implementation of css selectors''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; + sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + }; + + packageName = "css-selectors"; + + asdFilesToKeep = ["css-selectors.asd"]; + overrides = x: x; +} +/* (SYSTEM css-selectors DESCRIPTION An implementation of css selectors SHA256 + 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL + http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz + MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors FILENAME + css-selectors DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams + yacc) + VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp) + PARASITES (css-selectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index d6885fc58d8c6bf366622ca16e1d31b4bc4d2667..f03a95d27b1f026c9a0072953ca29c6e87fbe5c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -5,7 +5,7 @@ rec { description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; @@ -25,7 +25,7 @@ rec { (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 44ce34a2cb3366402ae6baf3d83ea24b9cc2f947..95162ffc99a3cf949e62f46b64e6bb178a85844e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -5,7 +5,7 @@ rec { description = ''Full-featured http/https client based on usocket''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; @@ -24,7 +24,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 6a103b5ac1c566ffa5f605392c408e507b85d0a0..611ef77256fad68bd83e29b1285172ac35f88dea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -10,7 +10,7 @@ rec { simple framework for user-defined handlers and can be extended through subclassing.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; @@ -34,7 +34,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp) (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index da9fe306276f335b13f4d9dd19555cc8b0eda711..a913cdbe521c13f270877e03d2de64da99badf0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -5,7 +5,7 @@ rec { description = ''Load data into PostgreSQL''; - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; + deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; @@ -28,7 +28,7 @@ rec { (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-containers FILENAME cl-containers) (NAME cl-csv FILENAME cl-csv) (NAME cl-fad FILENAME cl-fad) (NAME cl-interpol FILENAME cl-interpol) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index 356c7ff686427ccd20c1e1a2b36c5e2fb37f87b9..de24a598496052cf02cf1aaebf9e0104fdb0eb56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -5,7 +5,7 @@ rec { description = ''MySQL Native Driver''; - deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl+ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl_plus_ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; @@ -26,7 +26,8 @@ rec { (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME cl+ssl FILENAME cl+ssl) (NAME flexi-streams FILENAME flexi-streams) + (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME flexi-streams FILENAME flexi-streams) (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f5cc1e048de8bd7d9fa32edf8f0579ec7875db7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''string-case''; + version = ''20151218-git''; + + description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz''; + sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw''; + }; + + packageName = "string-case"; + + asdFilesToKeep = ["string-case.asd"]; + overrides = x: x; +} +/* (SYSTEM string-case DESCRIPTION + string-case is a macro that generates specialised decision trees to dispatch on string equality + SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL + http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz + MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case + DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix new file mode 100644 index 0000000000000000000000000000000000000000..4c88e839bdab0cbbe64da7c44d1788e8ecbcc46a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xembed''; + version = ''clx-20120909-git''; + + description = ''''; + + deps = [ args."clx" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz''; + sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb''; + }; + + packageName = "xembed"; + + asdFilesToKeep = ["xembed.asd"]; + overrides = x: x; +} +/* (SYSTEM xembed DESCRIPTION NIL SHA256 + 06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL + http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz + MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 9a7fb3e5d1b8d9961de79ff44088da48d035cbf6..0c12f169cf7b6794f81d49cae3b5167fbb3ddd3e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -46,7 +46,7 @@ in cxml = skipBuildPhase; wookie = addNativeLibs (with pkgs; [libuv openssl]); lev = addNativeLibs [pkgs.libev]; - "cl+ssl" = addNativeLibs [pkgs.openssl]; + cl_plus_ssl = addNativeLibs [pkgs.openssl]; cl-colors = skipBuildPhase; cl-libuv = addNativeLibs [pkgs.libuv]; cl-async-ssl = addNativeLibs [pkgs.openssl]; @@ -154,4 +154,8 @@ $out/lib/common-lisp/query-fs" ]; asdFilesToKeep = x.asdFilesToKeep ++ ["simple-date.asd"]; }; + buildnode = x: { + deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; + parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index ebf09c43a0e0f5e5aaca81a27fbdae145bca69a5..b133c3009ae6fa727b6a3a6247d3956eff7a9317 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -21,11 +21,13 @@ cl-base64 cl-cli cl-colors cl-cookie +cl-csv cl-dbi cl-emb cl-fuse cl-fuse-meta-fs cl-html-parse +cl-html5-parser cl-json cl-l10n cl-libuv @@ -55,8 +57,10 @@ cl-vectors cl-who clx clx-truetype +xembed command-line-arguments css-lite +css-selectors cxml dbd-mysql dbd-postgres diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index e931c12f1e72fdfc7a675c96296fcbabec1c0769..8ea7d4700bd6c304322827696c52283f72b738da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,34 +6,9 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "symbol-munger" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."symbol-munger" or (x: {})) - (import ./quicklisp-to-nix-output/symbol-munger.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iterate" = quicklisp-to-nix-packages."iterate"; - })); - - "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; - "lisp-unit2" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lisp-unit2" or (x: {})) - (import ./quicklisp-to-nix-output/lisp-unit2.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; - })); - - "moptilities" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."moptilities" or (x: {})) @@ -54,14 +29,6 @@ let quicklisp-to-nix-packages = rec { })); - "yacc" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."yacc" or (x: {})) - (import ./quicklisp-to-nix-output/yacc.nix { - inherit fetchurl; - })); - - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; @@ -135,7 +102,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "list-of" = quicklisp-to-nix-packages."list-of"; @@ -280,32 +247,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-interpol" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-interpol" or (x: {})) - (import ./quicklisp-to-nix-output/cl-interpol.nix { - inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - })); - - - "cl-csv" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-csv" or (x: {})) - (import ./quicklisp-to-nix-output/cl-csv.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; - })); - - "cl-containers" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-containers" or (x: {})) @@ -425,14 +366,6 @@ let quicklisp-to-nix-packages = rec { })); - "swank" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."swank" or (x: {})) - (import ./quicklisp-to-nix-output/swank.nix { - inherit fetchurl; - })); - - "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -524,6 +457,108 @@ let quicklisp-to-nix-packages = rec { })); + "yacc" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."yacc" or (x: {})) + (import ./quicklisp-to-nix-output/yacc.nix { + inherit fetchurl; + })); + + + "symbol-munger" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."symbol-munger" or (x: {})) + (import ./quicklisp-to-nix-output/symbol-munger.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "swank" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swank" or (x: {})) + (import ./quicklisp-to-nix-output/swank.nix { + inherit fetchurl; + })); + + + "collectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."collectors" or (x: {})) + (import ./quicklisp-to-nix-output/collectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "buildnode-xhtml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode-xhtml" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode-xhtml.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "buildnode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "zpb-ttf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."zpb-ttf" or (x: {})) @@ -689,6 +724,14 @@ let quicklisp-to-nix-packages = rec { })); + "string-case" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."string-case" or (x: {})) + (import ./quicklisp-to-nix-output/string-case.nix { + inherit fetchurl; + })); + + "pcall-queue" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pcall-queue" or (x: {})) @@ -716,6 +759,32 @@ let quicklisp-to-nix-packages = rec { })); + "lisp-unit2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-unit2" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit2.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "cl-interpol" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-interpol" or (x: {})) + (import ./quicklisp-to-nix-output/cl-interpol.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -1236,7 +1305,7 @@ let quicklisp-to-nix-packages = rec { "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-containers" = quicklisp-to-nix-packages."cl-containers"; "cl-csv" = quicklisp-to-nix-packages."cl-csv"; @@ -1490,7 +1559,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; @@ -1660,7 +1729,7 @@ let quicklisp-to-nix-packages = rec { "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; @@ -1694,7 +1763,7 @@ let quicklisp-to-nix-packages = rec { "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; @@ -1801,6 +1870,40 @@ let quicklisp-to-nix-packages = rec { })); + "css-selectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-selectors" or (x: {})) + (import ./quicklisp-to-nix-output/css-selectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "css-lite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."css-lite" or (x: {})) @@ -1817,6 +1920,15 @@ let quicklisp-to-nix-packages = rec { })); + "xembed" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xembed" or (x: {})) + (import ./quicklisp-to-nix-output/xembed.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); + + "clx-truetype" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clx-truetype" or (x: {})) @@ -1941,10 +2053,10 @@ let quicklisp-to-nix-packages = rec { })); - "cl+ssl" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl+ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl+ssl.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; @@ -2021,7 +2133,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -2171,6 +2283,18 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html5-parser" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html5-parser" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html5-parser.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "string-case" = quicklisp-to-nix-packages."string-case"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "cl-html-parse" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html-parse" or (x: {})) @@ -2245,6 +2369,21 @@ let quicklisp-to-nix-packages = rec { })); + "cl-csv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-csv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-csv.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + })); + + "cl-cookie" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-cookie" or (x: {})) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 63d6f3305194a24c9076fb43b07a76b30aee753f..3824a04826f17900b22eb950d3c2b190f5ec03c3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -55,6 +55,7 @@ (#\\ "_backslash_") (#\_ "__") (#\. "_dot_") + (#\+ "_plus_") (t x))))) (defvar *system-info-bin* diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 7152d0b9e3602cd3464b72eceb6fcd5cb87b75d8..091ae06ab910338f6d4495fe9a18ece09423b2be 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,4 +1,4 @@ -lua: +{ lua, writeText }: { buildInputs ? [], disabled ? false, ... } @ attrs: @@ -19,5 +19,36 @@ else { name = "lua${lua.luaversion}-" + attrs.name; buildInputs = buildInputs ++ [ lua ]; + + setupHook = writeText "setup-hook.sh" '' + # check for lua/clua modules and don't add duplicates + + addLuaLibPath() { + local package_path="$1/share/lua/${lua.luaversion}" + if [[ ! -d $package_path ]]; then return; fi + if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi + + if [[ -z $LUA_PATH ]]; then + export LUA_PATH="$package_path/?.lua" + else + export LUA_PATH="$LUA_PATH;$package_path/?.lua" + fi + } + + addLuaLibCPath() { + local package_cpath="$1/lib/lua/${lua.luaversion}" + if [[ ! -d $package_cpath ]]; then return; fi + if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi + + if [[ -z $LUA_CPATH ]]; then + export LUA_CPATH="$package_cpath/?.so" + else + export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so" + fi + } + + addEnvHooks "$hostOffset" addLuaLibPath + addEnvHooks "$hostOffset" addLuaLibCPath + ''; } ) diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 2fd8c2d39c4e5ae828a47d4f3bc2e049f6a7a3dd..0826b83ed1992bcb5bf509b1352816b14e41978e 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "2.26"; + version = "2.30"; in stdenv.mkDerivation { name = "avr-binutils-${version}"; src = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; configureFlags = "--target=avr --enable-languages=c,c++"; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix new file mode 100644 index 0000000000000000000000000000000000000000..19fc0dc812d855e1ba7beb1280fb1bbafd853ff1 --- /dev/null +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -0,0 +1,82 @@ +{ lib, hostPlatform, targetPlatform +, makeWrapper +, runCommand, wrapBintoolsWith, wrapCCWith +, buildAndroidndk, androidndk, targetAndroidndkPkgs +}: + +let + # Mapping from a platform to information needed to unpack NDK stuff for that + # platform. + # + # N.B. The Android NDK uses slightly different LLVM-style platform triples + # than we do. We don't just use theirs because ours are less ambiguous and + # some builds need that clarity. + ndkInfoFun = { config, ... }: { + "x86_64-unknown-linux-gnu" = { + double = "linux-x86_64"; + }; + "arm-unknown-linux-androideabi" = { + arch = "arm"; + triple = "arm-linux-androideabi"; + gccVer = "4.8"; + }; + "aarch64-unknown-linux-android" = { + arch = "arm64"; + triple = "aarch64-linux-android"; + gccVer = "4.9"; + }; + }.${config} or + (throw "Android NDK doesn't support ${config}, as far as we know"); + + hostInfo = ndkInfoFun hostPlatform; + targetInfo = ndkInfoFun targetPlatform; + +in + +rec { + # Misc tools + binaries = let + ndkBinDir = + "${androidndk}/libexec/${androidndk.name}/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; + in runCommand "ndk-gcc-binutils" { + isGNU = true; # for cc-wrapper + nativeBuildInputs = [ makeWrapper ]; + propgatedBuildInputs = [ androidndk ]; + } '' + mkdir -p $out/bin + for prog in ${ndkBinDir}/${targetInfo.triple}-*; do + prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') + ln -s $prog $out/bin/${targetPlatform.config}-$prog_suffix + done + ''; + + binutils = wrapBintoolsWith { + bintools = binaries; + libc = targetAndroidndkPkgs.libraries; + }; + + gcc = wrapCCWith { + cc = binaries; + bintools = binutils; + libc = targetAndroidndkPkgs.libraries; + extraBuildCommands = + # GCC 4.9 is the first relase with "-fstack-protector" + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") '' + sed -E \ + -i $out/nix-support/add-hardening.sh \ + -e 's|(-fstack-protector)-strong|\1|g' + ''; + }; + + # Bionic lib C and other libraries. + # + # We use androidndk from the previous stage, else we waste time or get cycles + # cross-compiling packages to wrap incorrectly wrap binaries we don't include + # anyways. + libraries = { + name = "bionic-prebuilt"; + type = "derivation"; + outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/"; + drvPath = throw "fake derivation, build ${buildAndroidndk} to use"; + }; +} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 3891ea4c6be2e765230d3c81376e242b9686e036..b77cc68fa0e835c1b1b1cfea599100cb9e3d35dd 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -242,4 +242,19 @@ rec { inherit (pkgs) stdenv; inherit androidsdk; }; + + androidndkPkgs = import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + lib hostPlatform targetPlatform + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; + inherit androidndk; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + }; } diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cee1c9e5dee86456fc675c2a0078a3ac178e64a --- /dev/null +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, bzip2, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "imgpatchtools-${version}"; + version = "0.3"; + + src = fetchzip { + url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz"; + sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd"; + }; + + buildInputs = [ bzip2 openssl zlib ]; + + installPhase = "install -Dt $out/bin bin/*"; + + meta = with stdenv.lib; { + description = "Tools to manipulate Android OTA archives"; + longDescription = '' + This package is useful for Android development. In particular, it can be + used to extract ext4 /system image from Android distribution ZIP archives + such as those distributed by LineageOS and Replicant, via BlockImageUpdate + utility. It also includes other, related, but arguably more advanced tools + for OTA manipulation. + ''; + homepage = https://github.com/erfanoabdi/imgpatchtools; + license = licenses.gpl3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix deleted file mode 100644 index e5892ee616d651ac74254f3ac90dcaa03d2429ad..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/composition-v4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages-v4.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 4232324f35020108bed9837803454da5391991f2..fa4d7268f01e8da8e8f9532a9aaa6d004e78ef91 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index cb8e6ee8adfe999f4e9eb65452d08f89ad008dd0..a83df852ce2932ae4a16afd88647be59fa8536fc 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix deleted file mode 100644 index 7546b2e34ce957092dc002284f76e56a0a3e7b8a..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/default-v4.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, system, nodejs, stdenv}: - -let - nodePackages = import ./composition-v4.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); -} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 5ce63dd882fe16c6dc6a4accf8422de2361d6630..c3aa741ef806461b6096817a50616a6ba9693e8e 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,6 +2,5 @@ #! nix-shell -i bash -p nodePackages.node2nix rm -f node-env.nix -node2nix -i node-packages-v4.json -o node-packages-v4.nix -c composition-v4.nix node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix diff --git a/pkgs/development/node-packages/node-packages-v4.json b/pkgs/development/node-packages/node-packages-v4.json deleted file mode 100644 index b1349773a73d6f7e186c79c9373cebf16286f22d..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/node-packages-v4.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - "coffee-script" -, "grunt-cli" -, "gulp" -, "node-gyp" -, "node-inspector" -, "node-pre-gyp" -, "npm" -] diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix deleted file mode 100644 index 9db719716472ccd83daae970acd11a75cf22f3ec..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ /dev/null @@ -1,6292 +0,0 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; - }; - }; - "accepts-1.3.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; - }; - }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; - }; - }; - "ajv-5.5.2" = { - name = "ajv"; - packageName = "ajv"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; - }; - }; - "ansi-gray-0.1.1" = { - name = "ansi-gray"; - packageName = "ansi-gray"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; - sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "ansi-wrap-0.1.0" = { - name = "ansi-wrap"; - packageName = "ansi-wrap"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; - sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; - }; - }; - "aproba-1.2.0" = { - name = "aproba"; - packageName = "aproba"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; - }; - }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - }; - "are-we-there-yet-1.1.4" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; - sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; - }; - }; - "arr-diff-4.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; - }; - }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; - }; - }; - "arr-union-3.1.0" = { - name = "arr-union"; - packageName = "arr-union"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; - }; - }; - "array-differ-1.0.0" = { - name = "array-differ"; - packageName = "array-differ"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; - sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; - }; - }; - "array-each-1.0.1" = { - name = "array-each"; - packageName = "array-each"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; - sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; - }; - }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; - }; - }; - "array-slice-1.1.0" = { - name = "array-slice"; - packageName = "array-slice"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; - sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; - }; - }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; - }; - }; - "array-unique-0.3.2" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "assign-symbols-1.0.0" = { - name = "assign-symbols"; - packageName = "assign-symbols"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "atob-2.0.3" = { - name = "atob"; - packageName = "atob"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; - sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; - }; - }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "base-0.11.2" = { - name = "base"; - packageName = "base"; - version = "0.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; - }; - }; - "base64-js-0.0.8" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; - sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; - }; - }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; - }; - }; - "beeper-1.1.1" = { - name = "beeper"; - packageName = "beeper"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; - sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; - }; - }; - "biased-opener-0.2.8" = { - name = "biased-opener"; - packageName = "biased-opener"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; - sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; - }; - }; - "big-integer-1.6.26" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.26"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz"; - sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; - }; - }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; - "body-parser-1.18.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; - "bplist-parser-0.1.1" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; - sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "braces-2.3.0" = { - name = "braces"; - packageName = "braces"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; - sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; - }; - }; - "browser-launcher2-0.4.6" = { - name = "browser-launcher2"; - packageName = "browser-launcher2"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; - sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - }; - "cache-base-1.0.1" = { - name = "cache-base"; - packageName = "cache-base"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "class-utils-0.3.6" = { - name = "class-utils"; - packageName = "class-utils"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; - }; - }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; - }; - }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; - }; - }; - "clone-stats-0.0.1" = { - name = "clone-stats"; - packageName = "clone-stats"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; - sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; - "collection-visit-1.0.0" = { - name = "collection-visit"; - packageName = "collection-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; - }; - }; - "color-support-1.1.3" = { - name = "color-support"; - packageName = "color-support"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - }; - "content-disposition-0.5.2" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; - }; - }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - }; - "copy-descriptor-0.1.1" = { - name = "copy-descriptor"; - packageName = "copy-descriptor"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "dateformat-2.2.0" = { - name = "dateformat"; - packageName = "dateformat"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; - sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "decode-uri-component-0.2.0" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; - }; - }; - "default-browser-id-1.0.4" = { - name = "default-browser-id"; - packageName = "default-browser-id"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz"; - sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "define-property-0.2.5" = { - name = "define-property"; - packageName = "define-property"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; - }; - }; - "define-property-1.0.0" = { - name = "define-property"; - packageName = "define-property"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - }; - "depd-1.1.1" = { - name = "depd"; - packageName = "depd"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; - sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; - "detect-file-1.0.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; - }; - }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; - }; - }; - "end-of-stream-0.1.5" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; - sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; - }; - }; - "expand-brackets-2.1.4" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; - }; - }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; - }; - }; - "express-4.16.2" = { - name = "express"; - packageName = "express"; - version = "4.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; - sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; - }; - }; - "extend-3.0.1" = { - name = "extend"; - packageName = "extend"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; - }; - }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; - }; - }; - "extend-shallow-3.0.2" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; - }; - }; - "extglob-2.0.4" = { - name = "extglob"; - packageName = "extglob"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "fancy-log-1.3.2" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; - sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; - }; - }; - "fast-deep-equal-1.0.0" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; - }; - }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; - }; - }; - "fill-range-4.0.0" = { - name = "fill-range"; - packageName = "fill-range"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; - }; - }; - "finalhandler-1.1.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; - sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; - }; - }; - "find-index-0.1.1" = { - name = "find-index"; - packageName = "find-index"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "findup-sync-0.3.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; - sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; - }; - }; - "findup-sync-2.0.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; - }; - }; - "fined-1.1.0" = { - name = "fined"; - packageName = "fined"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; - sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; - }; - }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; - }; - }; - "flagged-respawn-1.0.0" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; - sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; - }; - }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - }; - "for-own-1.0.0" = { - name = "for-own"; - packageName = "for-own"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; - sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; - }; - }; - "form-data-2.3.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; - "forwarded-0.1.2" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; - }; - }; - "fragment-cache-0.2.1" = { - name = "fragment-cache"; - packageName = "fragment-cache"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "fstream-1.0.11" = { - name = "fstream"; - packageName = "fstream"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; - }; - }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; - }; - }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - }; - "gaze-0.5.2" = { - name = "gaze"; - packageName = "gaze"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "get-value-2.0.6" = { - name = "get-value"; - packageName = "get-value"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - }; - "glob-3.1.21" = { - name = "glob"; - packageName = "glob"; - version = "3.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; - }; - }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; - }; - }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; - }; - }; - "glob-stream-3.1.18" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "3.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; - }; - }; - "glob-watcher-0.0.6" = { - name = "glob-watcher"; - packageName = "glob-watcher"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; - }; - }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; - }; - }; - "global-modules-1.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; - }; - }; - "global-prefix-1.0.2" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; - }; - }; - "globule-0.1.0" = { - name = "globule"; - packageName = "globule"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; - }; - }; - "glogg-1.0.1" = { - name = "glogg"; - packageName = "glogg"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; - sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna"; - }; - }; - "graceful-fs-1.2.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }; - }; - "graceful-fs-3.0.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "3.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "grunt-known-options-1.1.0" = { - name = "grunt-known-options"; - packageName = "grunt-known-options"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; - }; - }; - "gulp-util-3.0.8" = { - name = "gulp-util"; - packageName = "gulp-util"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; - sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; - }; - }; - "gulplog-1.0.0" = { - name = "gulplog"; - packageName = "gulplog"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; - sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; - }; - }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "har-validator-5.0.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "has-gulplog-0.1.0" = { - name = "has-gulplog"; - packageName = "has-gulplog"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; - sha1 = "6414c82913697da51590397dafb12f22967811ce"; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - }; - "has-value-0.3.1" = { - name = "has-value"; - packageName = "has-value"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; - }; - }; - "has-value-1.0.0" = { - name = "has-value"; - packageName = "has-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; - }; - }; - "has-values-0.1.4" = { - name = "has-values"; - packageName = "has-values"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; - }; - }; - "has-values-1.0.0" = { - name = "has-values"; - packageName = "has-values"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "headless-0.1.7" = { - name = "headless"; - packageName = "headless"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; - sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "hoek-4.2.0" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; - }; - }; - "homedir-polyfill-1.0.1" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; - }; - }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-1.0.2" = { - name = "inherits"; - packageName = "inherits"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "ini-1.3.5" = { - name = "ini"; - packageName = "ini"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; - }; - }; - "interpret-1.1.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; - "ipaddr.js-1.5.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; - }; - }; - "is-absolute-1.0.0" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; - }; - }; - "is-accessor-descriptor-0.1.6" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; - }; - }; - "is-accessor-descriptor-1.0.0" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - }; - "is-data-descriptor-1.0.0" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; - }; - }; - "is-descriptor-0.1.6" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; - }; - }; - "is-descriptor-1.0.2" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; - }; - }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - }; - "is-extendable-1.0.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "is-glob-3.1.0" = { - name = "is-glob"; - packageName = "is-glob"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; - }; - }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; - }; - }; - "is-odd-1.0.0" = { - name = "is-odd"; - packageName = "is-odd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; - sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; - }; - }; - "is-relative-1.0.0" = { - name = "is-relative"; - packageName = "is-relative"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "is-unc-path-1.0.0" = { - name = "is-unc-path"; - packageName = "is-unc-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "is-windows-1.0.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "json-schema-traverse-0.3.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; - }; - }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; - }; - }; - "kind-of-6.0.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; - sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; - }; - }; - "lazy-cache-2.0.2" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; - sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "liftoff-2.5.0" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; - sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "lodash-1.0.2" = { - name = "lodash"; - packageName = "lodash"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; - }; - }; - "lodash-2.4.2" = { - name = "lodash"; - packageName = "lodash"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; - }; - }; - "lodash._basetostring-3.0.1" = { - name = "lodash._basetostring"; - packageName = "lodash._basetostring"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; - sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; - }; - }; - "lodash._basevalues-3.0.0" = { - name = "lodash._basevalues"; - packageName = "lodash._basevalues"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; - sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; - }; - }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; - }; - }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; - }; - }; - "lodash._reescape-3.0.0" = { - name = "lodash._reescape"; - packageName = "lodash._reescape"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; - sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; - }; - }; - "lodash._reevaluate-3.0.0" = { - name = "lodash._reevaluate"; - packageName = "lodash._reevaluate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; - sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; - }; - }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; - }; - }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - }; - "lodash.escape-3.2.0" = { - name = "lodash.escape"; - packageName = "lodash.escape"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; - sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; - }; - }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; - }; - }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; - }; - }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; - }; - }; - "lodash.restparam-3.6.1" = { - name = "lodash.restparam"; - packageName = "lodash.restparam"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; - sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; - }; - }; - "lodash.template-3.6.2" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; - sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; - }; - }; - "lodash.templatesettings-3.1.1" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; - sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "lru-cache-2.7.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; - sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; - }; - }; - "make-iterator-1.0.0" = { - name = "make-iterator"; - packageName = "make-iterator"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; - sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; - }; - }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "map-visit-1.0.0" = { - name = "map-visit"; - packageName = "map-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "micromatch-3.1.5" = { - name = "micromatch"; - packageName = "micromatch"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz"; - sha512 = "2y22i8yrib7vcgpfcm5sq9g4fh4wxrn0f3z017vdbkvybvywa1axl3kym81k9ad6h3d4jmqkqyahcaj2c5qy5wpa17kvbyhnfn6sjya"; - }; - }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; - }; - }; - "mime-db-1.30.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; - }; - }; - "mime-types-2.1.17" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; - }; - }; - "minimatch-0.2.14" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "mixin-deep-1.3.0" = { - name = "mixin-deep"; - packageName = "mixin-deep"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; - sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "multipipe-0.1.2" = { - name = "multipipe"; - packageName = "multipipe"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; - sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; - }; - }; - "nan-2.8.0" = { - name = "nan"; - packageName = "nan"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; - }; - }; - "nanomatch-1.2.7" = { - name = "nanomatch"; - packageName = "nanomatch"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz"; - sha512 = "2m4xaq739s2r5bvh287d8zm8af9mxa706z1a7ila48yhvkspi4iimwyg0id1cl327i7kqssrcnc2nwdc2qw8s83xwqg3bmfgjr5v6gz"; - }; - }; - "natives-1.1.1" = { - name = "natives"; - packageName = "natives"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; - sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; - }; - }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; - }; - }; - "node-pre-gyp-0.6.39" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - }; - "nopt-3.0.6" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; - }; - }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "object-assign-3.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; - sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "object-copy-0.1.0" = { - name = "object-copy"; - packageName = "object-copy"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; - }; - }; - "object-visit-1.0.1" = { - name = "object-visit"; - packageName = "object-visit"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; - }; - }; - "object.defaults-1.1.0" = { - name = "object.defaults"; - packageName = "object.defaults"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; - sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; - }; - }; - "object.map-1.0.1" = { - name = "object.map"; - packageName = "object.map"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; - sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; - }; - }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - }; - "orchestrator-0.3.8" = { - name = "orchestrator"; - packageName = "orchestrator"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; - }; - }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "parse-filepath-1.0.2" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; - }; - }; - "parseurl-1.3.2" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; - }; - }; - "pascalcase-0.1.1" = { - name = "pascalcase"; - packageName = "pascalcase"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; - }; - }; - "path-root-0.1.1" = { - name = "path-root"; - packageName = "path-root"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; - sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; - }; - }; - "path-root-regex-0.1.2" = { - name = "path-root-regex"; - packageName = "path-root-regex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "plist-1.2.0" = { - name = "plist"; - packageName = "plist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"; - sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; - }; - }; - "posix-character-classes-0.1.1" = { - name = "posix-character-classes"; - packageName = "posix-character-classes"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; - }; - }; - "pretty-hrtime-1.0.3" = { - name = "pretty-hrtime"; - packageName = "pretty-hrtime"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; - sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "proxy-addr-2.0.2" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; - sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; - }; - }; - "range-parser-1.2.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; - }; - }; - "raw-body-2.3.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; - }; - }; - "rc-1.2.4" = { - name = "rc"; - packageName = "rc"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; - sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "readable-stream-1.0.34" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.34"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "regex-not-1.0.0" = { - name = "regex-not"; - packageName = "regex-not"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; - sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; - }; - }; - "repeat-element-1.1.2" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; - sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "replace-ext-0.0.1" = { - name = "replace-ext"; - packageName = "replace-ext"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; - sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; - }; - }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; - }; - }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; - "resolve-1.5.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; - }; - }; - "resolve-dir-1.0.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; - }; - }; - "resolve-url-0.2.1" = { - name = "resolve-url"; - packageName = "resolve-url"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; - }; - }; - "rimraf-2.2.8" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; - }; - }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; - }; - }; - "semver-4.3.6" = { - name = "semver"; - packageName = "semver"; - version = "4.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; - }; - }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; - }; - }; - "semver-5.5.0" = { - name = "semver"; - packageName = "semver"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; - }; - }; - "send-0.16.1" = { - name = "send"; - packageName = "send"; - version = "0.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; - sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; - }; - }; - "sequencify-0.0.7" = { - name = "sequencify"; - packageName = "sequencify"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; - }; - }; - "serve-favicon-2.4.5" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; - sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; - }; - }; - "serve-static-1.13.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; - sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; - "set-getter-0.1.0" = { - name = "set-getter"; - packageName = "set-getter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; - sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; - }; - }; - "set-value-0.4.3" = { - name = "set-value"; - packageName = "set-value"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - }; - "set-value-2.0.0" = { - name = "set-value"; - packageName = "set-value"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; - sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; - }; - }; - "setprototypeof-1.0.3" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; - }; - }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "snapdragon-0.8.1" = { - name = "snapdragon"; - packageName = "snapdragon"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; - sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; - }; - }; - "snapdragon-node-2.1.1" = { - name = "snapdragon-node"; - packageName = "snapdragon-node"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; - }; - }; - "snapdragon-util-3.0.1" = { - name = "snapdragon-util"; - packageName = "snapdragon-util"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - }; - "source-map-resolve-0.5.1" = { - name = "source-map-resolve"; - packageName = "source-map-resolve"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; - sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; - }; - }; - "source-map-url-0.4.0" = { - name = "source-map-url"; - packageName = "source-map-url"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; - }; - }; - "sparkles-1.0.0" = { - name = "sparkles"; - packageName = "sparkles"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"; - sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "split-string-3.1.0" = { - name = "split-string"; - packageName = "split-string"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; - }; - }; - "sshpk-1.13.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; - }; - }; - "static-extend-0.1.2" = { - name = "static-extend"; - packageName = "static-extend"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; - }; - }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; - }; - }; - "stream-consume-0.1.0" = { - name = "stream-consume"; - packageName = "stream-consume"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; - sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "strip-bom-1.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; - "strong-data-uri-1.0.4" = { - name = "strong-data-uri"; - packageName = "strong-data-uri"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; - sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "tar-2.2.1" = { - name = "tar"; - packageName = "tar"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; - }; - }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; - }; - }; - "through2-0.6.5" = { - name = "through2"; - packageName = "through2"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; - sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; - }; - }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; - "tildify-1.2.0" = { - name = "tildify"; - packageName = "tildify"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; - sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; - }; - }; - "time-stamp-1.1.0" = { - name = "time-stamp"; - packageName = "time-stamp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; - sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; - }; - }; - "to-object-path-0.3.0" = { - name = "to-object-path"; - packageName = "to-object-path"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; - }; - }; - "to-regex-3.0.1" = { - name = "to-regex"; - packageName = "to-regex"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; - sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; - }; - }; - "to-regex-range-2.1.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; - }; - }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "truncate-1.0.5" = { - name = "truncate"; - packageName = "truncate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "type-is-1.6.15" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.15"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; - sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; - }; - }; - "uid-0.0.2" = { - name = "uid"; - packageName = "uid"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; - sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; - }; - }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; - }; - }; - "ultron-1.0.2" = { - name = "ultron"; - packageName = "ultron"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - }; - "unc-path-regex-0.1.2" = { - name = "unc-path-regex"; - packageName = "unc-path-regex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; - }; - }; - "union-value-1.0.0" = { - name = "union-value"; - packageName = "union-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; - }; - }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "unset-value-1.0.0" = { - name = "unset-value"; - packageName = "unset-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; - }; - }; - "untildify-2.1.0" = { - name = "untildify"; - packageName = "untildify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz"; - sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; - }; - }; - "urix-0.1.0" = { - name = "urix"; - packageName = "urix"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; - }; - }; - "use-2.0.2" = { - name = "use"; - packageName = "use"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; - sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; - }; - }; - "user-home-1.1.1" = { - name = "user-home"; - packageName = "user-home"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; - }; - }; - "uuid-3.2.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; - sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; - }; - }; - "v8-debug-1.0.1" = { - name = "v8-debug"; - packageName = "v8-debug"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; - sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; - }; - }; - "v8-profiler-5.7.0" = { - name = "v8-profiler"; - packageName = "v8-profiler"; - version = "5.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; - sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; - }; - }; - "v8flags-2.1.1" = { - name = "v8flags"; - packageName = "v8flags"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; - sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; - }; - }; - "vinyl-0.5.3" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; - sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; - }; - }; - "vinyl-fs-0.3.14" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "0.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; - }; - }; - "which-1.3.0" = { - name = "which"; - packageName = "which"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; - sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; - }; - }; - "wide-align-1.1.2" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; - sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; - }; - }; - "win-detect-browsers-1.0.2" = { - name = "win-detect-browsers"; - packageName = "win-detect-browsers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz"; - sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; - }; - }; - "window-size-0.1.4" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "ws-1.1.5" = { - name = "ws"; - packageName = "ws"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; - }; - }; - "x-default-browser-0.3.1" = { - name = "x-default-browser"; - packageName = "x-default-browser"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; - sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; - }; - }; - "xmlbuilder-4.0.0" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; - sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; - }; - }; - "xmldom-0.1.27" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.27"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; - sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "yargs-1.3.3" = { - name = "yargs"; - packageName = "yargs"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; - sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; - }; - }; - "yargs-3.32.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.32.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; - }; - }; - }; -in -{ - coffee-script = nodeEnv.buildNodePackage { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - grunt-cli = nodeEnv.buildNodePackage { - name = "grunt-cli"; - packageName = "grunt-cli"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; - sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; - }; - dependencies = [ - (sources."findup-sync-0.3.0" // { - dependencies = [ - (sources."glob-5.0.15" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - sources."grunt-known-options-1.1.0" - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.1" - ]; - }) - sources."resolve-1.1.7" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The grunt command line interface"; - homepage = "https://github.com/gruntjs/grunt-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - gulp = nodeEnv.buildNodePackage { - name = "gulp"; - packageName = "gulp"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; - }; - dependencies = [ - sources."archy-1.0.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - sources."deprecated-0.0.1" - (sources."gulp-util-3.0.8" // { - dependencies = [ - sources."array-differ-1.0.0" - sources."array-uniq-1.0.3" - sources."beeper-1.1.1" - sources."dateformat-2.2.0" - (sources."fancy-log-1.3.2" // { - dependencies = [ - (sources."ansi-gray-0.1.1" // { - dependencies = [ - sources."ansi-wrap-0.1.0" - ]; - }) - sources."color-support-1.1.3" - sources."time-stamp-1.1.0" - ]; - }) - (sources."gulplog-1.0.0" // { - dependencies = [ - (sources."glogg-1.0.1" // { - dependencies = [ - sources."sparkles-1.0.0" - ]; - }) - ]; - }) - (sources."has-gulplog-0.1.0" // { - dependencies = [ - sources."sparkles-1.0.0" - ]; - }) - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - (sources."lodash.template-3.6.2" // { - dependencies = [ - sources."lodash._basecopy-3.0.1" - sources."lodash._basetostring-3.0.1" - sources."lodash._basevalues-3.0.0" - sources."lodash._isiterateecall-3.0.9" - (sources."lodash.escape-3.2.0" // { - dependencies = [ - sources."lodash._root-3.0.1" - ]; - }) - (sources."lodash.keys-3.1.2" // { - dependencies = [ - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - ]; - }) - sources."lodash.restparam-3.6.1" - sources."lodash.templatesettings-3.1.1" - ]; - }) - (sources."multipipe-0.1.2" // { - dependencies = [ - (sources."duplexer2-0.0.2" // { - dependencies = [ - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - ]; - }) - ]; - }) - sources."object-assign-3.0.0" - sources."replace-ext-0.0.1" - (sources."through2-2.0.3" // { - dependencies = [ - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-0.5.3" // { - dependencies = [ - sources."clone-1.0.3" - sources."clone-stats-0.0.1" - ]; - }) - ]; - }) - sources."interpret-1.1.0" - (sources."liftoff-2.5.0" // { - dependencies = [ - sources."extend-3.0.1" - (sources."findup-sync-2.0.0" // { - dependencies = [ - sources."detect-file-1.0.0" - (sources."is-glob-3.1.0" // { - dependencies = [ - sources."is-extglob-2.1.1" - ]; - }) - (sources."micromatch-3.1.5" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.0" // { - dependencies = [ - sources."arr-flatten-1.1.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."repeat-string-1.6.1" - sources."to-regex-range-2.1.1" - ]; - }) - sources."isobject-3.0.1" - sources."repeat-element-1.1.2" - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - (sources."split-string-3.1.0" // { - dependencies = [ - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."assign-symbols-1.0.0" - sources."is-extendable-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."define-property-1.0.0" // { - dependencies = [ - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - ]; - }) - ]; - }) - (sources."extend-shallow-2.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - (sources."expand-brackets-2.1.4" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - sources."posix-character-classes-0.1.1" - ]; - }) - ]; - }) - (sources."fragment-cache-0.2.1" // { - dependencies = [ - sources."map-cache-0.2.2" - ]; - }) - sources."kind-of-6.0.2" - (sources."nanomatch-1.2.7" // { - dependencies = [ - (sources."is-odd-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."regex-not-1.0.0" - (sources."snapdragon-0.8.1" // { - dependencies = [ - (sources."base-0.11.2" // { - dependencies = [ - (sources."cache-base-1.0.1" // { - dependencies = [ - (sources."collection-visit-1.0.0" // { - dependencies = [ - sources."map-visit-1.0.0" - sources."object-visit-1.0.1" - ]; - }) - sources."get-value-2.0.6" - (sources."has-value-1.0.0" // { - dependencies = [ - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."kind-of-4.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - (sources."set-value-2.0.0" // { - dependencies = [ - sources."is-extendable-0.1.1" - (sources."split-string-3.1.0" // { - dependencies = [ - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."assign-symbols-1.0.0" - sources."is-extendable-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."to-object-path-0.3.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."union-value-1.0.0" // { - dependencies = [ - sources."arr-union-3.1.0" - sources."is-extendable-0.1.1" - sources."set-value-0.4.3" - ]; - }) - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."has-values-0.1.4" - (sources."isobject-2.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."arr-union-3.1.0" - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - (sources."static-extend-0.1.2" // { - dependencies = [ - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."copy-descriptor-0.1.1" - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - sources."component-emitter-1.2.1" - (sources."define-property-1.0.0" // { - dependencies = [ - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - ]; - }) - ]; - }) - sources."isobject-3.0.1" - (sources."mixin-deep-1.3.0" // { - dependencies = [ - sources."for-in-1.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."pascalcase-0.1.1" - ]; - }) - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - sources."map-cache-0.2.2" - sources."source-map-0.5.7" - (sources."source-map-resolve-0.5.1" // { - dependencies = [ - sources."atob-2.0.3" - sources."decode-uri-component-0.2.0" - sources."resolve-url-0.2.1" - sources."source-map-url-0.4.0" - sources."urix-0.1.0" - ]; - }) - (sources."use-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - (sources."lazy-cache-2.0.2" // { - dependencies = [ - (sources."set-getter-0.1.0" // { - dependencies = [ - (sources."to-object-path-0.3.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."to-regex-3.0.1" // { - dependencies = [ - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."resolve-dir-1.0.1" // { - dependencies = [ - (sources."expand-tilde-2.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - ]; - }) - (sources."global-modules-1.0.0" // { - dependencies = [ - (sources."global-prefix-1.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - sources."ini-1.3.5" - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - }) - sources."is-windows-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."fined-1.1.0" // { - dependencies = [ - (sources."expand-tilde-2.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - ]; - }) - (sources."object.defaults-1.1.0" // { - dependencies = [ - sources."array-each-1.0.1" - sources."array-slice-1.1.0" - (sources."for-own-1.0.0" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) - sources."isobject-3.0.1" - ]; - }) - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."parse-filepath-1.0.2" // { - dependencies = [ - (sources."is-absolute-1.0.0" // { - dependencies = [ - (sources."is-relative-1.0.0" // { - dependencies = [ - (sources."is-unc-path-1.0.0" // { - dependencies = [ - sources."unc-path-regex-0.1.2" - ]; - }) - ]; - }) - sources."is-windows-1.0.1" - ]; - }) - sources."map-cache-0.2.2" - (sources."path-root-0.1.1" // { - dependencies = [ - sources."path-root-regex-0.1.2" - ]; - }) - ]; - }) - ]; - }) - sources."flagged-respawn-1.0.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."object.map-1.0.1" // { - dependencies = [ - (sources."for-own-1.0.0" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) - (sources."make-iterator-1.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - sources."rechoir-0.6.2" - (sources."resolve-1.5.0" // { - dependencies = [ - sources."path-parse-1.0.5" - ]; - }) - ]; - }) - sources."minimist-1.2.0" - (sources."orchestrator-0.3.8" // { - dependencies = [ - (sources."end-of-stream-0.1.5" // { - dependencies = [ - (sources."once-1.3.3" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."sequencify-0.0.7" - sources."stream-consume-0.1.0" - ]; - }) - sources."pretty-hrtime-1.0.3" - sources."semver-4.3.6" - (sources."tildify-1.2.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - (sources."v8flags-2.1.1" // { - dependencies = [ - sources."user-home-1.1.1" - ]; - }) - (sources."vinyl-fs-0.3.14" // { - dependencies = [ - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.3" - ]; - }) - (sources."glob-stream-3.1.18" // { - dependencies = [ - (sources."glob-4.5.3" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - (sources."glob2base-0.0.12" // { - dependencies = [ - sources."find-index-0.1.1" - ]; - }) - (sources."minimatch-2.0.10" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - sources."ordered-read-streams-0.1.0" - sources."unique-stream-1.0.0" - ]; - }) - (sources."glob-watcher-0.0.6" // { - dependencies = [ - (sources."gaze-0.5.2" // { - dependencies = [ - (sources."globule-0.1.0" // { - dependencies = [ - (sources."glob-3.1.21" // { - dependencies = [ - sources."graceful-fs-1.2.3" - sources."inherits-1.0.2" - ]; - }) - sources."lodash-1.0.2" - (sources."minimatch-0.2.14" // { - dependencies = [ - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."graceful-fs-3.0.11" // { - dependencies = [ - sources."natives-1.1.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."strip-bom-1.0.0" // { - dependencies = [ - sources."first-chunk-stream-1.0.0" - sources."is-utf8-0.2.1" - ]; - }) - (sources."through2-0.6.5" // { - dependencies = [ - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-0.4.6" // { - dependencies = [ - sources."clone-0.2.0" - sources."clone-stats-0.0.1" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The streaming build system"; - homepage = http://gulpjs.com/; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - node-gyp = nodeEnv.buildNodePackage { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; - sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; - }; - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - sources."graceful-fs-4.1.11" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.1" - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - (sources."request-2.83.0" // { - dependencies = [ - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.3.1" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-5.0.3" // { - dependencies = [ - (sources."ajv-5.5.2" // { - dependencies = [ - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - ]; - }) - sources."har-schema-2.0.0" - ]; - }) - (sources."hawk-6.0.2" // { - dependencies = [ - sources."boom-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."hoek-4.2.0" - sources."sntp-2.1.0" - ]; - }) - (sources."http-signature-1.2.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - sources."rimraf-2.6.2" - sources."semver-5.3.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - sources."inherits-2.0.3" - ]; - }) - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon build tool"; - homepage = "https://github.com/nodejs/node-gyp#readme"; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - node-inspector = nodeEnv.buildNodePackage { - name = "node-inspector"; - packageName = "node-inspector"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz"; - sha1 = "e7851eb973f380543c058db564a9812055eac640"; - }; - dependencies = [ - sources."async-0.9.2" - (sources."biased-opener-0.2.8" // { - dependencies = [ - (sources."browser-launcher2-0.4.6" // { - dependencies = [ - sources."headless-0.1.7" - sources."lodash-2.4.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - (sources."plist-1.2.0" // { - dependencies = [ - sources."base64-js-0.0.8" - sources."util-deprecate-1.0.2" - (sources."xmlbuilder-4.0.0" // { - dependencies = [ - sources."lodash-3.10.1" - ]; - }) - sources."xmldom-0.1.27" - ]; - }) - sources."rimraf-2.2.8" - sources."uid-0.0.2" - (sources."win-detect-browsers-1.0.2" // { - dependencies = [ - sources."after-0.8.2" - sources."xtend-4.0.1" - sources."yargs-1.3.3" - ]; - }) - ]; - }) - sources."minimist-1.2.0" - (sources."x-default-browser-0.3.1" // { - dependencies = [ - (sources."default-browser-id-1.0.4" // { - dependencies = [ - (sources."bplist-parser-0.1.1" // { - dependencies = [ - sources."big-integer-1.6.26" - ]; - }) - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - (sources."normalize-package-data-2.4.0" // { - dependencies = [ - sources."hosted-git-info-2.5.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - (sources."untildify-2.1.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."express-4.16.2" // { - dependencies = [ - (sources."accepts-1.3.4" // { - dependencies = [ - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."negotiator-0.6.1" - ]; - }) - sources."array-flatten-1.1.1" - (sources."body-parser-1.18.2" // { - dependencies = [ - sources."bytes-3.0.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."unpipe-1.0.0" - ]; - }) - ]; - }) - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."depd-1.1.2" - sources."encodeurl-1.0.2" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - (sources."finalhandler-1.1.0" // { - dependencies = [ - sources."unpipe-1.0.0" - ]; - }) - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - (sources."proxy-addr-2.0.2" // { - dependencies = [ - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - ]; - }) - sources."qs-6.5.1" - sources."range-parser-1.2.0" - sources."safe-buffer-5.1.1" - (sources."send-0.16.1" // { - dependencies = [ - sources."destroy-1.0.4" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - ]; - }) - sources."mime-1.4.1" - sources."ms-2.0.0" - ]; - }) - sources."serve-static-1.13.1" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" - (sources."type-is-1.6.15" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - ]; - }) - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - ]; - }) - (sources."glob-5.0.15" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."path-is-absolute-1.0.1" - (sources."rc-1.2.4" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."semver-4.3.6" - (sources."serve-favicon-2.4.5" // { - dependencies = [ - sources."etag-1.8.1" - sources."fresh-0.5.2" - sources."ms-2.0.0" - sources."parseurl-1.3.2" - sources."safe-buffer-5.1.1" - ]; - }) - (sources."strong-data-uri-1.0.4" // { - dependencies = [ - sources."truncate-1.0.5" - ]; - }) - (sources."v8-debug-1.0.1" // { - dependencies = [ - sources."nan-2.8.0" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - sources."detect-libc-1.0.3" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."hoek-2.16.3" - sources."sntp-1.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - (sources."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."semver-5.5.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - }) - ]; - }) - (sources."v8-profiler-5.7.0" // { - dependencies = [ - sources."nan-2.8.0" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - sources."detect-libc-1.0.3" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."hoek-2.16.3" - sources."sntp-1.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - (sources."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."semver-5.5.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - }) - ]; - }) - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - (sources."ws-1.1.5" // { - dependencies = [ - sources."options-0.0.6" - sources."ultron-1.0.2" - ]; - }) - (sources."yargs-3.32.0" // { - dependencies = [ - sources."camelcase-2.1.1" - (sources."cliui-3.2.0" // { - dependencies = [ - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wrap-ansi-2.1.0" - ]; - }) - sources."decamelize-1.2.0" - (sources."os-locale-1.4.0" // { - dependencies = [ - (sources."lcid-1.0.0" // { - dependencies = [ - sources."invert-kv-1.0.0" - ]; - }) - ]; - }) - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - sources."window-size-0.1.4" - sources."y18n-3.2.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; - }; - production = true; - bypassCache = false; - }; - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - dependencies = [ - sources."detect-libc-1.0.3" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."hoek-2.16.3" - sources."sntp-1.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."rc-1.2.4" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - (sources."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - sources."semver-5.5.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = false; - }; - npm = nodeEnv.buildNodePackage { - name = "npm"; - packageName = "npm"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; - sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; - license = "Artistic-2.0"; - }; - production = true; - bypassCache = false; - }; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 90f5fd309d0051afb33c72ba7d022c39ad8a99a8..ebea0df1362dea748f153bfa8f5ece0e148295c8 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -49,6 +49,33 @@ let sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; }; }; + "@types/babel-types-7.0.1" = { + name = "_at_types_slash_babel-types"; + packageName = "@types/babel-types"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz"; + sha512 = "3bsk1lhqbj6zdrzkmzf9yjr2v77nlaqq1rzsjq8n56k8n0fl3fyxpcanxm3h5yqm6zzfi8qdmdxf5hrvrmg3kwbdspii3kb9y9hwiqj"; + }; + }; + "@types/babylon-6.16.2" = { + name = "_at_types_slash_babylon"; + packageName = "@types/babylon"; + version = "6.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz"; + sha512 = "3nps6llkag9z58iv9mkg13c2b35ba57z1dmis7900x1dkd09svfn0haxwcgsp4v9xmnqb95v40h3ki4w3xnv68cajsnfscgm7ip56zq"; + }; + }; + "@types/caseless-0.12.1" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"; + sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n"; + }; + }; "@types/form-data-2.2.1" = { name = "_at_types_slash_form-data"; packageName = "@types/form-data"; @@ -58,31 +85,31 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.5.9" = { + "@types/node-8.9.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.5.9"; + version = "8.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; - sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; + url = "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz"; + sha512 = "0fc7dnkm8mxih1kx7dpxdjp9432wwn2hj9k3rs6ipmyac7x4d73kjxhkinlv9wzmzpxkz8n0cp6zykl8nvb4ksh3gycwhm7mbgw6avm"; }; }; - "@types/node-9.3.0" = { + "@types/node-9.4.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.3.0"; + version = "9.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz"; - sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; + url = "https://registry.npmjs.org/@types/node/-/node-9.4.6.tgz"; + sha512 = "08j600qycq8wmra6zn9jvh2ifnkr90s08rcv3spjqc03mjapfm4bz009cm6xfqd7ipbsm7q6ymxccdnlw4gbyd3lyh21a4npqnjsd89"; }; }; - "@types/request-2.0.13" = { + "@types/request-2.47.0" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.0.13"; + version = "2.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.13.tgz"; - sha512 = "3gbwnwgvm7d4jwixg004j635l89kvd2vll1wkv0rdlz5v8biqwnmgfg67nbj3lccvn4rhbalwpkrgvqz66j0n3d20fs02xyxr0z8x80"; + url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz"; + sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw"; }; }; "@types/tough-cookie-2.3.2" = { @@ -103,13 +130,13 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "@zeit/check-updates-1.0.5" = { + "@zeit/check-updates-1.1.0" = { name = "_at_zeit_slash_check-updates"; packageName = "@zeit/check-updates"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.0.5.tgz"; - sha512 = "3a4h5bdrpjkv8rjvyafqf9b3wnyynzi3gisz92k37c35nvawlicsdv4svwnsxfqvhjhqn3lab6rjmkkivvdijr41vm3r048pp5dm1s0"; + url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.1.0.tgz"; + sha512 = "0pg9y2fssdvfwq19ih2w4fwma8qw3anxlsbqrzncywxl30j65k2bwwlp2djz5brkz27xixcrx9g9gx9blszhbaz0pv5xmghrw33700y"; }; }; "CSSselect-0.4.1" = { @@ -274,13 +301,13 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.3.0" = { + "acorn-5.5.0" = { name = "acorn"; packageName = "acorn"; - version = "5.3.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; - sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.5.0.tgz"; + sha512 = "3zaj6p3hwrmg5i65dg7q0kk9224w6fd404k830k922wn3mn4x95c48zrmgg4n85xigg904syrzbh5nca94aaf4anfjpjm9vbpfgkfba"; }; }; "acorn-dynamic-import-2.0.2" = { @@ -292,6 +319,15 @@ let sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; }; }; + "acorn-dynamic-import-3.0.0" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; + sha512 = "1d15axgran5kql29v8hk39yifs5zcg7rkffakv4nd3k49jpbzxh030nbsh9q31gnw8n3rfmwpmsq7rq9k9sk2p2l14wk2i5kzqramfd"; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -319,6 +355,15 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; + "acorn-node-1.3.0" = { + name = "acorn-node"; + packageName = "acorn-node"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz"; + sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr"; + }; + }; "active-x-obfuscator-0.0.1" = { name = "active-x-obfuscator"; packageName = "active-x-obfuscator"; @@ -382,22 +427,22 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-0.33.0" = { + "addons-linter-0.35.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "0.33.0"; + version = "0.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.33.0.tgz"; - sha1 = "0b2a75a6650e743fe22a34ec7cfd4647fd062efc"; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.35.0.tgz"; + sha1 = "85872cce58983ff339ced297dbff486c02ecd336"; }; }; - "addr-to-ip-port-1.4.2" = { + "addr-to-ip-port-1.4.3" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz"; - sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692"; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.3.tgz"; + sha512 = "0cjsq4lq001pd9nr0j7lc41vxyrf0x9qpaq8d8989n1grjzzbv8vjdq9l607ab8pgfh1qkx0vhgva4wsnfndkb2c955f04jq8dx78gq"; }; }; "address-1.0.3" = { @@ -535,6 +580,15 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; + "ajv-6.2.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz"; + sha1 = "afac295bbaa0152449e522742e4547c1ae9328d2"; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -553,6 +607,24 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; + "ajv-keywords-3.1.0" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz"; + sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be"; + }; + }; + "ajv-merge-patch-3.0.0" = { + name = "ajv-merge-patch"; + packageName = "ajv-merge-patch"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-3.0.0.tgz"; + sha1 = "76f071e391f419fe9fe3fea7e920a1ad824b2b61"; + }; + }; "aliasify-2.1.0" = { name = "aliasify"; packageName = "aliasify"; @@ -922,22 +994,22 @@ let sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; }; }; - "argparse-1.0.4" = { + "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; - version = "1.0.4"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; - sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; }; }; - "argparse-1.0.9" = { + "argparse-1.0.4" = { name = "argparse"; packageName = "argparse"; - version = "1.0.9"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; + sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; "args-3.0.8" = { @@ -1246,13 +1318,13 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "asn1.js-4.9.2" = { + "asn1.js-4.10.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.9.2"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; - sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; }; }; "assert-1.4.1" = { @@ -1318,13 +1390,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.10.1" = { + "ast-types-0.11.2" = { name = "ast-types"; packageName = "ast-types"; - version = "0.10.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz"; - sha512 = "2wjsah372x6rjrrsq3bv915lccq4pjpyk4b0vb7kmc87ab5yjgac4rab0qclh6brhhyv95mbyy1k5sijfyx36676darz57k6gsgx3ji"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.2.tgz"; + sha512 = "1mfcrhzn37ray5i3fizrfm5gr1zijv6k1gy370v62smzd6j8d3irphhma9cs9kij7nwkgh5v60q53bfivpm2sscfxbdms9ywiqakgv8"; }; }; "ast-types-0.9.6" = { @@ -1525,13 +1597,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.187.0" = { + "aws-sdk-2.203.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.187.0"; + version = "2.203.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.187.0.tgz"; - sha1 = "04cb9a333d39c09753bf3ff63ec065b32b00db18"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.203.0.tgz"; + sha1 = "7573c1274a4350bd5d78a6db93c9eeab40940acb"; }; }; "aws-sign-0.2.0" = { @@ -1957,13 +2029,13 @@ let sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; }; }; - "babel-generator-6.26.0" = { + "babel-generator-6.26.1" = { name = "babel-generator"; packageName = "babel-generator"; - version = "6.26.0"; + version = "6.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; - sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; + sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz"; }; }; "babel-helper-builder-react-jsx-6.26.0" = { @@ -2236,13 +2308,13 @@ let sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; - "base64-js-1.2.1" = { + "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; - sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; + sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; "base64-url-1.2.1" = { @@ -2650,13 +2722,13 @@ let sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "blob-to-buffer-1.2.6" = { + "blob-to-buffer-1.2.7" = { name = "blob-to-buffer"; packageName = "blob-to-buffer"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz"; - sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033"; + url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.7.tgz"; + sha512 = "3vjm0x8c1iv48p266p8s61kwfyvi089npgmwb8zf69yyqrwfixxis0rsgsfrzizl22wzmf0azbxsxqb132nx2q8fjjcgqf7bi2kl593"; }; }; "block-stream-0.0.9" = { @@ -2758,15 +2830,6 @@ let sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; }; }; - "body-parser-1.17.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; - sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; - }; - }; "body-parser-1.18.2" = { name = "body-parser"; packageName = "body-parser"; @@ -2938,13 +3001,13 @@ let sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; }; - "brace-expansion-1.1.8" = { + "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.8"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "braces-0.1.5" = { @@ -2965,13 +3028,13 @@ let sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; - "braces-2.3.0" = { + "braces-2.3.1" = { name = "braces"; packageName = "braces"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; - sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; + url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz"; + sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8"; }; }; "broadway-0.3.6" = { @@ -3001,13 +3064,13 @@ let sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "browser-pack-6.0.3" = { + "browser-pack-6.0.4" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.3.tgz"; - sha512 = "3rbr2j80zl8099hjgsqkizp276cg4q60zjkd481fvnj66k8gmm5w0wbvvqdzpsipgaa3xxsypcr3ryjw1sk2vgzr2hw6pzwr5i933r6"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; + sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; }; }; "browser-resolve-1.11.2" = { @@ -3172,13 +3235,13 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.0.8" = { + "buffer-5.1.0" = { name = "buffer"; packageName = "buffer"; - version = "5.0.8"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz"; - sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; "buffer-alloc-unsafe-1.0.0" = { @@ -3505,6 +3568,15 @@ let sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; + "cacache-10.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "10.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; + sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -3676,13 +3748,13 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "camelo-1.1.11" = { - name = "camelo"; - packageName = "camelo"; - version = "1.1.11"; + "camelcase-keys-4.2.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelo/-/camelo-1.1.11.tgz"; - sha512 = "39qf2hdriyb5zn5bc62wgj59whx06nmzij9yylv0mrjnivgpqg2z3ksxl035nn35lnavi1b20qi062l41xah3b3nnbw42dh6b4qk34i"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; + sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; "capture-stack-trace-1.0.0" = { @@ -3838,6 +3910,15 @@ let sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; + "chalk-2.3.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1"; + }; + }; "character-entities-1.2.1" = { name = "character-entities"; packageName = "character-entities"; @@ -3964,13 +4045,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.0" = { + "chokidar-2.0.2" = { name = "chokidar"; packageName = "chokidar"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.0.tgz"; - sha512 = "01y5j8xkkzlzc4yzh4f8gbshbs6i3hb4wlz5nd48xcmm3vmawah9jj052km463v3d2vqx9kbrnxvjw2fkcbdxw0sg33ksclzlvc419s"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz"; + sha512 = "1kncf65ax274b43r63m0bfbap3j5ah7dn86niqwpzzw6ilvpc7yy0fan14k584lw8ycf4nl78n5gv3bpyr4jrk5j3v441ragk1qfzcp"; }; }; "chownr-0.0.2" = { @@ -3991,6 +4072,15 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; + "chrome-trace-event-0.1.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz"; + sha1 = "90f36885d5345a50621332f0717b595883d5d982"; + }; + }; "chromecast-player-0.2.3" = { name = "chromecast-player"; packageName = "chromecast-player"; @@ -4252,13 +4342,13 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipboardy-1.2.2" = { + "clipboardy-1.2.3" = { name = "clipboardy"; packageName = "clipboardy"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.2.tgz"; - sha512 = "2pq14hxz6w4k5yvndrm1fv3iyscdqf5c4nja421gl2661didzh80r08zddd84zny94831qs44biamjhvwmqh40pfy3pjv3vwl2ap8np"; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz"; + sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr"; }; }; "clite-0.3.0" = { @@ -4360,6 +4450,15 @@ let sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; + "clone-buffer-1.0.0" = { + name = "clone-buffer"; + packageName = "clone-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; + }; + }; "clone-deep-0.3.0" = { name = "clone-deep"; packageName = "clone-deep"; @@ -4396,6 +4495,24 @@ let sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; }; }; + "clone-stats-1.0.0" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; + }; + }; + "cloneable-readable-1.0.0" = { + name = "cloneable-readable"; + packageName = "cloneable-readable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz"; + sha1 = "a6290d413f217a61232f95e458ff38418cfb0117"; + }; + }; "cmd-shim-2.0.2" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -4648,13 +4765,13 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.5" = { + "combined-stream-1.0.6" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; "command-join-2.0.0" = { @@ -4738,22 +4855,22 @@ let sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; - "commander-2.12.2" = { + "commander-2.13.0" = { name = "commander"; packageName = "commander"; - version = "2.12.2"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; - sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; + url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; + sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; }; }; - "commander-2.13.0" = { + "commander-2.14.1" = { name = "commander"; packageName = "commander"; - version = "2.13.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; - sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; }; }; "commander-2.6.0" = { @@ -4801,6 +4918,15 @@ let sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; }; }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -4873,13 +4999,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.12" = { + "compressible-2.0.13" = { name = "compressible"; packageName = "compressible"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz"; - sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz"; + sha1 = "0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"; }; }; "compression-1.5.2" = { @@ -4891,13 +5017,13 @@ let sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; }; }; - "compression-1.7.1" = { + "compression-1.7.2" = { name = "compression"; packageName = "compression"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz"; - sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db"; + url = "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; + sha1 = "aaffbcd6aaf854b44ebb280353d5ad1651f59a69"; }; }; "concat-map-0.0.1" = { @@ -5044,13 +5170,13 @@ let sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e"; }; }; - "connect-3.6.5" = { + "connect-3.6.6" = { name = "connect"; packageName = "connect"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz"; - sha1 = "fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; }; }; "connect-busboy-0.0.2" = { @@ -5152,13 +5278,13 @@ let sha1 = "4b945d9937907bcd98ee575122c3817516544141"; }; }; - "constantinople-3.1.0" = { + "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz"; - sha1 = "7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"; + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; + sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9"; }; }; "constants-browserify-1.0.0" = { @@ -5243,85 +5369,85 @@ let sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "conventional-changelog-1.1.7" = { + "conventional-changelog-1.1.17" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.7"; + version = "1.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz"; - sha1 = "9151a62b1d8edb2d82711dabf5b7cf71041f82b1"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.17.tgz"; + sha512 = "325x3h1qn2q1cg3x4dlia7sjanlv2qsj9c0nq8pzvr5fcwmg9qmf3am30bk4c4yjikyvfgpsvnp8rrh937bywd5y4d410hwfn1hbwhn"; }; }; - "conventional-changelog-angular-1.6.0" = { + "conventional-changelog-angular-1.6.6" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "1.6.0"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz"; - sha1 = "0a26a071f2c9fcfcf2b86ba0cfbf6e6301b75bfa"; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz"; + sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j"; }; }; - "conventional-changelog-atom-0.1.2" = { + "conventional-changelog-atom-0.2.4" = { name = "conventional-changelog-atom"; packageName = "conventional-changelog-atom"; - version = "0.1.2"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz"; - sha1 = "12595ad5267a6937c34cf900281b1c65198a4c63"; + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz"; + sha512 = "2b43fd5cpi069hsmfswl320lnpnvahmqmnrc9csk6qv0dq72nfj0jzafmbv5gsb3ds2ssr29lswwky61shy3n9hbxshq0qw3in6ds73"; }; }; - "conventional-changelog-cli-1.3.5" = { + "conventional-changelog-cli-1.3.15" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.5"; + version = "1.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz"; - sha1 = "46c51496216b7406588883defa6fac589e9bb31e"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.15.tgz"; + sha512 = "0b9w7fp4mrgs12s4hznwzp79m9lza4fsygvdyma6qnd53h699jscc7h6jwlhdf398h5rpf91y2x0gl38fxfb9ydicshmvy5qdsgc4yh"; }; }; - "conventional-changelog-codemirror-0.2.1" = { + "conventional-changelog-codemirror-0.3.4" = { name = "conventional-changelog-codemirror"; packageName = "conventional-changelog-codemirror"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz"; - sha1 = "299a4f7147baf350e6c8158fc54954a291c5cc09"; + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz"; + sha512 = "33091h0zm06gdwhcqi5c3xvcjl6fw8cj3wvis9hyl5gix1vl2wd2pifymgp7rag6dbyzilb0g5q3ak29dcsrdzizqzibk8m0hdfkkph"; }; }; - "conventional-changelog-core-1.9.5" = { + "conventional-changelog-core-2.0.5" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "1.9.5"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.5.tgz"; - sha1 = "5db7566dad7c0cb75daf47fbb2976f7bf9928c1d"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz"; + sha512 = "1agyx5rj0lbrky9ndhha25la98lh2h1lyli2r4r27r1p0pr48niwg04al4whnvcldh0592fmyrdgf8vqqp5n6xz3df43j6dkpnnrzcl"; }; }; - "conventional-changelog-ember-0.2.10" = { + "conventional-changelog-ember-0.3.6" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.2.10"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.10.tgz"; - sha512 = "04s2g1mkzbpbklqj81q25j87vxl4ggq0x9n7nyry9771cyawn7007wridq4hnhd4qa5vvz5lnslwvj7aliwi78l3vw2dvlhxrj4241c"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz"; + sha512 = "24dx0snmkfhr4qi7vdq0aywjw9k23x68kaqh0gn92lca7j1268zbzr6vf00izx5g86kkjihlzgsgx8piyy1mnimn9nk7bj8pv2ka4w4"; }; }; - "conventional-changelog-eslint-0.2.1" = { + "conventional-changelog-eslint-1.0.4" = { name = "conventional-changelog-eslint"; packageName = "conventional-changelog-eslint"; - version = "0.2.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz"; - sha1 = "2c2a11beb216f80649ba72834180293b687c0662"; + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.4.tgz"; + sha512 = "3zk9p0rc8xns93flvpc0lnyfqdyv48yc3m2z71da07gj8fbmbrxs0px30xnlqzdwmbcz86i9fksxrcnqq9mhlwcfkwyzma396n4cxpp"; }; }; - "conventional-changelog-express-0.2.1" = { + "conventional-changelog-express-0.3.4" = { name = "conventional-changelog-express"; packageName = "conventional-changelog-express"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz"; - sha1 = "838d9e1e6c9099703b150b9c19aa2d781742bd6c"; + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz"; + sha512 = "3w3pm3dqwn8bj29809j0ivybw8vn2grnz486h9bm4kk9bn4849k9pxiqmx2ifpqf09hdl17fjk1xw320zz33wnvjzx78kbrpmpi9r9k"; }; }; "conventional-changelog-jquery-0.1.0" = { @@ -5342,49 +5468,58 @@ let sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; }; }; - "conventional-changelog-jshint-0.2.1" = { + "conventional-changelog-jshint-0.3.4" = { name = "conventional-changelog-jshint"; packageName = "conventional-changelog-jshint"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz"; - sha1 = "86139bb3ac99899f2b177e9617e09b37d99bcf3a"; + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz"; + sha512 = "0lzbgx3x2bfchxp8p4ppjavnp4yywjks3486yrxanq3skq0x5g4wnbhcf2viwm167mhn3aiawxygsxql5ww8md1xzssdrqb730fmnh9"; }; }; - "conventional-changelog-writer-2.0.3" = { + "conventional-changelog-preset-loader-1.1.6" = { + name = "conventional-changelog-preset-loader"; + packageName = "conventional-changelog-preset-loader"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz"; + sha512 = "12qk33piqbilkyrvin1vsjzp5pcvs7sschn5jry272r1hnv3x0jrwb1dlnik8vpp3zqai6n70h4ls55q2ch5n13a6g25c1hvhzwhqy9"; + }; + }; + "conventional-changelog-writer-3.0.4" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "2.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.3.tgz"; - sha512 = "1nchhqyp5qmrwqn9yxrkn8zjhlk1ph5jgnky26lzkrd1j4lh2n93602xw1zm6gv7qg48r61qzk5qh74v480nx4q7d8zilfb8pnn2kfq"; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz"; + sha512 = "1ryw2mmza9y6bk5hs2ivhvp9p5hq7hhydhis2880w41dajr193zvccwhglp7js7j435d3i2d38i5aikydqg2r4jdc7753w4d22zyiqi"; }; }; - "conventional-commits-filter-1.1.1" = { + "conventional-commits-filter-1.1.5" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.1"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz"; - sha512 = "0jrsm3hlyq0a425d320l1rghxmmb621r0bcvlsfbdichzbyimflwn7wz1mhw62kdnr3wxskdpaq11f5qpdsz5g2d5f7ha4d4jvrl33d"; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz"; + sha512 = "0dw3vksvzwig2hiiw1kky2p424136r2faa941bkcdy3ljhp7mgd9i8pz3vdccw23v51z7vhh1dkw7wg363qxg9kvcxr2lgwp1cgwgcs"; }; }; - "conventional-commits-parser-2.1.0" = { + "conventional-commits-parser-2.1.5" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "2.1.0"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.0.tgz"; - sha512 = "0mnckb77dj8jk9xspzh6q0kaybc5wyb2ny94qgnvbj5f1yjnk7s2sak86b0h3dhrfk4y9nncwfjpvsg8iyiary68sdbwrbl4gkz9h7h"; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz"; + sha512 = "2nb2s8hrbv3sl19xzz9x5pqgmm4kimrsaqlzs8xa2wzr0zg68090xnlq5ifcbmcm47fg5l9m63kkri248idzrvz2y689y3jbbmhz84d"; }; }; - "conventional-recommended-bump-1.1.0" = { + "conventional-recommended-bump-1.2.1" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz"; - sha512 = "3gh833x8hqmnxfmacs3ryrb2gh3y397ddkiwisv6g3dfz6j617i1fm22yq3r83y40pidmf1n77qzvwmbx4ws7jn4yydfxypi6fhgbaq"; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz"; + sha512 = "3irsgzxrhc2s4y4mlq7vmrvrhn74kpda34sn2ladm98q4gy88l7dpqxs8xf6lxm4sai5qqwzxk1gzlrfgvsrmfzzvmxk0hi77lcd650"; }; }; "convert-source-map-1.1.3" = { @@ -5549,6 +5684,15 @@ let sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; }; }; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; + }; + }; "copy-descriptor-0.1.1" = { name = "copy-descriptor"; packageName = "copy-descriptor"; @@ -5657,15 +5801,6 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cors-2.8.3" = { - name = "cors"; - packageName = "cors"; - version = "2.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; - sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; - }; - }; "cors-2.8.4" = { name = "cors"; packageName = "cors"; @@ -5783,13 +5918,13 @@ let sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; }; - "cron-1.2.1" = { + "cron-1.3.0" = { name = "cron"; packageName = "cron"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; - sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; + url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz"; + sha512 = "3iq9zg5plipbybssrb38lhlqdp1p4mbrmvp92zc477z9ck9k90dnxwgssjzb2a572g801q3c75mwy5hmx1ccmiqf5in6ck0k7n8bx1b"; }; }; "cross-spawn-4.0.0" = { @@ -6143,6 +6278,15 @@ let sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; }; }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; "d-1.0.0" = { name = "d"; packageName = "d"; @@ -6269,13 +6413,13 @@ let sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "dat-node-3.5.6" = { + "dat-node-3.5.8" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; - sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; + sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; }; }; "dat-registry-4.0.0" = { @@ -6287,22 +6431,22 @@ let sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; - "dat-secret-storage-4.0.0" = { + "dat-secret-storage-4.0.1" = { name = "dat-secret-storage"; packageName = "dat-secret-storage"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; - sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; }; }; - "dat-storage-1.0.3" = { + "dat-storage-1.0.4" = { name = "dat-storage"; packageName = "dat-storage"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; - sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; "dat-swarm-defaults-1.0.0" = { @@ -6350,15 +6494,6 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "dateformat-1.0.12" = { - name = "dateformat"; - packageName = "dateformat"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; - }; - }; "dateformat-1.0.2-1.2.3" = { name = "dateformat"; packageName = "dateformat"; @@ -6377,6 +6512,15 @@ let sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; + "dateformat-3.0.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; + sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g"; + }; + }; "datland-swarm-defaults-1.0.2" = { name = "datland-swarm-defaults"; packageName = "datland-swarm-defaults"; @@ -6476,24 +6620,6 @@ let sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "debug-2.6.3" = { - name = "debug"; - packageName = "debug"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; - }; - }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -6530,6 +6656,15 @@ let sha512 = "0zc3slyk7cc9xjfcnw3nk2d1vkq4kxrjalavqgp3zykbgnp5v12xcs47kr436k0izbzyxhkrdww94p5g1lcmzcdqncc9p0mqzk6jji2"; }; }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -6647,6 +6782,15 @@ let sha512 = "2sylzgq5rwi12ac5y4fbvyyhs128zlcrp1q1i0bkp27fvlg60hr1slxzckk22x2rzgmwsqqlvzyylm9v0gwzbsbprd3c1mg78c396gp"; }; }; + "deepmerge-2.0.1" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz"; + sha512 = "2qww1m640drvrkcyijaky5kpzdg7pqixb2qk3ms5r99p9ch6isv8a6h0yqwypsw42d1hlg3v7v1x4x7cy0v10pn87cms9vaqa4g10sl"; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -6710,6 +6854,15 @@ let sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; }; }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + }; + }; "defined-0.0.0" = { name = "defined"; packageName = "defined"; @@ -7304,13 +7457,13 @@ let sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; }; }; - "domutils-1.6.2" = { + "domutils-1.7.0" = { name = "domutils"; packageName = "domutils"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"; - sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf"; }; }; "dot-prop-3.0.0" = { @@ -7466,13 +7619,13 @@ let sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; - "editions-1.3.3" = { + "editions-1.3.4" = { name = "editions"; packageName = "editions"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; - sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz"; + sha512 = "196fp42k8j9d8cmi0sqjj6wfqcr7y0c9zcrfv1bcs38ipkn78ivg3xl2f33x3hfiqnyp3gb5y7ndkgqpw433jn5rb43qq37dkxahdl3"; }; }; "editor-1.0.0" = { @@ -7602,24 +7755,6 @@ let sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; }; }; - "emojic-1.1.14" = { - name = "emojic"; - packageName = "emojic"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/emojic/-/emojic-1.1.14.tgz"; - sha512 = "0j0wbbcyvx0qklz7xvqbv2w2n2vqzq5vhyv3jrnsvb775c0zr2bh7m3k7mh0aw6i4rbmgf8x6rw7bfvgzsh5hvlgj01w61xfml89b4z"; - }; - }; - "emojilib-2.2.12" = { - name = "emojilib"; - packageName = "emojilib"; - version = "2.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/emojilib/-/emojilib-2.2.12.tgz"; - sha512 = "2z6nk0nin1cmj81c54pxjyxgpa61d0g61sdn3swykk4j8n8mnba95m1s1cpjcr4wr96jhgyal1z4swd8pcazzp3a50msqir0vj4vcwq"; - }; - }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -7710,13 +7845,13 @@ let sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; }; }; - "engine.io-3.1.4" = { + "engine.io-3.1.5" = { name = "engine.io"; packageName = "engine.io"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; - sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz"; + sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg"; }; }; "engine.io-client-1.3.1" = { @@ -7737,13 +7872,13 @@ let sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; }; }; - "engine.io-client-3.1.4" = { + "engine.io-client-3.1.5" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; - sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.5.tgz"; + sha512 = "3ld2inpqkyy451a7lpf8kmaf76zrj9a50yg28z1d1znhnnj40g3cnrcq93690lknhb6mjv0k1nav2cbqx2p3aqqhmav7kippy0nzzs6"; }; }; "engine.io-parser-1.0.6" = { @@ -7791,6 +7926,15 @@ let sha1 = "0421e339fd71419b3da13d129b3979040230476e"; }; }; + "enhanced-resolve-4.0.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz"; + sha512 = "3r1f41kk9dzckpghscy0q2j6qzmzckbv4mc83y5d4kxg2r458wgsimljpr0ycx6pvg8sjwwdhh8750h1wrl3m54svaqf6pncvmpz34f"; + }; + }; "ensure-posix-path-1.0.2" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -7845,13 +7989,13 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; - "errno-0.1.6" = { + "errno-0.1.7" = { name = "errno"; packageName = "errno"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; - sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; }; }; "error-7.0.2" = { @@ -7908,13 +8052,13 @@ let sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "es5-ext-0.10.38" = { + "es5-ext-0.10.39" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.38"; + version = "0.10.39"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz"; - sha512 = "0m7d1yd67hb93gsxv7790h9ayxg3pwf3vgih9v2kxqvsg073wim7jgwf3z57lksdczxnqv2d8gm4mfk4b29f6rc27a7c09vz9w348wc"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; + sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; }; }; "es5-ext-0.8.2" = { @@ -8097,13 +8241,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "escodegen-1.9.0" = { + "escodegen-1.9.1" = { name = "escodegen"; packageName = "escodegen"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz"; - sha512 = "0il8dp1bh3n1am3xx5pazmpjb5m8wzdn9xg1lgh4j8axvsy8v24i1171c04qafx0j4xsaq76j29ljq2srf4i3kdl3qbrn9psjy1hhxz"; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz"; + sha512 = "3nl4jbvigqc5ax1f35b601vlca4fa4ghr27wfglgrmv7h5pssnkh7px0vjh8wzrkjvx8bw7c71b0axc307akkjd1vkl2nj0acxy657a"; }; }; "escope-3.6.0" = { @@ -8133,13 +8277,13 @@ let sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; }; }; - "eslint-4.16.0" = { + "eslint-4.18.1" = { name = "eslint"; packageName = "eslint"; - version = "4.16.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; - sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz"; + sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40"; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -8169,13 +8313,13 @@ let sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; }; }; - "espree-3.5.2" = { + "espree-3.5.3" = { name = "espree"; packageName = "espree"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz"; - sha512 = "04mnrkdqs32w98h9sfkn9i9zkyqj69sz2q1kxpnmsryjnfd9jrpqqlwrik73a80mdz86xckbr7vayw1dwkxhhnbvs4zciqsiiwlm9xi"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz"; + sha512 = "1cv3w3jgkm5sdaszxn172lhwgwr13w7sw75hmigqppmr9n2xx761r5cm32xhhg25ws8h00iy746qka5l85nm6sx5qci8iyfj00fsbb7"; }; }; "esprima-1.0.4" = { @@ -8232,13 +8376,13 @@ let sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; }; }; - "esrecurse-4.2.0" = { + "esrecurse-4.2.1" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; - sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; }; }; "estraverse-1.9.3" = { @@ -8394,13 +8538,13 @@ let sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; - "eventemitter3-3.0.0" = { + "eventemitter3-3.0.1" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.0.tgz"; - sha512 = "0jijxlrlxb3vf5xqxibisd132qzlh9ag6ckxgvz791d4rqrzvzc2mzzn86jx1bgbsym1wi0pgm017i4rd5m84g1d38n56zqvh5g2r7b"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz"; + sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20"; }; }; "events-1.1.1" = { @@ -8412,6 +8556,15 @@ let sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; + "events-2.0.0" = { + name = "events"; + packageName = "events"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; + sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; + }; + }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -8619,15 +8772,6 @@ let sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; }; }; - "express-4.15.3" = { - name = "express"; - packageName = "express"; - version = "4.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; - }; - }; "express-4.16.2" = { name = "express"; packageName = "express"; @@ -8682,15 +8826,6 @@ let sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; }; }; - "express-session-1.15.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; - sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; - }; - }; "express-session-1.15.6" = { name = "express-session"; packageName = "express-session"; @@ -8808,6 +8943,15 @@ let sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; }; }; + "extract-text-webpack-plugin-3.0.2" = { + name = "extract-text-webpack-plugin"; + packageName = "extract-text-webpack-plugin"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz"; + sha512 = "10rc4hfyzf8n5b30q0fpawnbnr1cs33mmrz9466hhcxjzlz7ys44zbsr5kbvr1jn5nivcr91nmfhpq2mqi1wxmr19zsnimri5kwppvf"; + }; + }; "extract-zip-1.5.0" = { name = "extract-zip"; packageName = "extract-zip"; @@ -8889,13 +9033,13 @@ let sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; }; }; - "fast-deep-equal-1.0.0" = { + "fast-deep-equal-1.1.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; }; }; "fast-diff-1.1.2" = { @@ -8925,6 +9069,15 @@ let sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; + "fast-json-patch-1.2.2" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz"; + sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9"; + }; + }; "fast-json-patch-2.0.6" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -9087,13 +9240,13 @@ let sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; - "filesize-3.5.11" = { + "filesize-3.6.0" = { name = "filesize"; packageName = "filesize"; - version = "3.5.11"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz"; - sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz"; + sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; }; }; "fill-range-2.2.3" = { @@ -9177,6 +9330,15 @@ let sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; + "find-cache-dir-1.0.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; + sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; + }; + }; "find-elm-dependencies-1.0.2" = { name = "find-elm-dependencies"; packageName = "find-elm-dependencies"; @@ -9402,6 +9564,15 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -9420,13 +9591,13 @@ let sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; }; }; - "follow-redirects-1.2.4" = { + "follow-redirects-1.3.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; - sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.3.0.tgz"; + sha1 = "f684871fc116d2e329fda55ef67687f4fabc905c"; }; }; "follow-redirects-1.4.1" = { @@ -9573,13 +9744,13 @@ let sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "form-data-2.3.1" = { + "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; "formidable-1.0.11" = { @@ -9672,15 +9843,6 @@ let sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; }; }; - "fresh-0.5.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; - sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; - }; - }; "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; @@ -9816,6 +9978,15 @@ let sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; }; }; + "fs-write-stream-atomic-1.0.10" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; "fs.extra-1.3.2" = { name = "fs.extra"; packageName = "fs.extra"; @@ -10131,13 +10302,13 @@ let sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; - "git-raw-commits-1.3.0" = { + "git-raw-commits-1.3.4" = { name = "git-raw-commits"; packageName = "git-raw-commits"; - version = "1.3.0"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz"; - sha1 = "0bc8596e90d5ffe736f7f5546bd2d12f73abaac6"; + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz"; + sha512 = "0yfkxk071bahnzw2h5ip6qb7mq76psfwiqs232gkzr91hc55kqw57pjn33j04h3xiwvgrikl20mbccisi006rxyh0lwfvj7bkivwwqv"; }; }; "git-remote-origin-url-2.0.0" = { @@ -10158,13 +10329,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-1.2.3" = { + "git-semver-tags-1.3.4" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.2.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz"; - sha1 = "188b453882bf9d7a23afd31baba537dab7388d5d"; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz"; + sha512 = "0hhdj4992a96ys5i9k6pjbn99wwsabb92drxr0s7vzxyxlpydrvjzbb4rwdnsd0rm7h92420yr2f3khpakkp6ivgg09fp9hhgprkvax"; }; }; "gitconfiglocal-1.0.0" = { @@ -10429,13 +10600,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-11.2.0" = { + "globals-11.3.0" = { name = "globals"; packageName = "globals"; - version = "11.2.0"; + version = "11.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.2.0.tgz"; - sha512 = "0ad39906l0grsfy2953m3c6jkhbwakd89vbqprzz9g0cafvikzfcp5azqch3zm8pmyhc29sbbcfgnays990jvwmq9xgw8vv7m7bnc24"; + url = "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz"; + sha512 = "1vlgbj6gcsd9dshs7xldhg92zd62r3w51jf9x80qnn0y4llbl2ji5sl7ibmv7ysr0iv8hzid151n8zxhyi84rlnczysjhb6v4l5qjlj"; }; }; "globals-9.18.0" = { @@ -10528,13 +10699,13 @@ let sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; - "got-8.0.3" = { + "got-8.2.0" = { name = "got"; packageName = "got"; - version = "8.0.3"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.0.3.tgz"; - sha512 = "2bglci1j77rvr4z2klmnr6d2qfqk0f60nm1myj9m0g2rzh7pd68hzki9nm8f5dpaxqr98ncjbd4rfzw75j35nvsfcyb2i1l9jjailak"; + url = "https://registry.npmjs.org/got/-/got-8.2.0.tgz"; + sha512 = "01g5s6aqp4ikmpwhqvw4j7c4n4fq3v7nqaszr9kvwrx801gxzb70b3qx0pqsir2hqw2a7jfd1ja6v577hmmnblvz7c0h8spkal9s9l2"; }; }; "graceful-fs-1.2.3" = { @@ -10834,6 +11005,15 @@ let sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -10843,13 +11023,13 @@ let sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; - "has-symbol-support-x-1.4.1" = { + "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; - sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; }; }; "has-symbols-1.0.0" = { @@ -11113,13 +11293,13 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-4.2.0" = { + "hoek-4.2.1" = { name = "hoek"; packageName = "hoek"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; "hogan.js-3.0.2" = { @@ -11293,13 +11473,13 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-parser-js-0.4.9" = { + "http-parser-js-0.4.10" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz"; - sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; }; }; "http-proxy-1.0.2" = { @@ -11464,13 +11644,13 @@ let sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; }; }; - "hypercore-6.12.0" = { + "hypercore-6.12.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; - sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz"; + sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6"; }; }; "hypercore-protocol-6.5.2" = { @@ -11482,13 +11662,13 @@ let sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; }; }; - "hyperdrive-9.12.2" = { + "hyperdrive-9.12.3" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.2"; + version = "9.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.2.tgz"; - sha512 = "133iwkp8w88awfxffdjjfxl2wsrj99cdw1p2rvbv65q7mgficva14skid7vsd55r750lrvg0wbmlz0h4m44w6ypd7cvpb4hjvb2f815"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; + sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; }; }; "hyperdrive-http-4.2.2" = { @@ -11500,13 +11680,13 @@ let sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; - "hyperdrive-network-speed-2.0.1" = { + "hyperdrive-network-speed-2.1.0" = { name = "hyperdrive-network-speed"; packageName = "hyperdrive-network-speed"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; - sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; "i-0.3.6" = { @@ -11590,6 +11770,15 @@ let sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + }; "ignore-3.3.7" = { name = "ignore"; packageName = "ignore"; @@ -11932,13 +12121,13 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; - "invariant-2.2.2" = { + "invariant-2.2.3" = { name = "invariant"; packageName = "invariant"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.3.tgz"; + sha512 = "2s1gvqa56gnq2pkh0yy5ch3pb69dkwxr6myw9r3cc1c55xnrpiwzgc90ns4n9lij9slw0aayzm95k3x3rfrv0m7dnikq39hx0ylz7pd"; }; }; "invert-kv-1.0.0" = { @@ -11995,22 +12184,13 @@ let sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; - "ipaddr.js-1.5.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; - }; - }; - "ipaddr.js-1.5.4" = { + "ipaddr.js-1.6.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz"; - sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz"; + sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; }; }; "irc-replies-2.0.1" = { @@ -12247,15 +12427,6 @@ let sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; }; }; - "is-expression-2.1.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz"; - sha1 = "91be9d47debcfef077977e9722be6dcfb4465ef0"; - }; - }; "is-expression-3.0.0" = { name = "is-expression"; packageName = "is-expression"; @@ -12382,13 +12553,22 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; - "is-my-json-valid-2.17.1" = { + "is-my-ip-valid-1.0.0" = { + name = "is-my-ip-valid"; + packageName = "is-my-ip-valid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; + sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42"; + }; + }; + "is-my-json-valid-2.17.2" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.17.1"; + version = "2.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; - sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz"; + sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610"; }; }; "is-negated-glob-1.0.0" = { @@ -12436,6 +12616,15 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; + }; + }; "is-obj-1.0.1" = { name = "is-obj"; packageName = "is-obj"; @@ -12454,13 +12643,13 @@ let sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; }; }; - "is-odd-1.0.0" = { + "is-odd-2.0.0" = { name = "is-odd"; packageName = "is-odd"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; - sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; + url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz"; + sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; }; }; "is-path-cwd-1.0.0" = { @@ -12760,13 +12949,13 @@ let sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; }; }; - "is-windows-1.0.1" = { + "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; }; }; "is-wsl-1.1.0" = { @@ -12895,15 +13084,6 @@ let sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; }; }; - "iterate-object-1.3.2" = { - name = "iterate-object"; - packageName = "iterate-object"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; - sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; - }; - }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -12931,13 +13111,13 @@ let sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "jaeger-client-3.7.0" = { + "jaeger-client-3.9.1" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.7.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.7.0.tgz"; - sha1 = "65ec79e33fc6aaeb5acf36064d08acf4ec47da96"; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.9.1.tgz"; + sha1 = "27a7954cf390e279ba9ad503cfed01ce171b15a1"; }; }; "jed-1.1.1" = { @@ -13048,15 +13228,6 @@ let sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; - "js-yaml-3.8.4" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; - }; - }; "js2xmlparser-1.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -13129,6 +13300,15 @@ let sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; }; }; + "json-merge-patch-0.2.3" = { + name = "json-merge-patch"; + packageName = "json-merge-patch"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-0.2.3.tgz"; + sha1 = "fa2c6b5af87da77bae2966a589d52e23ed81fe40"; + }; + }; "json-parse-better-errors-1.0.1" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; @@ -13273,13 +13453,13 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "jsonata-1.2.6" = { + "jsonata-1.5.0" = { name = "jsonata"; packageName = "jsonata"; - version = "1.2.6"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; - sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a"; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.0.tgz"; + sha512 = "3qb6rsslbqqrl7gna4xl2gsjqf8z5q4imysdp2plnqyr2q43hplwga22di8qv2q9dr1jgd4pgcbsdn23qcg9adsj0ml0b99dg8r7kq5"; }; }; "jsonfile-1.0.1" = { @@ -13895,13 +14075,13 @@ let sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; }; }; - "level-post-1.0.5" = { + "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz"; - sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c"; + url = "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz"; + sha512 = "1xwlwdkqryzw8bd0ywmjnlrcd85c88hrcf8r245377p52cwvgcrjsajg5w8zpx1d236v6043v4c3a29lcbyqmxqmh7apl9lhhdjlrix"; }; }; "level-sublevel-6.6.1" = { @@ -14210,13 +14390,13 @@ let sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; - "lodash-4.17.4" = { + "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; - version = "4.17.4"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; "lodash-4.2.1" = { @@ -14543,13 +14723,22 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "lodash.isfunction-3.0.8" = { + "lodash.isfunction-3.0.9" = { name = "lodash.isfunction"; packageName = "lodash.isfunction"; - version = "3.0.8"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; + sha512 = "0ki8njk33gc8ayf2vmnx2jrfdapwckm7dx2z4zn1ik07hwgwx5zb3fsi9mlamhg6rnj1qlvfwsbg2074x19x8gq60615fbr7lvdfah2"; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz"; - sha1 = "4db709fc81bc4a8fd7127a458a5346c5cdce2c6b"; + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; }; "lodash.isstring-4.0.1" = { @@ -14588,22 +14777,22 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "lodash.merge-4.6.0" = { + "lodash.merge-4.6.1" = { name = "lodash.merge"; packageName = "lodash.merge"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz"; - sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz"; + sha512 = "0lv358i7xyg1hn90fk3xzih5kmj1zlmr759g0hh9fa7npbik629q8h5jd2lvjnrm76ciz92k0yn5z6vcqdbgws1zzsrqzw7ixmk7rh0"; }; }; - "lodash.mergewith-4.6.0" = { + "lodash.mergewith-4.6.1" = { name = "lodash.mergewith"; packageName = "lodash.mergewith"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; - sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz"; + sha512 = "1swsfrcjr7yv5bkxi47mfjyrl5c8d2c8s4m01qpnffgnjnl9mbri6i9ys9gvwq0drsqszzrmq0rlglmc6c17h8a0r22n86qwfpkjv3r"; }; }; "lodash.once-4.1.1" = { @@ -14786,13 +14975,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.5.2" = { + "log4js-2.5.3" = { name = "log4js"; packageName = "log4js"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.5.2.tgz"; - sha512 = "3cr4zy75cf74ajn55xnidbz0m4848yyjyc2zrhlyksjdi0hsp0skwkq8ipgpahwfz1b7zlr9zg1blapz0nsn3h8kmz5w2cz036n2rij"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.5.3.tgz"; + sha512 = "29zsw029b55hq8a7c5hrqwf4ka97sai18wn4vpxhzgg61jisclhcxlfm4m219iz3j3kqfkyb3k76dmwvqm2ivk6b4iavd2q7jjymgv0"; }; }; "loggly-1.1.1" = { @@ -14804,13 +14993,13 @@ let sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; }; }; - "lokijs-1.5.1" = { + "lokijs-1.5.2" = { name = "lokijs"; packageName = "lokijs"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz"; - sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy"; + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.2.tgz"; + sha1 = "75d43df21232f1d5479d191a69b6ebf61754a873"; }; }; "long-2.4.0" = { @@ -14939,15 +15128,6 @@ let sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; - "lru-cache-2.2.4" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; - sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; - }; - }; "lru-cache-2.5.2" = { name = "lru-cache"; packageName = "lru-cache"; @@ -15119,22 +15299,22 @@ let sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; - "make-dir-1.1.0" = { + "make-dir-1.2.0" = { name = "make-dir"; packageName = "make-dir"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; - sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz"; + sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8"; }; }; - "make-error-1.3.2" = { + "make-error-1.3.4" = { name = "make-error"; packageName = "make-error"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz"; - sha512 = "1sw30dxbwvv9pa0871cyshryjqam7d0pl4m1f6zww2r81qv3sgmx5qz7aimhz2xhxlihy9fglnwc1sy7hwfbfwcvg2n4mbrk7gxmnlp"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz"; + sha512 = "3m1bilfa38sjf09x439iz2050vhi5790qcxx11nwr51wygfiazbghxbaqznmhamij5vh6zv83s7kgjx0va77996dmighm2apgjrndnh"; }; }; "make-error-cause-1.2.2" = { @@ -15173,6 +15353,15 @@ let sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; }; }; + "map-obj-2.0.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; + sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + }; + }; "map-stream-0.1.0" = { name = "map-stream"; packageName = "map-stream"; @@ -15200,13 +15389,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "markdown-it-8.4.0" = { + "markdown-it-8.4.1" = { name = "markdown-it"; packageName = "markdown-it"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz"; - sha512 = "0c0jpdfbi4fmqyjc2ilwvinxyc8rn4p9j7fwshh2c00nkc0q2lh6yw2dgragvnpy8bjhcwa1hlfy2ih2ih3np78wrpqx7gf4w48xnxl"; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz"; + sha512 = "3w1l75fip7divhr6q8n1sf0af49ssf9kc4vh8gha0svw5q84c8s8csr0f50qz7n0smx1a8iwfnlj2kbnl9bwmpryqgia5b44d4ylg0b"; }; }; "markdown-it-emoji-1.4.0" = { @@ -15218,13 +15407,13 @@ let sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; }; }; - "markdown-it-github-headings-1.1.0" = { + "markdown-it-github-headings-1.1.1" = { name = "markdown-it-github-headings"; packageName = "markdown-it-github-headings"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.0.tgz"; - sha1 = "d6f73da5276ded956861337189addf3d52b93558"; + url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.1.tgz"; + sha512 = "3cs9xbmjc64jh19ashy00z2hig9q9mvcvnqdm8hkysiidr3fl17zkhypvb5z7dqvklwyycah9s325vwj4gbwr214xc7hrddb2cn2jwc"; }; }; "markdown-it-task-checkbox-1.0.6" = { @@ -15254,13 +15443,13 @@ let sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; }; }; - "marked-0.3.12" = { + "marked-0.3.17" = { name = "marked"; packageName = "marked"; - version = "0.3.12"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz"; - sha512 = "2h8qj30y9n29m3xvbbg777kmxcdx57hf1ir6z3jyn94gj7s0kcz74203y1hazavwh60cfp69zdjv532vxyjc853kx82pvyjxddmm0wk"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; + sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; }; }; "matcher-collection-1.0.5" = { @@ -15398,6 +15587,15 @@ let sha1 = "72cb668b425228290abbfa856892587308a801fb"; }; }; + "meow-4.0.0" = { + name = "meow"; + packageName = "meow"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz"; + sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri"; + }; + }; "merge-1.2.0" = { name = "merge"; packageName = "merge"; @@ -15542,13 +15740,13 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; - "micromatch-3.1.5" = { + "micromatch-3.1.9" = { name = "micromatch"; packageName = "micromatch"; - version = "3.1.5"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz"; - sha512 = "2y22i8yrib7vcgpfcm5sq9g4fh4wxrn0f3z017vdbkvybvywa1axl3kym81k9ad6h3d4jmqkqyahcaj2c5qy5wpa17kvbyhnfn6sjya"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz"; + sha512 = "3vfciram7xbwcwvhii8960vnvf3jczn092sfbfgx1vivk3scvkm9znjnbq2ppywg9h8i86d8vq3ha4c9a3jllaian0gcl7rrgm36lja"; }; }; "miller-rabin-4.0.1" = { @@ -15623,22 +15821,13 @@ let sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; }; - "mime-db-1.30.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; - }; - }; - "mime-db-1.32.0" = { + "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz"; - sha512 = "1bl21q8acya2jj67757518bdy1yhc5d7ybn755wnikwcca3gq5akfg835nj5mp2kmd4f97yyy0qwx662jlwk1rgx7nl9qsd2vzsi5gr"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; "mime-types-2.0.14" = { @@ -15650,13 +15839,13 @@ let sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; }; }; - "mime-types-2.1.17" = { + "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.17"; + version = "2.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; "mimelib-0.3.1" = { @@ -15668,13 +15857,13 @@ let sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; - "mimic-fn-1.1.0" = { + "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; - sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; }; }; "mimic-response-1.0.0" = { @@ -15758,15 +15947,6 @@ let sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; }; }; - "minimatch-3.0.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; - sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; - }; - }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -15821,6 +16001,15 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; + "minimist-options-3.0.2" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; + sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; + }; + }; "minipass-2.2.1" = { name = "minipass"; packageName = "minipass"; @@ -15848,13 +16037,22 @@ let sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; - "mixin-deep-1.3.0" = { + "mississippi-2.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; + sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; + }; + }; + "mixin-deep-1.3.1" = { name = "mixin-deep"; packageName = "mixin-deep"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; - sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; }; }; "mixin-object-2.0.1" = { @@ -15956,13 +16154,13 @@ let sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; - "module-deps-5.0.1" = { + "module-deps-6.0.0" = { name = "module-deps"; packageName = "module-deps"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-5.0.1.tgz"; - sha512 = "0jc7ysgbhwbj17j14vcl7aa6pn7pcp5bas2d5lb53rq3l7xkcxgvjqgrc9l4xvdhy2sdwyj1s9nssn7fhwhrdb841wycbxz37z2la5j"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; + sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; }; }; "moment-2.1.0" = { @@ -15992,15 +16190,6 @@ let sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; - "moment-2.18.1" = { - name = "moment"; - packageName = "moment"; - version = "2.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; - }; - }; "moment-2.20.1" = { name = "moment"; packageName = "moment"; @@ -16082,6 +16271,15 @@ let sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; }; }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; "mpath-0.1.1" = { name = "mpath"; packageName = "mpath"; @@ -16100,22 +16298,22 @@ let sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }; }; - "mqtt-2.9.0" = { + "mqtt-2.15.1" = { name = "mqtt"; packageName = "mqtt"; - version = "2.9.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; - sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.15.1.tgz"; + sha512 = "13ycishr81p39yimwf97c4p9pwhg8a0k2hfmfhkcrpy4yshilfb9rr197fr0r27kniqnbzcfsa19pyvgnkrq24zb4kdiafgrw8kbif1"; }; }; - "mqtt-packet-5.4.0" = { + "mqtt-packet-5.5.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; - sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.5.0.tgz"; + sha512 = "3wbymw2jfhqw0z4zcasxy5njy5ynwrbfq1vkrb2pwwx28mkrywlj2mq4bykrgjgq09v6a5carizhcl6h1kbcvmn902kbbpxxb1r87wi"; }; }; "mri-1.1.0" = { @@ -16199,13 +16397,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.0" = { + "ms-rest-2.3.1" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.0.tgz"; - sha512 = "2dfmfxr3xagmds2agz7g6rnj1s9lh29fgfwxbqsfpkkabh3qhcc7sznkaviilpzr59fks1401wy6sh9xyy3wsaqbm975vm5b2bj6cwf"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.1.tgz"; + sha512 = "34xikyld48lq65i6ngn4wf8gsnn2lllbd7fray2rsxihkz6azm7zsqs2fm9ng566fdy6mf6qj41lvvyl2xih7d5a074rkhxpwdf1w1m"; }; }; "ms-rest-azure-1.15.7" = { @@ -16217,13 +16415,13 @@ let sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; - "ms-rest-azure-2.5.0" = { + "ms-rest-azure-2.5.4" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.5.0"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.0.tgz"; - sha512 = "22v7h9wa04laz1v40rq0wx3az880flfhz6xzjgk5pny3674kar5c0vj0ww1rjbsi891j9hvxvk9v51dykivirfjh5srqrjfmswzk3fw"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.4.tgz"; + sha512 = "049vfg1l6jfzdn82m5shchi6zzlfk81csihlalwj1mm96j0dykbx885sbjyv3wr0iqwjwzp4i1x2kv750xvzvyljfqrlnh1kfhrq32b"; }; }; "msgpack-1.0.2" = { @@ -16271,13 +16469,13 @@ let sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; }; }; - "multicast-dns-6.2.2" = { + "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; - sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -16505,13 +16703,13 @@ let sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; - "nan-2.8.0" = { + "nan-2.9.2" = { name = "nan"; packageName = "nan"; - version = "2.8.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; + sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; }; }; "nanoassert-1.1.0" = { @@ -16532,22 +16730,22 @@ let sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; }; }; - "nanoid-1.0.1" = { + "nanoid-1.0.2" = { name = "nanoid"; packageName = "nanoid"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.1.tgz"; - sha512 = "3dh8fdgynnii8rgdpyk69z99y49bnl60244wsaw8mk2lzhfhczgf7nxgmm0qakmgzbvqqqfngq03z3j8hp70smh7ka0il806w7ajxh5"; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.2.tgz"; + sha512 = "2bzl500sgpk3i3ird4iviglsj0gj9a0qhmj4hnky3xmxbl4ahamjhi96rslr8k65j77glmw771m3jm7r5sr5akw6ip5glmxvqkg095h"; }; }; - "nanomatch-1.2.7" = { + "nanomatch-1.2.9" = { name = "nanomatch"; packageName = "nanomatch"; - version = "1.2.7"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz"; - sha512 = "2m4xaq739s2r5bvh287d8zm8af9mxa706z1a7ila48yhvkspi4iimwyg0id1cl327i7kqssrcnc2nwdc2qw8s83xwqg3bmfgjr5v6gz"; + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz"; + sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z"; }; }; "nanotiming-1.0.1" = { @@ -16743,13 +16941,13 @@ let sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "needle-2.1.1" = { + "needle-2.2.0" = { name = "needle"; packageName = "needle"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.1.1.tgz"; - sha1 = "f3d501d633e661d34cd9648ca6c42f782a44d071"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; + sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; }; }; "negotiator-0.3.0" = { @@ -16789,6 +16987,15 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; + "neo-async-2.5.0" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz"; + sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw"; + }; + }; "nested-error-stacks-1.0.2" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -16888,13 +17095,13 @@ let sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; }; }; - "node-abi-2.1.2" = { + "node-abi-2.3.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.1.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; - sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz"; + sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg"; }; }; "node-alias-1.0.4" = { @@ -16960,13 +17167,13 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "node-forge-0.7.1" = { + "node-forge-0.7.2" = { name = "node-forge"; packageName = "node-forge"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz"; - sha1 = "9da611ea08982f4b94206b3beb4cc9665f20c300"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.2.tgz"; + sha512 = "2kc6a8y2fmpsmiddh9vkiy32kg6isg3igpfgpkvvkw48y5x2n3wwrxsi7zcjyxf2yakjygvim3gy74c077lrc0cm60f388diw2nhc2x"; }; }; "node-gyp-build-3.2.2" = { @@ -17050,13 +17257,13 @@ let sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; }; }; - "node-red-node-rbe-0.1.14" = { + "node-red-node-rbe-0.2.1" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.14"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.14.tgz"; - sha512 = "2xixj71payi14frjkb30lhnripprfcxzqaa9cbwh7w21s426y452ns0vpaycnbsbfwfcn5gcs4b2fjh0b6rxnbasd9hijqf6h3v26wa"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.1.tgz"; + sha512 = "3s12a0r8a6nzfqk1a1v1k5drczf4qpnia460l3rq4bixnl0k0fahc1hh4cqcw9rlzc59cz3p4dv19ixrwf2wc6nxixsyqz417li68wb"; }; }; "node-red-node-twitter-0.1.12" = { @@ -17410,15 +17617,6 @@ let sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; }; - "npm-registry-client-8.4.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; - sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx"; - }; - }; "npm-registry-client-8.5.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -17591,13 +17789,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "oauth2orize-1.8.0" = { + "oauth2orize-1.11.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.8.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; - sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.0.tgz"; + sha1 = "793cef251d45ebdeac32ae40a8b6814faab1d483"; }; }; "object-assign-1.0.0" = { @@ -17942,15 +18140,6 @@ let sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; - "opn-5.1.0" = { - name = "opn"; - packageName = "opn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz"; - sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; - }; - }; "opn-5.2.0" = { name = "opn"; packageName = "opn"; @@ -18032,13 +18221,13 @@ let sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; - "ora-1.3.0" = { + "ora-1.4.0" = { name = "ora"; packageName = "ora"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; - sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; + url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; }; }; "orchestrator-0.3.8" = { @@ -18167,13 +18356,13 @@ let sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "osenv-0.1.4" = { + "osenv-0.1.5" = { name = "osenv"; packageName = "osenv"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "osx-release-1.1.0" = { @@ -18356,6 +18545,15 @@ let sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; }; }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; "param-case-2.1.1" = { name = "param-case"; packageName = "param-case"; @@ -18599,15 +18797,6 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; - "passport-0.3.2" = { - name = "passport"; - packageName = "passport"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; - sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; - }; - }; "passport-0.4.0" = { name = "passport"; packageName = "passport"; @@ -19068,6 +19257,15 @@ let sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; }; }; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -19104,13 +19302,13 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "playerui-1.2.0" = { + "playerui-1.3.0" = { name = "playerui"; packageName = "playerui"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; - sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812"; + url = "https://registry.npmjs.org/playerui/-/playerui-1.3.0.tgz"; + sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; "please-upgrade-node-3.0.1" = { @@ -19266,13 +19464,13 @@ let sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; }; }; - "postcss-6.0.16" = { + "postcss-6.0.19" = { name = "postcss"; packageName = "postcss"; - version = "6.0.16"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz"; - sha512 = "2h2vfl4i770c41s6zy98za52jq23a0l5976rgh8x911znh1xsv8pcwvwnck8m1yrxfvpxnihs0myv9rsinwhck3zx3k2jp6cd2prglv"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; + sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; "prebuild-install-2.1.2" = { @@ -19419,6 +19617,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + }; + }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -19491,6 +19698,15 @@ let sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23"; }; }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; "promise-phantom-3.1.6" = { name = "promise-phantom"; packageName = "promise-phantom"; @@ -19536,13 +19752,13 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "prop-types-15.6.0" = { + "prop-types-15.6.1" = { name = "prop-types"; packageName = "prop-types"; - version = "15.6.0"; + version = "15.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz"; - sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz"; + sha512 = "28vp2j7wpa97ygi4clflilfs8wj8qsz1x3fismsqx293a9cvpyc20k4pbrppyn7y6hks0dp3mn0wmj5q3y1y3i5k7ra5ssqimnkprz1"; }; }; "properties-1.2.1" = { @@ -19617,13 +19833,13 @@ let sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "proxy-addr-2.0.2" = { + "proxy-addr-2.0.3" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; - sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz"; + sha512 = "1fjf093wrxz3nm9njw491r9rvqwrcv8d8h0mnmyakpijnbff7lllysr7aq9h9w7jdvxjvaf9r055ywd7sghcqxwa2nfpdc9423c414d"; }; }; "proxy-agent-2.0.0" = { @@ -19833,13 +20049,13 @@ let sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; }; }; - "pull-level-2.0.3" = { + "pull-level-2.0.4" = { name = "pull-level"; packageName = "pull-level"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz"; - sha1 = "9500635e257945d6feede185f5d7a24773455b17"; + url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz"; + sha512 = "1k9a17my3m2zkz7g8hynxswrqks679vih7vd97qz5ky16x4kkms4ysxxzs5744kfzwwxg9p14xgnx8vs6kc15wjmdlkhlfy62bajvkx"; }; }; "pull-live-1.0.1" = { @@ -19851,22 +20067,22 @@ let sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; - "pull-pushable-2.1.2" = { + "pull-pushable-2.2.0" = { name = "pull-pushable"; packageName = "pull-pushable"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.2.tgz"; - sha1 = "3fe15b8f7eec89f3972d238bc04890c9405a6dbb"; + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz"; + sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; - "pull-stream-3.6.1" = { + "pull-stream-3.6.2" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.1.tgz"; - sha1 = "c5c2ae4a51246efeebcc65c0412a3d725a92ce00"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.2.tgz"; + sha1 = "1ea14c6f13174e6ac4def0c2a4e76567b7cb0c5c"; }; }; "pull-window-2.1.4" = { @@ -19995,13 +20211,13 @@ let sha1 = "11f9e8fa8890fe7cb99210c0f44d0613b7372cac"; }; }; - "qjobs-1.1.5" = { + "qjobs-1.2.0" = { name = "qjobs"; packageName = "qjobs"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"; - sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; + url = "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"; + sha512 = "0g8mmxjq1gn92mf9gzpf2469xwrisbg2vdlxg3bnq18gqlviy2s7l7wi99wmbz5kvbb9yn0wxbi9r83f4jchhzivn0299vigc88k0zi"; }; }; "qs-0.4.2" = { @@ -20148,13 +20364,13 @@ let sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "query-string-5.0.1" = { + "query-string-5.1.0" = { name = "query-string"; packageName = "query-string"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; - sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.0.tgz"; + sha512 = "04m33y2wlmhz19y109cv7l537bdagzl15jv3y0jc3mb7wrw3jpz15pws8m7pbfbqv9nwad46cg3c4cd620f27mwzs1hml2q373y8w0p"; }; }; "querystring-0.2.0" = { @@ -20184,13 +20400,13 @@ let sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; }; }; - "r-json-1.2.8" = { - name = "r-json"; - packageName = "r-json"; - version = "1.2.8"; + "quick-lru-1.1.0" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/r-json/-/r-json-1.2.8.tgz"; - sha1 = "7440560cc1edf00b9d8d94fa30bcad7dde94eae2"; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; + sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; }; }; "rai-0.1.12" = { @@ -20211,6 +20427,15 @@ let sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; }; }; + "random-access-file-2.0.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; + }; + }; "random-access-memory-2.4.0" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -20220,6 +20445,15 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; + "random-access-storage-1.1.1" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; + sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + }; + }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -20256,13 +20490,13 @@ let sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; - "randomfill-1.0.3" = { + "randomfill-1.0.4" = { name = "randomfill"; packageName = "randomfill"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz"; - sha512 = "08l7hdx65kfxli7g9pcnlv84bdrccj7d267d1kfi93db6a4mihwyhvsipmx2n0yk9z45cs21isgpld6rib5saxg28s2g8nn3ap8dgk0"; + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; }; }; "range-parser-0.0.4" = { @@ -20337,15 +20571,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "raw-body-2.2.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; - sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; - }; - }; "raw-body-2.3.2" = { name = "raw-body"; packageName = "raw-body"; @@ -20373,13 +20598,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.4" = { + "rc-1.2.5" = { name = "rc"; packageName = "rc"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; - sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; + sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; }; }; "rc-config-loader-2.0.1" = { @@ -20490,6 +20715,15 @@ let sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; }; }; + "read-pkg-up-3.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + }; + }; "read-torrent-1.3.0" = { name = "read-torrent"; packageName = "read-torrent"; @@ -20535,13 +20769,13 @@ let sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "readable-stream-2.3.3" = { + "readable-stream-2.3.4" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; + sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; }; }; "readdirp-2.1.0" = { @@ -20589,13 +20823,22 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "recursive-watch-1.1.2" = { + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + }; + }; + "recursive-watch-1.1.3" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; - sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; + sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; }; }; "redent-1.0.0" = { @@ -20607,6 +20850,15 @@ let sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; + "redent-2.0.0" = { + name = "redent"; + packageName = "redent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; + sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + }; + }; "redis-0.10.3" = { name = "redis"; packageName = "redis"; @@ -20643,13 +20895,13 @@ let sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; }; }; - "redis-commands-1.3.1" = { + "redis-commands-1.3.4" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz"; - sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b"; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.4.tgz"; + sha512 = "2xl6insq71fz02pxvdcqj9q06la7nj0g5idl66yp5x7741k6xah4slrslq8wfil0fa9lx68cgl2rvzy08p1bgp7jyvjbinc8r13df25"; }; }; "redis-parser-2.6.0" = { @@ -20706,31 +20958,22 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; - "regex-escape-3.4.8" = { - name = "regex-escape"; - packageName = "regex-escape"; - version = "3.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; - sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; - }; - }; - "regex-not-1.0.0" = { + "regex-not-1.0.2" = { name = "regex-not"; packageName = "regex-not"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; - sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; - "registry-auth-token-3.3.1" = { + "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; }; }; "registry-url-3.1.0" = { @@ -20877,6 +21120,15 @@ let sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; }; }; + "replace-ext-1.0.0" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; + }; + }; "request-2.16.6" = { name = "request"; packageName = "request"; @@ -21147,6 +21399,15 @@ let sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; }; }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + }; + }; "retry-0.10.1" = { name = "retry"; packageName = "retry"; @@ -21318,13 +21579,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "run-parallel-1.1.6" = { + "run-parallel-1.1.7" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.6"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz"; + sha512 = "322cb6n7h8761gprij4m1z52rizyzvxwviima893gphrbrxkhjv6q4ifwspd0w9jhlk7jj0x64449aagms18v7ps6hr774ymvavh7lw"; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz"; - sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; "run-series-1.1.4" = { @@ -21336,13 +21606,13 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "rusha-0.8.12" = { + "rusha-0.8.13" = { name = "rusha"; packageName = "rusha"; - version = "0.8.12"; + version = "0.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; - sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; + sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; "rx-2.5.3" = { @@ -21426,22 +21696,31 @@ let sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; }; }; - "safe-json-stringify-1.0.4" = { + "safe-json-stringify-1.1.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; - sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz"; + sha512 = "30fqwpa7qn9rsk4va9ih61jqhm0x59s3wa2n5kff1ygdwpi9hxmpig24y1vhdv1di2pfd6gy0iwkryix6lc5gff7pcb3xa7l58nsc0k"; }; }; - "sanitize-html-1.17.0" = { + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "sanitize-html-1.18.2" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.17.0"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.17.0.tgz"; - sha512 = "1gnj506vfw53kv0d0y0v2cg4694lyq7fbcbpjllzmls3z3b8pdrh40nw3pp70bfs851c8sklh3f4zifaznd02jkbn62z089x7kbmgg6"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz"; + sha512 = "2kbz3x78dradp1xaddz60iakax4cj1rqgdxhjj5ljfgwm17kjc5pvr1kh2lyqrbxxmcx9kbfv8pa68af126v5clprks11vvwq1y2r77"; }; }; "sax-0.3.5" = { @@ -21507,6 +21786,24 @@ let sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; + "schema-utils-0.3.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz"; + sha1 = "f5877222ce3e931edae039f17eb3716e7137f8cf"; + }; + }; + "schema-utils-0.4.5" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz"; + sha512 = "1y97jl7qm7xvd867cghrgfzrlyf5z05rvwpigvi4ijzy4c8ckqr0bl76ym5nh6akiyc2qb19kbnmmk1r8nkfm4fsp4lznnpsipy72n9"; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -21696,15 +21993,6 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "send-0.15.3" = { - name = "send"; - packageName = "send"; - version = "0.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; - }; - }; "send-0.15.6" = { name = "send"; packageName = "send"; @@ -21723,6 +22011,15 @@ let sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; }; }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + }; + }; "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; @@ -21750,6 +22047,15 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; + "serialize-javascript-1.4.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz"; + sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005"; + }; + }; "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -21795,15 +22101,6 @@ let sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; }; }; - "serve-static-1.12.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; - }; - }; "serve-static-1.12.6" = { name = "serve-static"; packageName = "serve-static"; @@ -21822,6 +22119,15 @@ let sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; }; }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + }; + }; "serve-static-1.8.1" = { name = "serve-static"; packageName = "serve-static"; @@ -21840,13 +22146,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.5.0" = { + "service-runner-2.5.1" = { name = "service-runner"; packageName = "service-runner"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.0.tgz"; - sha1 = "78b347542c5c6ad2f31e78a10533045fc6414c1f"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.1.tgz"; + sha1 = "b282214463187607748aa3695023a09f5d28c672"; }; }; "set-blocking-2.0.0" = { @@ -22011,13 +22317,13 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.0" = { + "shelljs-0.8.1" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.0.tgz"; - sha512 = "0z8im8zw5g4r44mf2iiy61kxi5idq41b4cs6d4c3lv9shh8ag2gnp25kvwawg899bczvh9g95b07gcpabik39md8q2vmnwcjjizdgn1"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; + sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; }; }; "shellwords-0.1.1" = { @@ -22110,13 +22416,13 @@ let sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; }; }; - "simple-git-1.89.0" = { + "simple-git-1.91.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz"; - sha1 = "ef52fe734d5060566ce187b2bbace36c2323e34c"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.91.0.tgz"; + sha1 = "842db6c2ba08328e93c17391a895b850518cd13a"; }; }; "simple-lru-cache-0.0.2" = { @@ -22425,13 +22731,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.69.3" = { + "snyk-1.69.10" = { name = "snyk"; packageName = "snyk"; - version = "1.69.3"; + version = "1.69.10"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.69.3.tgz"; - sha1 = "c948a05982b206002a09d4e55fb16aee6d5e80e0"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.69.10.tgz"; + sha1 = "34c66b21791435dd17fa2955904a5fdd6b57415d"; }; }; "snyk-config-1.0.1" = { @@ -22497,31 +22803,22 @@ let sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi"; }; }; - "snyk-policy-1.10.1" = { + "snyk-policy-1.10.2" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.1.tgz"; - sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz"; + sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; }; }; - "snyk-python-plugin-1.5.3" = { + "snyk-python-plugin-1.5.6" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.3.tgz"; - sha512 = "1yln7fd9x5zayvnq5hrvh44k9f37vnpirvw6gk87aq560kslsq4p2hknq02iq6az58wbc6r69g5rrszmv689c0ky3wjbmb2hmc9q7c1"; - }; - }; - "snyk-recursive-readdir-2.0.0" = { - name = "snyk-recursive-readdir"; - packageName = "snyk-recursive-readdir"; - version = "2.0.0"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; - sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.6.tgz"; + sha512 = "1iv7h9k0vj7g2zzx8nzighx84q70kwvl4hhzd4fzxmc8vv06ymwwn4v7cirgbksqrjf9z1bfxq8id308ifb1flyas7blz8zs7xf4w30"; }; }; "snyk-resolve-1.0.0" = { @@ -22542,13 +22839,13 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; - "snyk-sbt-plugin-1.2.2" = { + "snyk-sbt-plugin-1.2.4" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.2.tgz"; - sha512 = "1sq30kk2kq0flsak5759wylylzgm6ivd6di4lmbkahy858i26yf6kf86f2m86wvlz4fcmxsbcl7p0wkd498cx193v4nbr2hq39jyjlz"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.4.tgz"; + sha512 = "3fry8q6f0nrcrzs67zjxkgabb0hinyn5zy1kxq8wf9ca1r0fs67mk4ybiy4fxjy8rwj2axbhhhc3lf5wi97m3amh9k70pakg08yq7q4"; }; }; "snyk-tree-1.0.0" = { @@ -22695,13 +22992,13 @@ let sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; - "socket.io-parser-3.1.2" = { + "socket.io-parser-3.1.3" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; - sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz"; + sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3"; }; }; "socks-1.1.10" = { @@ -22947,13 +23244,13 @@ let sha512 = "276x5a16yv0nlzjdvspsnbkxqhv8lvfj7a0sfzkaasfcwa2rm1ni3h3c0fva63bfqnazbywvs4pzrnbwg43j7gpymjd9cbbndq5x4qi"; }; }; - "source-map-support-0.5.2" = { + "source-map-support-0.5.3" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.2.tgz"; - sha512 = "3hgzhp5z7w8w0sadaa0m7sspd2ihnba3j1rd7l53l1mvx4wjblrbjq2642zz0xxkv4bag4hs4pms7dz5rc8hk5d61d49h6hjrwxqcgp"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz"; + sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; }; }; "source-map-url-0.4.0" = { @@ -23001,31 +23298,40 @@ let sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; - "spdx-correct-1.0.2" = { + "spdx-correct-3.0.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "1.0.2"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; + sha512 = "3xgkqk4hsm4nzvy68icv1rlv4s0qgb7mwpi9s4z2mp1a5fwny6kc6m4nqa7zzx2k7mrjlh7psci9lb7892bl3q4r4y2f4sw7vvnhprp"; + }; + }; + "spdx-exceptions-2.1.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; + sha512 = "057m2ab3y8j38xb89w7d191hfaa693vbf7wnwkf302zicsgi2v5ayvcc4f03vyj4yyycqasqp3ryp2d3q0vcaq54r4ls2g5dar4vbg0"; }; }; - "spdx-expression-parse-1.0.4" = { + "spdx-expression-parse-3.0.0" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "1.0.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; }; }; - "spdx-license-ids-1.2.2" = { + "spdx-license-ids-3.0.0" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "1.2.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; + sha512 = "066gb8vcffv2mf3lbmxvxp5b60jviw32x52n50l3zgl9z4cgwg74ca4kr4y5c3mss736bmg9nxl1lvprishbikqy0jy56770v10zqfv"; }; }; "spdy-1.32.5" = { @@ -23199,6 +23505,15 @@ let sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; }; }; + "ssri-5.2.4" = { + name = "ssri"; + packageName = "ssri"; + version = "5.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz"; + sha512 = "2si1dr4dwg0bkvsn38d6rk5raw5lbn2m9giwf8pnhy55wqgxsvv7b1pn252wj166cd8j302a2gwjy00ni473yr1vrxrzmssqs000waj"; + }; + }; "stable-0.1.6" = { name = "stable"; packageName = "stable"; @@ -23334,13 +23649,13 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "stream-consume-0.1.0" = { + "stream-consume-0.1.1" = { name = "stream-consume"; packageName = "stream-consume"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; - sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; + url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz"; + sha512 = "3553srgw60szs493rx8nyy09lcjkw3bh16c2b5z30jcf9h95r4hdiqjk31r9190w47av8dg4zx60fnnvqanv95hbpxl7314723vgmml"; }; }; "stream-counter-0.2.0" = { @@ -23766,6 +24081,15 @@ let sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; + "strip-indent-2.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + }; "strip-json-comments-0.1.3" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -23793,13 +24117,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strong-data-uri-1.0.4" = { + "strong-data-uri-1.0.5" = { name = "strong-data-uri"; packageName = "strong-data-uri"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; - sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; + url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.5.tgz"; + sha512 = "2mwdm0k873sdi2bramixwg6fafqyi2313scq32fsnq2qa5hqbpdln34rc9a67wd15mi05v3c6bfiw6r4h7dy4aac1q3ac8b2ig6j96n"; }; }; "strong-log-transformer-1.0.6" = { @@ -23928,13 +24252,13 @@ let sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; }; }; - "supports-color-5.1.0" = { + "supports-color-5.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; - sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz"; + sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp"; }; }; "symbol-observable-1.0.1" = { @@ -23955,13 +24279,13 @@ let sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; }; }; - "syntax-error-1.3.0" = { + "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; - sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; }; }; "table-3.8.3" = { @@ -23973,13 +24297,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.2" = { + "table-4.0.3" = { name = "table"; packageName = "table"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; - sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; + url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; + sha512 = "0m684sf5sicq9hlavaw7wrm8d10p2vm1cvvrxgl7f2rpqbn5cm6hhsbzb0is6r1bm19p7960dwxif6lc48bz712kx27s176hhafgfjb"; }; }; "tabtab-1.3.2" = { @@ -24028,6 +24352,15 @@ let sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; }; }; + "tapable-1.0.0" = { + name = "tapable"; + packageName = "tapable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz"; + sha512 = "2r08r7ymr8jvw7f1vamajcm9na9fscx6qiby1l3c99ndk1x50v0k3x6lhqmysk9bwczdl8kr2908lfvi6j5mfz0dam7cii4sin6213m"; + }; + }; "tape-2.3.3" = { name = "tape"; packageName = "tape"; @@ -24064,13 +24397,13 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.3.0" = { + "tar-4.4.0" = { name = "tar"; packageName = "tar"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.3.0.tgz"; - sha512 = "1844acixnz54bqf6q85avzdgq39i30d6gridz084iff0f3fh670wag8gs72k8dhbvmhxs2czlax99bfwypyfxbhrq3w80xb2kl5gbjd"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz"; + sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0"; }; }; "tar-fs-1.16.0" = { @@ -24226,13 +24559,13 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thriftrw-3.11.1" = { + "thriftrw-3.11.2" = { name = "thriftrw"; packageName = "thriftrw"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz"; - sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc"; + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz"; + sha512 = "2cll36ns03xrjz6y3116ca9hgnqsi384k6mcyk8xpl81znx0lkwkz7iwyhprc0rm1ry6mrlwpdrnh38sfqvm95hd7ila270a71ah86y"; }; }; "throat-3.2.0" = { @@ -24415,13 +24748,13 @@ let sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; }; }; - "tiny-lr-1.1.0" = { + "tiny-lr-1.1.1" = { name = "tiny-lr"; packageName = "tiny-lr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.0.tgz"; - sha512 = "06rjm9vpcs6h1890gzzj8pbn5k70724dz61qnk2fjwgiva4klx9zzwds5iidlgc31p7q41x6qz81pbbh116ap3jznqw07camvqzm1bz"; + url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"; + sha512 = "2w2806fq55jn2vd74qn5ryir4j6nbfycd8c2w030fckrwvlif6iiy5ranmsdlyqgcrs87x4zxwnlmwrz6dzn41l7861lsbcgc1s3373"; }; }; "tinycolor-0.0.1" = { @@ -24550,13 +24883,13 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; - "to-regex-3.0.1" = { + "to-regex-3.0.2" = { name = "to-regex"; packageName = "to-regex"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; - sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; }; }; "to-regex-range-2.1.1" = { @@ -24685,13 +25018,13 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; - "tough-cookie-2.3.3" = { + "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; "township-client-1.3.2" = { @@ -24775,6 +25108,15 @@ let sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; }; }; + "trim-newlines-2.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; + sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + }; + }; "trim-off-newlines-1.0.1" = { name = "trim-off-newlines"; packageName = "trim-off-newlines"; @@ -24811,13 +25153,13 @@ let sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; }; }; - "truncate-1.0.5" = { + "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; - version = "1.0.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; + url = "https://registry.npmjs.org/truncate/-/truncate-2.0.1.tgz"; + sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b"; }; }; "tslib-1.9.0" = { @@ -24856,6 +25198,15 @@ let sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; }; }; + "tty-browserify-0.0.1" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + }; + }; "tunnel-0.0.2" = { name = "tunnel"; packageName = "tunnel"; @@ -24937,13 +25288,13 @@ let sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; }; }; - "type-detect-4.0.7" = { + "type-detect-4.0.8" = { name = "type-detect"; packageName = "type-detect"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz"; - sha512 = "06b3944s70gv2pdbdkqpxp88izg727825j0lpdl0pdgs6p6nvpkzb034lycqin3a3nydd0jaafd86a991c78pabrqbd6m8cj3p7a671"; + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; + sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; }; }; "type-is-1.5.7" = { @@ -24955,22 +25306,22 @@ let sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; }; }; - "type-is-1.6.15" = { + "type-is-1.6.16" = { name = "type-is"; packageName = "type-is"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; - sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; }; }; - "typechecker-4.4.1" = { + "typechecker-4.5.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; - sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz"; + sha512 = "3izx27ms2gldkwjyllsg41zpgd7x57v7zrkgrxlrfhs3gc6csg91m6dk23kvcralq9rd5pn7njz4yj8raj31q7ybhd54v9pr7yw98vf"; }; }; "typedarray-0.0.6" = { @@ -24982,22 +25333,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typescript-2.4.2" = { - name = "typescript"; - packageName = "typescript"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; - sha1 = "f8395f85d459276067c988aa41837a8f82870844"; - }; - }; - "typescript-2.6.2" = { + "typescript-2.7.2" = { name = "typescript"; packageName = "typescript"; - version = "2.6.2"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; - sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; "typewise-1.0.3" = { @@ -25045,31 +25387,22 @@ let sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; }; }; - "uc-first-array-1.1.8" = { - name = "uc-first-array"; - packageName = "uc-first-array"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/uc-first-array/-/uc-first-array-1.1.8.tgz"; - sha512 = "3gmz15f5f5yn43v5gv1039pkhd3wwwjfd9jd4f501qz01bdlxj5f2vkg4ddy0lv4h7902n2hgw2vdlmc4a578hsr2bij1xzq5pjfc1d"; - }; - }; - "uc.micro-1.0.3" = { + "uc.micro-1.0.5" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; - sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz"; + sha512 = "0pb6n8f5qpdf3x1bgxlcvimha0n4xx3mgr1mj6nx6yksgg9ij62ai3nzhyy8806gfkklfk8blhlhimw0237yg9xr66rmgvk1vici0i6"; }; }; - "ucfirst-1.0.0" = { - name = "ucfirst"; - packageName = "ucfirst"; - version = "1.0.0"; + "uglify-es-3.3.10" = { + name = "uglify-es"; + packageName = "uglify-es"; + version = "3.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/ucfirst/-/ucfirst-1.0.0.tgz"; - sha1 = "4e105b6448d05e264ecec435e0b919363c5f2f2f"; + url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; + sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c"; }; }; "uglify-js-1.2.5" = { @@ -25117,22 +25450,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.0.20" = { + "uglify-js-3.3.12" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.20"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; - sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz"; + sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72"; }; }; - "uglify-js-3.3.8" = { + "uglify-js-3.3.6" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.8"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; - sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.6.tgz"; + sha512 = "0q2bfk5m49af6f84q1iyrmw0p6ra1gnaf1npffadjqxd9qsz324r144bwgrnchngvlcdj1zqbmyh1r6gva65zxbrxm89ibdgcs7nykl"; }; }; "uglify-to-browserify-1.0.2" = { @@ -25153,6 +25486,15 @@ let sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; + "uglifyjs-webpack-plugin-1.2.2" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz"; + sha512 = "3ngk387v5rza5gly8576cr1kmqmrpvb5jp6l33ac6ps5zkra0anr722gmx29i4m6q5bj6v4gdh8jikqg7l1lf4nkc06aynz6nzwsvq8"; + }; + }; "uid-0.0.2" = { name = "uid"; packageName = "uid"; @@ -25270,13 +25612,13 @@ let sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; }; }; - "undefsafe-2.0.1" = { + "undefsafe-2.0.2" = { name = "undefsafe"; packageName = "undefsafe"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.1.tgz"; - sha1 = "03b2f2a16c94556e14b2edef326cd66aaf82707a"; + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; }; }; "underscore-1.2.1" = { @@ -25405,6 +25747,24 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; + "unique-filename-1.1.0" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; + sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; + }; + }; + "unique-slug-2.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; + sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + }; + }; "unique-stream-1.0.0" = { name = "unique-stream"; packageName = "unique-stream"; @@ -25594,6 +25954,15 @@ let sha512 = "19nv38v416yy515gbq0lvg549w1m48mg17ibl9jp6g0pzlzg6j3lzygbw3c4ia2i9vk0ij0g4fcwfvsa9snxpgdk4a7qbprnj7s4abw"; }; }; + "upath-1.0.4" = { + name = "upath"; + packageName = "upath"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; + sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + }; + }; "update-notifier-0.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -25729,13 +26098,13 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "useragent-2.2.1" = { + "useragent-2.3.0" = { name = "useragent"; packageName = "useragent"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; - sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz"; + sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; }; }; "utf7-1.0.2" = { @@ -25909,13 +26278,13 @@ let sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; - "uws-0.14.5" = { + "uws-9.14.0" = { name = "uws"; packageName = "uws"; - version = "0.14.5"; + version = "9.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; - sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; + url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz"; + sha512 = "2m9vgbpgm39qsl9dk1zzqglr29qwy1hxn3cgj0rwrr05c4hyfij3sib08i1ck21y1136ljvvr0l2nixh6g7arjip455n0zryfs37lqw"; }; }; "v8-debug-1.0.1" = { @@ -25963,13 +26332,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "validate-npm-package-license-3.0.1" = { + "validate-npm-package-license-3.0.3" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; + sha512 = "39caf21ga6s2gvpka90wdngdijarwmkix5fpgh9r94bw14fx1zfnf7j5mprgsdlh8dv0wpwxn65qn9gfwa8n3dxw3iqaj7qf994wxpb"; }; }; "validate-npm-package-name-3.0.0" = { @@ -26161,6 +26530,15 @@ let sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; }; }; + "vinyl-2.1.0" = { + name = "vinyl"; + packageName = "vinyl"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz"; + sha1 = "021f9c2cf951d6b939943c89eb5ee5add4fd924c"; + }; + }; "vinyl-file-2.0.0" = { name = "vinyl-file"; packageName = "vinyl-file"; @@ -26197,13 +26575,13 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; - "voc-1.0.0" = { + "voc-1.1.0" = { name = "voc"; packageName = "voc"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; - sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r"; + url = "https://registry.npmjs.org/voc/-/voc-1.1.0.tgz"; + sha512 = "185v1xryljbds9hw4mc8r5grclrassdi8nq30ckz4sshn4lkivjlx0jm9k25bknf6j9ggxpcybmr94kad4qq2zppjyalbl9qdvn1n3y"; }; }; "void-elements-2.0.1" = { @@ -26341,6 +26719,15 @@ let sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; }; }; + "webpack-3.10.0" = { + name = "webpack"; + packageName = "webpack"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; + sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; + }; + }; "webpack-sources-1.1.0" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -26674,6 +27061,15 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; + "worker-farm-1.5.4" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz"; + sha512 = "3xic3z7f6cga2kaps1ysysq02qljwi534lziz472mvngx097xg4y0fk77qi194akp44dbl8wcinys0mjvwxcrd2rqlgsznw9fa84g11"; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -26791,15 +27187,6 @@ let sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; }; }; - "ws-1.1.1" = { - name = "ws"; - packageName = "ws"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; - sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; - }; - }; "ws-1.1.5" = { name = "ws"; packageName = "ws"; @@ -27007,13 +27394,13 @@ let sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; }; }; - "xmlbuilder-9.0.4" = { + "xmlbuilder-9.0.7" = { name = "xmlbuilder"; packageName = "xmlbuilder"; - version = "9.0.4"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz"; - sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f"; + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; "xmlcreate-1.0.2" = { @@ -27170,6 +27557,15 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + }; + }; "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; @@ -27472,7 +27868,7 @@ in sources."source-map-0.5.7" ]; }) - (sources."babel-generator-6.26.0" // { + (sources."babel-generator-6.26.1" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -27487,11 +27883,11 @@ in sources."babylon-6.18.0" sources."balanced-match-1.0.0" sources."bindings-1.2.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.1.2" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.3" @@ -27517,10 +27913,10 @@ in sources."home-or-tmp-2.0.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.5" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."is-3.2.1" sources."is-finite-1.0.2" - sources."is-windows-1.0.1" + sources."is-windows-1.0.2" sources."isexe-2.0.0" sources."js-tokens-3.0.2" sources."jsesc-1.3.0" @@ -27533,7 +27929,7 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."loose-envify-1.3.1" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" @@ -27541,7 +27937,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."node.extend-2.0.0" sources."nomnom-1.8.1" sources."number-is-nan-1.0.1" @@ -27583,10 +27979,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.0.tgz"; - sha512 = "149a2ndf9hbminr1y95b9l9p7pprrsw2j05w1mbmr0gbm07sqa6vk4x91ws7clnzc80mli1mgnw9xl5mllqfmiynjdrmss6k9zncvcp"; + url = "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz"; + sha512 = "1s03v9h1823r1y95jgrdnf4b2hj56gdi879kq29lv7q59hnn530q6g32qakjj8d6lzjx52r5qvg30szdi1fkvj3zx1dgaq30k5kiakq"; }; dependencies = [ sources."abbrev-1.1.1" @@ -27600,14 +27996,14 @@ in sources."bcrypt-pbkdf-1.0.1" sources."binary-0.3.0" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffers-0.1.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -27622,10 +28018,10 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -27634,7 +28030,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -27648,8 +28044,8 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -27682,7 +28078,7 @@ in sources."nopt-1.0.10" ]; }) - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -27708,9 +28104,10 @@ in sha1 = "e991dfa17dc5d7d91731180851fd9cbfbadf73c3"; }; dependencies = [ + sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.5.9" - sources."@types/request-2.0.13" + sources."@types/node-8.9.4" + sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" sources."JSV-4.0.2" @@ -27880,7 +28277,7 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.1.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" sources."buffer-equal-constant-time-1.0.1" sources."caller-id-0.1.0" @@ -27889,7 +28286,7 @@ in sources."clone-1.0.3" sources."co-4.6.0" sources."colors-1.1.2" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."commander-1.0.4" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -27918,12 +28315,12 @@ in sources."extend-1.2.1" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-patch-0.5.6" sources."fast-json-stable-stringify-2.0.0" sources."fibers-1.0.15" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."galaxy-0.1.12" @@ -27938,7 +28335,7 @@ in sources."has-color-0.1.7" sources."hash-base-3.0.4" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-basic-2.5.1" sources."http-response-object-1.1.0" sources."http-signature-1.2.0" @@ -27946,7 +28343,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-buffer-1.1.6" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -27978,29 +28376,32 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."map-stream-0.1.0" sources."md5.js-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.20.1" - (sources."ms-rest-2.3.0" // { + (sources."ms-rest-2.3.1" // { dependencies = [ sources."extend-3.0.1" - sources."moment-2.18.1" sources."request-2.83.0" sources."through-2.3.8" sources."tunnel-0.0.5" ]; }) - (sources."ms-rest-azure-2.5.0" // { + (sources."ms-rest-azure-2.5.4" // { dependencies = [ - sources."adal-node-0.1.27" - sources."async-2.5.0" - sources."moment-2.18.1" + sources."@types/node-9.4.6" + (sources."adal-node-0.1.27" // { + dependencies = [ + sources."@types/node-8.9.4" + ]; + }) + sources."async-2.6.0" sources."xpath.js-1.1.0" ]; }) @@ -28052,7 +28453,7 @@ in sources."boom-2.10.1" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."cryptiles-2.0.5" sources."extend-3.0.1" sources."form-data-1.0.1" @@ -28091,13 +28492,14 @@ in (sources."sync-request-3.0.0" // { dependencies = [ sources."caseless-0.11.0" - sources."readable-stream-2.3.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) sources."then-request-2.2.0" sources."through-2.3.4" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-0.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -28167,7 +28569,7 @@ in sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -28212,7 +28614,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.32.0" + sources."mime-db-1.33.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" @@ -28245,9 +28647,10 @@ in sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -28257,7 +28660,7 @@ in ]; }) sources."trim-newlines-1.0.0" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -28272,27 +28675,28 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "15.2.0"; + version = "16.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-15.2.0.tgz"; - sha512 = "353sai3zpq5rmqrw5xqkmvxpm866zpv2kiqmp90qp506vij6zvdjrk1zhlpvwmdvsyfjm07q3z2gk5z8ndx2mg55x134pmnz4a34xi0"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.1.0.tgz"; + sha512 = "356pxbnfj5skk2jkc36m9qma51v9f2cf3km9rbvblhdzv1jlpdhppm0ggi42ifmq2knlfg5jcvif4pqlxfkfjrs27x3adz5s0naa14g"; }; dependencies = [ sources."@browserify/acorn5-object-spread-5.0.1" sources."JSONStream-1.3.2" sources."acorn-4.0.13" + sources."acorn-node-1.3.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."astw-2.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."bn.js-4.11.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28304,19 +28708,14 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.0.8" + sources."buffer-5.1.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) + sources."concat-stream-1.6.0" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" @@ -28335,10 +28734,10 @@ in sources."des.js-1.0.0" sources."detective-5.0.2" sources."diffie-hellman-5.0.2" - sources."domain-browser-1.1.7" + sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" - sources."events-1.1.1" + sources."events-2.0.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -28357,6 +28756,9 @@ in (sources."insert-module-globals-7.0.1" // { dependencies = [ sources."combine-source-map-0.7.2" + sources."concat-stream-1.5.2" + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."is-buffer-1.1.6" @@ -28378,10 +28780,9 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-5.0.1" // { + (sources."module-deps-6.0.0" // { dependencies = [ - sources."acorn-5.3.0" - sources."concat-stream-1.6.0" + sources."acorn-5.5.0" ]; }) sources."once-1.4.0" @@ -28401,9 +28802,13 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - sources."readable-stream-2.3.3" + (sources."readable-stream-2.3.4" // { + dependencies = [ + sources."process-nextick-args-2.0.0" + ]; + }) sources."resolve-1.5.0" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" @@ -28421,12 +28826,16 @@ in sources."minimist-1.2.0" ]; }) - sources."syntax-error-1.3.0" + (sources."syntax-error-1.4.0" // { + dependencies = [ + sources."acorn-5.5.0" + ]; + }) sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.1" (sources."url-0.11.0" // { @@ -28456,13 +28865,13 @@ in castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; - version = "0.4.18"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; - sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; + url = "https://registry.npmjs.org/castnow/-/castnow-0.6.0.tgz"; + sha512 = "01z326dk78dypwf9wyjrcr81bimbkh77cgzp54qv9230j7r7jxvd4xbsd36prrssl66ggixzwxhh6wzfqnj44ygnx3j49rf0vqxj9jp"; }; dependencies = [ - sources."addr-to-ip-port-1.4.2" + sources."addr-to-ip-port-1.4.3" sources."airplay-js-0.2.16" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" @@ -28480,11 +28889,11 @@ in sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" - sources."blob-to-buffer-1.2.6" + sources."blob-to-buffer-1.2.7" sources."bn.js-4.11.8" sources."bncode-0.5.3" sources."boom-0.3.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" @@ -28504,7 +28913,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -28568,7 +28977,7 @@ in }) sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.5.4" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -28639,7 +29048,7 @@ in sources."object-assign-4.1.1" sources."once-1.2.0" sources."parse-torrent-file-2.1.4" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.0.1" sources."string_decoder-1.0.3" sources."thirty-two-0.0.2" @@ -28650,7 +29059,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."playerui-1.2.0" // { + (sources."playerui-1.3.0" // { dependencies = [ sources."ansi-regex-0.2.1" sources."ansi-styles-1.1.0" @@ -28661,7 +29070,7 @@ in ]; }) sources."plist-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promiscuous-0.6.0" sources."protobufjs-3.8.2" sources."pump-0.3.5" @@ -28697,9 +29106,9 @@ in sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" - sources."run-parallel-1.1.6" + sources."run-parallel-1.1.7" sources."run-series-1.1.4" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."rx-2.5.3" sources."safe-buffer-5.1.1" sources."sax-1.2.4" @@ -28716,14 +29125,15 @@ in }) sources."single-line-log-0.4.1" sources."sntp-0.1.4" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."speedometer-0.1.4" (sources."srt2vtt-1.3.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -28763,8 +29173,8 @@ in sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" - sources."validate-npm-package-license-3.0.1" - sources."voc-1.0.0" + sources."validate-npm-package-license-3.0.3" + sources."voc-1.1.0" sources."ware-1.3.0" sources."windows-no-runnable-0.0.6" sources."wordwrap-0.0.3" @@ -28773,7 +29183,7 @@ in sources."ws-1.1.5" (sources."xml2js-0.4.19" // { dependencies = [ - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" ]; }) sources."xmlbuilder-8.2.2" @@ -28830,49 +29240,43 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.13"; + version = "0.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.13.tgz"; - sha512 = "2q865h8b8fks806q7qhdm728xhcw684xv37fmlphqv0rdy5y7zfj9nffcnzjmlg5b2qgfrybdpp25q27pm26c4mnxl6lq7jdk7hr6f5"; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.22.tgz"; + sha512 = "3m2wqxac3lyi8f7hyfq4cp402194lv8mx6izc2qjvabi7s2yxhiwsj8dnam628hpbbgrjixfi37biv7g5wrykc5vha9x7dcp1nzj8i2"; }; dependencies = [ sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.0" sources."axios-0.17.1" - sources."camelo-1.1.11" - sources."chalk-1.1.3" + sources."chalk-2.3.1" sources."cli-cursor-2.1.0" sources."cli-spinners-1.1.0" sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" sources."colors-1.1.2" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."debug-3.1.0" - sources."emojic-1.1.14" - sources."emojilib-2.2.12" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.4.1" - sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" sources."is-fullwidth-code-point-1.0.0" - sources."iterate-object-1.3.2" sources."lodash-3.10.1" - sources."log-symbols-1.0.2" - sources."mimic-fn-1.1.0" + sources."log-symbols-2.2.0" + sources."mimic-fn-1.2.0" sources."ms-2.0.0" sources."number-is-nan-1.0.1" sources."onetime-2.0.1" - sources."ora-1.3.0" - sources."r-json-1.2.8" - sources."regex-escape-3.4.8" + sources."ora-1.4.0" sources."restore-cursor-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."uc-first-array-1.1.8" - sources."ucfirst-1.0.0" + sources."supports-color-5.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -28929,7 +29333,8 @@ in sources."JSONStream-1.3.2" sources."abbrev-1.1.1" sources."accepts-1.3.4" - sources."acorn-5.3.0" + sources."acorn-5.5.0" + sources."acorn-node-1.3.0" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-escapes-1.4.0" @@ -28940,7 +29345,7 @@ in sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1-0.2.3" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."assert-plus-0.2.0" sources."astw-2.2.0" @@ -28962,9 +29367,9 @@ in sources."boom-2.10.1" sources."bplist-creator-0.0.7" sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28972,7 +29377,6 @@ in }) (sources."browserify-14.4.0" // { dependencies = [ - sources."acorn-4.0.13" sources."isarray-1.0.0" ]; }) @@ -28983,7 +29387,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" - sources."buffer-5.0.8" + sources."buffer-5.1.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" @@ -28997,10 +29401,10 @@ in sources."cli-width-1.1.1" sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -29027,14 +29431,14 @@ in }) (sources."cordova-js-4.2.2" // { dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."isarray-0.0.1" ]; }) (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."combine-source-map-0.7.2" sources."glob-7.1.1" sources."hash-base-2.0.2" @@ -29046,6 +29450,7 @@ in sources."base64-js-1.1.2" ]; }) + sources."process-nextick-args-2.0.0" sources."q-1.0.1" sources."qs-6.3.2" sources."shelljs-0.3.0" @@ -29167,12 +29572,13 @@ in ]; }) sources."interpret-1.1.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" sources."is-obj-1.0.1" sources."is-property-1.0.2" @@ -29209,8 +29615,8 @@ in sources."methods-1.1.2" sources."miller-rabin-4.0.1" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -29238,7 +29644,7 @@ in sources."os-homedir-1.0.2" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."package-json-1.2.0" sources."pako-0.2.9" @@ -29260,7 +29666,7 @@ in sources."process-nextick-args-1.0.7" sources."promzard-0.3.0" sources."properties-parser-0.3.1" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."q-1.5.1" @@ -29268,15 +29674,15 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" sources."read-package-json-2.0.12" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."registry-url-3.1.0" @@ -29304,9 +29710,10 @@ in sources."slide-1.1.6" sources."sntp-1.0.9" sources."source-map-0.5.7" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -29327,18 +29734,18 @@ in sources."strip-json-comments-2.0.1" sources."subarg-1.0.0" sources."supports-color-2.0.0" - sources."syntax-error-1.3.0" + sources."syntax-error-1.4.0" sources."tar-2.2.1" sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-2.0.0" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" - sources."tough-cookie-2.3.3" - sources."tty-browserify-0.0.0" + sources."tough-cookie-2.3.4" + sources."tty-browserify-0.0.1" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.1" sources."underscore-1.8.3" @@ -29365,7 +29772,7 @@ in sources."utils-merge-1.0.1" sources."uuid-2.0.3" sources."valid-identifier-0.0.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -29454,20 +29861,19 @@ in sources."blake2b-wasm-1.1.7" sources."body-0.1.0" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.3" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -29475,7 +29881,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.1.2" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."connections-1.4.2" @@ -29510,18 +29916,23 @@ in sources."debug-2.6.9" ]; }) - sources."dat-log-1.1.1" - (sources."dat-node-3.5.6" // { + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) + (sources."dat-node-3.5.8" // { dependencies = [ sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" sources."pump-1.0.3" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" - sources."dat-secret-storage-4.0.0" - sources."dat-storage-1.0.3" + sources."dat-secret-storage-4.0.1" + sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.0" sources."datland-swarm-defaults-1.0.2" sources."debug-3.1.0" @@ -29534,11 +29945,7 @@ in sources."thunky-0.1.0" ]; }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."thunky-0.1.0" - ]; - }) + sources."dns-discovery-5.6.1" sources."dns-packet-1.3.1" sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" @@ -29553,7 +29960,7 @@ in sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" sources."filename-regex-2.0.1" @@ -29563,7 +29970,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -29573,28 +29980,24 @@ in sources."global-4.3.2" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.0" // { + (sources."hypercore-6.12.2" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."hypercore-protocol-6.5.2" - (sources."hyperdrive-9.12.2" // { + (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" ]; }) sources."hyperdrive-http-4.2.2" - (sources."hyperdrive-network-speed-2.0.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -29635,8 +30038,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -29644,11 +30047,11 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.2" + sources."multicast-dns-6.2.3" sources."multicb-1.2.2" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -29675,7 +30078,7 @@ in sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-string-1.2.2" (sources."prompt-1.0.0" // { dependencies = [ @@ -29686,12 +30089,9 @@ in sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.1" - (sources."random-access-file-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" + sources."random-access-storage-1.1.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -29704,8 +30104,8 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.3" - sources."recursive-watch-1.1.2" + sources."readable-stream-2.3.4" + sources."recursive-watch-1.1.3" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -29713,7 +30113,7 @@ in sources."request-2.83.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."safe-buffer-5.1.1" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" @@ -29743,7 +30143,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -29753,7 +30153,7 @@ in sources."thunky-1.0.2" sources."to-buffer-1.1.0" sources."toiletdb-1.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."township-client-1.3.2" sources."trim-0.0.1" sources."ttl-1.3.1" @@ -29795,10 +30195,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz"; - sha512 = "0xvz5ppq82s4yhrp4alp1ni696v960p9a8hycwns0bj33qjdsd2nn9h2xzpgssn9c27jbr91h9fr851rnc7sz7nd2ycblcsfy193sj0"; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.10.tgz"; + sha512 = "04a373cxgb6b43gzymh1z71aas9c7nx9ap9q11bsc5jgrhx9q6b9204w08qrlrmgn72kj1csiadl8zlm5031097a8paczgzi9653k3m"; }; dependencies = [ sources."minimist-1.2.0" @@ -29868,7 +30268,7 @@ in sources."fresh-0.2.4" sources."from-0.1.7" sources."hiredis-0.4.1" - sources."http-parser-js-0.4.9" + sources."http-parser-js-0.4.10" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ipaddr.js-1.0.5" @@ -29887,11 +30287,11 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -29977,7 +30377,7 @@ in sources."docker-parse-image-3.0.1" sources."duplexify-3.5.3" sources."end-of-stream-1.4.1" - (sources."errno-0.1.6" // { + (sources."errno-0.1.7" // { dependencies = [ sources."prr-1.0.1" ]; @@ -29986,7 +30386,7 @@ in (sources."fs-blob-store-5.2.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -29996,7 +30396,7 @@ in sources."jsonparse-0.0.5" sources."level-0.18.0" sources."level-packager-0.18.0" - sources."level-post-1.0.5" + sources."level-post-1.0.7" (sources."level-sublevel-6.6.1" // { dependencies = [ (sources."levelup-0.19.1" // { @@ -30037,7 +30437,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."split2-2.2.0" sources."string_decoder-1.0.3" sources."through2-2.0.3" @@ -30046,14 +30446,14 @@ in sources."network-address-0.0.5" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."protein-0.5.0" sources."prr-0.0.0" sources."pull-cat-1.1.11" - sources."pull-level-2.0.3" + sources."pull-level-2.0.4" sources."pull-live-1.0.1" - sources."pull-pushable-2.1.2" - sources."pull-stream-3.6.1" + sources."pull-pushable-2.2.0" + sources."pull-stream-3.6.2" sources."pull-window-2.1.4" sources."pump-1.0.3" (sources."pumpify-1.4.0" // { @@ -30076,7 +30476,7 @@ in dependencies = [ sources."bl-1.2.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -30107,10 +30507,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.1"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz"; - sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.6.tgz"; + sha512 = "0zn9wiliz4sz4xnmcc3nks76gkaxp8q0lk0nqm1ysxczibxnh074kap87w366jnzxvzx5la0h6wdqjrm7zja307sq8g0qj265fjyky6"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -30119,16 +30519,16 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.187.0" + sources."aws-sdk-2.203.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ @@ -30141,15 +30541,15 @@ in sources."events-1.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."ieee754-1.1.8" sources."ini-1.3.5" @@ -30163,9 +30563,9 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."oauth-sign-0.8.2" sources."optimist-0.6.1" @@ -30184,7 +30584,7 @@ in sources."sshpk-1.13.1" sources."stringstream-0.0.5" sources."through-2.3.8" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."url-0.10.3" @@ -30236,7 +30636,7 @@ in }) sources."block-stream-0.0.9" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -30251,8 +30651,8 @@ in sources."chokidar-1.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -30301,7 +30701,8 @@ in sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" @@ -30326,13 +30727,13 @@ in sources."lodash-4.13.1" sources."lru-cache-4.1.1" sources."micromatch-2.3.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."murmur-hash-js-1.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."node-elm-compiler-4.3.3" // { dependencies = [ sources."firstline-1.2.0" @@ -30350,7 +30751,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.3.2" @@ -30363,7 +30764,7 @@ in }) ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -30387,7 +30788,7 @@ in sources."tar-2.2.1" sources."temp-0.8.3" sources."through-2.3.8" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -30427,7 +30828,7 @@ in sources."auto-bind-1.2.0" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.0" - sources."babel-generator-6.26.0" + sources."babel-generator-6.26.1" sources."babel-helper-builder-react-jsx-6.26.0" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" @@ -30443,7 +30844,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -30452,7 +30853,7 @@ in sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" sources."cli-cursor-2.1.0" - sources."clipboardy-1.2.2" + sources."clipboardy-1.2.3" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -30481,8 +30882,8 @@ in sources."got-7.1.0" sources."graceful-fs-4.1.11" sources."has-ansi-3.0.0" - sources."has-flag-2.0.0" - sources."has-symbol-support-x-1.4.1" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.5.0" @@ -30498,14 +30899,14 @@ in (sources."ink-0.3.1" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."core-js-1.2.7" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."ink-text-input-1.1.1" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -30524,7 +30925,7 @@ in sources."json5-0.5.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -30533,7 +30934,7 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" (sources."meow-3.7.0" // { @@ -30545,7 +30946,7 @@ in sources."pify-2.3.0" ]; }) - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30577,7 +30978,7 @@ in sources."prepend-http-1.0.4" sources."private-0.1.8" sources."promise-7.3.1" - sources."prop-types-15.6.0" + sources."prop-types-15.6.1" sources."pseudomap-1.0.2" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -30597,9 +30998,10 @@ in sources."slash-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."string-width-2.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -30614,7 +31016,7 @@ in sources."unicode-emoji-modifier-base-1.0.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."whatwg-fetch-2.0.3" sources."which-1.3.0" sources."wrap-ansi-3.0.1" @@ -30633,24 +31035,24 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.16.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; - sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz"; + sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40"; }; dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."ajv-keywords-3.1.0" sources."ansi-escapes-3.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" @@ -30661,13 +31063,13 @@ in ]; }) sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.3.0" // { + (sources."chalk-2.3.1" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."chardet-0.4.2" @@ -30688,14 +31090,14 @@ in sources."escape-string-regexp-1.0.5" sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.2" + sources."espree-3.5.3" sources."esprima-4.0.0" sources."esquery-1.0.0" - sources."esrecurse-4.2.0" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.1.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" @@ -30704,11 +31106,11 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.2.0" + sources."globals-11.3.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" @@ -30728,9 +31130,9 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -30749,10 +31151,10 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -30776,7 +31178,11 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - sources."table-4.0.2" + (sources."table-4.0.3" // { + dependencies = [ + sources."ajv-6.2.0" + ]; + }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -30807,18 +31213,18 @@ in sha512 = "32h5278qn4pnlm2wl573mhg112diqpiazr07vxj0la2qwc3a1dlva5gsbyypnbnsis7r05kcx173qhb4wdl9w8spc7g3zk1575ciirc"; }; dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."ajv-keywords-3.1.0" sources."ansi-escapes-3.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" @@ -30829,7 +31235,7 @@ in ]; }) sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -30853,13 +31259,13 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.16.0" // { + (sources."eslint-4.18.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" - (sources."chalk-2.3.0" // { + (sources."chalk-2.3.1" // { dependencies = [ - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."strip-ansi-4.0.0" @@ -30868,14 +31274,14 @@ in }) sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.2" + sources."espree-3.5.3" sources."esprima-4.0.0" sources."esquery-1.0.0" - sources."esrecurse-4.2.0" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.1.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" @@ -30884,11 +31290,11 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.2.0" + sources."globals-11.3.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" @@ -30908,9 +31314,9 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -30930,10 +31336,10 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."require-uncached-1.0.3" sources."resolve-1.5.0" sources."resolve-from-1.0.1" @@ -30958,7 +31364,11 @@ in sources."has-flag-1.0.0" ]; }) - sources."table-4.0.2" + (sources."table-4.0.3" // { + dependencies = [ + sources."ajv-6.2.0" + ]; + }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -31025,7 +31435,9 @@ in sources."cli-cursor-1.0.2" sources."cli-spinners-1.1.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" sources."concat-stream-1.6.0" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -31046,12 +31458,12 @@ in sources."extend-3.0.1" sources."extract-zip-1.6.6" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."find-up-1.1.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" @@ -31059,9 +31471,10 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" sources."hasha-2.2.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."http-signature-1.2.0" sources."indent-string-2.1.0" @@ -31084,14 +31497,14 @@ in sources."kew-0.7.0" sources."klaw-1.3.1" sources."load-json-file-1.1.0" - sources."log-symbols-1.0.2" + sources."log-symbols-2.2.0" sources."log-update-1.0.2" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."mkdirp-0.5.0" sources."mkpath-1.0.0" @@ -31102,11 +31515,14 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."onetime-1.1.0" - (sources."ora-1.3.0" // { + (sources."ora-1.4.0" // { dependencies = [ + sources."ansi-styles-3.2.0" + sources."chalk-2.3.1" sources."cli-cursor-2.1.0" sources."onetime-2.0.1" sources."restore-cursor-2.0.0" + sources."supports-color-5.2.0" ]; }) sources."os-tmpdir-1.0.2" @@ -31123,14 +31539,14 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-1.1.8" sources."promise-phantom-3.1.6" sources."punycode-1.4.1" sources."qs-6.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.83.0" @@ -31140,9 +31556,10 @@ in sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -31152,14 +31569,14 @@ in sources."supports-color-2.0.0" sources."throttleit-1.0.0" sources."tmp-0.0.31" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."which-1.3.0" sources."yauzl-2.4.1" @@ -31217,7 +31634,7 @@ in sources."async-each-1.0.1" sources."balanced-match-1.0.0" sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -31292,7 +31709,7 @@ in sources."minimist-0.0.10" sources."mkdirp-0.5.1" sources."mute-stream-0.0.7" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -31316,7 +31733,7 @@ in sources."minimist-1.2.0" ]; }) - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."prompt-0.2.14" sources."ps-tree-0.0.3" (sources."randomatic-1.1.7" // { @@ -31329,7 +31746,7 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -31377,12 +31794,12 @@ in dependencies = [ sources."async-2.6.0" sources."debug-3.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" - sources."simple-git-1.89.0" + sources."simple-git-1.91.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -31397,10 +31814,10 @@ in git-standup = nodeEnv.buildNodePackage { name = "git-standup"; packageName = "git-standup"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.8.tgz"; - sha1 = "4df13a13e9c49ba4cdbd5ad35a90457c8795e352"; + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz"; + sha512 = "3w5bg88z2wm9b01s7s1yy16dd1qhm44n7dg7anh0w6rigl6r81xmb9vl95imf6lnakwkrsnlw7rqr98c079m6kgribjvzfv9kbzax7r"; }; buildInputs = globalBuildInputs; meta = { @@ -31422,7 +31839,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."findup-sync-0.3.0" sources."glob-5.0.15" @@ -31499,7 +31916,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."msgpack-1.0.2" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."optimist-0.3.7" sources."pop-iterate-1.0.1" sources."promise-6.1.0" @@ -31529,7 +31946,7 @@ in sources."with-4.0.3" sources."wordwrap-0.0.3" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; @@ -31576,10 +31993,11 @@ in ]; }) sources."beeper-1.1.1" - sources."brace-expansion-1.1.8" - (sources."braces-2.3.0" // { + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { dependencies = [ - sources."kind-of-3.2.2" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" ]; }) sources."cache-base-1.0.1" @@ -31601,7 +32019,7 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."defaults-1.0.3" - sources."define-property-1.0.0" + sources."define-property-2.0.2" sources."deprecated-0.0.1" sources."detect-file-1.0.0" sources."duplexer2-0.0.2" @@ -31614,21 +32032,32 @@ in }) sources."expand-tilde-2.0.2" sources."extend-3.0.1" - sources."extend-shallow-2.0.1" + sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" sources."kind-of-5.1.0" ]; }) sources."fancy-log-1.3.2" - sources."fill-range-4.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."find-index-0.1.1" (sources."findup-sync-2.0.0" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) sources."fined-1.1.0" @@ -31655,7 +32084,7 @@ in (sources."gulp-util-3.0.8" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -31674,16 +32103,16 @@ in sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" - sources."is-odd-1.0.0" + sources."is-odd-2.0.0" sources."is-plain-object-2.0.4" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.1" + sources."is-windows-1.0.2" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -31703,7 +32132,8 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" + sources."is-extendable-1.0.1" + sources."is-number-4.0.0" sources."isarray-1.0.0" sources."kind-of-3.2.2" ]; @@ -31729,7 +32159,7 @@ in sources."make-iterator-1.0.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - (sources."micromatch-3.1.5" // { + (sources."micromatch-3.1.9" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -31742,19 +32172,16 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" ]; }) sources."minimatch-2.0.10" sources."minimist-1.2.0" - sources."mixin-deep-1.3.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multipipe-0.1.2" - (sources."nanomatch-1.2.7" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."nanomatch-1.2.9" sources."natives-1.1.1" sources."object-assign-3.0.0" sources."object-copy-0.1.0" @@ -31774,17 +32201,19 @@ in sources."path-root-regex-0.1.2" sources."posix-character-classes-0.1.1" sources."pretty-hrtime-1.0.3" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."readable-stream-1.1.14" sources."rechoir-0.6.2" - sources."regex-not-1.0.0" + sources."regex-not-1.0.2" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" sources."resolve-1.5.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" sources."semver-4.3.6" sources."sequencify-0.0.7" sources."set-getter-0.1.0" @@ -31797,10 +32226,16 @@ in sources."kind-of-5.1.0" ]; }) + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."kind-of-4.0.0" ]; }) - sources."snapdragon-node-2.1.1" + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -31812,7 +32247,7 @@ in ]; }) sources."static-extend-0.1.2" - sources."stream-consume-0.1.0" + sources."stream-consume-0.1.1" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."strip-bom-1.0.0" @@ -31821,11 +32256,7 @@ in sources."tildify-1.2.0" sources."time-stamp-1.1.0" sources."to-object-path-0.3.0" - (sources."to-regex-3.0.1" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) + sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."unc-path-regex-0.1.2" (sources."union-value-1.0.0" // { @@ -31887,7 +32318,7 @@ in sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }; dependencies = [ - sources."eventemitter3-3.0.0" + sources."eventemitter3-3.0.1" sources."http-proxy-1.0.2" sources."lru-cache-2.5.2" sources."minimist-0.0.8" @@ -31913,7 +32344,7 @@ in dependencies = [ sources."async-1.4.2" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."cli-0.6.6" // { dependencies = [ sources."minimatch-0.3.0" @@ -31983,15 +32414,15 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz"; - sha512 = "29sg4r25g8awvmlyzjip0c216bjcd0nq730jd5vihagf3vpxw070gi5nd7z7333givgislxfylv4jrxn4ngqxgnwns5lg3xy3lc6zjr"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.9.tgz"; + sha512 = "3a2xnyzk38awjgzlkd59vsf8bk77ahyxsk7k9vg7gspl9z0v3zxgzzmix1vrz8xdfcxc00kg807z85hfqnz9wg20py4ihn9apvqx6hi"; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.9" - sources."commander-2.12.2" + sources."commander-2.14.1" sources."he-1.1.1" sources."lower-case-1.1.4" sources."ncname-1.0.0" @@ -31999,9 +32430,8 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.8" // { + (sources."uglify-js-3.3.12" // { dependencies = [ - sources."commander-2.13.0" sources."source-map-0.6.1" ]; }) @@ -32063,7 +32493,7 @@ in sources."bl-1.2.1" sources."body-5.1.0" sources."body-parser-1.18.2" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -32071,7 +32501,7 @@ in }) sources."buffer-crc32-0.2.13" sources."bytes-3.0.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."chardet-0.4.2" sources."chokidar-1.7.0" sources."chownr-1.0.1" @@ -32080,7 +32510,7 @@ in sources."cli-width-2.2.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" @@ -32122,7 +32552,7 @@ in sources."finalhandler-1.1.0" sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" @@ -32133,20 +32563,20 @@ in sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" (sources."http-errors-1.6.2" // { dependencies = [ sources."depd-1.1.1" ]; }) - sources."http-parser-js-0.4.9" + sources."http-parser-js-0.4.10" sources."http-proxy-1.16.2" sources."http-proxy-middleware-0.17.4" sources."iconv-lite-0.4.19" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-3.3.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" @@ -32167,7 +32597,7 @@ in sources."lazystream-1.0.0" sources."leek-0.0.24" sources."livereload-js-2.3.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -32186,9 +32616,9 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."minipass-2.2.1" @@ -32196,7 +32626,7 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."netmask-1.0.6" @@ -32214,8 +32644,8 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."qs-6.5.1" (sources."randomatic-1.1.7" // { @@ -32229,7 +32659,7 @@ in }) sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -32261,18 +32691,22 @@ in sources."string_decoder-1.0.3" sources."strip-ansi-4.0.0" sources."superagent-3.8.2" - sources."supports-color-4.5.0" - (sources."tar-4.3.0" // { + sources."supports-color-5.2.0" + (sources."tar-4.4.0" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."tar-stream-1.5.5" sources."through-2.3.8" - sources."tiny-lr-1.1.0" + (sources."tiny-lr-1.1.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."tmp-0.0.33" sources."tslib-1.9.0" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."ultron-1.1.1" sources."unpipe-1.0.0" sources."untildify-3.0.2" @@ -32329,10 +32763,10 @@ in sources."abbrev-1.0.9" sources."align-text-0.1.4" sources."amdefine-1.0.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."async-1.5.2" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."camelcase-1.2.1" sources."center-align-0.1.3" sources."cliui-2.1.0" @@ -32410,10 +32844,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.5.5"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.5.tgz"; - sha512 = "080s545iykbb70x7xm0nqs6s7qs0slprxcqslpv47ffyz6gx7gb8kaa1dlk9lxvkm8pfhdyyj0f6qsx7d1ydscnnl0x1wmkzagbpmzm"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.7.1.tgz"; + sha512 = "3dxj2iihfilq0dbhhrchhxqd6x9nhrjwnqkgr4gnmqk75zgnaa119p1h2vx7l0wmpqcafw0nifv02bn0g5y1wgal06a5yr6iii7dx18"; }; dependencies = [ sources."ansi-color-0.2.1" @@ -32421,15 +32855,15 @@ in sources."any-promise-1.3.0" sources."assertion-error-1.1.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."bufrw-1.2.1" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -32439,16 +32873,16 @@ in sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" sources."glob-7.1.2" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-0.0.8" - (sources."jaeger-client-3.7.0" // { + (sources."jaeger-client-3.9.1" // { dependencies = [ sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."long-2.4.0" sources."minimatch-3.0.4" sources."mz-2.7.0" @@ -32463,13 +32897,13 @@ in sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."symbol-observable-1.0.1" sources."thenify-3.3.0" sources."thenify-all-1.6.0" - sources."thriftrw-3.11.1" - sources."type-detect-4.0.7" - sources."typescript-2.4.2" + sources."thriftrw-3.11.2" + sources."type-detect-4.0.8" + sources."typescript-2.7.2" sources."vscode-jsonrpc-3.5.0" sources."vscode-languageserver-3.5.0" sources."vscode-languageserver-protocol-3.5.0" @@ -32528,7 +32962,7 @@ in sources."graceful-fs-4.1.11" sources."js2xmlparser-3.0.0" sources."klaw-2.0.0" - sources."marked-0.3.12" + sources."marked-0.3.17" sources."minimist-0.0.8" sources."mkdirp-0.5.1" (sources."requizzle-0.2.1" // { @@ -32561,7 +32995,7 @@ in }; dependencies = [ sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."cli-1.0.1" sources."concat-map-0.0.1" sources."console-browserify-1.1.0" @@ -32633,7 +33067,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -32658,10 +33092,10 @@ in jsonlint = nodeEnv.buildNodePackage { name = "jsonlint"; packageName = "jsonlint"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; - sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz"; + sha512 = "3f6z8yv4rp9mhcdbmvrmlvk8gdf05qbvn5fk60yq1cvjn00wsvs5i2k7p1bik8kvidsx44kv7r195asnbr8dfi04czhbvpy6crm7icc"; }; dependencies = [ sources."JSV-4.0.2" @@ -32723,15 +33157,15 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.3.tgz"; - sha512 = "3wagfrcaaj3vscma48jj349wbf838vi5fy0c02xfxd4k57qhf05mfw0i0624fvxfil9gfhx3sl35py85lfjx74hfkw6ra7kqw91p5cw"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz"; + sha512 = "1mbi99gcdrhmkr4nfhfdhwbk2ag55gajxdvzb6m1bddwdwnwn167xx12nypvbs6l0r90k9qrnwmbcbswdm18982b7a7mva27pkc2nah"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."commander-2.11.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" @@ -32740,24 +33174,24 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.10.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."ms-2.0.0" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" @@ -32804,16 +33238,16 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."cli-boxes-1.0.0" sources."cliui-4.0.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."combined-stream-1.0.6" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."configstore-3.1.1" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -32860,12 +33294,12 @@ in }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.0" sources."find-up-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."get-caller-file-1.0.2" @@ -32876,9 +33310,9 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" (sources."http-errors-1.6.2" // { dependencies = [ sources."depd-1.1.1" @@ -32891,7 +33325,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -32915,25 +33349,25 @@ in sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."media-typer-0.3.0" sources."mem-1.1.0" sources."merge-descriptors-1.0.1" sources."method-override-2.3.10" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.0.1" + sources."nanoid-1.0.2" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -32957,14 +33391,14 @@ in sources."please-upgrade-node-3.0.1" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" - sources."registry-auth-token-3.3.1" + sources."rc-1.2.5" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."request-2.83.0" sources."require-directory-2.1.1" @@ -32989,13 +33423,13 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -33044,7 +33478,7 @@ in sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" ]; @@ -33067,8 +33501,9 @@ in }; dependencies = [ sources."JSONStream-1.3.2" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."acorn-4.0.13" + sources."acorn-node-1.3.0" sources."addressparser-1.0.1" sources."after-0.8.2" sources."agent-base-2.1.1" @@ -33090,10 +33525,10 @@ in sources."array-unique-0.2.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."assert-plus-1.0.0" - sources."ast-types-0.10.1" + sources."ast-types-0.11.2" sources."astw-2.2.0" sources."async-2.1.5" sources."async-each-1.0.1" @@ -33110,7 +33545,7 @@ in sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."better-assert-1.0.2" @@ -33122,14 +33557,14 @@ in sources."bn.js-4.11.8" sources."body-parser-1.18.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -33137,10 +33572,11 @@ in }) (sources."browserify-14.5.0" // { dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."combine-source-map-0.7.2" sources."hash-base-2.0.2" sources."isarray-0.0.1" + sources."process-nextick-args-2.0.0" sources."source-map-0.5.7" ]; }) @@ -33150,7 +33586,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.0.8" + sources."buffer-5.1.0" sources."buffer-more-ints-0.0.2" sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" @@ -33167,8 +33603,8 @@ in sources."colors-1.1.2" sources."combine-lists-1.0.1" sources."combine-source-map-0.8.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -33179,7 +33615,7 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."connect-3.6.5" // { + (sources."connect-3.6.6" // { dependencies = [ sources."statuses-1.3.1" ]; @@ -33224,13 +33660,21 @@ in sources."ee-first-1.1.1" sources."elliptic-6.4.0" sources."encodeurl-1.0.2" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."ent-2.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.9.0" + sources."escodegen-1.9.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -33250,18 +33694,18 @@ in sources."extend-3.0.1" sources."extglob-0.3.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.3" - sources."finalhandler-1.0.6" + sources."finalhandler-1.1.0" sources."follow-redirects-1.0.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" (sources."ftp-0.3.10" // { @@ -33289,7 +33733,7 @@ in sources."hawk-6.0.2" sources."hipchat-notifier-1.1.0" sources."hmac-drbg-1.0.1" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."htmlescape-1.1.1" (sources."http-errors-1.6.2" // { dependencies = [ @@ -33319,7 +33763,8 @@ in sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" @@ -33346,9 +33791,9 @@ in sources."libbase64-0.1.0" sources."libmime-3.0.0" sources."libqp-1.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.memoize-3.0.4" - (sources."log4js-2.5.2" // { + (sources."log4js-2.5.3" // { dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" @@ -33372,7 +33817,6 @@ in sources."request-2.75.0" sources."sntp-1.0.9" sources."socks-1.1.9" - sources."source-map-0.5.7" sources."string_decoder-0.10.31" sources."tunnel-agent-0.4.3" ]; @@ -33392,8 +33836,8 @@ in sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -33401,7 +33845,7 @@ in sources."mkdirp-0.5.1" sources."module-deps-4.1.1" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."netmask-1.0.6" sources."node-uuid-1.4.8" @@ -33454,10 +33898,11 @@ in sources."process-0.11.10" sources."process-nextick-args-1.0.7" sources."proxy-agent-2.0.0" + sources."pseudomap-1.0.2" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."q-1.4.1" - sources."qjobs-1.1.5" + sources."qjobs-1.2.0" sources."qs-6.5.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -33471,18 +33916,18 @@ in ]; }) sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.2" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.3" // { + (sources."readable-stream-2.3.4" // { dependencies = [ sources."isarray-1.0.0" ]; }) sources."readdirp-2.1.0" sources."redis-2.8.0" - sources."redis-commands-1.3.1" + sources."redis-commands-1.3.4" sources."redis-parser-2.6.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -33512,7 +33957,11 @@ in }) sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."socks-1.1.10" sources."socks-proxy-agent-2.1.1" sources."source-map-0.6.1" @@ -33528,11 +33977,7 @@ in sources."strip-ansi-3.0.1" sources."subarg-1.0.0" sources."supports-color-2.0.0" - (sources."syntax-error-1.3.0" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) + sources."syntax-error-1.4.0" sources."through-2.3.8" sources."through2-2.0.3" sources."thunkify-2.1.2" @@ -33541,13 +33986,13 @@ in sources."tmp-0.0.33" sources."to-array-0.1.4" sources."to-arraybuffer-1.0.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tsscmp-1.0.5" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."ultron-1.1.1" sources."umd-3.0.1" @@ -33558,9 +34003,9 @@ in sources."punycode-1.3.2" ]; }) - (sources."useragent-2.2.1" // { + (sources."useragent-2.3.0" // { dependencies = [ - sources."lru-cache-2.2.4" + sources."lru-cache-4.1.1" ]; }) (sources."util-0.10.3" // { @@ -33571,7 +34016,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-0.14.5" + sources."uws-9.14.0" sources."verror-1.10.0" sources."vm-browserify-0.0.4" sources."void-elements-2.0.1" @@ -33582,6 +34027,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."xregexp-2.0.0" sources."xtend-4.0.1" + sources."yallist-2.1.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -33611,7 +34057,7 @@ in sources."body-parser-1.13.3" sources."bytes-2.1.0" sources."commander-2.6.0" - sources."compressible-2.0.12" + sources."compressible-2.0.13" sources."compression-1.5.2" (sources."connect-2.30.2" // { dependencies = [ @@ -33677,8 +34123,8 @@ in }) sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."morgan-1.6.1" @@ -33736,7 +34182,7 @@ in sources."stream-counter-0.2.0" sources."string_decoder-0.10.31" sources."tsscmp-1.0.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uid-safe-2.1.4" sources."uid2-0.0.3" sources."unpipe-1.0.0" @@ -33744,7 +34190,7 @@ in sources."vary-1.0.1" sources."vhost-3.0.2" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -33757,10 +34203,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.8.0.tgz"; - sha512 = "2admd5d0lmnck38apsqbblrk0pffnq52s25bb591q8sazykcfz68kz9pn534sgazjl26p57y23758n8n7xvw0ilb9hd5ri6j34i7kxn"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.9.0.tgz"; + sha512 = "18aayy3dsb36bz3rrvbmg1pfvc4zsxqmiax923v738dlp7nw68y5gndi268db91cyzjxwpdimppqfb84z9ywi79mhlak4i73flxgazh"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -33776,16 +34222,17 @@ in sources."array-ify-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" + sources."arrify-1.0.1" sources."async-1.5.2" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."byline-5.0.0" sources."camelcase-1.2.1" sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."chardet-0.4.2" sources."ci-info-1.1.2" sources."cli-cursor-2.1.0" @@ -33802,40 +34249,68 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."console-control-strings-1.1.0" - sources."conventional-changelog-1.1.7" - sources."conventional-changelog-angular-1.6.0" - sources."conventional-changelog-atom-0.1.2" - (sources."conventional-changelog-cli-1.3.5" // { + (sources."conventional-changelog-1.1.17" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + ]; + }) + sources."conventional-changelog-angular-1.6.6" + sources."conventional-changelog-atom-0.2.4" + (sources."conventional-changelog-cli-1.3.15" // { dependencies = [ sources."camelcase-2.1.1" + sources."camelcase-keys-4.2.0" sources."find-up-1.1.2" + sources."indent-string-3.2.0" sources."load-json-file-1.1.0" + sources."map-obj-2.0.0" sources."minimist-1.2.0" + sources."parse-json-4.0.0" sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" sources."read-pkg-1.1.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" + sources."trim-newlines-2.0.0" sources."wordwrap-0.0.2" sources."yargs-3.10.0" ]; }) - sources."conventional-changelog-codemirror-0.2.1" - sources."conventional-changelog-core-1.9.5" - sources."conventional-changelog-ember-0.2.10" - sources."conventional-changelog-eslint-0.2.1" - sources."conventional-changelog-express-0.2.1" + sources."conventional-changelog-codemirror-0.3.4" + (sources."conventional-changelog-core-2.0.5" // { + dependencies = [ + sources."meow-4.0.0" + ]; + }) + sources."conventional-changelog-ember-0.3.6" + sources."conventional-changelog-eslint-1.0.4" + sources."conventional-changelog-express-0.3.4" sources."conventional-changelog-jquery-0.1.0" sources."conventional-changelog-jscs-0.1.0" - sources."conventional-changelog-jshint-0.2.1" - sources."conventional-changelog-writer-2.0.3" - sources."conventional-commits-filter-1.1.1" - sources."conventional-commits-parser-2.1.0" - sources."conventional-recommended-bump-1.1.0" + sources."conventional-changelog-jshint-0.3.4" + sources."conventional-changelog-preset-loader-1.1.6" + sources."conventional-changelog-writer-3.0.4" + sources."conventional-commits-filter-1.1.5" + sources."conventional-commits-parser-2.1.5" + (sources."conventional-recommended-bump-1.2.1" // { + dependencies = [ + sources."meow-3.7.0" + sources."minimist-1.2.0" + ]; + }) sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."dargs-4.1.0" - sources."dateformat-1.0.12" + sources."dateformat-3.0.3" sources."decamelize-1.2.0" + sources."decamelize-keys-1.1.0" sources."dedent-0.7.0" sources."deep-extend-0.4.2" sources."defaults-1.0.3" @@ -33858,17 +34333,26 @@ in sources."get-port-3.2.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" - sources."git-raw-commits-1.3.0" + (sources."git-raw-commits-1.3.4" // { + dependencies = [ + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + ]; + }) sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-1.2.3" + sources."git-semver-tags-1.3.4" sources."gitconfiglocal-1.0.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" - sources."globby-6.1.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."handlebars-4.0.11" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.5.0" sources."iconv-lite-0.4.19" @@ -33913,12 +34397,11 @@ in (sources."load-json-file-4.0.0" // { dependencies = [ sources."parse-json-4.0.0" - sources."pify-3.0.0" sources."strip-bom-3.0.0" ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.4.0" sources."lodash.templatesettings-4.1.0" @@ -33926,13 +34409,23 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" - sources."meow-3.7.0" - sources."mimic-fn-1.1.0" + (sources."meow-4.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."load-json-file-4.0.0" + sources."path-exists-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."read-pkg-3.0.0" + ]; + }) + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" sources."modify-values-1.0.0" sources."moment-2.20.1" @@ -33967,26 +34460,22 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-type-1.1.0" - sources."pify-2.3.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."q-1.5.1" - sources."rc-1.2.4" + sources."quick-lru-1.1.0" + sources."rc-1.2.5" sources."read-cmd-shim-1.0.1" - (sources."read-pkg-3.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - sources."pify-3.0.0" - ]; - }) + sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" - sources."registry-auth-token-3.3.1" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."repeating-2.0.1" @@ -34007,9 +34496,10 @@ in sources."slash-1.0.0" sources."sort-keys-2.0.0" sources."source-map-0.4.4" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."split-1.0.1" sources."split2-2.2.0" sources."string-width-2.1.1" @@ -34024,11 +34514,10 @@ in sources."minimist-0.1.0" ]; }) - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."temp-dir-1.0.0" (sources."temp-write-3.4.0" // { dependencies = [ - sources."pify-3.0.0" sources."uuid-3.2.1" ]; }) @@ -34052,7 +34541,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-2.0.3" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."wcwidth-1.0.1" sources."which-1.3.0" sources."which-module-2.0.0" @@ -34062,11 +34551,7 @@ in sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - (sources."write-json-file-2.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."write-json-file-2.3.0" sources."write-pkg-3.1.0" sources."xtend-4.0.1" sources."y18n-3.2.1" @@ -34083,6 +34568,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."load-json-file-2.0.0" sources."path-type-2.0.0" + sources."pify-2.3.0" sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" sources."strip-bom-3.0.0" @@ -34102,10 +34588,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "2.7.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; + url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; + sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; }; dependencies = [ sources."ajv-4.11.8" @@ -34119,13 +34605,13 @@ in sources."boom-2.10.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" - sources."errno-0.1.6" + sources."errno-0.1.7" sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."forever-agent-0.6.1" @@ -34151,8 +34637,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" @@ -34171,7 +34657,7 @@ in ]; }) sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uuid-3.2.1" @@ -34212,24 +34698,26 @@ in lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.2.0.tgz"; - sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-2.0.0.tgz"; + sha512 = "1y38jkc5m8kb1ll4wcc12yikqdb2l19acc3rdjl0bhs4vjh834mz53hhgyc4jm4gya1gnmzrj3g5337xn05kkxs92vl35zdqcwxij08"; }; dependencies = [ sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-unique-0.2.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."clone-1.0.3" - sources."clone-stats-0.0.1" + sources."clone-2.1.1" + sources."clone-buffer-1.0.0" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.0.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-util-is-1.0.2" @@ -34295,7 +34783,7 @@ in sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -34305,12 +34793,12 @@ in }) ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."replace-ext-0.0.1" + sources."replace-ext-1.0.0" sources."safe-buffer-5.1.1" sources."stream-shift-1.0.0" sources."string_decoder-1.0.3" @@ -34322,13 +34810,21 @@ in sources."unique-stream-2.2.1" sources."util-deprecate-1.0.2" sources."vali-date-1.0.0" - sources."vinyl-1.2.0" + (sources."vinyl-2.1.0" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) (sources."vinyl-fs-2.4.4" // { dependencies = [ + sources."clone-1.0.3" + sources."clone-stats-0.0.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" sources."isarray-0.0.1" + sources."replace-ext-0.0.1" sources."string_decoder-0.10.31" + sources."vinyl-1.2.0" ]; }) sources."wrappy-1.0.2" @@ -34356,7 +34852,7 @@ in sources."after-0.8.2" sources."ajv-5.5.2" sources."anymatch-1.3.2" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-flatten-1.1.1" @@ -34379,7 +34875,7 @@ in sources."blob-0.0.4" sources."body-parser-1.18.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -34390,7 +34886,7 @@ in sources."caseless-0.12.0" sources."chokidar-1.7.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -34414,8 +34910,16 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."entities-1.1.1" sources."escape-html-1.0.3" @@ -34431,7 +34935,7 @@ in sources."extend-3.0.1" sources."extglob-0.3.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.3" @@ -34439,7 +34943,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fsevents-1.1.3" @@ -34453,7 +34957,7 @@ in sources."has-binary2-1.0.2" sources."has-cors-1.1.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."html-entities-1.2.1" (sources."http-errors-1.6.2" // { dependencies = [ @@ -34465,7 +34969,7 @@ in sources."indexof-0.0.1" sources."inherits-2.0.3" sources."innertext-1.0.2" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" @@ -34488,9 +34992,9 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."linkify-it-2.0.3" - sources."markdown-it-8.4.0" + sources."markdown-it-8.4.1" sources."markdown-it-emoji-1.4.0" - sources."markdown-it-github-headings-1.1.0" + sources."markdown-it-github-headings-1.1.1" sources."markdown-it-task-checkbox-1.0.6" sources."mdurl-1.0.1" sources."media-typer-0.3.0" @@ -34498,12 +35002,12 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" @@ -34519,8 +35023,8 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" (sources."randomatic-1.1.7" // { @@ -34534,7 +35038,7 @@ in }) sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -34549,30 +35053,33 @@ in sources."sntp-2.1.0" (sources."socket.io-2.0.4" // { dependencies = [ - sources."accepts-1.3.3" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."sprintf-js-1.0.3" sources."sshpk-1.13.1" sources."statuses-1.4.0" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" sources."to-array-0.1.4" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" - sources."uc.micro-1.0.3" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" sources."ultron-1.1.1" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-0.14.5" + sources."uws-9.14.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -34610,7 +35117,7 @@ in sources."batch-0.6.1" sources."bcryptjs-2.4.3" sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -34652,7 +35159,7 @@ in sources."depd-1.1.1" ]; }) - sources."http-parser-js-0.4.9" + sources."http-parser-js-0.4.10" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -34671,8 +35178,8 @@ in sources."map-stream-0.1.0" sources."micromatch-2.3.11" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" (sources."morgan-1.9.0" // { dependencies = [ @@ -34681,7 +35188,7 @@ in ]; }) sources."ms-0.7.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."object-assign-4.1.1" @@ -34694,7 +35201,7 @@ in sources."path-is-absolute-1.0.1" sources."pause-stream-0.0.11" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proxy-middleware-0.15.0" (sources."randomatic-1.1.7" // { dependencies = [ @@ -34706,17 +35213,18 @@ in ]; }) sources."range-parser-1.2.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."safe-buffer-5.1.1" - (sources."send-0.16.1" // { + (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."statuses-1.4.0" ]; }) (sources."serve-index-1.9.1" // { @@ -34789,14 +35297,14 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; - sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz"; + sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a"; }; dependencies = [ sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.0" sources."commander-2.11.0" sources."concat-map-0.0.1" @@ -34837,10 +35345,10 @@ in sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."core-util-is-1.0.2" @@ -34848,25 +35356,25 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.10.0" sources."json-refs-2.1.7" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."ms-2.0.0" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" @@ -34907,10 +35415,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.1.tgz"; - sha512 = "1iy5npqmbdgxjalbw73ybgd2pfhizi8jdg91w9dpcmj9hfz02wbl306bwia397njlz5ymcblbc700zp8qb2lvrpw7jnyfvmflpvvglp"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.2.tgz"; + sha512 = "2mvfkqyzfcjfp429vmagcshlp9iqblngn9fslcxpg2n83k6ajwlh0gcnyiypsixpws8nq14d3b3syr9implhsq98wg3zw7nj6b6sg9f"; }; dependencies = [ sources."abbrev-1.1.1" @@ -34923,7 +35431,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."builtin-modules-1.1.1" @@ -34931,7 +35439,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-stream-1.6.0" sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" @@ -34947,12 +35455,12 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."findit-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-0.6.4" (sources."fs.extra-1.3.2" // { dependencies = [ @@ -34966,7 +35474,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -34982,8 +35490,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."minipass-2.2.1" sources."minizlib-1.1.0" @@ -34993,7 +35501,7 @@ in sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" sources."npm-package-arg-5.1.2" - sources."npm-registry-client-8.4.0" + sources."npm-registry-client-8.5.0" (sources."npmconf-2.1.2" // { dependencies = [ sources."once-1.3.3" @@ -35008,26 +35516,27 @@ in sources."optparse-1.0.5" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slasp-0.0.4" sources."slide-1.1.6" sources."sntp-2.1.0" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."ssri-4.1.6" sources."string-width-1.0.2" @@ -35036,14 +35545,14 @@ in sources."strip-ansi-3.0.1" sources."tar-3.1.15" sources."temp-0.8.3" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."walk-2.3.9" @@ -35083,11 +35592,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -35102,10 +35611,10 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -35116,7 +35625,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -35130,8 +35639,8 @@ in sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -35143,13 +35652,13 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -35163,7 +35672,7 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -35202,10 +35711,10 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz"; - sha1 = "e7851eb973f380543c058db564a9812055eac640"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.2.tgz"; + sha1 = "690c9ef7e5813da50b7a2746f334e3ff319bccd7"; }; dependencies = [ sources."abbrev-1.1.1" @@ -35240,7 +35749,7 @@ in }) sources."boom-2.10.1" sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."browser-launcher2-0.4.6" // { dependencies = [ sources."minimist-0.0.8" @@ -35254,7 +35763,7 @@ in sources."cliui-3.2.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" @@ -35316,7 +35825,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -35346,13 +35855,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.39" sources."nopt-4.0.1" @@ -35367,7 +35876,7 @@ in sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."parse-json-2.2.0" sources."parseurl-1.3.2" sources."path-exists-2.1.0" @@ -35383,16 +35892,16 @@ in sources."lodash-3.10.1" ]; }) - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.81.0" @@ -35406,9 +35915,10 @@ in sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -35422,15 +35932,15 @@ in sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" - sources."strong-data-uri-1.0.4" + sources."strong-data-uri-1.0.5" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" - sources."truncate-1.0.5" + sources."truncate-2.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uid-0.0.2" sources."uid-number-0.0.6" sources."ultron-1.0.2" @@ -35448,7 +35958,7 @@ in ]; }) sources."v8-profiler-5.7.0" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.0" @@ -35496,11 +36006,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -35546,8 +36056,8 @@ in sources."assert-plus-1.0.0" ]; }) - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -35560,18 +36070,18 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.81.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -35591,7 +36101,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid-number-0.0.6" @@ -35613,10 +36123,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.14.11"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.11.tgz"; - sha512 = "11wlzxf5xjrdybvf0lr1acr7bqhdy7s66m1w5cm02g8pzbd567xziphv1pjx6i27s34qh18rjhp6prc1rapp68x1lr8gkaxi8zfwvfz"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.1.tgz"; + sha512 = "2dnscknr22xf5r06zcrjz0ljaa2agbrnczh4faf42qsmqfpcng6znv6138nwyyr16fpqk28wgfab1bw3snrsyfz8pirmjl9ywdqibx7"; }; dependencies = [ sources."abbrev-1.1.1" @@ -35628,6 +36138,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" ]; }) sources."arr-diff-4.0.0" @@ -35650,15 +36161,23 @@ in }) sources."binary-extensions-1.11.0" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" - sources."braces-2.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."chalk-2.3.0" - (sources."chokidar-2.0.0" // { + sources."chalk-2.3.1" + (sources."chokidar-2.0.2" // { dependencies = [ sources."debug-2.6.9" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" sources."has-values-0.1.4" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -35671,8 +36190,12 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-1.0.1" - sources."kind-of-3.2.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) (sources."class-utils-0.3.6" // { @@ -35695,7 +36218,7 @@ in sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."deep-extend-0.4.2" - sources."define-property-1.0.0" + sources."define-property-2.0.2" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" sources."duplexer3-0.1.4" @@ -35707,9 +36230,11 @@ in sources."define-property-0.2.5" ]; }) - sources."extend-shallow-2.0.1" + sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" sources."kind-of-5.1.0" ]; }) @@ -35728,7 +36253,7 @@ in sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."has-value-1.0.0" sources."has-values-1.0.0" sources."ignore-by-default-1.0.1" @@ -35741,24 +36266,21 @@ in sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-3.0.0" + sources."is-number-4.0.0" sources."is-obj-1.0.1" - (sources."is-odd-1.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-odd-2.0.0" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -35767,11 +36289,11 @@ in sources."lazy-cache-2.0.2" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - (sources."micromatch-3.1.5" // { + (sources."micromatch-3.1.9" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -35784,18 +36306,15 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" ]; }) sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mixin-deep-1.3.0" + sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.8.0" - (sources."nanomatch-1.2.7" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."nan-2.9.2" + sources."nanomatch-1.2.9" sources."nopt-1.0.10" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" @@ -35813,21 +36332,23 @@ in sources."pify-3.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.4" - sources."readable-stream-2.3.3" + sources."rc-1.2.5" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" - sources."regex-not-1.0.0" - sources."registry-auth-token-3.3.1" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-getter-0.1.0" @@ -35843,10 +36364,15 @@ in sources."kind-of-5.1.0" ]; }) + sources."extend-shallow-2.0.1" sources."kind-of-4.0.0" ]; }) - sources."snapdragon-node-2.1.1" + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -35865,19 +36391,15 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."to-object-path-0.3.0" - (sources."to-regex-3.0.1" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) + sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."touch-3.1.0" - (sources."undefsafe-2.0.1" // { + (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -35898,6 +36420,7 @@ in ]; }) sources."unzip-response-2.0.1" + sources."upath-1.0.4" sources."update-notifier-2.3.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -35921,22 +36444,22 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.17.5"; + version = "0.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.17.5.tgz"; - sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.18.4.tgz"; + sha512 = "0d25q2hxpf5snrg8f3gplrjd73hqzyzxna0g2q6l0bm04fm8xgby8ydixaf8mgyz9dly2k5mw79jvs653m6vk9cl0r61fv8qr75khjz"; }; dependencies = [ sources."abbrev-1.1.1" sources."accepts-1.3.4" - sources."addressparser-0.1.3" + sources."addressparser-0.3.2" sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."append-field-0.1.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-indexofobject-0.0.1" sources."asn1-0.2.3" @@ -35947,7 +36470,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."basic-auth-1.1.0" + sources."basic-auth-2.0.0" (sources."bcrypt-1.0.3" // { dependencies = [ sources."assert-plus-1.0.0" @@ -35959,13 +36482,11 @@ in sources."boom-5.2.0" ]; }) - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."nopt-4.0.1" - sources."qs-6.5.1" sources."request-2.83.0" sources."sntp-2.1.0" sources."tunnel-agent-0.6.0" @@ -35975,13 +36496,13 @@ in sources."bcryptjs-2.4.3" sources."bl-1.2.1" sources."block-stream-0.0.9" - sources."body-parser-1.17.2" + sources."body-parser-1.18.2" sources."boolbase-1.0.0" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buildmail-2.0.0" sources."busboy-0.2.14" - sources."bytes-2.4.0" + sources."bytes-3.0.0" sources."callback-stream-1.1.0" sources."caseless-0.11.0" sources."chalk-1.1.3" @@ -35993,8 +36514,8 @@ in sources."clone-2.1.1" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" - sources."commander-2.9.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."commist-1.0.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -36006,14 +36527,14 @@ in sources."cookie-signature-1.0.6" sources."cookies-0.7.1" sources."core-util-is-1.0.2" - sources."cors-2.8.3" + sources."cors-2.8.4" sources."crc-3.4.4" - sources."cron-1.2.1" + sources."cron-1.3.0" sources."cryptiles-2.0.5" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."dashdash-1.14.1" - sources."debug-2.6.7" + sources."debug-2.6.9" sources."deep-extend-0.4.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -36033,35 +36554,31 @@ in sources."entities-1.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."etag-1.8.1" - (sources."express-4.15.3" // { + (sources."express-4.16.2" // { dependencies = [ + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) - (sources."express-session-1.15.2" // { - dependencies = [ - sources."debug-2.6.3" - sources."ms-0.7.2" - ]; - }) + sources."express-session-1.15.6" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."feedparser-1.1.3" - (sources."finalhandler-1.0.6" // { + sources."finalhandler-1.1.0" + (sources."follow-redirects-1.3.0" // { dependencies = [ - sources."debug-2.6.9" + sources."debug-3.1.0" ]; }) - sources."follow-redirects-1.2.4" sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."forwarded-0.1.2" - sources."fresh-0.5.0" - sources."fs-extra-1.0.0" + sources."fresh-0.5.2" + sources."fs-extra-5.0.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" @@ -36074,18 +36591,13 @@ in sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.11" - sources."graceful-readlink-1.0.1" sources."har-schema-2.0.0" sources."har-validator-2.0.6" sources."has-ansi-2.0.0" sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" sources."hawk-3.1.3" - (sources."help-me-1.1.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) + sources."help-me-1.1.0" sources."hoek-2.16.3" (sources."htmlparser2-3.9.2" // { dependencies = [ @@ -36100,35 +36612,36 @@ in sources."http-signature-1.1.1" sources."i18next-1.10.6" sources."i18next-client-1.10.3" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."imap-0.8.19" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.6.0" sources."is-absolute-1.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-3.1.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-negated-glob-1.0.0" sources."is-property-1.0.2" sources."is-relative-1.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.1" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.8.4" + sources."js-yaml-3.10.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-0.2.0" - sources."jsonata-1.2.6" - sources."jsonfile-2.4.0" + sources."jsonata-1.5.0" + sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" (sources."jsprim-1.4.1" // { @@ -36137,12 +36650,11 @@ in ]; }) sources."keygrip-1.0.2" - sources."klaw-1.3.1" sources."leven-1.0.2" sources."libbase64-0.1.0" sources."libmime-1.2.0" sources."libqp-1.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" @@ -36150,39 +36662,41 @@ in sources."lodash.flatten-4.4.0" sources."lodash.foreach-4.5.0" sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.0" + sources."lodash.merge-4.6.1" sources."lodash.pick-4.4.0" sources."lodash.reduce-4.6.0" sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" + sources."lru-cache-4.1.1" (sources."mailcomposer-2.1.0" // { dependencies = [ sources."needle-0.10.0" ]; }) - (sources."mailparser-0.6.2" // { + sources."mailparser-0.6.2" + sources."media-typer-0.3.0" + (sources."memorystore-1.6.0" // { dependencies = [ - sources."addressparser-1.0.1" + sources."debug-3.1.0" ]; }) - sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."mimelib-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."moment-timezone-0.5.14" - (sources."mqtt-2.9.0" // { + (sources."mqtt-2.15.1" // { dependencies = [ sources."ws-3.3.3" ]; }) - sources."mqtt-packet-5.4.0" + sources."mqtt-packet-5.5.0" sources."ms-2.0.0" (sources."multer-1.3.0" // { dependencies = [ @@ -36200,26 +36714,28 @@ in sources."node-pre-gyp-0.6.36" (sources."node-red-node-email-0.1.24" // { dependencies = [ - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" sources."clone-1.0.3" sources."isarray-0.0.1" sources."minimist-0.0.10" sources."readable-stream-1.1.14" + sources."semver-5.3.0" sources."string_decoder-0.10.31" ]; }) (sources."node-red-node-feedparser-0.1.8" // { dependencies = [ + sources."addressparser-0.1.3" sources."async-2.6.0" sources."bl-1.1.2" sources."isarray-0.0.1" + sources."process-nextick-args-1.0.7" sources."qs-6.2.3" sources."readable-stream-1.0.34" - sources."sax-0.6.1" sources."string_decoder-0.10.31" ]; }) - sources."node-red-node-rbe-0.1.14" + sources."node-red-node-rbe-0.2.1" (sources."node-red-node-twitter-0.1.12" // { dependencies = [ sources."assert-plus-1.0.0" @@ -36231,12 +36747,11 @@ in sources."boom-5.2.0" ]; }) - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."qs-6.5.1" sources."request-2.83.0" sources."sntp-2.1.0" sources."tunnel-agent-0.6.0" @@ -36247,13 +36762,13 @@ in sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" sources."nodemailer-wellknown-0.1.10" - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.1.2" sources."nth-check-1.0.1" sources."number-is-nan-1.0.1" sources."oauth-0.9.14" sources."oauth-sign-0.8.2" - sources."oauth2orize-1.8.0" + sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.1" @@ -36263,9 +36778,9 @@ in sources."ordered-read-streams-1.0.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."parseurl-1.3.2" - sources."passport-0.3.2" + sources."passport-0.4.0" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" sources."passport-strategy-1.0.0" @@ -36277,17 +36792,18 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."poplib-0.1.7" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-1.1.5" - sources."pump-1.0.3" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."pseudomap-1.0.2" + sources."pump-2.0.1" sources."pumpify-1.4.0" sources."punycode-1.4.1" - sources."qs-6.4.0" + sources."qs-6.5.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."raw-body-2.2.0" - sources."rc-1.2.4" - sources."readable-stream-2.3.3" + sources."raw-body-2.3.2" + sources."rc-1.2.5" + sources."readable-stream-2.3.4" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" (sources."request-2.74.0" // { @@ -36299,17 +36815,17 @@ in sources."retry-0.6.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."sax-1.2.4" - sources."semver-5.3.0" - sources."send-0.15.3" + sources."sax-0.6.1" + sources."semver-5.4.1" + sources."send-0.16.1" sources."sentiment-2.1.0" - sources."serve-static-1.12.3" + sources."serve-static-1.13.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.0.3" sources."signal-exit-3.0.2" sources."smtp-connection-1.3.8" sources."sntp-1.0.9" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" (sources."sshpk-1.13.1" // { @@ -36331,23 +36847,28 @@ in sources."through2-2.0.3" sources."through2-filter-2.0.0" sources."to-absolute-glob-2.0.2" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."twitter-ng-0.6.2" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-3.0.20" + (sources."uglify-js-3.3.6" // { + dependencies = [ + sources."commander-2.13.0" + ]; + }) sources."uid-number-0.0.6" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.2.1" + sources."universalify-0.1.1" sources."unpipe-1.0.0" sources."utf7-1.0.2" sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.0" + sources."utils-merge-1.0.1" sources."uue-3.1.1" sources."uuid-3.2.1" sources."vary-1.1.2" @@ -36357,14 +36878,15 @@ in sources."wide-align-1.1.2" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - (sources."ws-1.1.1" // { + (sources."ws-1.1.5" // { dependencies = [ sources."ultron-1.0.2" ]; }) - sources."xml2js-0.4.17" - sources."xmlbuilder-4.2.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" sources."xtend-4.0.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -36548,13 +37070,13 @@ in ]; }) sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."chownr-0.0.2" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."coffee-script-1.12.7" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" (sources."config-chain-1.1.11" // { dependencies = [ @@ -36575,12 +37097,12 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."findit-1.2.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-0.6.4" (sources."fs.extra-1.3.2" // { dependencies = [ @@ -36601,7 +37123,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -36616,8 +37138,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -36644,11 +37166,11 @@ in sources."osenv-0.0.3" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."retry-0.6.0" sources."rimraf-2.6.2" @@ -36676,7 +37198,7 @@ in sources."rimraf-2.1.4" ]; }) - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."underscore-1.4.4" @@ -36713,7 +37235,7 @@ in sources."ansi-styles-2.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."asap-2.0.6" sources."async-1.5.2" sources."balanced-match-1.0.0" @@ -36721,7 +37243,7 @@ in sources."bluebird-3.5.1" sources."bops-0.1.1" sources."boxen-0.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -36739,7 +37261,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."concat-map-0.0.1" (sources."configstore-1.4.0" // { dependencies = [ @@ -36779,7 +37301,7 @@ in sources."graceful-fs-4.1.11" sources."graphlib-2.1.5" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hasbin-1.2.3" sources."hosted-git-info-2.5.0" sources."iconv-lite-0.4.19" @@ -36818,24 +37340,28 @@ in sources."lazy-cache-1.0.4" sources."lcid-1.0.0" sources."load-json-file-1.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.assign-4.2.0" sources."lodash.clonedeep-4.5.0" sources."lodash.defaults-4.2.0" sources."lodash.defaultsdeep-4.6.0" - sources."lodash.mergewith-4.6.0" + sources."lodash.mergewith-4.6.1" sources."longest-1.0.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" - sources."minimatch-3.0.2" + sources."make-dir-1.2.0" + sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-object-2.0.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."nconf-0.7.2" - sources."needle-2.1.1" + (sources."needle-2.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."nested-error-stacks-1.0.2" sources."node-alias-1.0.4" sources."node-status-codes-1.0.0" @@ -36857,7 +37383,7 @@ in sources."os-locale-1.4.0" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."p-finally-1.0.0" sources."package-json-2.4.0" @@ -36871,19 +37397,20 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."punycode-1.3.2" sources."querystring-0.2.0" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."rc-config-loader-2.0.1" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" - sources."registry-auth-token-3.3.1" + sources."readable-stream-2.3.4" + sources."recursive-readdir-2.2.2" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."repeating-2.0.1" @@ -36909,11 +37436,12 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - (sources."snyk-1.69.3" // { + (sources."snyk-1.69.10" // { dependencies = [ sources."async-0.9.2" sources."camelcase-3.0.0" sources."cliui-3.2.0" + sources."debug-3.1.0" sources."for-in-0.1.8" sources."got-3.3.1" sources."latest-version-1.0.1" @@ -36928,40 +37456,60 @@ in sources."yargs-4.8.1" ]; }) - sources."snyk-config-1.0.1" + (sources."snyk-config-1.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."snyk-go-plugin-1.4.5" sources."snyk-gradle-plugin-1.2.0" - sources."snyk-module-1.8.1" + (sources."snyk-module-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."snyk-mvn-plugin-1.1.1" (sources."snyk-nuget-plugin-1.3.9" // { dependencies = [ - sources."debug-3.1.0" sources."es6-promise-4.2.4" ]; }) - (sources."snyk-php-plugin-1.3.2" // { + sources."snyk-php-plugin-1.3.2" + (sources."snyk-policy-1.10.2" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-2.6.9" + ]; + }) + sources."snyk-python-plugin-1.5.6" + (sources."snyk-resolve-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" ]; }) - sources."snyk-policy-1.10.1" - sources."snyk-python-plugin-1.5.3" - sources."snyk-recursive-readdir-2.0.0" - sources."snyk-resolve-1.0.0" (sources."snyk-resolve-deps-1.7.0" // { dependencies = [ sources."configstore-2.1.0" + sources."debug-2.6.9" sources."update-notifier-0.6.3" sources."uuid-2.0.3" ]; }) - sources."snyk-sbt-plugin-1.2.2" + (sources."snyk-sbt-plugin-1.2.4" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."snyk-tree-1.0.0" - sources."snyk-try-require-1.2.0" + (sources."snyk-try-require-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."spawn-please-0.3.0" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" sources."stream-shift-1.0.0" sources."string-length-1.0.1" @@ -36992,7 +37540,7 @@ in sources."ansi-styles-3.2.0" sources."boxen-1.3.0" sources."camelcase-4.1.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."configstore-3.1.1" sources."dot-prop-4.2.0" sources."got-6.7.1" @@ -37002,7 +37550,7 @@ in sources."pify-3.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."widest-line-2.0.0" @@ -37014,7 +37562,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."which-1.3.0" sources."which-module-1.0.0" sources."widest-line-1.0.0" @@ -37026,7 +37574,7 @@ in sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" sources."y18n-3.2.1" sources."yallist-2.1.2" sources."yargs-3.15.0" @@ -37045,10 +37593,10 @@ in nsp = nodeEnv.buildNodePackage { name = "nsp"; packageName = "nsp"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nsp/-/nsp-3.1.0.tgz"; - sha512 = "0hbwm017cl5ybzw14l44mbinhnv38jrnbpg1ngkdibhc5hiimm8hqr2pi5dzh6flvxr0x6nym93029i7j41clr6rlvn1ab6r5cgdl4f"; + url = "https://registry.npmjs.org/nsp/-/nsp-3.2.1.tgz"; + sha512 = "06qrykgjpr3m7sl9g2axaraxh3mndmffgjxf45nqw5jblqa9zsnkvgmds8s29avp4qhmk084ri0rbg30yr15bd73i2152q6na5qdfbl"; }; dependencies = [ sources."agent-base-4.2.0" @@ -37058,7 +37606,7 @@ in sources."boom-5.2.0" sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-table2-0.2.0" @@ -37087,8 +37635,8 @@ in sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" - sources."hoek-4.2.0" + sources."has-flag-3.0.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."https-proxy-agent-2.1.1" sources."iconv-lite-0.4.19" @@ -37096,7 +37644,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -37114,7 +37662,7 @@ in sources."lodash-3.10.1" sources."lru-cache-4.1.1" sources."mem-1.1.0" - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nodesecurity-npm-utils-6.0.0" @@ -37147,17 +37695,18 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."which-1.3.0" sources."which-module-2.0.0" sources."wrap-ansi-2.1.0" @@ -37186,22 +37735,23 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.16"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.16.tgz"; - sha512 = "2f63gvm5x3c7dxp8fpaxhvjlha7isdfrbq7pqpkj0n33zndhi4925qkmzgrgn7qhrff6dhiqb3j1a3m1jjwq1k5kff910rrxd1622jd"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.27.tgz"; + sha512 = "14fhxv57nybf56n1454ccmdn2sn41amzf4f6a1n70ha48ndrpcw14g6hvv91k5bj775pxh74aa8ncsc3f7bfgz0cg0nwg8ysv43dmqw"; }; dependencies = [ sources."async-2.6.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" + sources."deepmerge-2.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.2" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."lodash-4.17.4" - sources."lokijs-1.5.1" + sources."lodash-4.17.5" + sources."lokijs-1.5.2" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -37237,7 +37787,7 @@ in sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."asap-2.0.6" sources."asn1-0.2.3" @@ -37257,7 +37807,7 @@ in ]; }) sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" @@ -37271,9 +37821,9 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."colors-1.1.2" - sources."combined-stream-1.0.5" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."combined-stream-1.0.6" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" @@ -37324,7 +37874,7 @@ in }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" (sources."finalhandler-1.1.0" // { dependencies = [ @@ -37334,7 +37884,7 @@ in sources."find-up-1.1.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."function-bind-1.1.1" @@ -37350,7 +37900,7 @@ in sources."has-symbols-1.0.0" sources."hat-0.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."hot-shots-4.8.0" (sources."http-errors-1.6.2" // { @@ -37363,7 +37913,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-arguments-1.0.2" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" @@ -37398,8 +37948,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" @@ -37407,7 +37957,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."normalize-package-data-2.4.0" @@ -37432,9 +37982,9 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prfun-2.1.5" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -37449,17 +37999,17 @@ in sources."right-align-0.1.3" sources."rimraf-2.4.5" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" + sources."safe-json-stringify-1.1.0" sources."semver-5.5.0" sources."send-0.16.1" sources."serve-favicon-2.4.5" sources."serve-static-1.13.1" - (sources."service-runner-2.5.0" // { + (sources."service-runner-2.5.1" // { dependencies = [ sources."isarray-1.0.0" sources."minimist-0.0.8" sources."ms-0.7.3" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -37468,9 +38018,10 @@ in sources."simplediff-0.1.1" sources."sntp-2.1.0" sources."source-map-0.4.4" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" sources."sshpk-1.13.1" sources."statuses-1.4.0" @@ -37480,10 +38031,10 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" @@ -37494,7 +38045,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-module-1.0.0" @@ -37529,7 +38080,7 @@ in sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; }; dependencies = [ - sources."addr-to-ip-port-1.4.2" + sources."addr-to-ip-port-1.4.3" sources."airplay-protocol-2.0.2" sources."airplayer-2.0.0" sources."ansi-escapes-1.4.0" @@ -37545,13 +38096,13 @@ in sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" - sources."blob-to-buffer-1.2.6" + sources."blob-to-buffer-1.2.7" sources."bn.js-4.11.8" sources."bncode-0.5.3" sources."bonjour-3.5.0" sources."bplist-creator-0.0.6" sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" @@ -37611,13 +38162,13 @@ in sources."ini-1.3.5" (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.17.4" + sources."lodash-4.17.5" ]; }) sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.5.4" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -37647,7 +38198,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.3.5" sources."ms-2.0.0" - sources."multicast-dns-6.2.2" + sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.6" sources."network-address-1.1.2" @@ -37687,26 +38238,26 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."plist-1.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pump-1.0.3" sources."random-access-file-1.8.1" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" sources."repeating-2.0.1" sources."restore-cursor-1.0.1" sources."reverse-http-1.3.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."run-parallel-1.1.6" + sources."run-parallel-1.1.7" sources."run-series-1.1.4" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."rx-4.1.0" sources."safe-buffer-5.1.1" sources."semver-5.5.0" @@ -37723,9 +38274,10 @@ in }) sources."single-line-log-1.1.2" sources."spawn-sync-1.0.15" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -37738,14 +38290,14 @@ in sources."supports-color-2.0.0" sources."thirty-two-1.0.2" sources."through-2.3.8" - sources."thunky-0.1.0" + sources."thunky-1.0.2" sources."tmp-0.0.29" (sources."torrent-discovery-5.4.0" // { dependencies = [ sources."bencode-0.8.0" sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -37764,7 +38316,6 @@ in sources."safe-buffer-5.0.1" sources."string_decoder-0.10.31" sources."thirty-two-0.0.2" - sources."thunky-1.0.2" sources."ultron-1.0.2" ]; }) @@ -37774,7 +38325,7 @@ in sources."uniq-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."winreg-1.2.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" @@ -37802,7 +38353,7 @@ in }; dependencies = [ sources."accepts-1.2.13" - sources."addr-to-ip-port-1.4.2" + sources."addr-to-ip-port-1.4.3" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."async-0.2.10" @@ -37825,7 +38376,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.13.3" sources."boom-0.3.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" @@ -37837,7 +38388,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - sources."compressible-2.0.12" + sources."compressible-2.0.13" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -37954,8 +38505,8 @@ in }) sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -37991,7 +38542,7 @@ in ]; }) sources."pend-1.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proxy-addr-1.0.10" sources."pump-1.0.3" sources."qs-6.5.1" @@ -38022,9 +38573,9 @@ in }) sources."rimraf-2.6.2" sources."rndm-1.2.0" - sources."run-parallel-1.1.6" + sources."run-parallel-1.1.7" sources."run-series-1.1.4" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."safe-buffer-5.1.1" (sources."send-0.13.0" // { dependencies = [ @@ -38087,7 +38638,7 @@ in sources."mkdirp-0.3.5" sources."ms-2.0.0" sources."once-1.3.3" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.0.1" sources."string_decoder-1.0.3" sources."ultron-1.1.1" @@ -38095,7 +38646,7 @@ in }) sources."tsscmp-1.0.5" sources."tunnel-agent-0.2.0" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uid-safe-2.1.4" sources."ultron-1.0.2" sources."uniq-1.0.1" @@ -38141,11 +38692,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.0.3" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -38176,7 +38727,8 @@ in sources."http-signature-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -38195,9 +38747,9 @@ in }) sources."kew-0.7.0" sources."klaw-1.3.1" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.0" @@ -38249,10 +38801,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz"; - sha512 = "1k0h7nzg4lg3lf86xy0z7adx2z7nhj8r1y7c5s0gwhfb7qn4qp0845w5agq9zy48ll7sldv7ak2haypkm7akspajvdq25hn0ahlvisd"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.11.0.tgz"; + sha512 = "3xk1i02slbak5bilsgbsi5qh2f68dn84s1as0h2bymmiwm3isnazndlvl74yjwlmqxkaw9sj45c402xhy5xk5h0nkbcv39gqwyyfg75"; }; buildInputs = globalBuildInputs; meta = { @@ -38274,6 +38826,7 @@ in dependencies = [ sources."JSONStream-1.3.2" sources."acorn-4.0.13" + sources."acorn-node-1.3.0" sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" @@ -38281,23 +38834,23 @@ in sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."array-unique-0.2.1" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."astw-2.2.0" sources."async-1.5.2" sources."async-each-1.0.1" sources."balanced-match-1.0.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."binary-extensions-1.11.0" sources."bn.js-4.11.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -38305,7 +38858,7 @@ in }) (sources."browserify-13.3.0" // { dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."combine-source-map-0.7.2" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -38314,6 +38867,7 @@ in }) sources."hash-base-2.0.2" sources."isarray-0.0.1" + sources."process-nextick-args-2.0.0" ]; }) sources."browserify-aes-1.1.1" @@ -38403,7 +38957,7 @@ in sources."kind-of-3.2.2" sources."labeled-stream-splicer-2.0.0" sources."lexical-scope-1.2.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" sources."micromatch-2.3.11" @@ -38415,7 +38969,7 @@ in sources."minimist-1.2.0" sources."module-deps-4.1.1" sources."mute-stream-0.0.7" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."node-static-0.7.10" // { dependencies = [ sources."minimist-0.0.10" @@ -38454,10 +39008,10 @@ in ]; }) sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.3" // { + (sources."readable-stream-2.3.4" // { dependencies = [ sources."isarray-1.0.0" sources."string_decoder-1.0.3" @@ -38484,18 +39038,14 @@ in sources."string-stream-0.0.7" sources."string_decoder-0.10.31" sources."subarg-1.0.0" - (sources."syntax-error-1.3.0" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) + sources."syntax-error-1.4.0" sources."temp-0.8.3" sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" sources."tree-kill-1.2.0" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.1" (sources."url-0.11.0" // { @@ -38538,6 +39088,8 @@ in sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa"; }; dependencies = [ + sources."@types/babel-types-7.0.1" + sources."@types/babylon-6.16.2" sources."accepts-1.3.4" sources."acorn-3.3.0" (sources."acorn-globals-3.1.0" // { @@ -38558,6 +39110,9 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" + sources."babel-runtime-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bindings-1.2.1" @@ -38575,15 +39130,16 @@ in sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."console-control-strings-1.1.0" - sources."constantinople-3.1.0" + sources."constantinople-3.1.2" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" + sources."core-js-2.5.3" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" @@ -38599,8 +39155,9 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - sources."errno-0.1.6" + sources."errno-0.1.7" sources."escape-html-1.0.3" + sources."esutils-2.0.2" sources."etag-1.8.1" sources."eventemitter2-3.0.2" sources."expand-template-1.1.0" @@ -38641,10 +39198,10 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."int64-buffer-0.1.10" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-3.2.1" sources."is-buffer-1.1.6" - sources."is-expression-2.1.0" + sources."is-expression-3.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" sources."is-regex-1.0.4" @@ -38672,13 +39229,14 @@ in }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" + sources."lodash-4.17.5" sources."longest-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."morgan-1.9.0" @@ -38692,7 +39250,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."node-abi-2.1.2" + sources."node-abi-2.3.0" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -38708,15 +39266,14 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-0.2.0" sources."prebuild-install-2.1.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."prr-1.0.1" (sources."pug-2.0.0-rc.4" // { dependencies = [ sources."acorn-4.0.13" sources."commander-2.8.1" - sources."is-expression-3.0.0" sources."source-map-0.4.4" ]; }) @@ -38741,8 +39298,9 @@ in sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" - sources."readable-stream-2.3.3" + sources."rc-1.2.5" + sources."readable-stream-2.3.4" + sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" sources."resolve-1.5.0" @@ -38777,11 +39335,12 @@ in sources."strip-json-comments-2.0.1" sources."tar-fs-1.16.0" sources."tar-stream-1.5.5" + sources."to-fast-properties-1.0.3" sources."token-stream-0.0.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uglify-js-2.8.29" sources."uglify-to-browserify-1.0.2" sources."ultron-1.1.1" @@ -38820,13 +39379,13 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."amdefine-1.0.1" sources."ast-types-0.9.6" sources."balanced-match-1.0.0" sources."base62-0.1.1" - sources."brace-expansion-1.1.8" - sources."commander-2.13.0" + sources."brace-expansion-1.1.11" + sources."commander-2.14.1" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -38876,7 +39435,7 @@ in sources."ansi-styles-2.2.1" sources."async-0.2.10" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."colors-0.6.2" sources."concat-map-0.0.1" @@ -38951,7 +39510,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."coffee-script-1.6.3" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."commander-2.0.0" (sources."connect-2.11.0" // { dependencies = [ @@ -38992,17 +39551,17 @@ in }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.0.11" sources."fresh-0.2.0" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-auth-2.0.7" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -39017,8 +39576,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."mkdirp-0.3.5" sources."ms-2.0.0" sources."multiparty-2.2.0" @@ -39051,7 +39610,7 @@ in sources."string-1.6.1" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" @@ -39087,13 +39646,17 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.4.9"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.9.tgz"; - sha512 = "2241nrhci4lgj15pxzvspx6m3vjdpcsih532sz1mi17fby8yiadv33d84v05z1465cszh35xhzf7kx3yirwzq5zbi7zvzhw13ddsqy0"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.0.tgz"; + sha512 = "3jvih9f09fhgz59n8j1nb607wvhwailsnw1x98zqrq8rig5rc2a6dc3v3r2mw4mnvbgg5jnpiss440jfm9gbrymf985hqw1wlngbyf2"; }; dependencies = [ - sources."@zeit/check-updates-1.0.5" + (sources."@zeit/check-updates-1.1.0" // { + dependencies = [ + sources."chalk-2.3.0" + ]; + }) sources."accepts-1.3.4" sources."address-1.0.3" sources."align-text-0.1.4" @@ -39115,9 +39678,14 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.0" + (sources."chalk-2.3.1" // { + dependencies = [ + sources."has-flag-3.0.0" + sources."supports-color-5.2.0" + ]; + }) sources."cli-boxes-1.0.0" - (sources."clipboardy-1.2.2" // { + (sources."clipboardy-1.2.3" // { dependencies = [ sources."execa-0.8.0" ]; @@ -39125,8 +39693,8 @@ in sources."cliui-2.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."configstore-3.1.1" sources."content-type-1.0.4" sources."create-error-class-3.0.2" @@ -39151,7 +39719,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - sources."filesize-3.5.11" + sources."filesize-3.6.0" sources."fresh-0.5.2" sources."fs-extra-5.0.0" sources."get-stream-3.0.0" @@ -39188,20 +39756,16 @@ in sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-1.0.4" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."longest-1.0.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."micro-9.1.0" sources."micro-compress-1.0.0" sources."mime-1.4.1" - sources."mime-db-1.32.0" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-1.2.0" sources."mri-1.1.0" sources."ms-2.1.1" @@ -39211,7 +39775,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."openssl-self-signed-certificate-1.1.6" - sources."opn-5.1.0" + sources."opn-5.2.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" sources."package-json-4.0.1" @@ -39224,18 +39788,18 @@ in sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" - sources."registry-auth-token-3.3.1" + sources."rc-1.2.5" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."semver-5.5.0" sources."semver-diff-2.1.0" - (sources."send-0.16.1" // { + (sources."send-0.16.2" // { dependencies = [ + sources."depd-1.1.2" sources."ms-2.0.0" - sources."statuses-1.3.1" ]; }) sources."setprototypeof-1.0.3" @@ -39326,8 +39890,8 @@ in ]; }) sources."co-4.6.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -39369,11 +39933,11 @@ in sources."express-4.16.2" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."from-0.1.7" @@ -39384,7 +39948,7 @@ in sources."has-binary-data-0.1.1" sources."has-cors-1.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" (sources."htmlparser2-3.7.3" // { dependencies = [ sources."entities-1.0.0" @@ -39399,7 +39963,7 @@ in sources."iconv-lite-0.4.19" sources."indexof-0.0.1" sources."inherits-2.0.3" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."irc-replies-2.0.1" sources."is-typedarray-1.0.0" sources."isarray-0.0.1" @@ -39417,8 +39981,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.7.0" @@ -39437,7 +40001,7 @@ in sources."path-to-regexp-0.1.7" sources."pause-stream-0.0.11" sources."performance-now-2.1.0" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -39479,10 +40043,10 @@ in sources."through-2.3.8" sources."tinycolor-0.0.1" sources."to-array-0.1.3" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."unpipe-1.0.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" @@ -39515,7 +40079,7 @@ in sources."ajv-5.5.2" sources."amdefine-1.0.1" sources."ansi-styles-3.2.0" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-flatten-2.1.1" sources."array-uniq-1.0.3" sources."asn1-0.2.3" @@ -39535,7 +40099,7 @@ in ]; }) sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."bunyan-1.8.12" // { dependencies = [ sources."minimatch-3.0.4" @@ -39543,14 +40107,14 @@ in }) sources."bytes-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" - sources."compressible-2.0.12" - (sources."compression-1.7.1" // { + sources."combined-stream-1.0.6" + sources."commander-2.14.1" + sources."compressible-2.0.13" + (sources."compression-1.7.2" // { dependencies = [ sources."bytes-3.0.0" ]; @@ -39580,7 +40144,7 @@ in }) sources."domelementtype-1.3.0" sources."domhandler-2.4.1" - sources."domutils-1.6.2" + sources."domutils-1.7.0" sources."dtrace-provider-0.8.6" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" @@ -39595,11 +40159,11 @@ in sources."express-json5-0.1.0" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-ext-0.6.0" @@ -39612,10 +40176,10 @@ in }) sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" sources."highlight.js-8.9.1" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."htmlparser2-3.9.2" (sources."http-errors-1.6.2" // { dependencies = [ @@ -39642,7 +40206,9 @@ in sources."linkify-it-1.2.4" sources."lodash.clonedeep-4.5.0" sources."lodash.escaperegexp-4.1.2" - sources."lodash.mergewith-4.6.0" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.mergewith-4.6.1" sources."lru-cache-2.7.3" sources."lunr-0.7.2" sources."markdown-it-4.4.0" @@ -39651,15 +40217,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."number-is-nan-1.0.1" @@ -39672,8 +40238,8 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."postcss-6.0.16" - sources."process-nextick-args-1.0.7" + sources."postcss-6.0.19" + sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" sources."qs-6.5.0" @@ -39687,9 +40253,8 @@ in }) (sources."render-readme-1.3.1" // { dependencies = [ - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."source-map-0.6.1" - sources."supports-color-5.1.0" ]; }) (sources."request-2.83.0" // { @@ -39705,8 +40270,8 @@ in ]; }) sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" - sources."sanitize-html-1.17.0" + sources."safe-json-stringify-1.1.0" + sources."sanitize-html-1.18.2" sources."semver-4.3.6" sources."send-0.15.6" sources."serve-static-1.12.6" @@ -39721,13 +40286,13 @@ in sources."statuses-1.3.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."through-2.3.8" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" - sources."uc.micro-1.0.3" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" sources."uglify-js-2.3.6" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" @@ -39762,7 +40327,7 @@ in dependencies = [ sources."async-2.1.5" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."cli-table-0.3.1" sources."colors-1.0.3" sources."commander-2.9.0" @@ -39772,10 +40337,10 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."minimatch-3.0.4" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.3.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" @@ -39805,7 +40370,7 @@ in sources."assert-plus-0.1.5" sources."backoff-2.5.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."bunyan-1.5.1" sources."clone-0.1.6" sources."cmdln-3.2.1" @@ -39838,7 +40403,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -39846,9 +40411,9 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."precond-0.2.3" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."qs-3.1.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -39861,7 +40426,7 @@ in }) sources."rimraf-2.4.5" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" + sources."safe-json-stringify-1.1.0" sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ @@ -39936,7 +40501,7 @@ in sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; dependencies = [ - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" @@ -39951,15 +40516,23 @@ in sources."component-inherit-0.0.3" sources."cookie-0.3.1" sources."debug-2.6.9" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."has-binary2-1.0.2" sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."object-component-0.0.3" @@ -39968,10 +40541,14 @@ in sources."safe-buffer-5.1.1" sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."to-array-0.1.4" sources."ultron-1.1.1" - sources."uws-0.14.5" + sources."uws-9.14.0" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" @@ -40017,7 +40594,7 @@ in sources."hashring-3.2.0" sources."keypress-0.1.0" sources."modern-syslog-1.1.2" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."sequence-2.2.1" sources."simple-lru-cache-0.0.2" sources."winser-0.1.6" @@ -40079,7 +40656,7 @@ in dependencies = [ sources."amdefine-1.0.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."css-parse-1.7.0" sources."debug-3.1.0" @@ -40109,13 +40686,13 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.0.3.tgz"; - sha512 = "1f9s0zk5rrb842w5gibjarlc9qw8bmjcxnbxc8jjn8is4d6c9l66ajwvifw87yx3pis6dcinyjwvvkxvzpyp326nl72vjv9rw5ndxnp"; + url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz"; + sha512 = "0z83qdi781ax865bpw8ywmp5dyljjwnan5f9lgja0zcyr8niycd0x35yqw7chwmh3wpps4ai1lkswybk8mjnjik526vdvw1z1zf52lx"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."boolbase-1.0.0" sources."coa-2.0.1" sources."colors-1.1.2" @@ -40184,11 +40761,11 @@ in dependencies = [ sources."acorn-4.0.13" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."enhanced-resolve-2.3.0" - sources."errno-0.1.6" + sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.2" sources."graceful-fs-4.1.11" @@ -40200,9 +40777,9 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."prr-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."resolve-from-2.0.0" sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" @@ -40247,8 +40824,8 @@ in sources."chalk-1.1.3" sources."cliui-2.1.0" sources."colors-1.1.2" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -40280,7 +40857,8 @@ in sources."http-signature-1.1.1" sources."humanize-0.0.9" sources."is-buffer-1.1.6" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -40297,11 +40875,11 @@ in sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."longest-1.0.1" sources."longjohn-0.2.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."moment-2.16.0" (sources."node-appc-0.2.41" // { @@ -40339,7 +40917,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."temp-0.8.3" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" (sources."uglify-js-2.7.5" // { @@ -40375,10 +40953,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.6.2"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; - sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; buildInputs = globalBuildInputs; meta = { @@ -40411,7 +40989,7 @@ in sources."balanced-match-1.0.0" sources."bluebird-3.5.1" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" @@ -40427,7 +41005,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."columnify-1.5.4" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."configstore-3.1.1" @@ -40448,7 +41026,7 @@ in sources."execa-0.7.0" sources."exit-hook-1.1.1" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stream-3.0.0" @@ -40458,7 +41036,7 @@ in sources."graceful-fs-4.1.11" sources."has-1.0.1" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."http-proxy-agent-1.0.0" sources."https-proxy-agent-1.0.0" @@ -40467,7 +41045,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."is-absolute-0.2.6" sources."is-arrayish-0.2.1" sources."is-fullwidth-code-point-2.0.0" @@ -40494,11 +41072,11 @@ in sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" - sources."make-error-1.3.2" + sources."make-dir-1.2.0" + sources."make-error-1.3.4" sources."make-error-cause-1.2.2" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" @@ -40521,17 +41099,17 @@ in sources."popsicle-rewrite-1.0.0" sources."popsicle-status-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.3" - sources."registry-auth-token-3.3.1" + sources."readable-stream-2.3.4" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" @@ -40556,9 +41134,9 @@ in sources."throat-3.2.0" sources."timed-out-4.0.1" sources."touch-1.0.0" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."typedarray-0.0.6" - sources."typescript-2.6.2" + sources."typescript-2.7.2" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -40570,9 +41148,9 @@ in (sources."update-notifier-2.3.0" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."semver-5.5.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."url-parse-lax-1.0.0" @@ -40600,13 +41178,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.8"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; - sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz"; + sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72"; }; dependencies = [ - sources."commander-2.13.0" + sources."commander-2.14.1" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -40621,10 +41199,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.7"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.7.tgz"; - sha512 = "1fg2pwdf3d1qnlly7y0kpm8ghx56kc35993ww9v4xgpkdn7ga1s53190yjsifi6dj6j3v6602y8dnr5y0jyp4qm6v4rdb385dw5p2xs"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.10.tgz"; + sha512 = "0l2pf7nl7pkc8kq77agwg5s5c21wd3rl10l42l6xk6s3bkdv8l0vhlrvzampasaraikblyjh0sq81rqym3whn2jfspqhivllpkb8iqp"; }; dependencies = [ sources."abbrev-1.1.1" @@ -40654,7 +41232,7 @@ in sources."blueimp-md5-2.10.0" sources."body-parser-1.18.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -40713,11 +41291,19 @@ in }) sources."eachr-3.2.0" sources."ecc-jsbn-0.1.1" - sources."editions-1.3.3" + sources."editions-1.3.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -40725,6 +41311,7 @@ in sources."execa-0.7.0" (sources."express-4.16.2" // { dependencies = [ + sources."serve-static-1.13.1" sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; @@ -40734,7 +41321,7 @@ in sources."extract-opts-3.3.1" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.0" sources."find-up-2.1.0" @@ -40758,7 +41345,7 @@ in sources."has-unicode-2.0.1" sources."hasher-1.2.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hogan.js-3.0.2" sources."hosted-git-info-2.5.0" (sources."http-errors-1.6.2" // { @@ -40774,7 +41361,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.3.1" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" @@ -40801,7 +41388,7 @@ in sources."knockout-3.5.0-beta" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" sources."lsmod-1.0.0" sources."media-typer-0.3.0" @@ -40814,9 +41401,9 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -40830,12 +41417,12 @@ in sources."npm-package-arg-5.1.2" (sources."npm-registry-client-8.5.0" // { dependencies = [ - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."delayed-stream-1.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -40854,7 +41441,7 @@ in sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" @@ -40871,8 +41458,8 @@ in sources."path-to-regexp-0.1.7" sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" @@ -40884,7 +41471,7 @@ in ]; }) sources."raw-body-2.3.2" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -40899,7 +41486,11 @@ in sources."safe-buffer-5.1.1" sources."semver-5.4.1" sources."send-0.16.1" - sources."serve-static-1.13.1" + (sources."serve-static-1.13.2" // { + dependencies = [ + sources."send-0.16.2" + ]; + }) sources."set-blocking-2.0.0" sources."setprototypeof-1.0.3" sources."shebang-command-1.2.0" @@ -40912,17 +41503,21 @@ in sources."sntp-2.1.0" (sources."socket.io-2.0.4" // { dependencies = [ - sources."accepts-1.3.3" sources."component-emitter-1.2.1" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."ssri-4.1.6" sources."stack-trace-0.0.9" @@ -40935,16 +41530,16 @@ in sources."strip-json-comments-2.0.1" (sources."superagent-3.8.2" // { dependencies = [ - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" sources."delayed-stream-1.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -40955,11 +41550,11 @@ in }) sources."timed-out-4.0.1" sources."to-array-0.1.4" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" - sources."typechecker-4.4.1" + sources."type-is-1.6.16" + sources."typechecker-4.5.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" sources."ultron-1.1.1" @@ -40968,8 +41563,8 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-0.14.5" - sources."validate-npm-package-license-3.0.1" + sources."uws-9.14.0" + sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -41034,11 +41629,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.0.3" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -41076,7 +41671,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.1.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -41095,9 +41691,9 @@ in }) sources."kew-0.1.7" sources."klaw-1.3.1" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -41163,39 +41759,50 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.10.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; - sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.0.1.tgz"; + sha512 = "1hb2dyvj718ijrx00xnd3zbzqll3jqnij5rp5qp4pxx3vl9wxg7jsz8s703h3snxr73yi9a2xpfgwqxs8gcbhl277g5l4lgc8r0sx4c"; }; dependencies = [ - sources."acorn-5.3.0" - (sources."acorn-dynamic-import-2.0.2" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) - sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" - sources."align-text-0.1.4" - sources."ansi-regex-2.1.1" + sources."acorn-5.5.0" + sources."acorn-dynamic-import-3.0.0" + sources."ajv-6.2.0" + sources."ajv-keywords-3.1.0" sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" + sources."aproba-1.2.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" - sources."array-unique-0.2.1" - sources."asn1.js-4.9.2" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" + sources."assign-symbols-1.0.0" sources."async-2.6.0" sources."async-each-1.0.1" + sources."atob-2.0.3" sources."balanced-match-1.0.0" - sources."base64-js-1.2.1" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-1.0.1" + sources."kind-of-3.2.2" + ]; + }) + sources."base64-js-1.2.3" sources."big.js-3.2.0" sources."binary-extensions-1.11.0" + sources."bluebird-3.5.1" sources."bn.js-4.11.8" - sources."brace-expansion-1.1.8" - (sources."braces-1.8.5" // { + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { dependencies = [ - sources."kind-of-4.0.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" ]; }) sources."brorand-1.1.0" @@ -41207,152 +41814,202 @@ in sources."browserify-zlib-0.2.0" sources."buffer-4.9.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" + sources."cacache-10.0.4" + sources."cache-base-1.0.1" sources."chokidar-1.7.0" + sources."chownr-1.0.1" + sources."chrome-trace-event-0.1.2" sources."cipher-base-1.0.4" - sources."cliui-2.1.0" - sources."co-4.6.0" - sources."code-point-at-1.1.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."collection-visit-1.0.0" + sources."commander-2.14.1" + sources."commondir-1.0.1" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.0" sources."create-hash-1.1.3" sources."create-hmac-1.1.6" - sources."cross-spawn-5.1.0" sources."crypto-browserify-3.12.0" - sources."d-1.0.0" + sources."cyclist-0.2.2" sources."date-now-0.1.4" - sources."decamelize-1.2.0" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" sources."des.js-1.0.0" sources."diffie-hellman-5.0.2" sources."domain-browser-1.2.0" + sources."duplexify-3.5.3" sources."elliptic-6.4.0" sources."emojis-list-2.1.0" - sources."enhanced-resolve-3.4.1" - sources."errno-0.1.6" - sources."error-ex-1.3.1" - sources."es5-ext-0.10.38" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."es6-weak-map-2.0.2" - sources."escope-3.6.0" - sources."esrecurse-4.2.0" + sources."end-of-stream-1.4.1" + sources."enhanced-resolve-4.0.0" + sources."errno-0.1.7" + sources."eslint-scope-3.7.1" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" - sources."event-emitter-0.3.5" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" - sources."execa-0.7.0" - sources."expand-brackets-0.1.5" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."expand-range-1.8.2" - sources."extglob-0.3.2" - sources."fast-deep-equal-1.0.0" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" - sources."fill-range-2.2.3" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."find-cache-dir-1.0.0" sources."find-up-2.1.0" + sources."flush-write-stream-1.0.2" sources."for-in-1.0.2" sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" - sources."get-caller-file-1.0.2" - sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" - sources."hosted-git-info-2.5.0" sources."https-browserify-1.0.0" sources."ieee754-1.1.8" + sources."iferr-0.1.5" + sources."imurmurhash-0.1.4" sources."indexof-0.0.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."interpret-1.1.0" - sources."invert-kv-1.0.0" - sources."is-arrayish-0.2.1" + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-fullwidth-code-point-1.0.0" sources."is-glob-2.0.1" - sources."is-number-2.1.0" + sources."is-number-3.0.0" + sources."is-odd-2.0.0" + sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-stream-1.1.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."json-loader-0.5.7" + sources."isobject-3.0.1" sources."json-schema-traverse-0.3.1" sources."json5-0.5.1" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."lcid-1.0.0" - sources."load-json-file-2.0.0" + sources."kind-of-6.0.2" + sources."lazy-cache-2.0.2" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" - sources."longest-1.0.1" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."md5.js-1.3.4" - sources."mem-1.1.0" sources."memory-fs-0.4.1" - sources."micromatch-2.3.11" + (sources."micromatch-3.1.9" // { + dependencies = [ + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."is-number-4.0.0" + ]; + }) sources."miller-rabin-4.0.1" - sources."mimic-fn-1.1.0" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."mississippi-2.0.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" - sources."nan-2.8.0" + sources."move-concurrently-1.0.1" + sources."ms-2.0.0" + sources."nan-2.9.2" + sources."nanomatch-1.2.9" + sources."neo-async-2.5.0" (sources."node-libs-browser-2.1.0" // { dependencies = [ sources."hash-base-2.0.2" sources."inherits-2.0.1" ]; }) - sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" sources."object.omit-2.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."os-locale-2.1.0" - sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."pako-1.0.6" + sources."parallel-transform-1.1.0" sources."parse-asn1-5.1.0" sources."parse-glob-3.0.4" - sources."parse-json-2.2.0" + sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-type-2.0.0" sources."pbkdf2-3.0.14" - sources."pify-2.3.0" + sources."pify-3.0.0" + sources."pkg-dir-2.0.0" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" + sources."promise-inflight-1.0.1" sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."public-encrypt-4.0.0" + sources."pump-2.0.1" + sources."pumpify-1.4.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -41366,89 +42023,150 @@ in ]; }) sources."randombytes-2.0.6" - sources."randomfill-1.0.3" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."readable-stream-2.3.3" + sources."randomfill-1.0.4" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."right-align-0.1.3" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.6.2" sources."ripemd160-2.0.1" + sources."run-queue-1.0.3" sources."safe-buffer-5.1.1" - sources."semver-5.5.0" - sources."set-blocking-2.0.0" + sources."safe-regex-1.1.0" + sources."schema-utils-0.4.5" + sources."serialize-javascript-1.4.0" + sources."set-getter-0.1.0" sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.10" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.1" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."snapdragon-util-3.0.1" sources."source-list-map-2.0.0" sources."source-map-0.5.7" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) + sources."ssri-5.2.4" + sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" + sources."stream-each-1.2.2" sources."stream-http-2.8.0" - sources."string-width-2.1.1" + sources."stream-shift-1.0.0" sources."string_decoder-1.0.3" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."supports-color-4.5.0" - sources."tapable-0.2.8" + sources."tapable-1.0.0" + sources."through2-2.0.3" sources."timers-browserify-2.0.6" sources."to-arraybuffer-1.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" sources."tty-browserify-0.0.0" - sources."uglify-js-2.8.29" - sources."uglify-to-browserify-1.0.2" - (sources."uglifyjs-webpack-plugin-0.4.6" // { + sources."typedarray-0.0.6" + sources."uglify-es-3.3.10" + (sources."uglifyjs-webpack-plugin-1.2.2" // { dependencies = [ - sources."yargs-3.10.0" + sources."source-map-0.6.1" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-filename-1.1.0" + sources."unique-slug-2.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) ]; }) + sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) + sources."use-2.0.2" sources."util-0.10.3" sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.1" sources."vm-browserify-0.0.4" - sources."watchpack-1.4.0" + (sources."watchpack-1.4.0" // { + dependencies = [ + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."kind-of-3.2.2" + sources."micromatch-2.3.11" + ]; + }) (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."which-1.3.0" - sources."which-module-2.0.0" - sources."window-size-0.1.0" - sources."wordwrap-0.0.2" - sources."wrap-ansi-2.1.0" + sources."worker-farm-1.5.4" + sources."wrappy-1.0.2" sources."xtend-4.0.1" - sources."y18n-3.2.1" + sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-8.0.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."camelcase-4.1.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -41462,15 +42180,20 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.3.2.tgz"; - sha1 = "45c7cb50cbea90d6127a3c4bb128802a67f67c93"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.4.0.tgz"; + sha1 = "4103e737196eb2a9fe83087752357d1dfe618294"; }; dependencies = [ - sources."@types/node-9.3.0" + sources."@types/node-9.4.6" sources."JSONSelect-0.2.1" - sources."acorn-5.3.0" + sources."acorn-5.5.0" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -41479,23 +42202,32 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-0.33.0" // { + (sources."addons-linter-0.35.0" // { dependencies = [ sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" sources."async-2.6.0" + sources."camelcase-1.2.1" sources."cli-cursor-1.0.2" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) sources."debug-3.1.0" sources."decamelize-1.2.0" sources."domelementtype-1.1.3" sources."figures-1.7.0" - sources."globals-11.2.0" + sources."globals-11.3.0" + sources."hash-base-2.0.2" + sources."inherits-2.0.1" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" sources."mute-stream-0.0.5" sources."onetime-1.1.0" + sources."parse-json-2.2.0" sources."pluralize-1.2.1" sources."progress-1.1.8" sources."punycode-2.1.0" @@ -41510,24 +42242,22 @@ in sources."supports-color-4.5.0" sources."table-3.8.3" sources."underscore-1.6.0" + sources."wordwrap-0.0.2" (sources."yargs-10.0.3" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."camelcase-4.1.0" sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" + sources."string-width-2.1.1" ]; }) + sources."yargs-parser-8.1.0" ]; }) sources."adm-zip-0.4.7" sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."ajv-keywords-3.1.0" + sources."ajv-merge-patch-3.0.0" + sources."align-text-0.1.4" sources."anchor-markdown-header-0.5.7" sources."ansi-align-2.0.0" sources."ansi-escapes-3.0.0" @@ -41537,7 +42267,7 @@ in sources."anymatch-1.3.2" sources."archiver-2.1.1" sources."archiver-utils-1.3.0" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-filter-0.0.1" @@ -41549,6 +42279,8 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."asn1-0.2.3" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" sources."assert-plus-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" @@ -41557,7 +42289,7 @@ in sources."aws4-1.6.0" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.0" - sources."babel-generator-6.26.0" + sources."babel-generator-6.26.1" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" (sources."babel-polyfill-6.26.0" // { @@ -41578,24 +42310,37 @@ in sources."babylon-6.18.0" sources."bail-1.0.2" sources."balanced-match-1.0.0" + sources."base64-js-1.2.3" sources."base64url-2.0.0" sources."bcrypt-pbkdf-1.0.1" + sources."big.js-3.2.0" sources."binary-extensions-1.11.0" sources."bl-1.2.1" sources."bluebird-2.9.34" + sources."bn.js-4.11.8" sources."boolbase-1.0.0" sources."boom-4.3.1" sources."boundary-1.0.1" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) + sources."brorand-1.1.0" + sources."browserify-aes-1.1.1" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-4.9.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" (sources."bunyan-1.8.12" // { dependencies = [ sources."glob-6.0.4" @@ -41608,6 +42353,7 @@ in sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."ccount-1.0.2" + sources."center-align-0.1.3" sources."chalk-2.3.0" sources."character-entities-1.2.1" sources."character-entities-html4-1.1.1" @@ -41620,15 +42366,12 @@ in ]; }) sources."chokidar-1.7.0" + sources."cipher-base-1.0.4" sources."circular-json-0.3.3" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) + sources."cliui-2.1.0" sources."clone-1.0.3" sources."co-4.6.0" sources."code-point-at-1.1.0" @@ -41637,19 +42380,24 @@ in sources."color-name-1.1.3" sources."colors-0.5.1" sources."columnify-1.5.4" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."common-tags-1.7.2" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."configstore-3.1.1" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" sources."convert-source-map-1.5.1" sources."core-js-2.5.3" sources."core-util-is-1.0.2" sources."crc-3.5.0" sources."crc32-stream-2.0.0" + sources."create-ecdh-4.0.0" sources."create-error-class-3.0.2" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" sources."cross-spawn-5.1.0" sources."crx-parser-0.1.2" (sources."cryptiles-3.1.2" // { @@ -41657,14 +42405,17 @@ in sources."boom-5.2.0" ]; }) + sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."d-1.0.0" sources."dashdash-1.14.1" + sources."date-now-0.1.4" sources."debounce-1.1.0" sources."debug-2.6.9" sources."decamelize-2.0.0" + sources."deep-equal-1.0.1" sources."deep-extend-0.4.2" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" @@ -41672,15 +42423,19 @@ in sources."defaults-1.0.3" sources."del-2.2.2" sources."delayed-stream-1.0.0" + sources."des.js-1.0.0" sources."detect-indent-4.0.0" + sources."diffie-hellman-5.0.2" (sources."dispensary-0.12.0" // { dependencies = [ + sources."semver-5.4.1" sources."source-map-support-0.5.0" ]; }) sources."doctoc-1.3.0" sources."doctrine-2.1.0" sources."dom-serializer-0.1.0" + sources."domain-browser-1.2.0" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" @@ -41689,12 +42444,16 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" + sources."elliptic-6.4.0" sources."emoji-regex-6.1.3" + sources."emojis-list-2.1.0" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" + sources."enhanced-resolve-3.4.1" sources."entities-1.1.1" + sources."errno-0.1.7" sources."error-ex-1.3.1" - sources."es5-ext-0.10.38" + sources."es5-ext-0.10.39" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -41733,14 +42492,16 @@ in }) sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.2" + sources."espree-3.5.3" sources."esprima-3.1.3" sources."esquery-1.0.0" - sources."esrecurse-4.2.0" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" sources."execa-0.7.0" sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" @@ -41748,9 +42509,11 @@ in sources."extend-3.0.1" sources."external-editor-2.1.0" sources."extglob-0.3.2" + sources."extract-text-webpack-plugin-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-parse-1.0.3" + sources."fast-json-patch-1.2.2" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-1.2.3" @@ -41773,7 +42536,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" @@ -41814,22 +42577,28 @@ in sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-2.0.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hmac-drbg-1.0.1" + sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.5.0" sources."htmlparser2-3.9.2" sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" + sources."ieee754-1.1.8" sources."ignore-3.3.7" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inquirer-3.3.0" sources."interpret-1.1.0" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."invert-kv-1.0.0" sources."is-absolute-0.1.7" sources."is-alphabetical-1.0.1" @@ -41848,7 +42617,8 @@ in sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.1" sources."is-installed-globally-0.1.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" sources."is-number-2.1.0" sources."is-obj-1.0.1" @@ -41879,6 +42649,8 @@ in sources."js-yaml-3.10.0" sources."jsbn-0.1.1" sources."jsesc-1.3.0" + sources."json-loader-0.5.7" + sources."json-merge-patch-0.2.3" sources."json-parse-better-errors-1.0.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -41896,30 +42668,39 @@ in sources."jws-3.1.4" sources."kind-of-3.2.2" sources."latest-version-3.1.0" + sources."lazy-cache-1.0.4" sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."load-json-file-1.1.0" + sources."load-json-file-2.0.0" + sources."loader-runner-2.3.0" + sources."loader-utils-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.endswith-4.2.1" - sources."lodash.isfunction-3.0.8" + sources."lodash.isfunction-3.0.9" sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lodash.startswith-4.2.1" + sources."longest-1.0.1" sources."longest-streak-1.0.0" sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."markdown-table-0.4.0" sources."markdown-to-ast-3.4.0" + sources."md5.js-1.3.4" sources."mem-1.1.0" + sources."memory-fs-0.4.1" sources."micromatch-2.3.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."miller-rabin-4.0.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -41932,7 +42713,7 @@ in sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -41943,7 +42724,8 @@ in sources."traverse-0.4.6" ]; }) - sources."node-forge-0.7.1" + sources."node-forge-0.7.2" + sources."node-libs-browser-2.1.0" sources."node-notifier-5.2.1" sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" @@ -41958,6 +42740,7 @@ in sources."onetime-2.0.1" sources."open-0.0.5" sources."optionator-0.8.2" + sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-shim-0.1.3" @@ -41968,16 +42751,19 @@ in sources."p-try-1.0.0" sources."package-json-4.0.1" sources."pako-1.0.6" + sources."parse-asn1-5.1.0" sources."parse-entities-1.1.1" sources."parse-glob-3.0.4" sources."parse-json-4.0.0" sources."parse5-3.0.3" + sources."path-browserify-0.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.5" - sources."path-type-1.1.0" + sources."path-type-2.0.0" + sources."pbkdf2-3.0.14" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-2.3.0" @@ -42002,12 +42788,17 @@ in sources."debug-2.6.9" ]; }) - sources."process-nextick-args-1.0.7" + sources."process-0.11.10" + sources."process-nextick-args-2.0.0" sources."progress-2.0.0" + sources."prr-1.0.1" sources."pseudomap-1.0.2" + sources."public-encrypt-4.0.0" sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" sources."quick-format-unescaped-1.1.2" (sources."randomatic-1.1.7" // { dependencies = [ @@ -42018,16 +42809,18 @@ in }) ]; }) - sources."rc-1.2.4" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."rc-1.2.5" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."regenerator-runtime-0.11.1" sources."regex-cache-0.4.4" - sources."registry-auth-token-3.3.1" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { dependencies = [ @@ -42052,22 +42845,26 @@ in sources."resolve-1.5.0" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" sources."rimraf-2.6.2" + sources."ripemd160-2.0.1" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" + sources."safe-json-stringify-1.1.0" sources."sax-1.2.4" - sources."semver-5.4.1" + sources."schema-utils-0.3.0" + sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" + sources."setimmediate-1.0.5" sources."sha.js-2.4.10" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.8.0" + sources."shelljs-0.8.1" sources."shellwords-0.1.1" (sources."sign-addon-0.2.2" // { dependencies = [ @@ -42098,20 +42895,24 @@ in sources."slash-1.0.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" + sources."source-list-map-2.0.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.2" // { + (sources."source-map-support-0.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."spawn-sync-1.0.15" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."split-0.3.3" sources."split2-2.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.13.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.8.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { @@ -42132,7 +42933,12 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - sources."table-4.0.2" + (sources."table-4.0.3" // { + dependencies = [ + sources."ajv-6.2.0" + ]; + }) + sources."tapable-0.2.8" sources."tar-stream-1.5.5" sources."term-size-1.2.0" sources."text-table-0.2.0" @@ -42141,21 +42947,31 @@ in sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-4.0.1" + sources."timers-browserify-2.0.6" sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" sources."to-fast-properties-1.0.3" sources."topo-1.1.0" sources."tosource-1.0.0" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tr46-1.0.1" sources."traverse-0.6.6" sources."trim-0.0.1" sources."trim-right-1.0.1" sources."trim-trailing-lines-1.1.0" sources."trough-1.0.1" + sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" + sources."uglify-js-2.8.29" + sources."uglify-to-browserify-1.0.2" + (sources."uglifyjs-webpack-plugin-0.4.6" // { + dependencies = [ + sources."yargs-3.10.0" + ]; + }) sources."underscore-1.8.3" sources."unherit-1.1.0" sources."unified-4.2.1" @@ -42172,14 +42988,21 @@ in ]; }) sources."update-section-0.3.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) sources."url-parse-lax-1.0.0" sources."user-home-2.0.0" + sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" sources."vfile-location-2.0.2" + sources."vm-browserify-0.0.4" (sources."watchpack-1.4.0" // { dependencies = [ sources."async-2.6.0" @@ -42187,11 +43010,30 @@ in }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" + (sources."webpack-3.10.0" // { + dependencies = [ + sources."ajv-keywords-2.1.1" + sources."ansi-regex-2.1.1" + sources."camelcase-4.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."source-map-0.5.7" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + sources."webpack-sources-1.1.0" sources."whatwg-url-6.3.0" sources."when-3.7.7" sources."which-1.3.0" sources."which-module-2.0.0" sources."widest-line-2.0.0" + sources."window-size-0.1.0" sources."winreg-0.0.12" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" @@ -42200,7 +43042,7 @@ in sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xregexp-4.0.0" sources."xtend-4.0.1" @@ -42209,19 +43051,24 @@ in (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" + sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."find-up-1.1.2" sources."is-fullwidth-code-point-1.0.0" + sources."load-json-file-1.1.0" sources."os-locale-1.4.0" sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" sources."string-width-1.0.2" sources."strip-bom-2.0.0" sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-8.1.0" + sources."yargs-parser-7.0.0" sources."yauzl-2.9.1" (sources."zip-dir-1.0.2" // { dependencies = [ @@ -42259,10 +43106,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.3.2"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.3.2.tgz"; - sha1 = "5939762581b5b4ddcd3418c0f6be42df3aee195f"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz"; + sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4"; }; buildInputs = globalBuildInputs; meta = { @@ -42311,7 +43158,7 @@ in }) sources."boom-4.3.1" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."cacheable-request-2.1.4" sources."camelcase-2.1.1" @@ -42333,7 +43180,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."configstore-3.1.1" @@ -42371,7 +43218,7 @@ in sources."extend-3.0.1" sources."external-editor-2.1.0" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" sources."filter-obj-1.1.0" @@ -42380,7 +43227,7 @@ in sources."first-chunk-stream-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" (sources."fullname-3.3.0" // { @@ -42397,18 +43244,18 @@ in sources."glob-7.1.2" sources."global-dirs-0.1.1" sources."globby-6.1.0" - sources."got-8.0.3" + sources."got-8.2.0" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" - sources."has-symbol-support-x-1.4.1" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" @@ -42424,9 +43271,9 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) (sources."insight-0.8.4" // { @@ -42490,7 +43337,7 @@ in sources."latest-version-3.1.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash._getnative-3.9.1" sources."lodash.debounce-3.1.1" sources."lodash.pad-4.5.1" @@ -42500,7 +43347,7 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" sources."mem-fs-1.1.3" @@ -42511,9 +43358,9 @@ in sources."read-pkg-up-1.0.1" ]; }) - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -42547,7 +43394,7 @@ in }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."p-any-1.1.0" sources."p-cancelable-0.3.0" @@ -42583,12 +43430,12 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."query-string-5.0.1" - sources."rc-1.2.4" + sources."query-string-5.1.0" + sources."rc-1.2.5" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -42601,10 +43448,10 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readline2-1.0.1" sources."redent-1.0.0" - sources."registry-auth-token-3.3.1" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeating-2.0.1" sources."replace-ext-0.0.1" @@ -42635,9 +43482,10 @@ in sources."sort-keys-2.0.0" sources."sort-on-2.0.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" @@ -42675,7 +43523,7 @@ in sources."timed-out-4.0.1" sources."titleize-1.0.0" sources."tmp-0.0.33" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -42688,9 +43536,9 @@ in dependencies = [ sources."ansi-styles-3.2.0" sources."camelcase-4.1.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."execa-0.7.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -42698,7 +43546,7 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" @@ -42730,11 +43578,11 @@ in (sources."yeoman-environment-2.0.5" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."debug-3.1.0" sources."log-symbols-2.2.0" sources."pify-2.3.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) (sources."yosay-2.0.1" // { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 744894de4ffd994b6f14dc701fdc39f0104c1b12..8abdc0e608cdc9e56890ced4d7bb523b1158446d 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -11,4 +11,5 @@ , "pnpm" , "semver" , "sloc" +, "npm" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 7397866ccea862fea7e6b494cb60b452e5253532..61752e7598c5cd2e11e3aae3c1dcca7d8f331766 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -1,432 +1,9 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "@most/multicast-1.3.0" = { - name = "_at_most_slash_multicast"; - packageName = "@most/multicast"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz"; - sha512 = "2zs8n5gpgl9frbw960m4q63svcgvqkbb9iay3klw3qcj4c0hwbw6llbkj9h4v13s1fh5gc4k6zg2cxpz4vipbp6kzbrd9v0500zqq8d"; - }; - }; - "@most/prelude-1.7.0" = { - name = "_at_most_slash_prelude"; - packageName = "@most/prelude"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@most/prelude/-/prelude-1.7.0.tgz"; - sha512 = "0cdx6nag042jl38sm34c4cpc70wya0xns7f5j9i3hs8kwca8lkgbss9db6jkgd090hpvxq2qh5fzxnfnw705ph1zklgmnxf9wgw4l1s"; - }; - }; - "@pnpm/check-package-1.0.0" = { - name = "_at_pnpm_slash_check-package"; - packageName = "@pnpm/check-package"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/check-package/-/check-package-1.0.0.tgz"; - sha512 = "1hg0g5snqp1lkmnmis335fpvg7xz93snvlbzqmyxxmyl0ab2d4wdlar6rwl7gr59113cpsyn2k3sawh656zrp6fp8q1rdy6x24a3pxc"; - }; - }; - "@pnpm/default-fetcher-0.3.2" = { - name = "_at_pnpm_slash_default-fetcher"; - packageName = "@pnpm/default-fetcher"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/default-fetcher/-/default-fetcher-0.3.2.tgz"; - sha512 = "25lb4pf7sqsw31h5rdaqii969bl19ypip4l3x19i28p3c2174zi1hk152y3r6z36rfp66sfwq0p6f6gvnx10lf46vigw02ppv7szk49"; - }; - }; - "@pnpm/default-resolver-0.1.2" = { - name = "_at_pnpm_slash_default-resolver"; - packageName = "@pnpm/default-resolver"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/default-resolver/-/default-resolver-0.1.2.tgz"; - sha512 = "3smnd8xcmslnba22i9p10f7a724whjm2wvjz3l9fvw23fw8d5nwn78xdkgrvpraqb7xw75xwq8cxj3nvmvib1iqpmp3pcx7j4px5fhx"; - }; - }; - "@pnpm/fs-locker-1.0.1" = { - name = "_at_pnpm_slash_fs-locker"; - packageName = "@pnpm/fs-locker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/fs-locker/-/fs-locker-1.0.1.tgz"; - sha512 = "3nadpl6sinl2h484m7nnn1vsry8pp0kfxgw8apbnyhajqsq00chx3f2v93hl26xnxri2wlhz0s2pc15617xb0xlpln9n1lzrr43fqw2"; - }; - }; - "@pnpm/git-fetcher-0.2.0" = { - name = "_at_pnpm_slash_git-fetcher"; - packageName = "@pnpm/git-fetcher"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/git-fetcher/-/git-fetcher-0.2.0.tgz"; - sha512 = "2ax9drzzzrc2c7risivkxbv76nxdxafhfckl5g481b3k92gc8r8hl4j6kwrq8vl62sav010ssd7giadxs0b0h0nxqgwppsf0v942492"; - }; - }; - "@pnpm/git-resolver-0.3.0" = { - name = "_at_pnpm_slash_git-resolver"; - packageName = "@pnpm/git-resolver"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/git-resolver/-/git-resolver-0.3.0.tgz"; - sha512 = "3xh8kq7pykgpp39g7pjd7x9f834q2dj3jxw3fcrikim1vpn0xiim3g17mz9s87ci0cxrgxcrn2sd4qcap99z9jg5s577af64z4pj6qw"; - }; - }; - "@pnpm/local-resolver-0.1.1" = { - name = "_at_pnpm_slash_local-resolver"; - packageName = "@pnpm/local-resolver"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/local-resolver/-/local-resolver-0.1.1.tgz"; - sha512 = "3i66qx6iw71i07pg21k5j044r807ysq2ijy8q4a92jdg2a17w55ah2j59rs2mxsljl9kkxvp06852q8x00j2g8bbw2v5iivl5191h7y"; - }; - }; - "@pnpm/logger-1.0.0" = { - name = "_at_pnpm_slash_logger"; - packageName = "@pnpm/logger"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/logger/-/logger-1.0.0.tgz"; - sha512 = "2yi5y7s91gz8dhv7gjqar4mp7j6mr2m05irm9l85v2xlzsaqx7mcjw0gap3xmpfmbi1di5rb1g57l7k3zh4nrh0mzcixfd2ykkq86jm"; - }; - }; - "@pnpm/npm-resolver-0.3.11" = { - name = "_at_pnpm_slash_npm-resolver"; - packageName = "@pnpm/npm-resolver"; - version = "0.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/npm-resolver/-/npm-resolver-0.3.11.tgz"; - sha512 = "1mjzlk9hv180r3igrcg3kmgvkp5wkv2ipsr4aqmcjzky8sgz152g22292ps6sndcggri71a8ivjzi61f36bxcz60vz55zvmi6mnawdz"; - }; - }; - "@pnpm/outdated-0.2.5" = { - name = "_at_pnpm_slash_outdated"; - packageName = "@pnpm/outdated"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/outdated/-/outdated-0.2.5.tgz"; - sha512 = "08y7lv6gzw8yyzj24djya1pzh8r41rciz102lhb3nq279dyg5sgzr18z6fqlff8krdw160a8adx5s4csmlmfah2akawpczz9h8zy609"; - }; - }; - "@pnpm/package-requester-0.7.1" = { - name = "_at_pnpm_slash_package-requester"; - packageName = "@pnpm/package-requester"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/package-requester/-/package-requester-0.7.1.tgz"; - sha512 = "09azfnn5831bniyy2va2bjwaxx2pvgbxwqzd82f4p4y4610b26ii3mpyhpd5l19via1il1ylxc73na8ih2ihgv8xi9x9jd4dv6lfnfz"; - }; - }; - "@pnpm/pkgid-to-filename-1.0.0" = { - name = "_at_pnpm_slash_pkgid-to-filename"; - packageName = "@pnpm/pkgid-to-filename"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/pkgid-to-filename/-/pkgid-to-filename-1.0.0.tgz"; - sha512 = "17f44ay160i8pd1sl26v7ph8vdbx6bhydp0jhdc6mslhlyp4bwd1i9220hjvpiyiqkx4hwb4pa5b6hqzq3nyz8ldmna084wfz5q6x8y"; - }; - }; - "@pnpm/server-0.7.1" = { - name = "_at_pnpm_slash_server"; - packageName = "@pnpm/server"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/server/-/server-0.7.1.tgz"; - sha512 = "0y2h510ps6kg1ssdwfpi0wrb4ps7jr28qrng2hfwh01r969f2j1nskajzvn6wa68hnfjq2ysajl66nwccrqydsj24w6dn2kl1jbl0b6"; - }; - }; - "@pnpm/tarball-fetcher-0.3.4" = { - name = "_at_pnpm_slash_tarball-fetcher"; - packageName = "@pnpm/tarball-fetcher"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/tarball-fetcher/-/tarball-fetcher-0.3.4.tgz"; - sha512 = "1mpgr0ywrzkxq013ci9rjc9w9jdmr4lp5x121wwnnlybnzsxb98vzkh9mhmlrm77i98sb2drv880d82wgkdxkzx2d445pcmcsmf4z0w"; - }; - }; - "@pnpm/tarball-resolver-0.1.0" = { - name = "_at_pnpm_slash_tarball-resolver"; - packageName = "@pnpm/tarball-resolver"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/tarball-resolver/-/tarball-resolver-0.1.0.tgz"; - sha512 = "3rdjpckjhhcamkin62ycyqqssvjxd1kx7k927z8m7ing9sqgsf2ascpg2wpp2kh1shbgl5kkldgbalnqm41xv09fqa9ka9rd3saxrr1"; - }; - }; - "@pnpm/types-1.7.0" = { - name = "_at_pnpm_slash_types"; - packageName = "@pnpm/types"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/types/-/types-1.7.0.tgz"; - sha512 = "2bww115m0q5d4m69xvm0kn8xmidncrp3xc8rn2sj03xpkhnd78mcn3m0ib13sq0mlhl4fgq3abvdhlhmxicdp3g6j9zb8awxkif0zm6"; - }; - }; - "@sindresorhus/is-0.7.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; - }; - }; - "@types/archy-0.0.31" = { - name = "_at_types_slash_archy"; - packageName = "@types/archy"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/archy/-/archy-0.0.31.tgz"; - sha512 = "08lzn97gp9rbcmfs592xib111b3fn7nlvmnkn3vpxm2ins5as3p3s3447d5y22lgx6zr6696q9dv27mjgm1cabi1zh2amq57f5p3rxz"; - }; - }; - "@types/byline-4.2.31" = { - name = "_at_types_slash_byline"; - packageName = "@types/byline"; - version = "4.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/byline/-/byline-4.2.31.tgz"; - sha1 = "0e61fcb9c03e047d21c4496554c7116297ab60cd"; - }; - }; - "@types/chalk-0.4.31" = { - name = "_at_types_slash_chalk"; - packageName = "@types/chalk"; - version = "0.4.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz"; - sha1 = "a31d74241a6b1edbb973cf36d97a2896834a51f9"; - }; - }; - "@types/common-tags-1.4.0" = { - name = "_at_types_slash_common-tags"; - packageName = "@types/common-tags"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.4.0.tgz"; - sha512 = "1s47pidf7gs7k79gxz1yy0rwhamf147h9ylvg9b6wfc8p3ixpzsq2xlj2w99mq9pi2j1g2flia2z21babjhrdzln1snggivxx46v38w"; - }; - }; - "@types/get-port-3.2.0" = { - name = "_at_types_slash_get-port"; - packageName = "@types/get-port"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/get-port/-/get-port-3.2.0.tgz"; - sha512 = "3axab8z99gfcfzqvrqs2dq6qa24abjxblh17grpqxxgcz0wyg5xrabj5ss8zzcn7ybpgx2n2gy401hbdxgz96zvwig3g3343pqn08sf"; - }; - }; - "@types/got-7.1.6" = { - name = "_at_types_slash_got"; - packageName = "@types/got"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/got/-/got-7.1.6.tgz"; - sha512 = "0l95rpnrhc6n7khfjm4cl59206f387xap0j2qrk1j6z5gginkxfnkps2l0jw4jq842ii0hzdcakgxnllc2zxmdzsdg2z1wkm28jqf1i"; - }; - }; - "@types/load-json-file-2.0.7" = { - name = "_at_types_slash_load-json-file"; - packageName = "@types/load-json-file"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/load-json-file/-/load-json-file-2.0.7.tgz"; - sha512 = "1gwn4lafk2nq3nrxl8vjbndpb1ky25hkj4h7hjxh8kyxzlqmhk8258ah4a5g4fdv5yap970nkpsn8vsss3iwh7qah1b9vsmz66gmc9n"; - }; - }; - "@types/mem-1.1.2" = { - name = "_at_types_slash_mem"; - packageName = "@types/mem"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mem/-/mem-1.1.2.tgz"; - sha1 = "e3c8b095f2f2563b518f0aad59df9fe6a8b82065"; - }; - }; - "@types/mz-0.0.32" = { - name = "_at_types_slash_mz"; - packageName = "@types/mz"; - version = "0.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mz/-/mz-0.0.32.tgz"; - sha512 = "3i9s14bzsibxc5700404s654iygj7j301kvrkmyf1wy5ncglr1m9rcgysfy5zhmsjpp96g009fm66hy1py92imjfa77pb51n9wz4bbk"; - }; - }; - "@types/node-7.0.52" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "7.0.52"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz"; - sha512 = "3jzvdqsd0pgl0ax2vbn9h8iawx4m6pjf21wb8lqz34glnacjz5l4qv2b3h53j2dbs497g6aqdvkxfahrwvkc9a1q5zy3c46q9174flf"; - }; - }; - "@types/node-8.5.9" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; - sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; - }; - }; - "@types/node-9.3.0" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz"; - sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; - }; - }; - "@types/nopt-3.0.29" = { - name = "_at_types_slash_nopt"; - packageName = "@types/nopt"; - version = "3.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/nopt/-/nopt-3.0.29.tgz"; - sha1 = "f19df3db4c97ee1459a2740028320a71d70964ce"; - }; - }; - "@types/npm-2.0.29" = { - name = "_at_types_slash_npm"; - packageName = "@types/npm"; - version = "2.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/npm/-/npm-2.0.29.tgz"; - sha512 = "1ccspslp1mil7f8w4dj3khyxxv5fpakkky4s4bnvvsd2b1hgvwahpv8bk83rr9aq2as2q6hi3143g3b6aynh3ybpf6d9mlksw6qdjii"; - }; - }; - "@types/p-limit-1.1.2" = { - name = "_at_types_slash_p-limit"; - packageName = "@types/p-limit"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/p-limit/-/p-limit-1.1.2.tgz"; - sha512 = "21nzl33ss5mcflc6p0b0wgfhijb97nf1zr3s52ffvq8xy1l0svqwy3alqpj8g1ycsjisblh4xrcigrn2bzak702z4jnpxpbss02jx96"; - }; - }; - "@types/p-queue-1.1.0" = { - name = "_at_types_slash_p-queue"; - packageName = "@types/p-queue"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/p-queue/-/p-queue-1.1.0.tgz"; - sha512 = "1881hys9v61yxxzjmwckxgf0z5i562ix7xb6ibzfb6qmf40hl1ah8l2dlbqiq3vsglmy56vbjcndsx7skjnzrcapamdnhwapfcazdwl"; - }; - }; - "@types/p-series-1.0.1" = { - name = "_at_types_slash_p-series"; - packageName = "@types/p-series"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/p-series/-/p-series-1.0.1.tgz"; - sha512 = "0vpq52z9kblmkbqdp6icimy1qiyklhjarryn4n4svpa96srz4q7k98496rf3dcgy1wpn79jfvg4ddibvw88x7rbbb2jkrhz9gmzs2vp"; - }; - }; - "@types/ramda-0.25.16" = { - name = "_at_types_slash_ramda"; - packageName = "@types/ramda"; - version = "0.25.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ramda/-/ramda-0.25.16.tgz"; - sha512 = "1an84z8hbgidxn2dbkg8ln94z7si3a6a4cchv3ax86ci9bryiqm6q576m1chfbfag5zjm2pxk2h7s16n0b6qgd3i5y9wj541w95mp4c"; - }; - }; - "@types/rc-0.0.1" = { - name = "_at_types_slash_rc"; - packageName = "@types/rc"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-0.0.1.tgz"; - sha1 = "1f5b8a1b3b1ac6d1fee137c53fac5fa0f28ae0d7"; - }; - }; - "@types/retry-0.10.2" = { - name = "_at_types_slash_retry"; - packageName = "@types/retry"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.10.2.tgz"; - sha512 = "18ksn4fqz03wac8179aagjcfibm1k6lrzlpy8nzig47jn083sr64bsw1mdzbdwfxypi8flimg2l1g9prq6r0fqjbqyjvvahhmin98if"; - }; - }; - "@types/semver-5.4.0" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-5.4.0.tgz"; - sha512 = "256379swd2mh4gi5vxsgk9pf7387g32xkw1vsj1jhs7q4njds107nmkkxpaddjv5w5cqwbiwl64sil7bgqdcg8fyjfdg13wxyyc449w"; - }; - }; - "@types/update-notifier-1.0.3" = { - name = "_at_types_slash_update-notifier"; - packageName = "@types/update-notifier"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/update-notifier/-/update-notifier-1.0.3.tgz"; - sha512 = "0fivfj3sqfmhj3z8sp11iqc0hgzyyn50pximpbx56jk7rkvvw40pl0qzdlzcf97vm5c6yvdsixasgm0vh24gh79grxm237n2cvavd04"; - }; - }; - "@types/uuid-3.4.3" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; - sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; - }; - }; - "@types/write-json-file-2.2.1" = { - name = "_at_types_slash_write-json-file"; - packageName = "@types/write-json-file"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/write-json-file/-/write-json-file-2.2.1.tgz"; - sha512 = "2sasn3m49kqb3y62b2k4avvmb5536z98sq6rkmq7wb441pxaxvqj1ajfxn08jxgg7d4bznfc7gf7knwdnbp2m8k83nimxg6jd9bzlr5"; - }; - }; - "@zkochan/cmd-shim-2.2.4" = { - name = "_at_zkochan_slash_cmd-shim"; - packageName = "@zkochan/cmd-shim"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-2.2.4.tgz"; - sha512 = "0s6wbip576kwjkjcvgf3l6fszrbp1n7ijpjhwjy02hvdfb0hj9ynfi92ninp5blfd1mdhfp361cb76c2y4z1dbyxyc8q5cs7sivag04"; - }; - }; - "@zkochan/libnpx-9.6.1" = { - name = "_at_zkochan_slash_libnpx"; - packageName = "@zkochan/libnpx"; - version = "9.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/libnpx/-/libnpx-9.6.1.tgz"; - sha512 = "3lwjqxnqxn1jq5fnsdh31mvy9q4y5i000qd7xmra7wlmalxag1py7903f36s1l8bxfxh8j409vpnrz8pkhnc5vwipdn91kdzl8qvxj7"; - }; - }; - "@zkochan/npm-package-arg-1.0.0" = { - name = "_at_zkochan_slash_npm-package-arg"; - packageName = "@zkochan/npm-package-arg"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/npm-package-arg/-/npm-package-arg-1.0.0.tgz"; - sha512 = "2v87vqr2pjg6phz5h8mngbymf3b4fmqawisjfng2c424qib6bwldhfvkwqxqfla4s2bzry1qb5dm89if3lddvi3dbp2xqvy9k1h3wxr"; - }; - }; - "JSONStream-1.3.2" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; - sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; - }; - }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -445,33 +22,6 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "add-subtract-date-1.0.13" = { - name = "add-subtract-date"; - packageName = "add-subtract-date"; - version = "1.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/add-subtract-date/-/add-subtract-date-1.0.13.tgz"; - sha512 = "1jpp2jqxqm1ljj8a6xs15yl579jc48fdx4kflfd0faa78gy91gda0svy4jdv5dqqj1c5ccssq24kyz1ck5c3g4qykia2x32qmc2rc5x"; - }; - }; - "agent-base-4.2.0" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; - sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; - }; - }; - "agentkeepalive-3.3.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; - sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p"; - }; - }; "ajv-4.11.8" = { name = "ajv"; packageName = "ajv"; @@ -490,15 +40,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ansi-align-2.0.0" = { - name = "ansi-align"; - packageName = "ansi-align"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; - }; - }; "ansi-diff-stream-1.2.0" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; @@ -508,51 +49,6 @@ let sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; }; }; - "ansi-escapes-1.4.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; - sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; - }; - }; - "ansi-escapes-3.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; - }; - }; - "ansi-parser-2.0.0" = { - name = "ansi-parser"; - packageName = "ansi-parser"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-2.0.0.tgz"; - sha1 = "433498af32fee8c2a1df2c4e47941bc029bcf407"; - }; - }; - "ansi-parser-3.0.0" = { - name = "ansi-parser"; - packageName = "ansi-parser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-3.0.0.tgz"; - sha1 = "945c0e7232caf5675217375b3eb8892008c14629"; - }; - }; - "ansi-parser-3.2.8" = { - name = "ansi-parser"; - packageName = "ansi-parser"; - version = "3.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-3.2.8.tgz"; - sha1 = "ad80a6351ac5e58cc7e8a761abc037b5505041d0"; - }; - }; "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -571,15 +67,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; "ansi-styles-3.2.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -589,42 +76,6 @@ let sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; }; }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; - }; - }; - "ansistyles-0.1.3" = { - name = "ansistyles"; - packageName = "ansistyles"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; - sha1 = "5de60415bda071bb37127854c864f41b23254539"; - }; - }; - "ansy-1.0.13" = { - name = "ansy"; - packageName = "ansy"; - version = "1.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/ansy/-/ansy-1.0.13.tgz"; - sha512 = "1a13d7ws8k5vnckqfbrlmmmdxxmj0fjlsgs4h1g8ymmm6fz019gykr01kr479dsqzikgcbmz56jnfj1jjknllij7b840w7mzhvpxvyc"; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; - }; - }; "anymatch-1.3.2" = { name = "anymatch"; packageName = "anymatch"; @@ -661,15 +112,6 @@ let sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - }; "are-we-there-yet-1.1.4" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -679,15 +121,6 @@ let sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; - "argparse-1.0.9" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; - }; - }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -706,33 +139,6 @@ let sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "array-flatten-2.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; - sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; - }; - }; - "array-includes-3.0.3" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; - }; - }; "array-lru-1.1.1" = { name = "array-lru"; packageName = "array-lru"; @@ -742,24 +148,6 @@ let sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; }; }; - "array-union-1.0.2" = { - name = "array-union"; - packageName = "array-union"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; - }; - }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; - }; - }; "array-unique-0.2.1" = { name = "array-unique"; packageName = "array-unique"; @@ -769,40 +157,13 @@ let sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; }; }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; - }; - }; - "as-table-1.0.31" = { - name = "as-table"; - packageName = "as-table"; - version = "1.0.31"; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/as-table/-/as-table-1.0.31.tgz"; - sha1 = "d00180024ecbb6d1a747150df751d3716aea8166"; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; "assert-plus-0.2.0" = { @@ -895,15 +256,6 @@ let sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; - }; - }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -913,15 +265,6 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-js-0.0.8" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; - sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; - }; - }; "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -940,13 +283,13 @@ let sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; - "bindings-1.3.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.3.0"; + "bencode-2.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; - sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; "bitfield-rle-2.1.0" = { @@ -967,15 +310,6 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; - "bl-1.2.1" = { - name = "bl"; - packageName = "bl"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; - sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; - }; - }; "blake2b-2.1.2" = { name = "blake2b"; packageName = "blake2b"; @@ -1003,15 +337,6 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "bluebird-3.5.1" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; - }; - }; "body-0.1.0" = { name = "body"; packageName = "body"; @@ -1021,15 +346,6 @@ let sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; }; }; - "bole-3.0.2" = { - name = "bole"; - packageName = "bole"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bole/-/bole-3.0.2.tgz"; - sha1 = "bc8a483ca94049da9b837c1ad11cdfebee6e0514"; - }; - }; "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -1057,22 +373,13 @@ let sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; - "boxen-1.3.0" = { - name = "boxen"; - packageName = "boxen"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; - sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; - }; - }; - "brace-expansion-1.1.8" = { + "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.8"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "braces-1.8.5" = { @@ -1093,33 +400,6 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "browserify-zlib-0.1.4" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; - }; - }; - "buffer-3.6.0" = { - name = "buffer"; - packageName = "buffer"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; - sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; - }; - }; - "buffer-alloc-unsafe-1.0.0" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; - }; - }; "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; @@ -1138,33 +418,6 @@ let sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; - "bug-killer-4.4.4" = { - name = "bug-killer"; - packageName = "bug-killer"; - version = "4.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bug-killer/-/bug-killer-4.4.4.tgz"; - sha1 = "96e0322b9437a2b0672d78aacd1ed2bef11f945a"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "builtins-1.0.3" = { - name = "builtins"; - packageName = "builtins"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; - sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; - }; - }; "bulk-write-stream-1.1.3" = { name = "bulk-write-stream"; packageName = "bulk-write-stream"; @@ -1174,15 +427,6 @@ let sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; }; }; - "byline-5.0.0" = { - name = "byline"; - packageName = "byline"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; - }; - }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -1192,51 +436,6 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "bzip2-maybe-1.0.0" = { - name = "bzip2-maybe"; - packageName = "bzip2-maybe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bzip2-maybe/-/bzip2-maybe-1.0.0.tgz"; - sha1 = "c9aef7008a6b943cbe99cc617125eb4bd478296b"; - }; - }; - "cacache-10.0.2" = { - name = "cacache"; - packageName = "cacache"; - version = "10.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz"; - sha512 = "1nn7is7pd6vgcf96b9hym6ia3a0adgw2r4a4ckbb9ykm6risqsnw16kgqfrwvi37mpkzizricfnkns7d0d7agh1laws73imv7nxnn3n"; - }; - }; - "cacache-9.2.9" = { - name = "cacache"; - packageName = "cacache"; - version = "9.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; - sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642"; - }; - }; - "cacheable-request-2.1.4" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; - }; - }; - "call-limit-1.1.0" = { - name = "call-limit"; - packageName = "call-limit"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz"; - sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; - }; - }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -1246,24 +445,6 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; - }; - }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -1273,85 +454,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "chalk-2.3.0" = { + "chalk-2.3.1" = { name = "chalk"; packageName = "chalk"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; - sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; - }; - }; - "chownr-1.0.1" = { - name = "chownr"; - packageName = "chownr"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; - }; - }; - "ci-info-1.1.2" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz"; - sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr"; - }; - }; - "cidr-regex-1.0.6" = { - name = "cidr-regex"; - packageName = "cidr-regex"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz"; - sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1"; - }; - }; - "class-methods-1.0.10" = { - name = "class-methods"; - packageName = "class-methods"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/class-methods/-/class-methods-1.0.10.tgz"; - sha512 = "2j59qyqmhdcldp2k34mrcfx2rqblcv1c2902zzin1fzqamys2jxs32q341k4faclld17w96w7x3hnv2vjinn0jq0b6a7ld1icaay2wv"; - }; - }; - "cli-box-5.0.0" = { - name = "cli-box"; - packageName = "cli-box"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-box/-/cli-box-5.0.0.tgz"; - sha1 = "870ea8aa77e7c25179416ceccfe5ed0690804602"; - }; - }; - "cli-boxes-1.0.0" = { - name = "cli-boxes"; - packageName = "cli-boxes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1"; }; }; "cli-table-0.3.1" = { @@ -1363,15 +472,6 @@ let sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "cli-table2-0.2.0" = { - name = "cli-table2"; - packageName = "cli-table2"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; - sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; - }; - }; "cli-truncate-1.1.0" = { name = "cli-truncate"; packageName = "cli-truncate"; @@ -1390,51 +490,6 @@ let sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; }; }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; - }; - }; - "clone-response-1.0.2" = { - name = "clone-response"; - packageName = "clone-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; - }; - }; - "clp-3.2.1" = { - name = "clp"; - packageName = "clp"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clp/-/clp-3.2.1.tgz"; - sha1 = "af1ed66db895a5c9ce9b6d32e9c33dee02b3edf2"; - }; - }; - "cmd-shim-2.0.2" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; - sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; - }; - }; "co-4.6.0" = { name = "co"; packageName = "co"; @@ -1498,22 +553,13 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "columnify-1.5.4" = { - name = "columnify"; - packageName = "columnify"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz"; - sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; - }; - }; - "combined-stream-1.0.5" = { + "combined-stream-1.0.6" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; "commander-2.11.0" = { @@ -1534,15 +580,6 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "common-tags-1.7.2" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; - sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; - }; - }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -1561,24 +598,6 @@ let sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; - "config-chain-1.1.11" = { - name = "config-chain"; - packageName = "config-chain"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; - }; - }; - "configstore-3.1.1" = { - name = "configstore"; - packageName = "configstore"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; - sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; - }; - }; "connections-1.4.2" = { name = "connections"; packageName = "connections"; @@ -1606,24 +625,6 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "copy-concurrently-1.0.5" = { - name = "copy-concurrently"; - packageName = "copy-concurrently"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; - }; - }; - "core-js-2.5.3" = { - name = "core-js"; - packageName = "core-js"; - version = "2.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; - sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -1642,51 +643,6 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; - "couleurs-5.0.0" = { - name = "couleurs"; - packageName = "couleurs"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/couleurs/-/couleurs-5.0.0.tgz"; - sha1 = "1cd3ace5cca1bec0041578b27464b2676387f6db"; - }; - }; - "couleurs-6.0.9" = { - name = "couleurs"; - packageName = "couleurs"; - version = "6.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/couleurs/-/couleurs-6.0.9.tgz"; - sha1 = "b2b2a3ee37dae51875c9efd243ec7e7894afbc9e"; - }; - }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; - }; - }; - "credentials-by-uri-1.0.0" = { - name = "credentials-by-uri"; - packageName = "credentials-by-uri"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/credentials-by-uri/-/credentials-by-uri-1.0.0.tgz"; - sha512 = "3c5r91jgf91szpxfh7rh0c5wi3xzck43b8kzgmxi3ppw29hj9v9is6a3jh5divbgg7dr5diw6zysri7mpvji5jagh2ain0mcj81knjs"; - }; - }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - }; "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -1705,42 +661,6 @@ let sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; - "crypto-random-string-1.0.0" = { - name = "crypto-random-string"; - packageName = "crypto-random-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; - }; - }; - "csv-parser-1.12.0" = { - name = "csv-parser"; - packageName = "csv-parser"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csv-parser/-/csv-parser-1.12.0.tgz"; - sha512 = "3amd2y4wd86nqpmj4ngich00g73ldp4di353338vjdsgch52zgc7fl6mgh1yfm9n46nlifh7p0c6y8i8p5al90crkbfnsxw561m9lli"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "custom-return-1.0.10" = { - name = "custom-return"; - packageName = "custom-return"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/custom-return/-/custom-return-1.0.10.tgz"; - sha512 = "3pk09pi85idb0ycy2hmh3k2cbphacc3hr7rdv157gb93vvk9hfgjnc9dv0k1qvb11h46zpya9njb07f9whrmn31zbx8cf1hchmknpaq"; - }; - }; "cycle-1.0.3" = { name = "cycle"; packageName = "cycle"; @@ -1750,15 +670,6 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; - "cyclist-0.2.2" = { - name = "cyclist"; - packageName = "cyclist"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; - sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -1840,13 +751,13 @@ let sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "dat-node-3.5.6" = { + "dat-node-3.5.8" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; - sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; + sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; }; }; "dat-registry-4.0.0" = { @@ -1858,22 +769,22 @@ let sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; - "dat-secret-storage-4.0.0" = { + "dat-secret-storage-4.0.1" = { name = "dat-secret-storage"; packageName = "dat-secret-storage"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; - sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; }; }; - "dat-storage-1.0.3" = { + "dat-storage-1.0.4" = { name = "dat-storage"; packageName = "dat-storage"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; - sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; "dat-swarm-defaults-1.0.0" = { @@ -1885,24 +796,6 @@ let sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; }; }; - "data-uri-to-buffer-2.0.0" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz"; - sha512 = "1pvmcndfngvwy1z5x3vhy8jvrcpaahgc8jhq7cpnjcb2zfacai445afjpykxyzy8s6css19p1rl3ab91vz22fa1ffkqhgygncs85ck1"; - }; - }; - "date-unit-ms-1.1.12" = { - name = "date-unit-ms"; - packageName = "date-unit-ms"; - version = "1.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/date-unit-ms/-/date-unit-ms-1.1.12.tgz"; - sha512 = "39jwcz9i3f80f9sqx06abcpk9zs9dw90gyy2pb603h1h5q0ph2qpx005wzmmn0phfg83d4nx2d14p3lgfn1ywa6yfcc71rnnbw3l3f3"; - }; - }; "datland-swarm-defaults-1.0.2" = { name = "datland-swarm-defaults"; packageName = "datland-swarm-defaults"; @@ -1912,24 +805,6 @@ let sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; - "daty-1.1.4" = { - name = "daty"; - packageName = "daty"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/daty/-/daty-1.1.4.tgz"; - sha512 = "0a8n1f6rfaa6k4r76b2rqgvfp9qvw5xj7w0lzjfv1g4fxcjllk519vj3jfrx540jiv2mbpky6jv17d3zhwc0jg0a9rbnc0k1m4m5dgs"; - }; - }; - "days-1.1.1" = { - name = "days"; - packageName = "days"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/days/-/days-1.1.1.tgz"; - sha512 = "13wlz4m9gk0wf2w3x44y2gph1mmqmj8z1mfkhxpxhjk3rs7h28gj6lc8x0b6i966w00dvrws86da672vmizmy31whvj08q4bg0qhdxz"; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -1948,51 +823,6 @@ let sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; - "debuglog-1.0.1" = { - name = "debuglog"; - packageName = "debuglog"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; - sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "decode-uri-component-0.2.0" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - }; - "decompress-maybe-1.0.0" = { - name = "decompress-maybe"; - packageName = "decompress-maybe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-maybe/-/decompress-maybe-1.0.0.tgz"; - sha1 = "adfe78c66cc069e64e824bd1405b85e75e6d1cbb"; - }; - }; - "decompress-response-3.3.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -2011,58 +841,13 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "deffy-2.0.0" = { - name = "deffy"; - packageName = "deffy"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deffy/-/deffy-2.0.0.tgz"; - sha1 = "f82e08eea518c4a0a30b1f03ec504d248af28932"; - }; - }; - "deffy-2.2.2" = { - name = "deffy"; - packageName = "deffy"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deffy/-/deffy-2.2.2.tgz"; - sha1 = "088f40913cb47078653fa6f697c206e03471d523"; - }; - }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; - }; - }; - "delay-2.0.0" = { - name = "delay"; - packageName = "delay"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz"; - sha1 = "9112eadc03e4ec7e00297337896f273bbd91fae5"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; "delegates-1.0.0" = { @@ -2074,33 +859,6 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "dependencies-hierarchy-2.0.1" = { - name = "dependencies-hierarchy"; - packageName = "dependencies-hierarchy"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dependencies-hierarchy/-/dependencies-hierarchy-2.0.1.tgz"; - sha512 = "1sfyf5x0ffhb2yh04wcwd0szfknjfrf21ibabzk780m31ww4fnzm01ddr9h3j1wfn4ib15pjvg24kylhs2l9g5fg9gnkirpa7zphyxz"; - }; - }; - "dependency-path-1.2.0" = { - name = "dependency-path"; - packageName = "dependency-path"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dependency-path/-/dependency-path-1.2.0.tgz"; - sha512 = "3fx4g67dcmnhggas6gyk3qd0376f5ff9imzi9n3npqjdbnxqd0niagdl591n64mlk8l8rrnkp39fj7cgbd05az9k5b2ir5pr73lf9aq"; - }; - }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -2110,24 +868,6 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "dezalgo-1.0.3" = { - name = "dezalgo"; - packageName = "dezalgo"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"; - sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; - }; - }; - "diable-4.0.1" = { - name = "diable"; - packageName = "diable"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diable/-/diable-4.0.1.tgz"; - sha512 = "3xs7mj78f1pz54n7lgqczhksnznrsj1bz0733lnrsarqshqci89980q25yms1iva430jfxsjd9kgk4f1f30y3xpyi8krd0vkb57xkl6"; - }; - }; "diff-3.3.1" = { name = "diff"; packageName = "diff"; @@ -2137,33 +877,6 @@ let sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; }; }; - "diff-dates-1.0.11" = { - name = "diff-dates"; - packageName = "diff-dates"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-dates/-/diff-dates-1.0.11.tgz"; - sha512 = "3n24i042lak0xiwsf39kqkmgfjpk3yy7b7s5j4yli6a41h438lh8khdn0zg71jz30vmz0iil8bpjbm0amy24mmbyf4vz5jwp7z312fj"; - }; - }; - "dint-2.0.2" = { - name = "dint"; - packageName = "dint"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dint/-/dint-2.0.2.tgz"; - sha512 = "1kj5zqj3mz3jr7624dszj4qnypqa6z1ll8ysn56mibmchrdfb6x82ncfr8jl1h2igla24kp7kbivpmzzjp1zbb29s2gwj9y0zzrmf9v"; - }; - }; - "dir-glob-2.0.0" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz"; - sha512 = "1m705yfirf97v4w87gfvylhhq9jlwjsgfp5x0p0cp33mc180ldmvgbs06zmr7by48d7r01n3awx4xz3m3vzba99gqww1wgka2na5fnz"; - }; - }; "directory-index-html-2.1.0" = { name = "directory-index-html"; packageName = "directory-index-html"; @@ -2236,51 +949,6 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "dot-prop-4.2.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; - }; - }; - "dotenv-4.0.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; - sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; - }; - }; - "drive-by-path-1.0.0" = { - name = "drive-by-path"; - packageName = "drive-by-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/drive-by-path/-/drive-by-path-1.0.0.tgz"; - sha512 = "2qa8hminmq4ccas79iblr6bhpi5db7pr4wprwabf3b26mzky20grbamh8w91x0305gr9ab0hg314dqbhk7fjqylrzc5f8aq21mkl9hm"; - }; - }; - "drivelist-5.2.12" = { - name = "drivelist"; - packageName = "drivelist"; - version = "5.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/drivelist/-/drivelist-5.2.12.tgz"; - sha512 = "16zzhdm5j9sxfgcgh547v4s5y3han38a5iwj8ap8glp5ql6vbrl01jj6dsjpiqlbjf56pxla8shnz64yjngvnq0zcdkabns4cr1i0lp"; - }; - }; - "duplexer3-0.1.4" = { - name = "duplexer3"; - packageName = "duplexer3"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; - }; - }; "duplexify-3.5.3" = { name = "duplexify"; packageName = "duplexify"; @@ -2299,33 +967,6 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "editor-1.0.0" = { - name = "editor"; - packageName = "editor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; - sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; - }; - }; - "encode-registry-1.1.0" = { - name = "encode-registry"; - packageName = "encode-registry"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/encode-registry/-/encode-registry-1.1.0.tgz"; - sha512 = "0s849n20b958rnb9r35b9i0l6zvpk0vx49c6xap06fy5iq1zz0ls0wqc1bdskw1v39z5xz4a8sfaigsw0rjfckic6xlxmw4ybvn9vf1"; - }; - }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; - }; - }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -2335,69 +976,6 @@ let sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; - "err-code-1.1.2" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; - sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; - }; - }; - "errno-0.1.6" = { - name = "errno"; - packageName = "errno"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; - sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "es-abstract-1.10.0" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; - sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; - }; - }; - "es-to-primitive-1.1.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; - sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; - }; - }; - "es6-promise-4.2.4" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw"; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -2407,51 +985,6 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; - }; - }; - "exclude-arr-1.0.9" = { - name = "exclude-arr"; - packageName = "exclude-arr"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/exclude-arr/-/exclude-arr-1.0.9.tgz"; - sha512 = "1j9b7mbjp9g840wwzgq7jmqx66qv2xwxl3z3330891qd1a4yrm1x3jsig1g0adx6q1lj9d9f6dsb0snm564f4ff8lxhiag0k645vap7"; - }; - }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - }; - "execa-0.8.0" = { - name = "execa"; - packageName = "execa"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; - }; - }; - "execa-0.9.0" = { - name = "execa"; - packageName = "execa"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.9.0.tgz"; - sha512 = "2c2sw5624513vxbr2q2ay9x3qc80zfnwyr60n8cw35m1ji76yxhxv4nrk47iqd2wj1rv5l07klmncr2lfdzhfa0cn3si1pq4l30rd85"; - }; - }; "expand-brackets-0.1.5" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -2470,15 +1003,6 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; - "expand-template-1.1.0" = { - name = "expand-template"; - packageName = "expand-template"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz"; - sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; - }; - }; "extend-3.0.1" = { name = "extend"; packageName = "extend"; @@ -2515,13 +1039,13 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "fast-deep-equal-1.0.0" = { + "fast-deep-equal-1.1.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -2533,15 +1057,6 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; - "fast-safe-stringify-1.1.13" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "1.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.1.13.tgz"; - sha1 = "a01e9cd9c9e491715c98a75a42d5f0bbd107ff76"; - }; - }; "fd-read-stream-1.1.0" = { name = "fd-read-stream"; packageName = "fd-read-stream"; @@ -2551,15 +1066,6 @@ let sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; - "fetch-from-npm-registry-0.1.0" = { - name = "fetch-from-npm-registry"; - packageName = "fetch-from-npm-registry"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fetch-from-npm-registry/-/fetch-from-npm-registry-0.1.0.tgz"; - sha512 = "1264ixqa9c8kzm56hlq6y91d7rhzfkvbjy0asvj4xkdspwb5sy363n9g9frai3w415j9xyqfw8k73rcpw295gmhp790rnl5p1w0m88g"; - }; - }; "filename-regex-2.0.1" = { name = "filename-regex"; packageName = "filename-regex"; @@ -2578,33 +1084,6 @@ let sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; }; }; - "fillo-1.0.11" = { - name = "fillo"; - packageName = "fillo"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fillo/-/fillo-1.0.11.tgz"; - sha512 = "36l602p8x6jkfpk75skz4dwjlpy9bna1zqpx7jgfjlalqbwa7b67wb8rv23cd6m5saklalf77irgvly60b5ziy611a4477idbrrr1fx"; - }; - }; - "find-packages-2.1.2" = { - name = "find-packages"; - packageName = "find-packages"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-packages/-/find-packages-2.1.2.tgz"; - sha512 = "18j6pnfzxysg3ylhx9npp90infzxgczn174pd3mvy8mw13cshll2rzf6i9b27qfyzgq4chk7wbwy8wr1flmzlpll5g22c0ryp6dq2rh"; - }; - }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - }; "findup-sync-0.3.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -2614,15 +1093,6 @@ let sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; }; }; - "flat-colors-3.0.0" = { - name = "flat-colors"; - packageName = "flat-colors"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-colors/-/flat-colors-3.0.0.tgz"; - sha1 = "253ab1a23989c321f13b0acd4bf73fff4072ecb7"; - }; - }; "flat-tree-1.6.0" = { name = "flat-tree"; packageName = "flat-tree"; @@ -2632,15 +1102,6 @@ let sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; }; }; - "flush-write-stream-1.0.2" = { - name = "flush-write-stream"; - packageName = "flush-write-stream"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; - sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; - }; - }; "for-each-0.3.2" = { name = "for-each"; packageName = "for-each"; @@ -2668,15 +1129,6 @@ let sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; }; }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -2695,31 +1147,13 @@ let sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "form-data-2.3.1" = { + "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; - "formatoid-1.2.2" = { - name = "formatoid"; - packageName = "formatoid"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/formatoid/-/formatoid-1.2.2.tgz"; - sha512 = "3z818q9sgzw7jky4kc4gfmx15k3hhh7lj1dy17j30vcyzmx1p14k38d0a8nvl23f2sfm4bszam36wzz8niwkznr4m992wz009ipr6yy"; - }; - }; - "from2-1.3.0" = { - name = "from2"; - packageName = "from2"; - version = "1.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; - sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; "from2-2.3.0" = { @@ -2731,24 +1165,6 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-vacuum-1.2.10" = { - name = "fs-vacuum"; - packageName = "fs-vacuum"; - version = "1.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; - sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; - }; - }; - "fs-write-stream-atomic-1.0.10" = { - name = "fs-write-stream-atomic"; - packageName = "fs-write-stream-atomic"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; - sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; - }; - }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -2776,24 +1192,6 @@ let sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; }; }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; - }; - }; - "function.name-1.0.10" = { - name = "function.name"; - packageName = "function.name"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/function.name/-/function.name-1.0.10.tgz"; - sha512 = "02zis7zxfkwajdf08z58mr0z2axddibclbk8xd849mkz7pq3y29s781fjycqigp3fdnwmy2mlvcnsg4z5hrfm44sr7gw30wx2p41x10"; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -2803,87 +1201,6 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "generate-function-1.1.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-1.1.0.tgz"; - sha1 = "54c21b080192b16d9877779c5bb81666e772365f"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "genfun-4.0.1" = { - name = "genfun"; - packageName = "genfun"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz"; - sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"; - }; - }; - "get-caller-file-1.0.2" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; - }; - }; - "get-npm-tarball-url-2.0.1" = { - name = "get-npm-tarball-url"; - packageName = "get-npm-tarball-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.1.tgz"; - sha512 = "051jj5v45fys9v10fpvga4wby8aq0wjydhfgynfip8bgyl7db3zkjzssqn4rv264br9b04mdc25hr9479zgqyffzdq7xxcjdi2dbsiw"; - }; - }; - "get-port-3.2.0" = { - name = "get-port"; - packageName = "get-port"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; - sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; - }; - }; - "get-source-1.0.24" = { - name = "get-source"; - packageName = "get-source"; - version = "1.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/get-source/-/get-source-1.0.24.tgz"; - sha1 = "898dcc7b5592adba02e8bb82b8d2cda60cdae5c5"; - }; - }; - "get-stream-2.3.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -2893,15 +1210,6 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "github-from-package-0.0.0" = { - name = "github-from-package"; - packageName = "github-from-package"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; - sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; - }; - }; "glob-5.0.15" = { name = "glob"; packageName = "glob"; @@ -2947,42 +1255,6 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-dirs-0.1.1" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; - sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; - }; - }; - "globby-7.1.1" = { - name = "globby"; - packageName = "globby"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; - sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; - }; - }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; - }; - }; - "got-8.0.3" = { - name = "got"; - packageName = "got"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.0.3.tgz"; - sha512 = "2bglci1j77rvr4z2klmnr6d2qfqk0f60nm1myj9m0g2rzh7pd68hzki9nm8f5dpaxqr98ncjbd4rfzw75j35nvsfcyb2i1l9jjailak"; - }; - }; "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -2992,15 +1264,6 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "graceful-git-1.0.1" = { - name = "graceful-git"; - packageName = "graceful-git"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-git/-/graceful-git-1.0.1.tgz"; - sha512 = "31ajgk1zmq4zym3ckmr9n1x6n7sidg8naa3n8d2v6p8vr67g4gl7xxij5la1dxp6c9475pbrzq5vab7psp2dbjxvwdrzrlb8xwq83xp"; - }; - }; "graceful-readlink-1.0.1" = { name = "graceful-readlink"; packageName = "graceful-readlink"; @@ -3010,15 +1273,6 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; - "graph-sequencer-2.0.0" = { - name = "graph-sequencer"; - packageName = "graph-sequencer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graph-sequencer/-/graph-sequencer-2.0.0.tgz"; - sha1 = "bfb809b8af584f6f5287cdce507a30d4aea6ee70"; - }; - }; "growl-1.10.3" = { name = "growl"; packageName = "growl"; @@ -3037,15 +1291,6 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "gunzip-maybe-1.4.1" = { - name = "gunzip-maybe"; - packageName = "gunzip-maybe"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; - sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa"; - }; - }; "har-schema-1.0.5" = { name = "har-schema"; packageName = "har-schema"; @@ -3082,58 +1327,22 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; - }; - }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "2.0.0"; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "has-symbol-support-x-1.4.1" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; - sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; - }; - }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; "has-unicode-2.0.1" = { @@ -3181,31 +1390,13 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-4.2.0" = { + "hoek-4.2.1" = { name = "hoek"; packageName = "hoek"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; - }; - }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; "http-methods-0.1.0" = { @@ -3217,15 +1408,6 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-proxy-agent-2.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; - sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; - }; - }; "http-signature-1.1.1" = { name = "http-signature"; packageName = "http-signature"; @@ -3244,31 +1426,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "https-proxy-agent-2.1.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; - sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; - }; - }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; - }; - }; - "hypercore-6.12.0" = { + "hypercore-6.12.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; - sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz"; + sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6"; }; }; "hypercore-protocol-6.5.2" = { @@ -3280,13 +1444,13 @@ let sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; }; }; - "hyperdrive-9.12.2" = { + "hyperdrive-9.12.3" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.2"; + version = "9.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.2.tgz"; - sha512 = "133iwkp8w88awfxffdjjfxl2wsrj99cdw1p2rvbv65q7mgficva14skid7vsd55r750lrvg0wbmlz0h4m44w6ypd7cvpb4hjvb2f815"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; + sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; }; }; "hyperdrive-http-4.2.2" = { @@ -3298,13 +1462,13 @@ let sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; - "hyperdrive-network-speed-2.0.1" = { + "hyperdrive-network-speed-2.1.0" = { name = "hyperdrive-network-speed"; packageName = "hyperdrive-network-speed"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; - sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; "i-0.3.6" = { @@ -3316,78 +1480,6 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; - }; - }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; - }; - }; - "iferr-0.1.5" = { - name = "iferr"; - packageName = "iferr"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; - sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; - }; - }; - "ignore-3.3.7" = { - name = "ignore"; - packageName = "ignore"; - version = "3.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; - sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; - }; - }; - "ignore-walk-3.0.1" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; - }; - }; - "import-lazy-2.1.0" = { - name = "import-lazy"; - packageName = "import-lazy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "individual-3.0.0" = { - name = "individual"; - packageName = "individual"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/individual/-/individual-3.0.0.tgz"; - sha1 = "e7ca4f85f8957b018734f285750dc22ec2f9862d"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -3415,42 +1507,6 @@ let sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; - "init-package-json-1.10.1" = { - name = "init-package-json"; - packageName = "init-package-json"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; - sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; - }; - }; - "into-stream-2.0.1" = { - name = "into-stream"; - packageName = "into-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-2.0.1.tgz"; - sha1 = "db9b003694453eae091d8a5c84cc11507b781d31"; - }; - }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -3460,15 +1516,6 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -3478,69 +1525,6 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "is-bzip2-1.0.0" = { - name = "is-bzip2"; - packageName = "is-bzip2"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz"; - sha1 = "5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"; - }; - }; - "is-callable-1.1.3" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; - }; - }; - "is-ci-1.1.0" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; - sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; - }; - }; - "is-cidr-1.0.0" = { - name = "is-cidr"; - packageName = "is-cidr"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz"; - sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc"; - }; - }; - "is-date-object-1.0.1" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; - }; - }; - "is-deflate-1.0.0" = { - name = "is-deflate"; - packageName = "is-deflate"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; - sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; - }; - }; "is-dotfile-1.0.3" = { name = "is-dotfile"; packageName = "is-dotfile"; @@ -3613,42 +1597,6 @@ let sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; }; }; - "is-gzip-1.0.0" = { - name = "is-gzip"; - packageName = "is-gzip"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; - sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; - }; - }; - "is-inner-link-2.0.2" = { - name = "is-inner-link"; - packageName = "is-inner-link"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-inner-link/-/is-inner-link-2.0.2.tgz"; - sha512 = "2xbj75av7s092kdl27ic28ckwnfnxvl4wr3x879djhamp0waw1js8c0zrakfnbjbsp5vh087brimykngrg319zfzhgwjvni994m2bv1"; - }; - }; - "is-installed-globally-0.1.0" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; - sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; - }; - }; - "is-npm-1.0.0" = { - name = "is-npm"; - packageName = "is-npm"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; - }; - }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -3667,42 +1615,6 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; - "is-object-1.0.1" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; - }; - }; - "is-path-inside-1.0.1" = { - name = "is-path-inside"; - packageName = "is-path-inside"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; - }; - }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; - }; - }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -3721,60 +1633,6 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; - }; - }; - "is-regex-1.0.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; - }; - }; - "is-retry-allowed-1.1.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; - }; - }; - "is-ssh-1.3.0" = { - name = "is-ssh"; - packageName = "is-ssh"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.0.tgz"; - sha1 = "ebea1169a2614da392a63740366c3ce049d8dff6"; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; "is-string-1.0.4" = { name = "is-string"; packageName = "is-string"; @@ -3784,24 +1642,6 @@ let sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; }; }; - "is-subdir-1.0.2" = { - name = "is-subdir"; - packageName = "is-subdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-subdir/-/is-subdir-1.0.2.tgz"; - sha512 = "2czdnl66p1ls8xjwh0vx5ydk118b9m1zhnc4khf16v7bh9n8nwjhafr4aigvd6kj2igl0ylbzznc181pf0ppxm4bgiv9kwyvlryyzfq"; - }; - }; - "is-symbol-1.0.1" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; - sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; - }; - }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -3811,24 +1651,6 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "is-windows-1.0.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -3865,24 +1687,6 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; - }; - }; - "iterate-object-1.3.2" = { - name = "iterate-object"; - packageName = "iterate-object"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; - sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; - }; - }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -3892,15 +1696,6 @@ let sha1 = "d03f666ca4e6130138565997cacea54164203156"; }; }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; - }; - }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -3910,24 +1705,6 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "json-buffer-3.0.0" = { - name = "json-buffer"; - packageName = "json-buffer"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; - }; - }; - "json-parse-better-errors-1.0.1" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; - sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; - }; - }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -3964,15 +1741,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json2yaml-1.1.0" = { - name = "json2yaml"; - packageName = "json2yaml"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json2yaml/-/json2yaml-1.1.0.tgz"; - sha1 = "5414d907f9816586b80c513ec2e3aeb2ab819a6c"; - }; - }; "jsonify-0.0.0" = { name = "jsonify"; packageName = "jsonify"; @@ -3982,15 +1750,6 @@ let sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; - "jsonparse-1.3.1" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; - }; - }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -4018,22 +1777,13 @@ let sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; }; }; - "k-rpc-socket-1.7.2" = { + "k-rpc-socket-1.8.0" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; - sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; - }; - }; - "keyv-3.0.0" = { - name = "keyv"; - packageName = "keyv"; - version = "3.0.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; "kind-of-3.2.2" = { @@ -4063,42 +1813,6 @@ let sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; }; }; - "latest-version-3.1.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; - sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; - }; - }; - "lazy-property-1.0.0" = { - name = "lazy-property"; - packageName = "lazy-property"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz"; - sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "le-table-4.0.0" = { - name = "le-table"; - packageName = "le-table"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/le-table/-/le-table-4.0.0.tgz"; - sha1 = "3bfeb72d24cbfc37752f01539f9006d711d9be93"; - }; - }; "length-prefixed-message-3.0.3" = { name = "length-prefixed-message"; packageName = "length-prefixed-message"; @@ -4108,184 +1822,31 @@ let sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; - "libnpx-9.6.0" = { - name = "libnpx"; - packageName = "libnpx"; - version = "9.6.0"; + "lodash-4.17.5" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/libnpx/-/libnpx-9.6.0.tgz"; - sha512 = "28v6bsd92dcqj92yr2bk9r29ajwbqx46fd46mriva2934nr7s6hhkxy6f7xbf4nd7p93fxsbpzfx0ghq0y788x1zj8gnh1iswgd89sz"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; }; }; - "load-json-file-4.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "4.0.0"; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; - sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; - }; - }; - "load-yaml-file-0.1.0" = { - name = "load-yaml-file"; - packageName = "load-yaml-file"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.1.0.tgz"; - sha1 = "f680066e691b3eeb45017672e4a3956af5b83b89"; - }; - }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - }; - "lockfile-1.0.3" = { - name = "lockfile"; - packageName = "lockfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; - sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; - }; - }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "lodash._baseuniq-4.6.0" = { - name = "lodash._baseuniq"; - packageName = "lodash._baseuniq"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; - sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; - }; - }; - "lodash._createset-4.0.3" = { - name = "lodash._createset"; - packageName = "lodash._createset"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"; - sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; - }; - }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; - }; - }; - "lodash.throttle-4.1.1" = { - name = "lodash.throttle"; - packageName = "lodash.throttle"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; - sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; - }; - }; - "lodash.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - }; - "lodash.without-4.4.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; - sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; - }; - }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; "lru-2.0.1" = { @@ -4306,60 +1867,6 @@ let sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; }; }; - "lru-cache-4.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; - }; - }; - "make-dir-1.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; - sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; - }; - }; - "make-fetch-happen-2.6.0" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz"; - sha512 = "1kmyri7r2lpf3fjzwbbdramk86mhplv53x5pl535frn1vryq9xl7hmzkb3awxw6c31n19w0i20mv0h3zj8mmcw5yjkiysrlsaab8nhl"; - }; - }; - "meant-1.0.1" = { - name = "meant"; - packageName = "meant"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz"; - sha512 = "2b6yi25bkxg4hd38w2cpfjy0xyka4iqiyzhsnkklx3nxwbgnzr4hfl07xxpflccjvnb03zvnssw0y9fspxdk2fmq3abd4fab0n1baai"; - }; - }; - "mem-1.1.0" = { - name = "mem"; - packageName = "mem"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; - }; - }; - "mem-3.0.0" = { - name = "mem"; - packageName = "mem"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-3.0.0.tgz"; - sha1 = "84e58ad4dfbdf5d105b26b6548a398b2b3aa8a21"; - }; - }; "memory-pager-1.1.0" = { name = "memory-pager"; packageName = "memory-pager"; @@ -4396,40 +1903,22 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "mime-db-1.30.0" = { + "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.30.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; - "mime-types-2.1.17" = { + "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; - }; - }; - "mimic-fn-1.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.1.0"; + version = "2.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; - sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; - }; - }; - "mimic-response-1.0.0" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; "min-document-2.19.0" = { @@ -4468,24 +1957,6 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.2.1" = { - name = "minipass"; - packageName = "minipass"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; - }; - }; - "minizlib-1.1.0" = { - name = "minizlib"; - packageName = "minizlib"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; - }; - }; "mirror-folder-2.1.1" = { name = "mirror-folder"; packageName = "mirror-folder"; @@ -4495,15 +1966,6 @@ let sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; - "mississippi-1.3.1" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz"; - sha512 = "2vfagk7xiqrqmyp78yz1cpnjsaibgix7q22cgxggwzf5kqr7y1p21dbi67vcvsvip1g2s6mrvskw7d8a2288sala5n0nv65hpqw3apz"; - }; - }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -4513,51 +1975,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkdirp-promise-5.0.1" = { - name = "mkdirp-promise"; - packageName = "mkdirp-promise"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz"; - sha1 = "e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"; - }; - }; - "months-1.2.0" = { - name = "months"; - packageName = "months"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/months/-/months-1.2.0.tgz"; - sha512 = "0wl48vfgi3c46vwy8cfa0j4z65rbar2j8cwgns9jcgi3cc3n79fm7yjg6wlbd90y3jhhfj03i2xs0as0sv3kkb0jc32d2bk9a2knlyc"; - }; - }; - "most-1.7.2" = { - name = "most"; - packageName = "most"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/most/-/most-1.7.2.tgz"; - sha512 = "1jxsiagsdkjmd2h0ys7kkc34rw79bswfdlyijd2fv434d0sxk8i8j055fhmpfs4ca1j9wgi6pj9k4b2cyq7di528vykwgf7mr8v6d4c"; - }; - }; - "most-last-1.0.0" = { - name = "most-last"; - packageName = "most-last"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/most-last/-/most-last-1.0.0.tgz"; - sha1 = "4e3f0b289c24cf90b9d8384676de90a26e376171"; - }; - }; - "move-concurrently-1.0.1" = { - name = "move-concurrently"; - packageName = "move-concurrently"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; - sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; - }; - }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -4567,15 +1984,6 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { - name = "ms"; - packageName = "ms"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; - }; - }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -4585,13 +1993,13 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multicast-dns-6.2.2" = { + "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; - sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; "multicb-1.2.2" = { @@ -4621,22 +2029,13 @@ let sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; - }; - }; - "nan-2.8.0" = { + "nan-2.9.2" = { name = "nan"; packageName = "nan"; - version = "2.8.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; + sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; }; }; "nanoassert-1.1.0" = { @@ -4675,33 +2074,6 @@ let sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; - "ndjson-1.5.0" = { - name = "ndjson"; - packageName = "ndjson"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; - sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; - }; - }; - "neat-csv-2.1.0" = { - name = "neat-csv"; - packageName = "neat-csv"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/neat-csv/-/neat-csv-2.1.0.tgz"; - sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; - }; - }; "neat-log-1.1.2" = { name = "neat-log"; packageName = "neat-log"; @@ -4711,15 +2083,6 @@ let sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; - "nerf-dart-1.0.0" = { - name = "nerf-dart"; - packageName = "nerf-dart"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nerf-dart/-/nerf-dart-1.0.0.tgz"; - sha1 = "e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"; - }; - }; "nets-3.2.0" = { name = "nets"; packageName = "nets"; @@ -4738,571 +2101,130 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "node-abi-2.1.2" = { - name = "node-abi"; - packageName = "node-abi"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; - sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; - }; - }; - "node-fetch-npm-2.0.2" = { - name = "node-fetch-npm"; - packageName = "node-fetch-npm"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; - sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; - }; - }; - "node-gyp-3.6.2" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; - sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; - }; - }; "node-gyp-build-3.2.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; - }; - }; - "noop-logger-0.1.1" = { - name = "noop-logger"; - packageName = "noop-logger"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; - }; - }; - "noop6-1.0.7" = { - name = "noop6"; - packageName = "noop6"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/noop6/-/noop6-1.0.7.tgz"; - sha1 = "96767bf2058ba59ca8cb91559347ddc80239fa8e"; - }; - }; - "nopt-3.0.6" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; - }; - }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; - "normalize-path-2.1.1" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; - }; - }; - "normalize-registry-url-1.0.0" = { - name = "normalize-registry-url"; - packageName = "normalize-registry-url"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-registry-url/-/normalize-registry-url-1.0.0.tgz"; - sha512 = "3s6mrnn04pf7i9gqc04l6c4mnwdwy08235c4rd1rzw080z1a27bs1xwh2fcbzc8p1lbm4xjbby1g11pd38i4wsfjarbsvvmrvir7znj"; - }; - }; - "normalize-ssh-1.0.0" = { - name = "normalize-ssh"; - packageName = "normalize-ssh"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-ssh/-/normalize-ssh-1.0.0.tgz"; - sha1 = "22a8308fa7cd932bdb49af74ecac644cf4a6196b"; - }; - }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; - }; - }; - "not-bundled-npm-5.5.1" = { - name = "not-bundled-npm"; - packageName = "not-bundled-npm"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/not-bundled-npm/-/not-bundled-npm-5.5.1.tgz"; - sha512 = "1mzbw8sibjcs0c9ldxq90v7z5nrni5jz1khkbv7yvxf2gxqdp12b85fzs9qw3lrxjjcxk5w32rzadaz0q0llpqs72ikxcpi3i4wak9a"; - }; - }; - "npm-bundled-1.0.3" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; - }; - }; - "npm-cache-filename-1.0.2" = { - name = "npm-cache-filename"; - packageName = "npm-cache-filename"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; - sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; - }; - }; - "npm-install-checks-3.0.0" = { - name = "npm-install-checks"; - packageName = "npm-install-checks"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz"; - sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; - }; - }; - "npm-lifecycle-1.0.3" = { - name = "npm-lifecycle"; - packageName = "npm-lifecycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-1.0.3.tgz"; - sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa"; - }; - }; - "npm-lifecycle-2.0.0" = { - name = "npm-lifecycle"; - packageName = "npm-lifecycle"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.0.0.tgz"; - sha512 = "1rwl5baayxqs7bcgbrjjbrl8lj46p9r4b4k9ad9gnkvgcs5ghsdr9fi6s4xmd0a9dlli0hfwf5mrd9h0rxmlh9zbn553lwfbp9wfkk8"; - }; - }; - "npm-package-arg-5.1.2" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; - sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; - }; - }; - "npm-package-arg-6.0.0" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; - sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; - }; - }; - "npm-packlist-1.1.10" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; - sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; - }; - }; - "npm-pick-manifest-1.0.4" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; - sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; - }; - }; - "npm-profile-2.0.5" = { - name = "npm-profile"; - packageName = "npm-profile"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz"; - sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl"; - }; - }; - "npm-registry-client-8.5.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; - sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; - }; - }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - }; - "npm-user-validate-1.0.0" = { - name = "npm-user-validate"; - packageName = "npm-user-validate"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; - sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; - }; - }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "object-keys-1.0.11" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; - sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; - }; - }; - "object.getownpropertydescriptors-2.0.3" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; - }; - }; - "object.omit-2.0.1" = { - name = "object.omit"; - packageName = "object.omit"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; - }; - }; - "observatory-1.0.0" = { - name = "observatory"; - packageName = "observatory"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/observatory/-/observatory-1.0.0.tgz"; - sha1 = "2baa606e8299e6866914ec9c8a4db6a41136e59b"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "opener-1.4.3" = { - name = "opener"; - packageName = "opener"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; - sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; - }; - }; - "optparse-1.0.5" = { - name = "optparse"; - packageName = "optparse"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; - sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-locale-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "overlap-2.0.0" = { - name = "overlap"; - packageName = "overlap"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/overlap/-/overlap-2.0.0.tgz"; - sha1 = "b29b6bb2ad7569c4e66faef28cb5d74361179cb4"; - }; - }; - "p-cancelable-0.3.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; - sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; - }; - }; - "p-defer-1.0.0" = { - name = "p-defer"; - packageName = "p-defer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - }; - "p-every-1.0.2" = { - name = "p-every"; - packageName = "p-every"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-every/-/p-every-1.0.2.tgz"; - sha1 = "4e01d85c23da19ed71a4afba319bdb4d94c85e00"; - }; - }; - "p-filter-1.0.0" = { - name = "p-filter"; - packageName = "p-filter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-filter/-/p-filter-1.0.0.tgz"; - sha1 = "629d317150209c8fd508ba137713ef4bb920e9db"; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; }; }; - "p-limit-1.2.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.2.0"; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; - sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "p-map-1.2.0" = { - name = "p-map"; - packageName = "p-map"; - version = "1.2.0"; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"; - sha512 = "084pyivsr35xi3fdmpznf0c0nc9jz15hak8iyh3v24n25b376blg13ngb4mgpm71zdnfp9b17zbyn728z0jjz1r674k71hd4c0cmb5g"; + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; - "p-queue-2.3.0" = { - name = "p-queue"; - packageName = "p-queue"; - version = "2.3.0"; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-2.3.0.tgz"; - sha1 = "65d55e71bc1500fc413122da98ae457ff8a7c038"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; - "p-reduce-1.0.0" = { - name = "p-reduce"; - packageName = "p-reduce"; - version = "1.0.0"; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz"; - sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "p-series-1.0.0" = { - name = "p-series"; - packageName = "p-series"; - version = "1.0.0"; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-series/-/p-series-1.0.0.tgz"; - sha1 = "7ec9e7b4406cc32066298a6f9860e55e91b36e07"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "p-timeout-2.0.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "2.0.1"; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; }; }; - "package-json-4.0.1" = { - name = "package-json"; - packageName = "package-json"; - version = "4.0.1"; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; - sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "package-store-0.15.2" = { - name = "package-store"; - packageName = "package-store"; - version = "0.15.2"; + "optparse-1.0.5" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/package-store/-/package-store-0.15.2.tgz"; - sha512 = "074xsl6ca8j68cvbh8gj3h846g9rxgcxwxhbryab9f72brc5lmcq3dcj80kbjbykkzgpikzxj4qdmvxzwrhj3bilgncbbm0ladlv17r"; + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; - "pacote-6.0.4" = { - name = "pacote"; - packageName = "pacote"; - version = "6.0.4"; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz"; - sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "pako-0.2.9" = { - name = "pako"; - packageName = "pako"; - version = "0.2.9"; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "parallel-transform-1.1.0" = { - name = "parallel-transform"; - packageName = "parallel-transform"; - version = "1.1.0"; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; - sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "parse-glob-3.0.4" = { @@ -5323,69 +2245,6 @@ let sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; }; }; - "parse-it-1.0.8" = { - name = "parse-it"; - packageName = "parse-it"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-it/-/parse-it-1.0.8.tgz"; - sha1 = "e9a53bde18c8049e7bb415b73e16d3292df8eae7"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "parse-json-4.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; - }; - }; - "parse-npm-tarball-url-1.0.2" = { - name = "parse-npm-tarball-url"; - packageName = "parse-npm-tarball-url"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-npm-tarball-url/-/parse-npm-tarball-url-1.0.2.tgz"; - sha512 = "26zvr85a2wbbkqrwzyy3226waj0p5z3vrh19gxxvkgxf98qgvl1jdz20hvsr20x5f1viwqm9n2yr8yi61kkb9h0cd1kszw2yv8542cs"; - }; - }; - "parse-url-1.3.11" = { - name = "parse-url"; - packageName = "parse-url"; - version = "1.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-1.3.11.tgz"; - sha1 = "57c15428ab8a892b1f43869645c711d0e144b554"; - }; - }; - "path-absolute-1.0.0" = { - name = "path-absolute"; - packageName = "path-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-absolute/-/path-absolute-1.0.0.tgz"; - sha512 = "2fjzk70izrnlxrvqprakq310j8b1zcvsln7aji0qfljcl5is8c7aip8bc6ly07v8qg6l4rsrgzyj411rlbzyhmgnsiwzlnlhkr1lk5k"; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -5395,60 +2254,6 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-is-inside-1.0.2" = { - name = "path-is-inside"; - packageName = "path-is-inside"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; - }; - }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - }; - "path-name-1.0.0" = { - name = "path-name"; - packageName = "path-name"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-name/-/path-name-1.0.0.tgz"; - sha1 = "8ca063a63de7982dfa95760edaffd10214494f24"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; - "path-type-3.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; - }; - }; - "peek-stream-1.1.2" = { - name = "peek-stream"; - packageName = "peek-stream"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz"; - sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; - }; - }; "performance-now-0.2.0" = { name = "performance-now"; packageName = "performance-now"; @@ -5467,42 +2272,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "pify-3.0.0" = { - name = "pify"; - packageName = "pify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -5521,96 +2290,6 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "pkgs-graph-2.0.0-0" = { - name = "pkgs-graph"; - packageName = "pkgs-graph"; - version = "2.0.0-0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkgs-graph/-/pkgs-graph-2.0.0-0.tgz"; - sha512 = "3p1llv78shph6qwba9p8vd14hxanjdp1zmzivmn94dzfff2diqkvsc0zar9pj40pl2fwkbqg3p266ilcjbj6ajhzn8kcpmir5fx2f0c"; - }; - }; - "pnpm-default-reporter-0.11.8" = { - name = "pnpm-default-reporter"; - packageName = "pnpm-default-reporter"; - version = "0.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-default-reporter/-/pnpm-default-reporter-0.11.8.tgz"; - sha512 = "2x14yf0yi5q5dvq1777khbvah4wpcm92l4il946nq0f7nyra450llgp09q56161rk6qk6x7gr9hffii97c25b98a35pr7gwgc8yfrwz"; - }; - }; - "pnpm-file-reporter-0.0.1" = { - name = "pnpm-file-reporter"; - packageName = "pnpm-file-reporter"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-file-reporter/-/pnpm-file-reporter-0.0.1.tgz"; - sha1 = "f7c3e2164c5cc955a0b3ed661314e6357b3f2e63"; - }; - }; - "pnpm-install-checks-1.1.0" = { - name = "pnpm-install-checks"; - packageName = "pnpm-install-checks"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-install-checks/-/pnpm-install-checks-1.1.0.tgz"; - sha1 = "741d9979762fdfad93f3e469deb4a814d3430008"; - }; - }; - "pnpm-list-2.0.1" = { - name = "pnpm-list"; - packageName = "pnpm-list"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-list/-/pnpm-list-2.0.1.tgz"; - sha512 = "0rrmch43p1dncghmvb6mwv59c0gan88d87fdbvzsmg4lj6j5l4bkfrr5x6gmi9z8f4nf3lqddf5b5wg8l7bb5if6c5wknim1w3l2vlb"; - }; - }; - "pnpm-logger-0.0.0" = { - name = "pnpm-logger"; - packageName = "pnpm-logger"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-logger/-/pnpm-logger-0.0.0.tgz"; - sha1 = "28701b97618a1fc32d2fee1bf410746588bb1a85"; - }; - }; - "pnpm-shrinkwrap-5.1.1" = { - name = "pnpm-shrinkwrap"; - packageName = "pnpm-shrinkwrap"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-shrinkwrap/-/pnpm-shrinkwrap-5.1.1.tgz"; - sha512 = "0nrnbsdiq01q2383pib07a7hrc602bpl9sf2j05pmjk5xn7hipicp90jdwlzf36wln2bqjzi1zgv5a5fhw41zx3zfad6affppkf8c5d"; - }; - }; - "prebuild-install-2.5.0" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.0.tgz"; - sha512 = "137vbrb6szyda92qg093yp1l6d2l4s1nb7c0dznjgbyrzsm252spxnrdpmj8nmf170fcq404pgsn0p65sxm4z74p2fyqyd415k742fz"; - }; - }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; - }; - }; - "prepend-http-2.0.0" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; - }; - }; "preserve-0.2.0" = { name = "preserve"; packageName = "preserve"; @@ -5629,15 +2308,6 @@ let sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; }; }; - "pretty-bytes-4.0.2" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz"; - sha1 = "b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"; - }; - }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -5647,24 +2317,6 @@ let sha1 = "16e0579188def56bdb565892bcd05a5d65324807"; }; }; - "printable-characters-1.0.38" = { - name = "printable-characters"; - packageName = "printable-characters"; - version = "1.0.38"; - src = fetchurl { - url = "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.38.tgz"; - sha1 = "76ef84accfd7f8366fb7138fb92466a916d599bc"; - }; - }; - "proc-output-1.0.6" = { - name = "proc-output"; - packageName = "proc-output"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/proc-output/-/proc-output-1.0.6.tgz"; - sha1 = "9ffcfb3ac6a156ee32b7ebd69f024a4f6d896350"; - }; - }; "process-0.5.2" = { name = "process"; packageName = "process"; @@ -5674,15 +2326,6 @@ let sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; }; }; - "process-exists-3.0.0" = { - name = "process-exists"; - packageName = "process-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-exists/-/process-exists-3.0.0.tgz"; - sha512 = "3lwxdzkx3bzfvb8qvrjccjdk90advh7p3j52d1b4hn3v2d7cf780k7wbvy94w6chgpq6lrrs6m0n122463q7g8z06aajbjqncq0db9h"; - }; - }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -5692,6 +2335,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + }; + }; "progress-string-1.2.2" = { name = "progress-string"; packageName = "progress-string"; @@ -5701,24 +2353,6 @@ let sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; }; }; - "promise-inflight-1.0.1" = { - name = "promise-inflight"; - packageName = "promise-inflight"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; - }; - }; - "promise-retry-1.1.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; - sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; - }; - }; "prompt-1.0.0" = { name = "prompt"; packageName = "prompt"; @@ -5728,33 +2362,6 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "promzard-0.3.0" = { - name = "promzard"; - packageName = "promzard"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; - sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; - }; - }; - "proper-lockfile-2.0.1" = { - name = "proper-lockfile"; - packageName = "proper-lockfile"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; - sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; - }; - }; - "proto-list-1.2.4" = { - name = "proto-list"; - packageName = "proto-list"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; - }; - }; "protocol-buffers-encodings-1.1.0" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -5764,51 +2371,6 @@ let sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; - "protocols-1.4.6" = { - name = "protocols"; - packageName = "protocols"; - version = "1.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/protocols/-/protocols-1.4.6.tgz"; - sha1 = "f8bb263ea1b5fd7a7604d26b8be39bd77678bf8a"; - }; - }; - "protoduck-4.0.0" = { - name = "protoduck"; - packageName = "protoduck"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; - sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; - }; - }; - "prr-1.0.1" = { - name = "prr"; - packageName = "prr"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; - }; - }; - "ps-list-4.0.0" = { - name = "ps-list"; - packageName = "ps-list"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-4.0.0.tgz"; - sha1 = "57c8b3d38161ee8977811cd32a5dc52237fdb299"; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - }; "pump-1.0.3" = { name = "pump"; packageName = "pump"; @@ -5827,31 +2389,13 @@ let sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; - "pumpify-1.4.0" = { - name = "pumpify"; - packageName = "pumpify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; - sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; - }; - }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "qrcode-terminal-0.11.0" = { - name = "qrcode-terminal"; - packageName = "qrcode-terminal"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz"; - sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; "qs-6.4.0" = { @@ -5872,49 +2416,13 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "query-string-5.0.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; - sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; - }; - }; - "qw-1.0.1" = { - name = "qw"; - packageName = "qw"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz"; - sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; - }; - }; - "ramda-0.24.1" = { - name = "ramda"; - packageName = "ramda"; - version = "0.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz"; - sha1 = "c3b7755197f35b8dc3502228262c4c91ddb6b857"; - }; - }; - "ramda-0.25.0" = { - name = "ramda"; - packageName = "ramda"; - version = "0.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz"; - sha512 = "1qixam46hr8jsw2f4g0rvhn8jf493dpjqhi65ggacz83ndqwnal1m8kiy18d3ak9x4lapcjb1fvrx18zj26jfhlxp51vhsghnnmyyhr"; - }; - }; - "random-access-file-1.8.1" = { + "random-access-file-2.0.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.8.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; }; }; "random-access-memory-2.4.0" = { @@ -5926,6 +2434,15 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; + "random-access-storage-1.1.1" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; + sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + }; + }; "randomatic-1.1.7" = { name = "randomatic"; packageName = "randomatic"; @@ -5953,13 +2470,13 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "rc-1.2.4" = { + "rc-1.2.5" = { name = "rc"; packageName = "rc"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; - sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; + sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; }; }; "read-1.0.7" = { @@ -5971,94 +2488,13 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "read-cmd-shim-1.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; - }; - }; - "read-installed-4.0.3" = { - name = "read-installed"; - packageName = "read-installed"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"; - sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; - }; - }; - "read-package-json-2.0.12" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; - sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; - }; - }; - "read-package-tree-5.1.6" = { - name = "read-package-tree"; - packageName = "read-package-tree"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz"; - sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; - "read-pkg-3.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; - }; - }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "readable-stream-2.3.3" = { + "readable-stream-2.3.4" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "readdir-scoped-modules-1.0.2" = { - name = "readdir-scoped-modules"; - packageName = "readdir-scoped-modules"; - version = "1.0.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"; - sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; + sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; }; }; "readdirp-2.1.0" = { @@ -6070,22 +2506,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "recursive-watch-1.1.2" = { + "recursive-watch-1.1.3" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; - sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; - }; - }; - "regenerator-runtime-0.11.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.11.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; + sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; }; }; "regex-cache-0.4.4" = { @@ -6097,51 +2524,6 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; - "regex-escape-3.4.8" = { - name = "regex-escape"; - packageName = "regex-escape"; - version = "3.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; - sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; - }; - }; - "registry-auth-token-3.3.1" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; - }; - }; - "registry-url-3.1.0" = { - name = "registry-url"; - packageName = "registry-url"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; - }; - }; - "remedial-1.0.7" = { - name = "remedial"; - packageName = "remedial"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/remedial/-/remedial-1.0.7.tgz"; - sha1 = "d6674413a65676007be00dd400980987b2c300c1"; - }; - }; - "remove-all-except-outer-links-1.0.3" = { - name = "remove-all-except-outer-links"; - packageName = "remove-all-except-outer-links"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-all-except-outer-links/-/remove-all-except-outer-links-1.0.3.tgz"; - sha512 = "27mlgakm2rw58mad07fnzfmjk893mr23qqi393b30qsqv2wyng86j0mqn1d06wi2cjzhlcq86zxzz1i3rvd58ajhq71crrm27dyblw7"; - }; - }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -6151,15 +2533,6 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "rename-overwrite-1.0.0" = { - name = "rename-overwrite"; - packageName = "rename-overwrite"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rename-overwrite/-/rename-overwrite-1.0.0.tgz"; - sha1 = "b45a74ceb93d1073e31c5b701c428de5796523d8"; - }; - }; "repeat-element-1.1.2" = { name = "repeat-element"; packageName = "repeat-element"; @@ -6178,15 +2551,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "replace-string-1.1.0" = { - name = "replace-string"; - packageName = "replace-string"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/replace-string/-/replace-string-1.1.0.tgz"; - sha1 = "87062117f823fe5800c306bacb2cfa359b935fea"; - }; - }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -6205,24 +2569,6 @@ let sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; }; }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -6232,51 +2578,6 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "3i345pdv74jb3xbprqb38xq1zfhsbxzm6b1h0mbcvhfpzz907m4amq35s0spijdj3phs508sha4cnr3incg4w8in4r0kd7ccmicrgx5"; - }; - }; - "resolve-link-target-1.0.1" = { - name = "resolve-link-target"; - packageName = "resolve-link-target"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-link-target/-/resolve-link-target-1.0.1.tgz"; - sha512 = "144pdhsw05w6zrwzh2daxd63x0qv6qgf5cimbkbvz9m4ncclp5z9xj6ym5ayhd6xvc2s7pwymj4x439k00czm5jz2h7z1dhgzipf9xs"; - }; - }; - "responselike-1.0.2" = { - name = "responselike"; - packageName = "responselike"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "retry-0.10.1" = { - name = "retry"; - packageName = "retry"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; - sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; - }; - }; "revalidator-0.1.8" = { name = "revalidator"; packageName = "revalidator"; @@ -6295,31 +2596,13 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; - "rimraf-then-1.0.1" = { - name = "rimraf-then"; - packageName = "rimraf-then"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf-then/-/rimraf-then-1.0.1.tgz"; - sha1 = "bd4458a79eb561b7548aaec0ac3753ef429fe70b"; - }; - }; - "run-queue-1.0.3" = { - name = "run-queue"; - packageName = "run-queue"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "e848396f057d223f24386924618e25694161ec47"; - }; - }; - "rusha-0.8.12" = { + "rusha-0.8.13" = { name = "rusha"; packageName = "rusha"; - version = "0.8.12"; + version = "0.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; - sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; + sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; "safe-buffer-5.1.1" = { @@ -6331,15 +2614,6 @@ let sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; - "sec-1.0.0" = { - name = "sec"; - packageName = "sec"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sec/-/sec-1.0.0.tgz"; - sha1 = "033d60a3ad20ecf2e00940d14f97823465774335"; - }; - }; "semver-5.3.0" = { name = "semver"; packageName = "semver"; @@ -6349,15 +2623,6 @@ let sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; - }; - }; "semver-5.5.0" = { name = "semver"; packageName = "semver"; @@ -6367,24 +2632,6 @@ let sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; - "semver-diff-2.1.0" = { - name = "semver-diff"; - packageName = "semver-diff"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; - }; - }; - "semver-regex-1.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; - sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; - }; - }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -6403,33 +2650,6 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "sha-2.0.1" = { - name = "sha"; - packageName = "sha"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz"; - sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae"; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -6448,15 +2668,6 @@ let sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129"; }; }; - "simple-get-1.4.3" = { - name = "simple-get"; - packageName = "simple-get"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; - sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; - }; - }; "simple-sha1-2.1.0" = { name = "simple-sha1"; packageName = "simple-sha1"; @@ -6475,15 +2686,6 @@ let sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; }; }; - "slash-1.0.0" = { - name = "slash"; - packageName = "slash"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; - }; - }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -6502,24 +2704,6 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - }; - "smart-buffer-1.1.15" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "1.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; - sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; - }; - }; "sntp-1.0.9" = { name = "sntp"; packageName = "sntp"; @@ -6538,24 +2722,6 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "socks-1.1.10" = { - name = "socks"; - packageName = "socks"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; - sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; - }; - }; - "socks-proxy-agent-3.0.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; - sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; - }; - }; "sodium-javascript-0.5.4" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -6583,15 +2749,6 @@ let sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; - }; - }; "sorted-array-functions-1.1.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; @@ -6610,33 +2767,6 @@ let sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; }; }; - "sorted-object-2.0.1" = { - name = "sorted-object"; - packageName = "sorted-object"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; - sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; - }; - }; - "sorted-union-stream-2.1.3" = { - name = "sorted-union-stream"; - packageName = "sorted-union-stream"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; - sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; - }; - }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -6646,42 +2776,6 @@ let sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "spawno-2.0.7" = { - name = "spawno"; - packageName = "spawno"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/spawno/-/spawno-2.0.7.tgz"; - sha512 = "0h8xflvrqwdvz8gadif970wlj5mby4vxhar40h0g96ld6qv6b696msspl89rs2l6n8zv3d9yd5lm85v1g5qk7fpjhqiai2862anzyrc"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; "speedometer-1.0.0" = { name = "speedometer"; packageName = "speedometer"; @@ -6691,24 +2785,6 @@ let sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; }; }; - "split2-2.2.0" = { - name = "split2"; - packageName = "split2"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; - sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4"; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; - }; - }; "sshpk-1.13.1" = { name = "sshpk"; packageName = "sshpk"; @@ -6718,33 +2794,6 @@ let sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; }; }; - "ssri-4.1.6" = { - name = "ssri"; - packageName = "ssri"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; - }; - }; - "ssri-5.0.0" = { - name = "ssri"; - packageName = "ssri"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz"; - sha512 = "0g0vz6pdy8f13fqnadimwxx39hq1ix1my6gv0cm308vpv7i06f7gk4ywp7q9aw5sbhrakf86x37ai9fn2y4jvw6lashjw8h5bih6vzg"; - }; - }; - "ssri-5.1.0" = { - name = "ssri"; - packageName = "ssri"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-5.1.0.tgz"; - sha512 = "11f7imn7d4s1vs4z45yk8gkis18gbb5qn1z4v5liidy6vwairj5426xciyk10yh3gnxj77bkamzffip8v7v9mjr8ggs8h1iz3qw5ssd"; - }; - }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -6754,24 +2803,6 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stacktracey-1.2.100" = { - name = "stacktracey"; - packageName = "stacktracey"; - version = "1.2.100"; - src = fetchurl { - url = "https://registry.npmjs.org/stacktracey/-/stacktracey-1.2.100.tgz"; - sha1 = "9e32c7a7fa643eaf69a8f9572361339a8afb6b59"; - }; - }; - "static-methods-1.0.10" = { - name = "static-methods"; - packageName = "static-methods"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/static-methods/-/static-methods-1.0.10.tgz"; - sha512 = "2vn92wnri9w5d8san58a7nyyz1ai56gl2qaic9w430bbyyscw98k0a89h3nhk3fkpg9p47hdizwmgp4cnx2g6kxjgk7la5mclk7vb2y"; - }; - }; "status-logger-3.1.1" = { name = "status-logger"; packageName = "status-logger"; @@ -6799,15 +2830,6 @@ let sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; - "stream-iterate-1.2.0" = { - name = "stream-iterate"; - packageName = "stream-iterate"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; - sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; - }; - }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -6826,15 +2848,6 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -6853,15 +2866,6 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; @@ -6890,39 +2894,12 @@ let }; }; "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; - "strip-color-0.1.0" = { - name = "strip-color"; - packageName = "strip-color"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-color/-/strip-color-0.1.0.tgz"; - sha1 = "106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b"; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; "strip-json-comments-2.0.1" = { @@ -6943,33 +2920,6 @@ let sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; }; }; - "supi-0.12.1" = { - name = "supi"; - packageName = "supi"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/supi/-/supi-0.12.1.tgz"; - sha512 = "1fb6fkng687rhx89agz3mqa854p424b8nwj1ix6ckfv40gnkz3saydxs0di4nildpccn2rgwf01flxk922pj2rap6wqg8fdr2c8crz7"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "supports-color-3.2.3" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; - sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; - }; - }; "supports-color-4.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -6979,31 +2929,13 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-4.5.0" = { + "supports-color-5.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; - "symbol-observable-1.1.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz"; - sha512 = "19pk4fk1ddq50all5c15bb58iwchzck5lvmsvlx5va17sfrq89pda0qrrnlma34m1kzay4q3k3ghmfp32hlqvk8njlfnhvavdvj42km"; - }; - }; - "symlink-dir-1.1.2" = { - name = "symlink-dir"; - packageName = "symlink-dir"; - version = "1.1.2"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/symlink-dir/-/symlink-dir-1.1.2.tgz"; - sha512 = "2bzpdrkxnd1iysdlc7n6i5pqwqm98s2m2srfp9br9872qdvv8pbnm3i7r27rqxbad6pypj2lzhkxf8zghfzp3psl9psk9bkbp02yw8r"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz"; + sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp"; }; }; "tar-2.2.1" = { @@ -7015,24 +2947,6 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.0.2" = { - name = "tar"; - packageName = "tar"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; - sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; - }; - }; - "tar-fs-1.16.0" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "1.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; - sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; - }; - }; "tar-pack-3.4.1" = { name = "tar-pack"; packageName = "tar-pack"; @@ -7042,60 +2956,6 @@ let sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; - "tar-stream-1.5.5" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; - }; - }; - "tasklist-3.1.0" = { - name = "tasklist"; - packageName = "tasklist"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tasklist/-/tasklist-3.1.0.tgz"; - sha1 = "873a98a4e45cbdecfa2c2ee18865353057e63696"; - }; - }; - "term-size-1.2.0" = { - name = "term-size"; - packageName = "term-size"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; - }; - }; - "thenify-3.3.0" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; - }; - }; "throttle-1.0.3" = { name = "throttle"; packageName = "throttle"; @@ -7105,15 +2965,6 @@ let sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; "through2-2.0.3" = { name = "through2"; packageName = "through2"; @@ -7141,24 +2992,6 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; - }; - }; - "timeout-then-1.1.0" = { - name = "timeout-then"; - packageName = "timeout-then"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timeout-then/-/timeout-then-1.1.0.tgz"; - sha1 = "0145b06070159c17e2146fd292b01a1bd81e5fbc"; - }; - }; "to-buffer-1.1.0" = { name = "to-buffer"; packageName = "to-buffer"; @@ -7177,13 +3010,13 @@ let sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; }; }; - "tough-cookie-2.3.3" = { + "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; "township-client-1.3.2" = { @@ -7195,15 +3028,6 @@ let sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; - "tree-kill-1.2.0" = { - name = "tree-kill"; - packageName = "tree-kill"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz"; - sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f"; - }; - }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -7249,24 +3073,6 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typpy-2.0.0" = { - name = "typpy"; - packageName = "typpy"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typpy/-/typpy-2.0.0.tgz"; - sha1 = "adef3bacc12ff47aff920fab03a8ff3279d737d6"; - }; - }; - "typpy-2.3.10" = { - name = "typpy"; - packageName = "typpy"; - version = "2.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/typpy/-/typpy-2.3.10.tgz"; - sha512 = "2m116608xyx0v7pl2hwvw0z7gw1yyxqx7yhp0l3a2nxrlsn7xav33rnys72xrc6jr0dwsg0r71f7qj42pdzgza15fz8l5wphycr5a0c"; - }; - }; "uid-number-0.0.6" = { name = "uid-number"; packageName = "uid-number"; @@ -7285,69 +3091,6 @@ let sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; }; }; - "ul-5.0.0" = { - name = "ul"; - packageName = "ul"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ul/-/ul-5.0.0.tgz"; - sha1 = "ca80d793025f3fd5dc9bf83469818d310a7c9a62"; - }; - }; - "ul-5.2.13" = { - name = "ul"; - packageName = "ul"; - version = "5.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/ul/-/ul-5.2.13.tgz"; - sha1 = "9ff0504ea35ca1f74c0bf59e6480def009bad7b5"; - }; - }; - "umask-1.1.0" = { - name = "umask"; - packageName = "umask"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"; - sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; - }; - }; - "unbzip2-stream-1.2.5" = { - name = "unbzip2-stream"; - packageName = "unbzip2-stream"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; - sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; - }; - }; - "unique-filename-1.1.0" = { - name = "unique-filename"; - packageName = "unique-filename"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; - sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; - }; - }; - "unique-slug-2.0.0" = { - name = "unique-slug"; - packageName = "unique-slug"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; - sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; - }; - }; - "unique-string-1.0.0" = { - name = "unique-string"; - packageName = "unique-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; - }; - }; "unixify-1.0.0" = { name = "unixify"; packageName = "unixify"; @@ -7384,24 +3127,6 @@ let sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; }; }; - "unpack-stream-3.0.1" = { - name = "unpack-stream"; - packageName = "unpack-stream"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unpack-stream/-/unpack-stream-3.0.1.tgz"; - sha512 = "3m37z48fshadh46ay1hibdw9fawz3rgx1c16wx63mgplka0bs71364xnn72awwzc83dns0gkhnv3slmk071k1mdrm1bzvbi8z1br8f9"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; "untildify-3.0.2" = { name = "untildify"; packageName = "untildify"; @@ -7411,69 +3136,6 @@ let sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; }; }; - "unzip-response-1.0.2" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; - }; - }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; - }; - }; - "update-notifier-2.2.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; - }; - }; - "update-notifier-2.3.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz"; - sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; - }; - }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; - }; - }; - "url-parse-lax-3.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; - }; - }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; - }; - }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -7483,24 +3145,6 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "util-extend-1.0.3" = { - name = "util-extend"; - packageName = "util-extend"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz"; - sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; - }; - }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; - }; - }; "utile-0.3.0" = { name = "utile"; packageName = "utile"; @@ -7519,15 +3163,6 @@ let sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; }; }; - "uuid-3.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; - }; - }; "uuid-3.2.1" = { name = "uuid"; packageName = "uuid"; @@ -7537,24 +3172,6 @@ let sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "validate-npm-package-name-3.0.0" = { - name = "validate-npm-package-name"; - packageName = "validate-npm-package-name"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; - sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; - }; - }; "varint-3.0.1" = { name = "varint"; packageName = "varint"; @@ -7591,24 +3208,6 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "version-selector-type-2.0.0" = { - name = "version-selector-type"; - packageName = "version-selector-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/version-selector-type/-/version-selector-type-2.0.0.tgz"; - sha512 = "3n7bidjd5r4lph1qq3sz6kyjk3isb2hjvvaccsqqsspphm2in151xgga6lzjimydbvl9a6cr9jy8q06qdgvalq4nxyggs1v49i150qm"; - }; - }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; - }; - }; "which-1.3.0" = { name = "which"; packageName = "which"; @@ -7618,15 +3217,6 @@ let sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; "wide-align-1.1.2" = { name = "wide-align"; packageName = "wide-align"; @@ -7636,15 +3226,6 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; - "widest-line-2.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; - sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; - }; - }; "winston-2.1.1" = { name = "winston"; packageName = "winston"; @@ -7654,24 +3235,6 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "worker-farm-1.5.2" = { - name = "worker-farm"; - packageName = "worker-farm"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz"; - sha512 = "28xgfshjpa79hz7v39axfrfnjhhjl371w30vy7dhs0kdzsdd42xi8lz85yjs2m0fp481iydiwscsy61gr99igkmkak7xrjd8vv9062z"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; "wrap-ansi-3.0.1" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -7690,78 +3253,6 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; - }; - }; - "write-file-atomic-2.1.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; - sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni"; - }; - }; - "write-file-atomic-2.3.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; - }; - }; - "write-json-file-2.3.0" = { - name = "write-json-file"; - packageName = "write-json-file"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz"; - sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; - }; - }; - "write-pkg-3.1.0" = { - name = "write-pkg"; - packageName = "write-pkg"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; - sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; - }; - }; - "write-yaml-file-1.0.0" = { - name = "write-yaml-file"; - packageName = "write-yaml-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-1.0.0.tgz"; - sha1 = "7b4bd0df72ca13fbe9d6b0178fd83c077b8ea86b"; - }; - }; - "x256-0.0.2" = { - name = "x256"; - packageName = "x256"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz"; - sha1 = "c9af18876f7a175801d564fe70ad9e8317784934"; - }; - }; - "xdg-basedir-3.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; - sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; - }; - }; "xhr-2.4.1" = { name = "xhr"; packageName = "xhr"; @@ -7789,69 +3280,6 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; - }; - }; - "yallist-3.0.2" = { - name = "yallist"; - packageName = "yallist"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; - sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; - }; - }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - }; - "zen-observable-0.7.1" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.7.1.tgz"; - sha512 = "134nwk2ggcx46rx0n2cy1fqmlixar7c4sygxkym7kpd8wkqvdnlg1win4kns4zcxx99mxmbpr57jppq8bkva5z2ladfmjdl4wqrb3iq"; - }; - }; - "zen-push-0.2.1" = { - name = "zen-push"; - packageName = "zen-push"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-push/-/zen-push-0.2.1.tgz"; - sha512 = "3bx83jgamf9vq3n0150j5h8ndbxck5psnhw21fwifmq7jz37vcmlm7wmirbxh824jhq3kv16lc4h6iki1kwxx0zsjwyf8hrryyjmzj2"; - }; - }; }; in { @@ -7930,20 +3358,19 @@ in sources."blake2b-wasm-1.1.7" sources."body-0.1.0" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.3" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -7951,7 +3378,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.1.2" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."connections-1.4.2" @@ -7986,35 +3413,36 @@ in sources."debug-2.6.9" ]; }) - sources."dat-log-1.1.1" - (sources."dat-node-3.5.6" // { + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) + (sources."dat-node-3.5.8" // { dependencies = [ sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" sources."pump-1.0.3" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" - sources."dat-secret-storage-4.0.0" - sources."dat-storage-1.0.3" + sources."dat-secret-storage-4.0.1" + sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.0" sources."datland-swarm-defaults-1.0.2" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" - sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.7" - (sources."discovery-swarm-4.4.2" // { - dependencies = [ - sources."thunky-0.1.0" - ]; - }) - (sources."dns-discovery-5.6.1" // { + sources."directory-index-html-2.1.0" + sources."discovery-channel-5.4.7" + (sources."discovery-swarm-4.4.2" // { dependencies = [ sources."thunky-0.1.0" ]; }) + sources."dns-discovery-5.6.1" sources."dns-packet-1.3.1" sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" @@ -8029,7 +3457,7 @@ in sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" sources."filename-regex-2.0.1" @@ -8039,7 +3467,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -8049,28 +3477,24 @@ in sources."global-4.3.2" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.0" // { + (sources."hypercore-6.12.2" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."hypercore-protocol-6.5.2" - (sources."hyperdrive-9.12.2" // { + (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" ]; }) sources."hyperdrive-http-4.2.2" - (sources."hyperdrive-network-speed-2.0.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8099,8 +3523,12 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."k-bucket-3.3.1" - sources."k-rpc-4.2.1" - sources."k-rpc-socket-1.7.2" + (sources."k-rpc-4.2.1" // { + dependencies = [ + sources."bencode-2.0.0" + ]; + }) + sources."k-rpc-socket-1.8.0" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" sources."length-prefixed-message-3.0.3" @@ -8111,8 +3539,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -8120,11 +3548,11 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.2" + sources."multicast-dns-6.2.3" sources."multicb-1.2.2" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -8151,7 +3579,7 @@ in sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-string-1.2.2" (sources."prompt-1.0.0" // { dependencies = [ @@ -8162,12 +3590,9 @@ in sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.1" - (sources."random-access-file-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" + sources."random-access-storage-1.1.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -8180,8 +3605,8 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.3" - sources."recursive-watch-1.1.2" + sources."readable-stream-2.3.4" + sources."recursive-watch-1.1.3" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -8189,7 +3614,7 @@ in sources."request-2.83.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."safe-buffer-5.1.1" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" @@ -8219,7 +3644,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -8229,7 +3654,7 @@ in sources."thunky-1.0.2" sources."to-buffer-1.1.0" sources."toiletdb-1.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."township-client-1.3.2" sources."trim-0.0.1" sources."ttl-1.3.1" @@ -8279,7 +3704,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."findup-sync-0.3.0" sources."glob-5.0.15" @@ -8305,14 +3730,14 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; - sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz"; + sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a"; }; dependencies = [ sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.0" sources."commander-2.11.0" sources."concat-map-0.0.1" @@ -8388,11 +3813,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -8407,10 +3832,10 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -8421,7 +3846,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8435,8 +3860,8 @@ in sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -8448,13 +3873,13 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -8468,7 +3893,7 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -8527,11 +3952,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -8577,8 +4002,8 @@ in sources."assert-plus-1.0.0" ]; }) - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -8591,18 +4016,18 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.81.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -8622,7 +4047,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid-number-0.0.6" @@ -8644,818 +4069,11 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.31.0"; + version = "1.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.31.0.tgz"; - sha1 = "7d971bb0e48c25d4e04db420eee8ee0bcb4c66d4"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.1.tgz"; + sha1 = "7eb1265daa9da18dab7a7b1645747cd046c42f33"; }; - dependencies = [ - sources."@most/multicast-1.3.0" - sources."@most/prelude-1.7.0" - sources."@pnpm/check-package-1.0.0" - (sources."@pnpm/default-fetcher-0.3.2" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - sources."ssri-5.0.0" - ]; - }) - (sources."@pnpm/default-resolver-0.1.2" // { - dependencies = [ - sources."@types/node-9.3.0" - ]; - }) - sources."@pnpm/fs-locker-1.0.1" - sources."@pnpm/git-fetcher-0.2.0" - sources."@pnpm/git-resolver-0.3.0" - sources."@pnpm/local-resolver-0.1.1" - (sources."@pnpm/logger-1.0.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."@pnpm/npm-resolver-0.3.11" - (sources."@pnpm/outdated-0.2.5" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."pify-2.3.0" - ]; - }) - sources."@pnpm/package-requester-0.7.1" - sources."@pnpm/pkgid-to-filename-1.0.0" - (sources."@pnpm/server-0.7.1" // { - dependencies = [ - sources."@types/node-9.3.0" - ]; - }) - sources."@pnpm/tarball-fetcher-0.3.4" - (sources."@pnpm/tarball-resolver-0.1.0" // { - dependencies = [ - sources."@types/node-8.5.9" - ]; - }) - sources."@pnpm/types-1.7.0" - sources."@sindresorhus/is-0.7.0" - sources."@types/archy-0.0.31" - sources."@types/byline-4.2.31" - sources."@types/chalk-0.4.31" - sources."@types/common-tags-1.4.0" - sources."@types/get-port-3.2.0" - sources."@types/got-7.1.6" - sources."@types/load-json-file-2.0.7" - sources."@types/mem-1.1.2" - sources."@types/mz-0.0.32" - sources."@types/node-8.5.9" - sources."@types/nopt-3.0.29" - sources."@types/npm-2.0.29" - sources."@types/p-limit-1.1.2" - sources."@types/p-queue-1.1.0" - sources."@types/p-series-1.0.1" - sources."@types/ramda-0.25.16" - sources."@types/rc-0.0.1" - sources."@types/retry-0.10.2" - sources."@types/semver-5.4.0" - sources."@types/update-notifier-1.0.3" - sources."@types/uuid-3.4.3" - sources."@types/write-json-file-2.2.1" - sources."@zkochan/cmd-shim-2.2.4" - (sources."@zkochan/libnpx-9.6.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."execa-0.7.0" - sources."is-fullwidth-code-point-2.0.0" - sources."load-json-file-2.0.0" - sources."mem-1.1.0" - sources."pify-2.3.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."@zkochan/npm-package-arg-1.0.0" - sources."JSONStream-1.3.2" - sources."abbrev-1.1.1" - sources."add-subtract-date-1.0.13" - sources."agent-base-4.2.0" - sources."agentkeepalive-3.3.0" - sources."ajv-5.5.2" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.0.0" - sources."ansi-parser-3.2.8" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.0" - sources."ansicolors-0.3.2" - sources."ansistyles-0.1.3" - sources."ansy-1.0.13" - sources."any-promise-1.3.0" - sources."aproba-1.2.0" - sources."archy-1.0.0" - sources."are-we-there-yet-1.1.4" - sources."argparse-1.0.9" - sources."arr-flatten-1.1.0" - sources."array-find-index-1.0.2" - sources."array-flatten-2.1.1" - sources."array-includes-3.0.3" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."arrify-1.0.1" - sources."as-table-1.0.31" - sources."asap-2.0.6" - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."babel-runtime-6.26.0" - sources."balanced-match-1.0.0" - sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" - sources."bindings-1.3.0" - sources."bl-1.2.1" - sources."block-stream-0.0.9" - sources."bluebird-3.5.1" - sources."bole-3.0.2" - sources."boom-4.3.1" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."chalk-2.3.0" - ]; - }) - sources."brace-expansion-1.1.8" - sources."browserify-zlib-0.1.4" - sources."buffer-3.6.0" - sources."bug-killer-4.4.4" - sources."builtin-modules-1.1.1" - sources."builtins-1.0.3" - sources."byline-5.0.0" - sources."bzip2-maybe-1.0.0" - sources."cacache-10.0.2" - sources."cacheable-request-2.1.4" - sources."call-limit-1.1.0" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" - sources."caseless-0.12.0" - sources."chalk-2.3.0" - sources."chownr-1.0.1" - sources."ci-info-1.1.2" - sources."cidr-regex-1.0.6" - sources."class-methods-1.0.10" - sources."cli-box-5.0.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" - (sources."cli-table2-0.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."clone-1.0.3" - sources."clone-response-1.0.2" - (sources."clp-3.2.1" // { - dependencies = [ - sources."typpy-2.0.0" - sources."ul-5.0.0" - ]; - }) - sources."cmd-shim-2.0.2" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."colors-1.1.2" - (sources."columnify-1.5.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."combined-stream-1.0.5" - sources."common-tags-1.7.2" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" - sources."config-chain-1.1.11" - sources."configstore-3.1.1" - sources."console-control-strings-1.1.0" - sources."copy-concurrently-1.0.5" - sources."core-js-2.5.3" - sources."core-util-is-1.0.2" - sources."couleurs-6.0.9" - sources."create-error-class-3.0.2" - sources."credentials-by-uri-1.0.0" - sources."cross-spawn-5.1.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."crypto-random-string-1.0.0" - sources."csv-parser-1.12.0" - sources."currently-unhandled-0.4.1" - sources."custom-return-1.0.10" - sources."cyclist-0.2.2" - sources."dashdash-1.14.1" - sources."data-uri-to-buffer-2.0.0" - sources."date-unit-ms-1.1.12" - sources."daty-1.1.4" - sources."days-1.1.1" - sources."debug-2.6.9" - sources."debuglog-1.0.1" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" - sources."decompress-maybe-1.0.0" - sources."decompress-response-3.3.0" - sources."deep-extend-0.4.2" - sources."defaults-1.0.3" - sources."deffy-2.2.2" - sources."define-properties-1.1.2" - sources."delay-2.0.0" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."dependencies-hierarchy-2.0.1" - sources."dependency-path-1.2.0" - sources."detect-indent-5.0.0" - sources."detect-libc-1.0.3" - sources."dezalgo-1.0.3" - (sources."diable-4.0.1" // { - dependencies = [ - sources."ansi-parser-2.0.0" - sources."couleurs-5.0.0" - sources."deffy-2.0.0" - sources."has-flag-1.0.0" - sources."supports-color-3.2.3" - ]; - }) - sources."diff-dates-1.0.11" - sources."dint-2.0.2" - sources."dir-glob-2.0.0" - sources."dot-prop-4.2.0" - sources."dotenv-4.0.0" - (sources."drive-by-path-1.0.0" // { - dependencies = [ - sources."ramda-0.24.1" - ]; - }) - sources."drivelist-5.2.12" - sources."duplexer3-0.1.4" - sources."duplexify-3.5.3" - sources."ecc-jsbn-0.1.1" - sources."editor-1.0.0" - sources."encode-registry-1.1.0" - sources."encoding-0.1.12" - sources."end-of-stream-1.4.1" - sources."err-code-1.1.2" - sources."errno-0.1.6" - sources."error-ex-1.3.1" - sources."es-abstract-1.10.0" - sources."es-to-primitive-1.1.1" - sources."es6-promise-4.2.4" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" - sources."exclude-arr-1.0.9" - sources."execa-0.8.0" - sources."expand-template-1.1.0" - sources."extend-3.0.1" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."fast-safe-stringify-1.1.13" - (sources."fetch-from-npm-registry-0.1.0" // { - dependencies = [ - sources."@types/node-8.5.9" - ]; - }) - sources."fillo-1.0.11" - (sources."find-packages-2.1.2" // { - dependencies = [ - sources."path-type-3.0.0" - sources."read-pkg-3.0.0" - ]; - }) - sources."find-up-2.1.0" - sources."flat-colors-3.0.0" - sources."flush-write-stream-1.0.2" - sources."foreach-2.0.5" - sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."formatoid-1.2.2" - sources."from2-2.3.0" - sources."fs-vacuum-1.2.10" - sources."fs-write-stream-atomic-1.0.10" - sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" - sources."function-bind-1.1.1" - sources."function.name-1.0.10" - sources."gauge-2.7.4" - sources."generate-function-1.1.0" - sources."generate-object-property-1.2.0" - sources."genfun-4.0.1" - sources."get-caller-file-1.0.2" - sources."get-npm-tarball-url-2.0.1" - sources."get-port-3.2.0" - sources."get-source-1.0.24" - sources."get-stream-3.0.0" - sources."getpass-0.1.7" - sources."github-from-package-0.0.0" - sources."glob-7.1.2" - sources."global-dirs-0.1.1" - sources."globby-7.1.1" - sources."got-8.0.3" - sources."graceful-fs-4.1.11" - sources."graceful-git-1.0.1" - sources."graph-sequencer-2.0.0" - sources."gunzip-maybe-1.4.1" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."has-1.0.1" - sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" - sources."has-symbol-support-x-1.4.1" - sources."has-to-string-tag-x-1.4.1" - sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.0" - sources."hosted-git-info-2.5.0" - sources."http-cache-semantics-3.8.1" - sources."http-proxy-agent-2.0.0" - sources."http-signature-1.2.0" - sources."https-proxy-agent-2.1.1" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" - sources."iferr-0.1.5" - sources."ignore-3.3.7" - sources."ignore-walk-3.0.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."individual-3.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."init-package-json-1.10.1" - sources."into-stream-3.1.0" - sources."invert-kv-1.0.0" - sources."ip-1.1.5" - sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" - sources."is-bzip2-1.0.0" - sources."is-callable-1.1.3" - sources."is-ci-1.1.0" - sources."is-cidr-1.0.0" - sources."is-date-object-1.0.1" - sources."is-deflate-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-gzip-1.0.0" - sources."is-inner-link-2.0.2" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-obj-1.0.1" - sources."is-object-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-obj-1.1.0" - sources."is-property-1.0.2" - sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" - sources."is-ssh-1.3.0" - sources."is-stream-1.1.0" - sources."is-subdir-1.0.2" - sources."is-symbol-1.0.1" - sources."is-typedarray-1.0.0" - sources."is-windows-1.0.1" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."isurl-1.0.0" - sources."iterate-object-1.3.2" - sources."js-yaml-3.10.0" - sources."jsbn-0.1.1" - sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."json2yaml-1.1.0" - sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" - sources."keyv-3.0.0" - sources."latest-version-3.1.0" - sources."lazy-property-1.0.0" - sources."lcid-1.0.0" - (sources."le-table-4.0.0" // { - dependencies = [ - sources."ansi-parser-3.0.0" - ]; - }) - sources."libnpx-9.6.0" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."parse-json-4.0.0" - ]; - }) - sources."load-yaml-file-0.1.0" - sources."locate-path-2.0.0" - sources."lockfile-1.0.3" - sources."lodash-3.10.1" - sources."lodash._baseuniq-4.6.0" - sources."lodash._createset-4.0.3" - sources."lodash._root-3.0.1" - sources."lodash.clonedeep-4.5.0" - sources."lodash.union-4.6.0" - sources."lodash.uniq-4.5.0" - sources."lodash.without-4.4.0" - sources."log-update-2.3.0" - sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" - sources."make-fetch-happen-2.6.0" - sources."meant-1.0.1" - sources."mem-3.0.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" - sources."mimic-response-1.0.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."minipass-2.2.1" - sources."minizlib-1.1.0" - sources."mississippi-1.3.1" - sources."mkdirp-0.5.1" - sources."mkdirp-promise-5.0.1" - sources."months-1.2.0" - sources."most-1.7.2" - sources."most-last-1.0.0" - sources."move-concurrently-1.0.1" - sources."ms-2.1.1" - sources."mute-stream-0.0.7" - sources."mz-2.7.0" - sources."nan-2.8.0" - sources."ncp-2.0.0" - sources."ndjson-1.5.0" - sources."neat-csv-2.1.0" - sources."nerf-dart-1.0.0" - sources."node-abi-2.1.2" - sources."node-fetch-npm-2.0.2" - (sources."node-gyp-3.6.2" // { - dependencies = [ - sources."nopt-3.0.6" - sources."semver-5.3.0" - sources."tar-2.2.1" - ]; - }) - sources."noop-logger-0.1.1" - sources."noop6-1.0.7" - sources."nopt-4.0.1" - sources."normalize-package-data-2.4.0" - sources."normalize-path-2.1.1" - sources."normalize-registry-url-1.0.0" - sources."normalize-ssh-1.0.0" - sources."normalize-url-2.0.1" - (sources."not-bundled-npm-5.5.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-2.2.1" - sources."cacache-9.2.9" - sources."chalk-1.1.3" - sources."execa-0.7.0" - sources."from2-1.3.0" - sources."got-6.7.1" - sources."is-fullwidth-code-point-2.0.0" - sources."isarray-0.0.1" - sources."minimist-1.2.0" - sources."prepend-http-1.0.4" - sources."semver-5.4.1" - sources."ssri-4.1.6" - sources."string-width-1.0.2" - sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" - sources."supports-color-2.0.0" - (sources."update-notifier-2.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."string-width-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."url-parse-lax-1.0.0" - sources."uuid-3.1.0" - sources."write-file-atomic-2.1.0" - sources."yallist-3.0.2" - ]; - }) - sources."npm-bundled-1.0.3" - sources."npm-cache-filename-1.0.2" - sources."npm-install-checks-3.0.0" - sources."npm-lifecycle-1.0.3" - sources."npm-package-arg-5.1.2" - sources."npm-packlist-1.1.10" - sources."npm-pick-manifest-1.0.4" - sources."npm-profile-2.0.5" - sources."npm-registry-client-8.5.0" - sources."npm-run-path-2.0.2" - sources."npm-user-validate-1.0.0" - (sources."npmlog-4.1.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" - sources."object-assign-4.1.1" - sources."object-keys-1.0.11" - sources."object.getownpropertydescriptors-2.0.3" - sources."observatory-1.0.0" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opener-1.4.3" - sources."os-homedir-1.0.2" - sources."os-locale-2.1.0" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."overlap-2.0.0" - sources."p-cancelable-0.3.0" - sources."p-defer-1.0.0" - sources."p-every-1.0.2" - sources."p-filter-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-1.2.0" - sources."p-locate-2.0.0" - sources."p-map-1.2.0" - sources."p-queue-2.3.0" - sources."p-reduce-1.0.0" - sources."p-series-1.0.0" - sources."p-timeout-2.0.1" - sources."p-try-1.0.0" - sources."package-json-4.0.1" - (sources."package-store-0.15.2" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."debug-3.1.0" - sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."unzip-response-1.0.2" - ]; - }) - sources."pacote-6.0.4" - sources."pako-0.2.9" - sources."parallel-transform-1.1.0" - sources."parse-it-1.0.8" - sources."parse-json-2.2.0" - sources."parse-npm-tarball-url-1.0.2" - sources."parse-url-1.3.11" - sources."path-absolute-1.0.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" - sources."path-name-1.0.0" - sources."path-type-2.0.0" - sources."peek-stream-1.1.2" - sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."pkgs-graph-2.0.0-0" // { - dependencies = [ - sources."npm-package-arg-6.0.0" - ]; - }) - (sources."pnpm-default-reporter-0.11.8" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) - (sources."pnpm-file-reporter-0.0.1" // { - dependencies = [ - sources."@types/node-7.0.52" - sources."ansi-escapes-1.4.0" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) - sources."pnpm-install-checks-1.1.0" - (sources."pnpm-list-2.0.1" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."npm-package-arg-6.0.0" - ]; - }) - sources."pnpm-logger-0.0.0" - sources."pnpm-shrinkwrap-5.1.1" - sources."prebuild-install-2.5.0" - sources."prepend-http-2.0.0" - sources."pretty-bytes-4.0.2" - sources."printable-characters-1.0.38" - sources."proc-output-1.0.6" - (sources."process-exists-3.0.0" // { - dependencies = [ - sources."get-stream-2.3.1" - sources."into-stream-2.0.1" - sources."minimist-1.2.0" - ]; - }) - sources."process-nextick-args-1.0.7" - sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" - sources."promzard-0.3.0" - sources."proper-lockfile-2.0.1" - sources."proto-list-1.2.4" - sources."protocols-1.4.6" - sources."protoduck-4.0.0" - sources."prr-1.0.1" - sources."ps-list-4.0.0" - sources."pseudomap-1.0.2" - sources."pump-1.0.3" - (sources."pumpify-1.4.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."punycode-1.4.1" - sources."qrcode-terminal-0.11.0" - sources."qs-6.5.1" - sources."query-string-5.0.1" - sources."qw-1.0.1" - sources."ramda-0.25.0" - sources."rc-1.2.4" - sources."read-1.0.7" - sources."read-cmd-shim-1.0.1" - sources."read-installed-4.0.3" - sources."read-package-json-2.0.12" - sources."read-package-tree-5.1.6" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."readable-stream-2.3.3" - sources."readdir-scoped-modules-1.0.2" - sources."regenerator-runtime-0.11.1" - sources."regex-escape-3.4.8" - sources."registry-auth-token-3.3.1" - sources."registry-url-3.1.0" - sources."remedial-1.0.7" - sources."remove-all-except-outer-links-1.0.3" - sources."remove-trailing-separator-1.1.0" - sources."rename-overwrite-1.0.0" - sources."replace-string-1.1.0" - sources."request-2.83.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."resolve-from-4.0.0" - sources."resolve-link-target-1.0.1" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" - sources."retry-0.10.1" - sources."rimraf-2.6.2" - sources."rimraf-then-1.0.1" - sources."run-queue-1.0.3" - sources."safe-buffer-5.1.1" - sources."sec-1.0.0" - sources."semver-5.5.0" - sources."semver-diff-2.1.0" - sources."semver-regex-1.0.0" - sources."set-blocking-2.0.0" - sources."sha-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."simple-get-1.4.3" - sources."slash-1.0.0" - sources."slide-1.1.6" - sources."smart-buffer-1.1.15" - sources."sntp-2.1.0" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."sort-keys-2.0.0" - sources."sorted-object-2.0.1" - (sources."sorted-union-stream-2.1.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-1.1.14" - sources."string_decoder-1.0.3" - ]; - }) - sources."source-map-0.6.1" - sources."spawno-2.0.7" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" - sources."split2-2.2.0" - sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."ssri-5.1.0" - (sources."stacktracey-1.2.100" // { - dependencies = [ - sources."@types/node-8.5.9" - ]; - }) - sources."static-methods-1.0.10" - sources."stream-each-1.2.2" - (sources."stream-iterate-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.3" - ]; - }) - sources."stream-shift-1.0.0" - sources."strict-uri-encode-1.1.0" - sources."string-width-2.1.1" - sources."string_decoder-1.0.3" - sources."stringstream-0.0.5" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - sources."strip-color-0.1.0" - sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" - (sources."supi-0.12.1" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."execa-0.9.0" - sources."npm-lifecycle-2.0.0" - sources."pify-2.3.0" - sources."write-file-atomic-1.3.4" - ]; - }) - sources."supports-color-4.5.0" - sources."symbol-observable-1.1.0" - sources."symlink-dir-1.1.2" - sources."tar-4.0.2" - sources."tar-fs-1.16.0" - sources."tar-stream-1.5.5" - (sources."tasklist-3.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."term-size-1.2.0" - sources."text-table-0.2.0" - sources."thenify-3.3.0" - sources."thenify-all-1.6.0" - sources."through-2.3.8" - sources."through2-2.0.3" - sources."timed-out-4.0.1" - sources."timeout-then-1.1.0" - sources."tough-cookie-2.3.3" - sources."tree-kill-1.2.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."typedarray-0.0.6" - sources."typpy-2.3.10" - sources."uid-number-0.0.6" - (sources."ul-5.2.13" // { - dependencies = [ - sources."deffy-2.2.2" - ]; - }) - sources."umask-1.1.0" - sources."unbzip2-stream-1.2.5" - sources."unique-filename-1.1.0" - sources."unique-slug-2.0.0" - sources."unique-string-1.0.0" - sources."unpack-stream-3.0.1" - sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.3.0" - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."util-deprecate-1.0.2" - sources."util-extend-1.0.3" - sources."util.promisify-1.0.0" - sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" - sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" - sources."version-selector-type-2.0.0" - sources."wcwidth-1.0.1" - sources."which-1.3.0" - sources."which-module-2.0.0" - sources."wide-align-1.1.2" - sources."widest-line-2.0.0" - sources."worker-farm-1.5.2" - sources."wrap-ansi-2.1.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" - sources."write-json-file-2.3.0" - sources."write-pkg-3.1.0" - sources."write-yaml-file-1.0.0" - sources."x256-0.0.2" - sources."xdg-basedir-3.0.0" - sources."xtend-4.0.1" - sources."y18n-3.2.1" - sources."yallist-2.1.2" - sources."yargs-8.0.2" - sources."yargs-parser-7.0.0" - sources."zen-observable-0.7.1" - sources."zen-push-0.2.1" - ]; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; @@ -9493,7 +4111,7 @@ in dependencies = [ sources."async-2.1.5" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."cli-table-0.3.1" sources."colors-1.0.3" sources."commander-2.9.0" @@ -9503,10 +4121,10 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."minimatch-3.0.4" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.3.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" @@ -9522,4 +4140,21 @@ in production = true; bypassCache = true; }; + npm = nodeEnv.buildNodePackage { + name = "npm"; + packageName = "npm"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; + sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a package manager for JavaScript"; + homepage = https://docs.npmjs.com/; + license = "Artistic-2.0"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4ed5acbe1b6d11d9d9a210bec6b903345c22945..154b4890e4fc5dd6afe229fb835be234ba67997b 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }: - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" - then { - version = "0.5.1"; - sha256 = "0rm79xyszy9aqvflcc13y9xiya82z31fzmr3b3hx91pmqviymhgc"; - } else { - version = "0.4.0"; - sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2"; - }; -in +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "angstrom is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - inherit (param) version; - name = "ocaml-angstrom-${version}"; + version = "0.8.1"; + name = "ocaml${ocaml.version}-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - inherit (param) sha256; + sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc"; }; - createFindlibDestdir = true; + buildInputs = [ ocaml findlib jbuilder alcotest ]; + propagatedBuildInputs = [ result ]; + + buildPhase = "jbuilder build -p angstrom"; + + doCheck = true; + checkPhase = "jbuilder runtest -p angstrom"; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result cstruct ]; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/inhabitedtype/angstrom; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index ea151d1e0e5c9409a92bc76f9542656f8c7bde3f..8c42783c97804b9d04adc5ce5c35ecaa98e9d7d0 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,18 +1,21 @@ -{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: +{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, + utop, + which, makeWrapper, writeText, ocaml}: buildOcaml rec { name = "bap"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; }; sigs = fetchurl { url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; createFindlibDestdir = true; @@ -28,7 +31,7 @@ buildOcaml rec { llvm_38 utop ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; installPhase = '' @@ -45,11 +48,7 @@ buildOcaml rec { disableIda = "--disable-ida --disable-fsi-benchmark"; - doCheck = true; - - checkTarget = "check test"; - - configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; @@ -58,6 +57,6 @@ buildOcaml rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; - broken = versionAtLeast ocaml.version "4.03"; + broken = versionOlder ocaml.version "4.03"; }; } diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 7047edf24b3e6a2f3cd9da5ab6ad2aa118ddf525..97c4750002e6c3dded2d839f6f1014626e984d2c 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "ocaml${ocaml.version}-biniou-${version}"; - src = fetchFromGitHub { - owner = "mjambon"; - repo = "biniou"; - rev = "v${version}"; - sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; - }; + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder ]; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ easy-format ]; - inherit (jbuilder) installPhase; + postPatch = '' + patchShebangs . + ''; - meta = { - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; - }; + inherit (jbuilder) installPhase; + + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index ef92a005c773468ae2c59c3587b3f5c453b0b3c5..24f0e9bfd7a5a57d70be1e78078eaf7e78764b2d 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.2"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0h9ak2bvhmcdxickvybpg45il33xszh2ksacpjgqrnnslxnh81ig"; + sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; }; buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index b419971921ba97e61ebf9d2f9e92faa8f1d0608e..0ddf3cb5995c6df1836234ecbf77f57ee0a50fc2 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,19 +1,19 @@ -{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: +{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: buildOcaml rec { name = "ctypes"; - version = "0.11.5"; + version = "0.13.1"; minimumSupportedOcamlVersion = "4"; - src = fetchurl { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/67e711ec891e087fbe1e0b4665aa525af4eaa409.tar.gz"; + sha256 = "1z84s5znr3lj84rzv6m37xxj9h7fwx4qiiykx3djf52qgk1rb2xb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ libffi ]; + propagatedBuildInputs = [ integers libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 5cd4c6064e08fa832ee6cdd1e06b76b6043cbf3f..fdfd0338bb23159963f618192e494ce4ce259863 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pipebang, sexplib, ocaml_oasis}: +{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +}: buildOcamlJane rec { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; + postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH"; propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 6a8e33dc2ee6c427d88ad2f9c7eb8f506541e51f..2e85a1017b6e6dc8fbf80c981dac3574266a4a08 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bap"; - version = "1.1.0"; + version = "1.3.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; - rev = "v${version}"; - sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + rev = "${version}"; + sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; }; propagatedBuildInputs = [bap requests]; diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a8a8ac110f108cca7d64f8e7feae21cb9547d694 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -0,0 +1,58 @@ +# FIXME: make gdk_pixbuf dependency optional +{ buildPythonPackage +, fetchPypi +, lib +, substituteAll +, makeFontsConf +, freefont_ttf +, pytest +, glibcLocales +, cairo +, cffi +, withXcffib ? false, xcffib +, python +, glib +, gdk_pixbuf }: + +buildPythonPackage rec { + pname = "cairocffi"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i9m3p39g9wrkpjvpawch2qmnmm3cnim7niz3nmmbcp2hrkixwk5"; + }; + + LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + patches = [ + # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 + (substituteAll { + src = ./dlopen-paths.patch; + cairo = cairo.out; + glib = glib.out; + gdk_pixbuf = gdk_pixbuf.out; + }) + ./fix_test_scaled_font.patch + ]; + + meta = with lib; { + homepage = https://github.com/SimonSapin/cairocffi; + license = licenses.bsd3; + maintainers = with maintainers; []; + description = "cffi-based cairo bindings for Python"; + }; +} diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 3fbdb500af8085129f87b95eab2fbaefe042dfc3..36cc20e027bbd223ea6ab582b828f6a54dcf102a 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "cement"; - name = "${pname}-${version}"; version = "2.10.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5ffa51def0d2799d7d02bd212e80634a0118b235 --- /dev/null +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +, pyperclip, six, pyparsing, vim +, contextlib2 ? null, subprocess32 ? null +, pytest, mock, which, fetchFromGitHub, glibcLocales +}: +buildPythonPackage rec { + pname = "cmd2"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "python-cmd2"; + repo = "cmd2"; + rev = version; + sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + }; + + LC_ALL="en_US.UTF-8"; + + postPatch = stdenv.lib.optional stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#/bin/sh' > bin/pbpaste + echo '#/bin/sh' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; + + checkInputs= [ pytest mock which vim glibcLocales ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + doCheck = !stdenv.isDarwin; + + propagatedBuildInputs = [ + pyperclip + six + pyparsing + ] + ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 + ; + + meta = with stdenv.lib; { + description = "Enhancements for standard library's cmd module"; + homepage = https://github.com/python-cmd2/cmd2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 99a59ae8fd4367a72f0bbcbcc7b2b575abcff9c6..bce14db7704f762024cb555afa666fa05384e779 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "colorama"; version = "0.3.9"; diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..195b20c27e4f55f639fdb3e7bcf09935bdfa5efc --- /dev/null +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, nose +}: +buildPythonPackage rec { + pname = "d2to1"; + version = "0.2.12"; + + checkInputs = [ nose ]; + + src = fetchFromGitHub { + owner = "embray"; + repo = pname; + rev = version; + sha256 = "1q04ab8vjvx7fmq9ckkl8r9hlwwbqiyjbzaa4v1mv5zicfssxwsi"; + }; + + meta = with lib;{ + description = "Support for distutils2-like setup.cfg files as package metadata"; + homepage = https://github.com/embray/d2to1; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index c8f122098da88ab218fcf4904b6f76126e0a8e9a..a0724c9ada59bc84dc36142d99699a3d6f6549a4 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib ] + buildInputs = [ dbus dbus-glib ] ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 4ce013ac797699ac142acb19d18fa5608efee833..bb39ccd7cf6e0f478cd0bc84b3d7946cebbb3e00 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -1,14 +1,13 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , six, requests, websocket_client , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { version = "2.7.0"; pname = "docker"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/docker/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; }; diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b1d2af357a4cf61d3279cd380ea610572e36749 --- /dev/null +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, enum34 }: + +buildPythonPackage rec { + pname = "enum-compat"; + version = "0.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; + }; + + propagatedBuildInputs = [ enum34 ]; + + meta = with lib; { + homepage = https://github.com/jstasiak/enum-compat; + description = "enum/enum34 compatibility package"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..128a8d18d819e3be46bfec98588d04c98973eeb2 --- /dev/null +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }: + +buildPythonPackage rec { + pname = "flake8-import-order"; + version = "0.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "60ea6674c77e4d916071beabf2b31b9b45e2f5b3bbda48a34db65766a5b25678"; + }; + + propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ pytest flake8 pycodestyle pylama ]; + + checkPhase = '' + pytest --strict + ''; + + meta = with lib; { + description = "Flake8 and pylama plugin that checks the ordering of import statements"; + homepage = https://github.com/PyCQA/flake8-import-order; + license = with licenses; [ lgpl3 mit ]; + }; +} diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..53307333048e2b5dfb1c49cff7b5899da0c82e7e --- /dev/null +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }: + +buildPythonPackage rec { + name = "Flask-Assets-${version}"; + version = "0.12"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; + }; + + propagatedBuildInputs = [ flask webassets flask_script nose ]; + + meta = with lib; { + homepage = http://github.com/miracle2k/flask-assets; + description = "Asset management for Flask, to compress and merge CSS and Javascript files"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 3c7731c30a8bd725a95ac40978b70876cb35fea3..e2585262e58e99918a373228984c236a668783c9 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,19 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast -, flask, nose, mock, blinker}: +, flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { pname = "Flask-Login"; name = "${pname}-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-login"; rev = version; - sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh"; + sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9"; }; - buildInputs = [ nose mock ]; + checkInputs = [ nose mock semantic-version ]; propagatedBuildInputs = [ flask blinker ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1f41f79876312bff6837a5a94921cb53724f8c6a --- /dev/null +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }: + +buildPythonPackage rec { + name = "Flask-Principal-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; + sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; + }; + + propagatedBuildInputs = [ flask blinker ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = http://packages.python.org/Flask-Principal/; + description = "Identity management for flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ace3cee2d22e8c170a86f488b21942f142957bf9 --- /dev/null +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchurl, flask, pytest }: + +buildPythonPackage rec { + name = "Flask-Script-${version}"; + version = "2.0.6"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Script/${name}.tar.gz"; + sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; + }; + + propagatedBuildInputs = [ flask ]; + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = http://github.com/smurfix/flask-script; + description = "Scripting support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 3295786bd08cdb237aff6a9eebb583d55efa2d51..e0294c2afca4d6ac35b18bf2dc9307a338205da3 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = "https://github.com/hmmlearn/hmmlearn"; + homepage = https://github.com/hmmlearn/hmmlearn; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1018c536ff7d905b586bef6997dcce58d2cf614d --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, jsonrpc-base }: + +buildPythonPackage rec { + pname = "jsonrpc-async"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC client library for asyncio"; + homepage = http://github.com/armills/jsonrpc-async; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8dbe07382889d087c35eb530dcbb9a6b66b79505 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "jsonrpc-base"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk"; + }; + + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC client library base interface"; + homepage = https://github.com/armills/jsonrpc-base; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b8a0c07d5a5d3be169208bcf83267a68cd06fff2 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, jsonrpc-base }: + +buildPythonPackage rec { + pname = "jsonrpc-websocket"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cijqb8fvv9iq5ds9y5sj0gd6lapi90mgqvpkczp28fxz440ihq4"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC websocket client library for asyncio"; + homepage = https://github.com/armills/jsonrpc-websocket; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..992780ef33d3e302cf4d6a78416592c0e8bf8cd1 --- /dev/null +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, scp +, pyserial +, paramiko +, netaddr +, ncclient +, lxml +, jinja2 +, pyyaml +, nose +}: + +buildPythonPackage rec { + pname = "junos-eznc"; + version = "2.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "95a037cdd05618a189517357e46a06886909a18c7923b628c6ac43d5f54b2912"; + }; + + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ + scp six pyserial paramiko netaddr ncclient lxml jinja2 pyyaml + ]; + + checkPhase = '' + nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit + ''; + + meta = with stdenv.lib; { + homepage = http://www.github.com/Juniper/py-junos-eznc; + description = "Junos 'EZ' automation for non-programmers"; + license = licenses.asl20; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02348c68e07ae4178314771deef69d0ce65c27e0 --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, jupyterhub +, ldap3 +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jupyterhub-ldapauthenticator"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz"; + }; + + # No tests implemented + doCheck = false; + + propagatedBuildInputs = [ jupyterhub ldap3 ]; + + meta = with lib; { + description = "Simple LDAP Authenticator Plugin for JupyterHub"; + homepage = https://github.com/jupyterhub/ldapauthenticator; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5566eea64eb856b95a25ff99347c4f4dfc274c6d --- /dev/null +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, + isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: + +buildPythonPackage rec { + pname = "kubernetes"; + version = "5.0.0"; + + prePatch = '' + sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt + + # This is used to randomize tests, which is not reproducible. Drop it. + sed -e '/randomize/d' -i test-requirements.txt + '' + # This is a python2 and python3.2 only requiremet since it is a backport of a python-3.3 api. + + (if (pythonAtLeast "3.3") then '' + sed -e '/ipaddress/d' -i requirements.txt + '' else ""); + + checkPhase = '' + py.test + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1z8rrlq73bzli9rg57kj8ivz09vhsydyjq1ksbcis6j7h9c187zq"; + }; + + checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ]; + + meta = with stdenv.lib; { + description = "Kubernetes python client"; + homepage = https://github.com/kubernetes-client/python; + license = licenses.asl20; + maintainers = with maintainers; [ lsix ]; + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 789beaa2384c27e1166d03e768a50bf35d682247..d9cc5fb0d9e5c6f6efc0a83904c69a21a083f6fc 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw"; + sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk"; }; propagatedBuildInputs = [ sip protobuf ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 67353a32ada6135ec9e1b0b33b75c831e916d1b5..c0c2b205f58baf5bcad13ee24525fff38a2ec3e6 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "libgpuarray"; - version = "0.6.9"; + version = "0.7.5"; name = pname + "-" + version; src = fetchFromGitHub { owner = "Theano"; repo = "libgpuarray"; rev = "v${version}"; - sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0"; + sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v"; }; # requires a GPU @@ -40,7 +40,6 @@ buildPythonPackage rec { make -j$NIX_BUILD_CORES make install - ls $out/lib export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" cd .. diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e6be19198efbc39b337df0bf01a442f57fc6e672 --- /dev/null +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, twisted, mock }: + +buildPythonPackage rec { + pname = "magic-wormhole-transit-relay"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "faac36266c72745102a1a8b93abc5b25feed1be5bca7b29968a156966c312567"; + }; + + propagatedBuildInputs = [ twisted ]; + + checkInputs = [ mock ]; + + checkPhase = '' + python -m twisted.trial wormhole_transit_relay + ''; + + meta = with lib; { + description = "Transit Relay server for Magic-Wormhole"; + homepage = https://github.com/warner/magic-wormhole-transit-relay; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 9d2d80747a9369525b8e71b904fda77d4bb21617..7d170345dbbe512c62c6869331b1464229173c27 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,41 +2,49 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, nettools -, glibcLocales +, python +, spake2 +, pynacl +, six +, attrs +, twisted , autobahn -, cffi -, click +, automat , hkdf -, pynacl -, spake2 , tqdm -, python -, mock -, ipaddress +, click , humanize -, pyopenssl -, service-identity +, ipaddress , txtorcon +, nettools +, glibc +, glibcLocales +, mock +, magic-wormhole-transit-relay }: buildPythonPackage rec { pname = "magic-wormhole"; version = "0.10.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; }; - checkInputs = [ mock ]; + checkInputs = [ mock magic-wormhole-transit-relay ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; + propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py + + # magic-wormhole will attempt to find all available locales by running + # 'locale -a'. If we're building on Linux, then this may result in us + # running the system's locale binary instead of the one from Nix, so let's + # ensure we patch this. + sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index a5940ed6c9f60a35b5be9a1aae1bd72b8d1c4485..3e4b0d1368b7b674c1cb4174342cf4fdef2696a5 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -1,12 +1,9 @@ { lib , buildPythonPackage , pythonOlder -, isPy35 -, isPy36 , fetchPypi , hypothesis , pytestcache -, pytestcov , pytestflakes , pytestpep8 , pytest @@ -19,10 +16,9 @@ buildPythonPackage rec { pname = "natsort"; version = "5.2.0"; - buildInputs = [ + checkInputs = [ hypothesis pytestcache - pytestcov pytestflakes pytestpep8 pytest @@ -41,7 +37,7 @@ buildPythonPackage rec { # testing based on project's tox.ini checkPhase = '' pytest --doctest-modules natsort - pytest --flakes --pep8 --cov natsort --cov-report term-missing + pytest --flakes --pep8 ''; meta = { diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4cc5769d8d836ca0ae1dd72bce92cdc81520310b --- /dev/null +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, paramiko +, lxml +, libxml2 +, libxslt +, pytest +, nose +, rednose +}: + +buildPythonPackage rec { + pname = "ncclient"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe6b9c16ed5f1b21f5591da74bfdd91a9bdf69eb4e918f1c06b3c8db307bd32b"; + }; + + checkInputs = [ nose rednose ]; + + propagatedBuildInputs = [ + paramiko lxml libxml2 libxslt + ]; + + checkPhase = '' + nosetests test --rednose --verbosity=3 --with-coverage --cover-package ncclient + ''; + + #Unfortunately the test hangs at te end + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://ncclient.org/; + description = "Python library for NETCONF clients"; + license = licenses.asl20; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c0a1e39b384b63bbce3e988d7b4dbee3bcfead58 --- /dev/null +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docopt, netifaces }: + +buildPythonPackage rec { + pname = "onkyo-eiscp"; + version = "1.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qb5w2g2cnckq7psh92g1w3gf76437x1vwfhwnd247wshs5h7hxj"; + }; + + propagatedBuildInputs = [ docopt netifaces ]; + + meta = with stdenv.lib; { + description = "Control Onkyo receivers over ethernet"; + homepage = https://github.com/miracle2k/onkyo-eiscp; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 18c083298e680800e46b1c9edde26a131ee3b724..09d759c97ee3d3275706781c541f2d0c8540600d 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -22,6 +22,7 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec { preCheck = '' export LC_ALL="en_US.UTF-8" + sed -i test_pathlib2.py -e "s@hasattr(pwd, 'getpwall')@False@" ''; meta = { @@ -29,4 +30,4 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec { homepage = https://pypi.python.org/pypi/pathlib2/; license = with lib.licenses; [ mit ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 410a633c46b056d55b7594cc10464238c0145e4e..bfe5d2f202df3d1b2caee9c5447d972e819512e4 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; - homepage = "https://github.com/dranjan/python-plyfile"; + homepage = https://github.com/dranjan/python-plyfile; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 0ed51d7acecf647938113d70ce32d331e995fcb8..da7ddbc7dcb7bd1fe4f5501e19fd5bac1af6f392 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -5,12 +5,12 @@ , requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { - version = "3.11.0"; + version = "3.12.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be"; + sha256 = "09a7yhsyqxb4xf2r6mbn3p5zx1wp89lxq7lj34y4zbin6ns5929s"; }; propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; @@ -18,10 +18,10 @@ buildPythonPackage rec { disabled = isPy3k; doCheck = false; # no setuptools tests for the package - # Can be removed when 3.12.0 is released + # Can be removed when 3.13.0 is released patches = [ (fetchpatch { - url = "https://github.com/Gallopsled/pwntools/pull/1098.patch"; + url = "https://github.com/Gallopsled/pwntools/commit/9859f54a21404174dd17efee02f91521a2dd09c5.patch"; sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; }) ]; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3931078c12edffe5a851d9c8aafec1a31e411b8a --- /dev/null +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, numpy +, six +, nose +, fetchPypi +}: + +buildPythonPackage rec { + pname = "py_stringmatching"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ numpy six ]; + + meta = with lib; { + description = "A Python string matching library including string tokenizers and string similarity measures"; + homepage = https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d96a4c8cea320d9990c2c28ae6e78b7fccdb4d7f..6192f94445f39362793a4f8e57d8c8608f765d81 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }: stdenv.mkDerivation rec { pname = "pyatspi"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { broken = true; buildInputs = [ - at_spi2_core + at-spi2-core pkgconfig pythonPackages.python pythonPackages.pygobject3 diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 46d3272807eb5bea406fbaf381f1593f8fa3354c..0b41b6ef0b10c73e3dd90b6c54c2c3fbf8586d73 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "1.0.3"; + version = "2.0.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "714a9e03e6a258081e3b6296ed15592e015facbe38bbe60819cca6f04c599f25"; + sha256 = "1cp1ssfb8zk4sz74nsnf72b7dd5fzkwc4qdgc7rq8nfr4v611w6c"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; meta = with lib; { description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; - homepage = "https://github.com/balloob/pychromecast"; + homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index fd1f0db0c1e5c927500c5202ddcb90984ca17b5a..a2f2daa2fe9c7fb414ef3a7037e099e25e2ca376 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, snowballstemmer, configparser, - pytest, pytestpep8, mock, pathlib }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder +, snowballstemmer, six, configparser +, pytest, pytestpep8, mock, pathlib }: buildPythonPackage rec { pname = "pydocstyle"; version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "15ssv8l6cvrmzgwcdzw76rnl4np3qf0dbwr1wsx76y0hc7lwsnsd"; + # no tests on PyPI + # https://github.com/PyCQA/pydocstyle/issues/302 + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; }; - propagatedBuildInputs = [ snowballstemmer configparser ]; + propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; - checkInputs = [ pytest pytestpep8 mock pathlib ]; + checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib; - meta = with stdenv.lib; { + checkPhase = '' + # test_integration.py installs packages via pip + py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" + ''; + + meta = with lib; { description = "Python docstring style checker"; homepage = https://github.com/PyCQA/pydocstyle/; license = licenses.mit; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index dbf36d0eac8b8682f7a2d0daaca26d6670d77549..c5e148d1500af1c6a8cb5dc2d2fa402668c1a747 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, - automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared_mime_info, + automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, attica, docbook_xml_dtd_42, docbook_xsl, giflib, libdbusmenu_qt, libjpeg, phonon, qt4 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - automoc4 cmake_2_8 libxslt perl pkgconfig shared_mime_info + automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info ]; buildInputs = [ attica giflib libdbusmenu_qt libjpeg diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c4ef98b43ef614f771061dfebadce5f39c037cba --- /dev/null +++ b/pkgs/development/python-modules/pylama/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, mccabe, pycodestyle, pydocstyle, pyflakes +, pytest, ipdb }: + +buildPythonPackage rec { + pname = "pylama"; + version = "7.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712"; + }; + + patches = fetchpatch { + url = "${meta.homepage}/pull/116.patch"; + sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv"; + }; + + propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ]; + + checkInputs = [ pytest ipdb ]; + + # tries to mess with the file system + doCheck = false; + + meta = with lib; { + description = "Code audit tool for python"; + homepage = https://github.com/klen/pylama; + # ambiguous license declarations: https://github.com/klen/pylama/issues/64 + license = licenses.lgpl3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 194d91341d8ab272d500f404890bb16d19314ee7..c38b71c7f47cd955e5f7dcd2bce3604a41e2e53c 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; - propagatedBuildInputs = [ astroid configparser isort ]; + propagatedBuildInputs = [ astroid configparser isort mccabe ]; postPatch = '' # Remove broken darwin tests diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..db8584c4f9e54f41f9eb6a46b755a602f55640a5 --- /dev/null +++ b/pkgs/development/python-modules/pylru/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "pylru-${version}"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://pypi/p/pylru/${name}.tar.gz"; + sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; + }; + + meta = with lib; { + homepage = https://github.com/jlhutch/pylru; + description = "A least recently used (LRU) cache implementation"; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a918528bdf8740799b486e89a997f8429cd12839 --- /dev/null +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: + +buildPythonPackage rec { + pname = "pymetar"; + version = "0.21"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + }; + + meta = with stdenv.lib; { + description = "A command-line tool to show the weather report by a given station ID"; + homepage = http://www.schwarzvogel.de/software/pymetar.html; + license = licenses.gpl2; + maintainers = with maintainers; [ erosennin ]; + }; +} diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6903b6c7a0c048d01646872e7fdc307feb86a576 --- /dev/null +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, pydns }: + +buildPythonPackage rec { + name = "pyspf-${version}"; + version = "2.0.12"; + + src = fetchurl { + url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; + sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; + }; + + propagatedBuildInputs = [ pydns ]; + + meta = with lib; { + homepage = http://bmsi.com/python/milter.html; + description = "Python API for Sendmail Milters (SPF)"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 51ec2a1f4cbcea2a869facfece20bda7ee896a0a..2694e9c1ea054b39abf4e212ef5a1d0e5af01b9e 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "8ed6c9ac6b7565b226b4da2da48876c9198d76401ec8d9c5e4c69b45423e33f8"; + sha256 = "0jgr1h1f0m9dl3alxiiw55as28pj2lpihz12gird9z1i3vvdyydq"; }; propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d90b7fa740dc2827281b0b09ec787c5c1eabd06a --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "python-axolotl-curve25519-${version}"; + version = "0.1"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; + sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + }; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl-curve25519; + description = "Curve25519 with ed25519 signatures"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..71c456875bcf012ef8e1c6bfd03d034f4d63cec5 --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }: + +buildPythonPackage rec { + name = "python-axolotl-${version}"; + version = "0.1.39"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; + sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; + }; + + propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; + # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) + doCheck = false; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl; + description = "Python port of libaxolotl-android"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad0a17da2ac85cd3e4619e08ab5651224d9458c2 --- /dev/null +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-ptrace"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "019jlpya2d2b3vbg037hnj4z0f564r7ibygayda7bm7qbpw0sa4g"; + }; + + # requires distorm, which is optionally + doCheck = false; + + meta = with stdenv.lib; { + description = "Python binding of ptrace library"; + homepage = https://github.com/vstinner/python-ptrace; + license = licenses.gpl2; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..31ec613df4c81a17e6ecbf8017f2493686ca139a --- /dev/null +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "pyunifi"; + version = "2.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dhbfzv5a29v763m0b9wsc4pvkdr979w7g4rz7ak8hsi4sx6b9dq"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "API towards Ubiquity Networks UniFi controller"; + homepage = https://github.com/finish06/unifi-api; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 65de083822393070811ed9fb59d6f45345d23c8d..44650618f5f5eee09709af753a54293d8691f58a 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { meta = { description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; + homepage = https://bitbucket.org/mrabarnett/mrab-regex; license = lib.licenses.psfl; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index f3ff4a84f1e8e6fa5f49585f4e8bffa2b01d483f..aeca2abf17cf2ecacc853cf2766d554f92b58904 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -3,7 +3,6 @@ , pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "requests"; version = "2.18.4"; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..340c8d002b72bca318780257b5a2475f75d1c6bb --- /dev/null +++ b/pkgs/development/python-modules/sarge/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "sarge-${version}"; + version = "0.1.4"; + + src = fetchurl { + url = "mirror://pypi/s/sarge/${name}.tar.gz"; + sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; + }; + + meta = with lib; { + homepage = http://sarge.readthedocs.org/; + description = "A wrapper for subprocess which provides command pipeline functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..521f68db1cc6bfc2d0c39988228b238e8467e945 --- /dev/null +++ b/pkgs/development/python-modules/scandir/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.7"; + + src = fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj"; + }; + + meta = with lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = https://github.com/benhoyt/scandir; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a612528d47ab47a479cf777495788027777ebd56 --- /dev/null +++ b/pkgs/development/python-modules/scp/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, paramiko +, python +}: + +buildPythonPackage rec { + pname = "scp"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "18f59e48df67fac0b069591609a0f4d50d781a101ddb8ec705f0c2e3501a8386"; + }; + + propagatedBuildInputs = [ + paramiko + ]; + + checkPhase = '' + SCPPY_PORT=10022 ${python.interpreter} test.py + ''; + + #The Pypi package doesn't include the test + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/jbardin/scp.py; + description = "SCP module for paramiko"; + license = licenses.lgpl3; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index f9e04691c1cb05527ae143aa531fa858e48c630c..e3c92a0e40fc100af432b5a579964e4bd249798b 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "semantic_version"; version = "2.6.0"; - name = "${pname}${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eff799e0d014ace0d7982092e7a2b28d0954f12a --- /dev/null +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, tornado }: + +buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + }; + + propagatedBuildInputs = [ tornado ]; + + meta = with lib; { + homepage = http://github.com/mrjoes/sockjs-tornado/; + description = "SockJS python server implementation on top of Tornado framework"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..08500aeb4ad1f4256a88db9998832dce09ba4cc6 --- /dev/null +++ b/pkgs/development/python-modules/spake2/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, hkdf, pytest }: + +buildPythonPackage rec { + pname = "spake2"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ hkdf ]; + + checkPhase = '' + py.test $out + ''; + + meta = with lib; { + description = "SPAKE2 password-authenticated key exchange library"; + homepage = "http://github.com/warner/python-spake2"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 189fa7c932da5dd4b087ef31ac7ad569fe419ad7..8ee4ce76069f07c7991e3543d021bee0d5fd0325 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numpy-based NIST SPH audio-file reader"; - homepage = "https://github.com/mcfletch/sphfile"; + homepage = https://github.com/mcfletch/sphfile; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index db7f43c1ea467a86c18fc91b3ec52eaf03a7fc50..b238d58f68d31dde61d51155827de303d0d5eb48 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { version = "0.8.2"; pname = "tabulate"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -25,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e51ceb313ef23879808932b552b403e28d04400a..85dd30118cc37e47241836a12db8c6d8629fa9f9 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -3,8 +3,9 @@ , which, swig, binutils, glibcLocales , python, jemalloc, openmpi , numpy, six, protobuf, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py -, xlaSupport ? true , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null +# XLA without CUDA is broken +, xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] , sse42Support ? false @@ -145,9 +146,10 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = "http://tensorflow.org"; + homepage = http://tensorflow.org; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; if cudaSupport then linux else linux ++ darwin; + broken = !(xlaSupport -> cudaSupport); }; } diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 24eecf82311a548646e4a728fce2ba91a84dfd47..774799f3b4d8d9bf9f911db2659d6faf531bad42 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.1"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk"; + sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz"; }; buildInputs = [ python gettext ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = "https://github.com/Ultimaker/Uranium"; + homepage = https://github.com/Ultimaker/Uranium; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e18e9f87acd365c7b62b8947f148628109fc1dff --- /dev/null +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }: + +buildPythonPackage rec { + name = "virtkey-${version}"; + majorVersion = "0.63"; + version = "${majorVersion}.0"; + + src = fetchurl { + url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; + sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ]; + + meta = with lib; { + description = "Extension to emulate keypresses and to get the layout information from the X server"; + homepage = https://launchpad.net/virtkey; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d4a47138d4abb680248d34048e948413157b6756 --- /dev/null +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "wakeonlan"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1snkyc6ph0bnypqs5yjw35mx3f9ij4808r5i06gl2vhn1rfzgyh1"; + }; + + meta = with stdenv.lib; { + description = "A small python module for wake on lan"; + homepage = https://github.com/remcohaszing/pywakeonlan; + license = licenses.wtfpl; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a5a7957e8ec1dd16f9e2658e3b5a3d203dcb7e73 --- /dev/null +++ b/pkgs/development/python-modules/webassets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }: + +buildPythonPackage rec { + name = "webassets-${version}"; + version = "0.12.1"; + + src = fetchurl { + url = "mirror://pypi/w/webassets/${name}.tar.gz"; + sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; + }; + + propagatedBuildInputs = [ pyyaml ]; + checkInputs = [ nose jinja2 mock pytest ]; + + # Needs Babel CLI tool + doCheck = false; + checkPhase = "py.test"; + + meta = with lib; { + description = "Media asset management for Python, with glue code for various web frameworks"; + homepage = http://github.com/miracle2k/webassets/; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dd6e9200db520bb9701f4ccd85a36af8396c88c4 --- /dev/null +++ b/pkgs/development/python-modules/websockets_client/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: +buildPythonPackage rec { + pname = "websocket_client"; + version = "0.47.0"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jb1446053ryp5p25wsr1hjfdzwfm04a6f3pzpcb63bfz96xqlx4"; + }; + + prePatch = '' + # ssl.match_hostname exists in python2.7 version maintained in nixpkgs, + # the dependency is not necessary. + sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py + ''; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/liris/websocket-client; + description = "Websocket client for python"; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..68c81157eb08aae54f9a9c833dbdb95faceae400 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootbox"; + version = "4.3.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://bootboxjs.com; + description = "Bootboxjs packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..757c2cc240ed478058de72c8ef04131578aa1b73 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootstrap"; + version = "3.3.5.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://getbootstrap.com; + description = "Bootstrap packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0cf029c68a59c0dc847cc2cdb9e7e01f44820e74 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery-File-Upload"; + version = "9.7.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://plugins.jquery.com/project/jQuery-File-Upload; + description = "jquery-file-upload packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b884a97eb2236859591fb82d049715971cffb43 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jquery-ui"; + version = "1.12.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://jqueryui.com/; + description = "jquery-ui packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c414e0a070ae5cd58ee5247d24512b12d47b8021 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery"; + version = "1.10.2.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://jquery.org; + description = "jquery packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8ec9b77860c210c8cc644d84b31f4a3ca7cb2e21 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Pygments"; + version = "1.6.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://pygments.org; + description = "pygments packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02931215b8d35544408fa3665c012c69c7189c20 --- /dev/null +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic"; + version = "1.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = https://bitbucket.org/thomaswaldmann/xstatic; + description = "Base packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3ad2176fb419912453588df989472a0b12fdff9f..62382a1f72d49b264440b1e6f1314a38c76c6932 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -369,7 +369,7 @@ let VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; - xml2 = [ pkgs.libxml2.dev ]; + xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; affyPLM = [ pkgs.zlib.dev ]; bamsignals = [ pkgs.zlib.dev ]; @@ -411,6 +411,7 @@ let fftw = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; + JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; kza = [ pkgs.pkgconfig ]; magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; @@ -760,6 +761,17 @@ let ''; }); + JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: { + postPatch = '' + for file in {R,src}/*.R; do + sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + preConfigure = '' + patchShebangs configure + ''; + }); + Mposterior = old.Mposterior.overrideDerivation (attrs: { PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8da6355e0016585993c9d2e0894f479a2d92cb47..ac0b2dd07f833dfc5d0c82164f0f7ed477620c3f 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -139,8 +139,9 @@ in }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; }; hitimes = attrs: { diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 1393229333d39313205fbc7b4dc079e55e179f87..3aa64356896f212a1bff05138c72ecbe05ebdfb1 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.3"; + version = "1.0.5"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm"; + sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index 99958a416c39e84e56e36978df0a125d04b5e891..a9793e04883905de61c8ad73a5f94dc8a0fe9b00 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n, kdiagram, kgraphviewer }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index e5bed62d324f0ec0c5edd2f9bbec6d5392e0462c..cdf59cd867c66905d49ccc808116b4b7adb9ed07 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "5.2.3"; + version = "6.0.1"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "03frkyiii7304qrcypdqcxqxjf5n3p59zjib0r802mbbx1nzcisn"; + sha256 = "13wmmy345p8bzvxdb8ldpkv85m3m8x9qs5f0jjhn0gkn65a988iq"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch new file mode 100644 index 0000000000000000000000000000000000000000..d237267078e68aab1ac9119063c62177fb759a03 --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/cmakepaths.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04c5c58..429ca47 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") + + set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") +-set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") ++set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") + + add_subdirectory(libear) + add_subdirectory(bear) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6afec72de5fd302bdf20ca28ef87dc63e95d214d..8f352f84b2287c5e569fa7674d7448adecd9d240 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # all fail - patches = [ ./ignore_wrapper.patch ]; + patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/rizsotto/Bear; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.vcunat maintainers.babariviere ]; }; } diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index d62ccd0c9fdaa25c6a83e4db3877fcdc0045fb2d..3e994227ef05b4c017db360feccbb73347ade282 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.15.post1"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "01m5x4lpz90lqf8j0s2c26gqb5yzan6x9d1ffgmrklwf0bljkwni"; + sha256 = "0y7gpymxl09gd9dyqj7zqhaihpl9da1v8ppxi4r161ywd8jv9b1g"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 8b23f8a2488911fd34d954e3cdc426645b20ee00..07480d15f2118ec3aafd1e5f1a0341948c8c2d74 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.15.post1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh"; + sha256 = "1rs2x0b2v92xfsfk0f2nr9x8lz5baawf768s58brj4jiab6mq312"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 40aaad2efd255f202e3e5f70d9ac888e91a75a91..1d1b963df9935eec766648f2b0763d7e3156896f 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "19cnzp5prima3jrk525xspw7vqc5pjln2nihj4kc3w90dhzllj8x"; + sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj"; }; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1j6aw2j2sl7ix8rb67pbs6nfvv8v3smgkvqzsjsyh5sdfr2663cg"; + sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -49,7 +49,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0k0wd4rq034bij2flfjv60h8czkfn836bnaa7hwsrl58gxds39m4"; + sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -69,7 +69,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "08ng56jmy50s3zyn6wxizji1zhgzhi65z7w3wljg02qrbd5688gj"; + sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -89,7 +89,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "15fm72yymv873n3vsw9kprypcf6jzln18v4lb062n8lqw9pykwb1"; + sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 51d6a5b56952912c4d4c04d24fd331120a863c5b..75e6bb0404be3edd783f02d497821cd532bd5b3f 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.15.post1"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "12zscqb218w88y9fd1jwfn4cr2sw35j998d0jlgd22bch020sy65"; + sha256 = "0ws31ypmksah1c83h4npwg560p8v7n9j6l94p79y5pispjsgzqzl"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index da404a63d85fd79e989434234a7b81616f4f1c99..28894850bbd96925034f9ec4cf10989328d4f4cb 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.7.2"; + version = "1.8.0"; enableParallelBuilding = true; @@ -12,21 +12,13 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9"; + sha256 = "0788d375sc6xdak9x6xclkkz243lb7di68yxfvl4v0n178mi22bk"; }; postUnpack = '' patchShebangs . ''; - patches = [ - # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/dlang/dub/pull/1354.patch"; - sha256 = "01alky8a91qwjmlnfjbrn8kiivwr69f3j4c84cjlxrzfp1ph20ah"; - }) - ]; - # Can be removed with https://github.com/dlang/dub/pull/1368 dubvar = "\\$DUB"; postPatch = '' @@ -71,8 +63,6 @@ let src = dubBuild.src; - patches = dubBuild.patches; - postUnpack = dubBuild.postUnpack; postPatch = dubBuild.postPatch; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index bdf446d4d12ac4422fe52f3870fb1017dd1615d5..5e8f14c5f843f333dd482a539372bb5b2210d892 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.5"; + name = "gradle-4.6"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1qxmb4mki2gjhfwmy7lwak283l86iq3nivw57a2gpw2g64xa9wh3"; + sha256 = "05drn7a9d2blbmd3l0443bpf5qzf5frwnl9ww0bha1qfng95zgcq"; }; }; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 4ea85eca2138555cfb63c958e52cdbf07a85bff4..01a112bcecce8c7ea2858a0107cc70d65c00d4ca 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1mz2aiwb3ha8dnx9fzbykz1y5ax01l2x6xml956fs1vm555v534x"; + sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 61184cb6ba1ae9d0c3886bf3ef618ee840e65012..65501b2b9350eab20f34422f9c95db70b3f24308 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "1.9.0"; + version = "2.0.4"; src = fetchurl { url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1sjpqzm2fzm8pxi3fwfinpsbw4z9040qkrzbg3lxik7ppsbjhn58"; + sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 5fdbd7766cf8641eadda9254a49e6a49c489d9c3..c778b67a95f5c875a4220c7a14bf5056b3bf6301 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { rev = "v${version}"; owner = "projectatomic"; repo = "buildah"; - sha256 = "0rq3dw6p9rcqc99jk93j0qwg1p8fh4pwqvzylcqlcyqhv46426zf"; + sha256 = "0xyq7rv0lj6bxwh2rnf44w9gjcqbdkfcdff88023b9vlsc8h4k0m"; }; goPackagePath = "github.com/projectatomic/buildah"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e7c2509ce77145ada756c86c1fdd599ffeeae19a..5181361abf6757024fe5eea968bdffb2cbf3a724 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.4.0"; + version = "10.5.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0fcddi1mwgj831abn628zcpwsah3mmvrbdi851pjf8vraynwr2xa"; + sha256 = "1ywfki1599ggyq0g3r8f7pi1njvvjz41kjhssfax20ljm2c6q5v0"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1zlk3i9jzmsqz5r3kzg08z9hyhidw9dpv5ji46bnbjis8q3dlw54"; + sha256 = "0r71zvyg17926h2vpjr3q16l1yqcb8ky21ic5arc7jh82nzywywl"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0kp6h53d1q652i4wp94hydy1ixlgmqh92sjsc6pqicnfc7nvwgfq"; + sha256 = "13c9jzqj92xf2dzk77xpsfc4dwffvjfp8bqy685shzz1lrrfhfvq"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 18ca5d4d8972871fdbb1940e5101b8f8e792d52d..2d534435b5f9eabd7a09567cc9f153c4a2780fec 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.89.3"; + version = "2.89.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0flqd3r1nip9wc8sy0kiqjivgx0zkpzlkbz6n3gb1plc73lpdwbr"; + sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 79a077f4a751820e43fc203190459e6bb7e60438..e3c8d7ed014de31f603f32e781edd1f8cf8784f5 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,21 +2,17 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "0167cgp3kqx336p8dmlxx57bi3lhzyp6ncly28v1s7r2sjxj9krj"; + sha256 = "1rn1vb33zfl9iy80fhqvi9ykdjxz029nah5yfr5xixcx9al0bai3"; }; nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; - - installPhase = '' - mkdir -p $out/bin - cp ${src} $out/bin/coursier - chmod +x $out/bin/coursier + buildCommand = '' + install -Dm555 $src $out/bin/coursier wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index a7b9976be43c7e9b1a0204405852f07b0e6d17b9..394169c9cc9d8768a78eebab2dd56f98464a9001 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.5.3"; + version = "3.5.5"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv"; + sha256 = "1ipjbzdb32xigm0vg6zzjnbx9n248rrkr324n5igp53nxbvgf3fs"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index afac17e121ad99d385441acb450203876fd7fc7a..7d4cf6ea5d5e9c3e479c0a30f7d279bc4758e8ee 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,13 +5,13 @@ , drivers ? [] }: let - version = "3.7.1"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; }; buildInputs = [ diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 3671a3dcca9b89398e815d237ada4073ab504346..9a7a600d13436d0f50220b6f196b4afa6d14f021 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "delve-${version}"; - version = "0.12.2"; + version = "1.0.0"; goPackagePath = "github.com/derekparker/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "derekparker"; repo = "delve"; rev = "v${version}"; - sha256 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30"; + sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b88b8e3c82a9769a815ad85e7d4b65ef831c2f17..a176c5cb76454185bea44b6e6c69204705656ec9 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome_doc_utils dblatex gettext which itstool + gnome-doc-utils dblatex gettext which itstool ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 144bd059634f424eae5e547b32048a82709860ba..b6daade32e7888dc3c47794baba936e517f7be05 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,14 +4,14 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.16.3"; + version = "0.17.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; + sha256 = "0hpjs9qj0nr57a249yv8xvl61d3d2rrdfqxp1fm28z77l2xjj772"; }; checkInputs = [ diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index d76bbb7f53a3a512d2cb02c62d8bac196df34de0..d5f691b0cac573065e27a7b75200e4116d103258 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.078.2"; + version = "2.079.0"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls"; + sha256 = "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y"; name = "dmd"; }) (fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${version}"; - sha256 = "1cydhn8g0h9i9mygzi80fb5fz3z1f6m8b9gypdvmyhkkzg63kf12"; + sha256 = "0fvpfwh3bh3fymrmis3n39x9hkfklmv81lrlqcyl8fmmk694yvad"; name = "dtools"; }) ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 0ef6e85297c1c82d75e92b8a9a31b29147c1eb59..11e2c6d2c5a44efd162bd437fbcb3d9743ef1a34 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "4.2.0"; + version = "5.0.7"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz"; - sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz"; + sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv"; }; buildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index d553a57455241ff13a56d918ce668e39a0ba2963..bbcdc0cd798e93b552718c18fd6b95200757ef6c 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.3.0"; + version = "2.3.6"; name = "${pname}-${version}"; inherit jre8; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "10z7vh3jiq7kbzzp3j0354swkr4xxz9qimi5c5bddbiy671k6cra"; + sha256 = "0kndib3slj7mdvhd36fxin5q87cnsz4hs135yxgjx0nccxq4f2h5"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 8f6e0dde58993cb16d3bb3587dc9128612ceee6d..9bc760bf1126edd38e4d71f39883cf4a0e76f590 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -1,20 +1,24 @@ { lib -, fetchurl +, fetchFromGitHub , rustPlatform }: with rustPlatform; buildRustPackage rec { - version = "0.19.1"; + version = "unstable-2018-02-24"; name = "geckodriver-${version}"; - src = fetchurl { - url = "https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"; - sha256 = "04zpv4aiwbig466yj24hhazl5hrapkyvwlhvg0za5599ykzdv47m"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "gecko-dev"; + rev = "ecb86060b4c5a9808798b81a57e79e821bb47082"; + sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl"; }; - cargoSha256 = "1cny8caqcd9p98hra1k7y4d3lb8sxsyaplr0svbwam0d2qc1c257"; + sourceRoot = "${src.name}/testing/geckodriver"; + + cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8"; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 00c2663e3a4683b451e0f2a6716731d3bf72d872..d569b8d3068747818e84680a20a40bb3388e7fd5 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.0.14"; + version = "2.1.7"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "02wy91nv79lrvvhhimcxp7sqz5wd457n1n68zl7qcsm5vfn1hm4q"; + sha256 = "05rifsgzfaalv5ymv59sjcvhr6i1byzbmq5p36hj3hpi5f929kip"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 2adc61ce6456ae0737777432047a78923a753706..d4a8d483e2e5ab96280d09656af156b67093965a 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.3"; + name = "babeltrace-1.5.4"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; + sha256 = "1h8zi7afilbfx4jvdlhhgysj6x01w3799mdk4mdcgax04fch6hwn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ff4ad83b642c097bdf12d49602d69a3faf737347..34d1d8a829b137dddf8469c19ddef10d1b4f66e9 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: +{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.5"; + version = "3.4.1"; src = fetchurl { - sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r"; + sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; url = "mirror://samba/ccache/${name}.tar.xz"; }; + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib ]; + outputs = [ "out" "man" ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ ./skip-fs-dependent-test.patch ]; + patches = [ + ./fix-debug-prefix-map-suite.patch + ./skip-fs-dependent-test.patch + ]; postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch new file mode 100644 index 0000000000000000000000000000000000000000..98a6fbf10bf18ceb410779245e90c0de23cb5b6c --- /dev/null +++ b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch @@ -0,0 +1,42 @@ +--- a/test/suites/debug_prefix_map.bash ++++ b/test/suites/debug_prefix_map.bash +@@ -29,7 +29,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -39,7 +39,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -52,10 +52,10 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi +- if ! grep "name" test.o >/dev/null 2>&1; then ++ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then + test_failed "Relocation (name) not found in test.o" + fi + +@@ -65,7 +65,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + } diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index 3bc3a95e42048f58b3263022810ba833f955f9e3..7b233df6531b5d1663d2b5462ebe02d585d3ed0a 100644 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -1,6 +1,6 @@ ---- a/test.sh -+++ b/test.sh -@@ -2669,23 +2669,6 @@ SUITE_cleanup() { +--- a/test/suites/cleanup.bash ++++ b/test/suites/cleanup.bash +@@ -94,23 +94,6 @@ $CCACHE -F 0 -M 256K >/dev/null CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 28b108c743f0a0f6eadd42e0b25689ac25e5c280..928f12602909978a3c1d8ac68e9610c4cbeb0ae5 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.15"; + name = "doclifter-2.17"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz; - sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz; + sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 27dadd08e56056052869866884b43deed2425393..9f0ea147b5856a1203df19079446bfb8527fe55d 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus dbus_glib ]; + buildInputs = [ glib dbus dbus-glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 6d5bfef2f80e4f1320512c4fdc0bab91d48b2305..de66bf5da14ef6d66fc20a2cdab000f5abf7070c 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -5,14 +5,14 @@ in python27Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "gdbgui"; - version = "0.11.0.0"; + version = "0.11.1.2"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "09bfrln16ai5azpjan1q24xz700sxsaa3ndynq8c8qdan82bfi1g"; + sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 50f451ebae2382d233a30a50ff4968f6b337ac60..02b4d15576785f5ebcb7ace5211329815a86972d 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor-icon-theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; meta = { homepage = https://code.google.com/archive/p/gtkdialog/; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 613a4fec85309944d046fd7d76dac4b872b1df67..cf9057d35e2c553edb25f33d1add1b0635bc9003 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -79,17 +79,6 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nixUnstable postgresql # for running the tests - (lib.overrideDerivation (aws-sdk-cpp.override { - apis = ["s3"]; - customMemoryManagement = false; - }) (attrs: { - src = fetchFromGitHub { - owner = "edolstra"; - repo = "aws-sdk-cpp"; - rev = "local"; - sha256 = "1vhgsxkhpai9a7dk38q4r239l6dsz2jvl8hii24c194lsga3g84h"; - }; - })) ]; hydraPath = lib.makeBinPath ( diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 9c131b72a316d7289e0e55fd3e4cd9463b322836..3d8b29e4ebc24f7f6744641aa2b6fd33ddca347b 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,22 +1,28 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, autoreconfHook, utilmacros }: +, procps, autoreconfHook, utilmacros, gnome2 }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.19"; + name = "intel-gpu-tools-1.21"; src = fetchurl { - url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754"; + url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; + sha256 = "0gvh317dg5c7kvjxxkh8g70hh3r3dc73mc4dzyvfa8nb4ix6xbyr"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook utilmacros ]; + nativeBuildInputs = [ pkgconfig utilmacros ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod - libXext libXv libXrandr glib bison libunwind python3 procps ]; + libXext libXv libXrandr glib bison libunwind python3 procps + gnome2.gtkdoc ]; + + preConfigure = '' + ./autogen.sh + ''; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' + substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index e1602b0d24e7bd777ceb3a6a4410b02f42df5b6d..66fbed514dc54a3ea8a1acddfb5f927b282d4d6a 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils }: +{ stdenv, fetchurl, elfutils, libunwind }: stdenv.mkDerivation rec { name = "ltrace-0.7.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; - buildInputs = [ elfutils ]; + buildInputs = [ elfutils libunwind ]; preConfigure = '' @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { makeFlagsArray=(INSTALL="install -c") ''; - meta = { + meta = with stdenv.lib; { description = "Library call tracer"; - homepage = http://www.ltrace.org/; + homepage = https://www.ltrace.org/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 3591cdc0f529488cf0e6490340bec2d871f6d7b7..eea54dbdf8be1f80f9a4ac0f309f2906f9a64693 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "005axllajfbxh73vh1cacbapdvbxjsi3pkzq40giih4ps9x4pg10"; + sha256 = "17wsdhkw8c8gb0d1bcgw4dfx2ljrq4rzgpi8sb9y9hs6pbwqy0xk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index bfdebec154ad3b64d6d893ca7397970b4f5310a9..edfc7dc30ca685fbeb2d70050e90efe86be40269 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs"; + sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index acfc8c54f641252f940517d60abe10562a07b582..ecee27c1385836266490aa9dbaa2bffba86cda48 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}: stdenv.mkDerivation rec { - version = "0.94"; + version = "0.97"; name = "msitools-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/${name}.tar.xz"; - sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; + url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; + sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; license = [licenses.gpl2 licenses.lgpl21]; - maintainers = [maintainers.vcunat]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 7cfd78a39a2814f142f067561ebf1dcda0b8395e..15d00b0a2a52210c858d87c07a9eab2c85c77ede 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; - preConfigure = optionalString (stdenv.system == "mips64el-linux") - ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; + preConfigure = ""; # TODO(@Ericson2314): Remove next mass rebuild buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index e5f298a1cabc864aad24093a8c8d3d9d743df787..80d1a75e801d4819d56b105a287c704cc26ee7ba 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "4.21"; src = fetchurl { - url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "1dvrwi6v9j6b9j6852zzlc61hxgiciadi1xsl89wzbzqlkxnahbd"; + url = "https://strace.io/files/${version}/${name}.tar.xz"; + sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw"; }; nativeBuildInputs = [ perl ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 "--enable-mpers=check"; meta = with stdenv.lib; { - homepage = http://strace.sourceforge.net/; + homepage = http://strace.io/; description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 612df55471ba95c014ef4203ad8e3a28e748a609..d72fc86d7ee58393a8a55b924dc0de8b6d923914 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,7 +2,7 @@ , libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.6"; + name = "sysbench-1.0.13"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ vim mysql.connector-c libaio ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.6"; - sha256 = "0y3hlhzrggyyxwf378n006zlg2kwhmhh6vq6il0qn9agjmjmhl5l"; + rev = "1.0.13"; + sha256 = "1inxyjpcyv2ag3k5riwlaq91362y16yks75vs2crmhjxlxdspy8c"; }; meta = { diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 6c27ad408603d6ecbb168d1813944c9c103b70bd..3cf707c6bebb1c4245c82ab82b3d945eb8c5b8a5 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.66"; + version = "0.66.1"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "156y71yf2xxskvikbn6yjfv8xgnsrrjij08irv21z0n7nx35jgmm"; + sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 8a1ce7c0886866f421f3e86b6c7746cfd276f68a..d34a94e0467001d0ef3e6aac1791edca04c59a9d 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usb-modeswitch-${version}"; - version = "2.5.0"; + version = "2.5.2"; src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "0cvnd16n2sp3w46fy507nl29q39jxxdk5qqbvk1rxaa91llbxh1i"; + sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"; }; makeFlags = [ diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 0acd70b424a89a0e04b3aca99d207cf8eb8de651..31cd7ccfd2c0bcbfdb1990499dff2bd34743044f 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,15 +6,22 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.03"; + name = "camlp5${if transitional then "_transitional" else ""}-7.05"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz; - sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8"; + url = https://github.com/camlp5/camlp5/archive/rel705.tar.gz; + sha256 = "16igfyjl2jja4f1mibjfzk0c2jr09nxsz6lb63x1jkccmy6430q2"; }; buildInputs = [ ocaml ]; + postPatch = '' + for p in compile/compile.sh config/Makefile.tpl test/Makefile test/check_ocaml_versions.sh + do + substituteInPlace $p --replace '/bin/rm' rm + done + ''; + prefixKey = "-prefix "; preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 2bfc832a0f0a49baa15efc30c88aa492e3f090e8..d48bc4101113bfb6ca0c94530ae6af1625ab8af2 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "jbuilder-${version}"; - version = "1.0+beta18"; + version = "1.0+beta17"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "1xw4i5qd2ndnddzb8b14fb52qxnjpr3lr9wx3mprv4f294kdg0l6"; + sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 821401d578c7c98461e952684c6a25e7e3166793..cdd599c451f8d48dbb1b14726f23fd6b81f27c47 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "omniorb-${version}"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl rec { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl"; + sha256 = "1klf6ivhsisdnqxcbf161jxva0xzmfgmwypnxfzf4jq16770knfx"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d97d67c9851abd6e07adfa6f9d0e80b63e64da64..b7757b47471681de47af150d1c1a1c9adafff589 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.1.3"; + version = "1.2.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0bfjv4sqci10jzy11qg6q1xyik36v98vd6ck91sarawvgbaprsp2"; + sha256 = "05qsyh6d4qsvabr543ggd4b09fipxzr270cawsx0glmkgw82nkzi"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 16fc48174175c5daf012ebe1e4c61db1c6170f78..6eb3e88a0d13dd88c0ee940fdd54d94f3740fb76 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pew"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh"; + sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; }; propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index b017b1dc24b58602061ba8594a9b269372e57184..de2e6eb96a810c3e315c28e7d67dc9091fab01a2 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "9.0.1"; + version = "10.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16k77iy1apbc1s5j78aimhjrcw89vbkq5irs80dmm70wayi0myz1"; + sha256 = "3732350e3cd8cc033d66748c418bab4b018dc0a4fcf1687f17a103ac44eac0c6"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 7b313f3014134ad5a4ab15455c276e7c2aa3d6ff..55902f48bb733092789241a60f1ec14fe041fc2d 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -5,9 +5,9 @@ let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc"; - sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2"; - version = "2017-02-04"; + rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; + sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; + version = "2017.10.18"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -16,7 +16,7 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs postPatch = '' diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index eb82cf84966065037169c13a032ba8ed06fe78ee..326fa84f472afd321f7fa277216dc5063299ed1c 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sassc-${version}"; - version = "3.4.5"; + version = "3.4.8"; src = fetchurl { url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9"; + sha256 = "02lnibrl6zgczkhvz01bdp0d2b0rbl69dfv5mdnbr4l8km7sa7b1"; }; patchPhase = '' diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index deb5c8106282e10512420d5cf2301faf509b7ef7..279bce20d142cde5860c9aa5eb4739a85845ade0 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, perl, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.5.0"; + name = "sslmate-1.6.0"; src = fetchurl { url = "https://packages.sslmate.com/other/${name}.tar.gz"; - sha256 = "1vxdkydwww4awi6ishvq68jvlj6vkbfw7pin1cdqpl84vs9q7ycg"; + sha256 = "1ypabdk0nlqjzpmn3m1szjyw7yq20svgbm92sqd5wqmsapyn3a6s"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 5d967ba812718200fb3453a1e638757c9d0515ff..7f62102621ea376b29c29d7acd199b6ff1d0f788 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,9 +1,9 @@ { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let - version = "2.0.1"; + version = "2.0.2"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1fjfl00n4rsq6khypm56g0vq6l153q128r35zky2ba30bz292ar1"; + sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index f8134a88643c151df8c771e058dfc5ac5154911c..96307c8d134c20ac40e65ea111c02a4132561245 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { name = "vim-vint-${version}"; - version = "0.3.11"; + version = "0.3.18"; src = fetchFromGitHub { owner = "kuniwak"; repo = "vint"; rev = "v${version}"; - sha256 = "0xl166xs7sm404f1qz2s0xcry7fr1hgyvhqhyj1qj0dql9i3xx8v"; + sha256 = "0qrlimg385sxq4y6vqbanby31inaa1q47w9qcw5knwffbz96whrs"; }; # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index ffa6d4aac0ca1d3f3d99285774394c3308a66acf..df32d68767fb88adffa84ff7403f12543950edf8 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "wiggle-1.0"; + name = "wiggle-1.1"; src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz"; - sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs"; + url = "https://github.com/neilbrown/wiggle/archive/v1.1.tar.gz"; + sha256 = "0gg1c0zcrd5fgawvjccmdscm3fka8h1qz4v807kvy1b2y1cf9c4w"; }; buildInputs = [ ncurses groff ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 72b0fe2adaf787cedbcaaffdbe53033e4aea5c8b..bd7dd5924c06e18af9333ed0d6a42cdcc386a705 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.3.2"; + version = "1.5.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0lyh24ais8xqfmzbb4sszd2002xl6qbsg9sdjnpwh6aysrwp56r8"; + sha256 = "13m1y1c2h1fvq8fw1vlmnmnh3jx3l2cx7mz3x55sbgwcinzhkz9m"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..45cf993f25ed0a9862be224dc072d098bd9bcbe0 --- /dev/null +++ b/pkgs/development/web/insomnia/default.nix @@ -0,0 +1,66 @@ +{ stdenv, lib, makeWrapper, fetchurl, dpkg, + + alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk2-x11, + nspr, nss, + + libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, + libXrender, libXtst, libxcb, + + libudev0-shim, glibc, curl +}: + +let + libPath = lib.makeLibraryPath [ + alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXtst libxcb + ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; +in stdenv.mkDerivation rec { + name = "insomnia-${version}"; + version = "5.14.7"; + + src = fetchurl { + url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; + sha256 = "1y6bn9kaxxplzyv7jjrcsfkrjnivjqdk5mbdp8vz32hv2bmdvzzy"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + buildPhase = ":"; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out/share/insomnia $out/lib $out/bin + + mv usr/share/* $out/share/ + mv opt/Insomnia/* $out/share/insomnia + mv $out/share/insomnia/*.so $out/lib/ + + ln -s $out/share/insomnia/insomnia $out/bin/insomnia + ''; + + preFixup = '' + for lib in $out/lib/*.so; do + patchelf --set-rpath "$out/lib:${libPath}" $lib + done + + for bin in $out/bin/insomnia; do + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$out/lib:${libPath}" \ + $bin + done + + wrapProgram "$out/bin/insomnia" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + ''; + + meta = with stdenv.lib; { + homepage = https://insomnia.rest/; + description = "The most intuitive cross-platform REST API Client"; + license = stdenv.lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ markus1189 ]; + }; + +} diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eafaf956ee02e55e898fea74d83c3d5ce661757e..22eb772da1f95984467a84be7a562f0b898dd7bd 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -26,6 +26,11 @@ let */ ]) (builtins.attrNames sharedLibDeps); + copyLibHeaders = + map + (name: "${getDev sharedLibDeps.${name}}/include/*") + (builtins.attrNames sharedLibDeps); + extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; in @@ -74,13 +79,16 @@ in mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm ''} + + # install the missing headers for node-gyp + cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node ''; meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = https://nodejs.org; license = licenses.mit; - maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix deleted file mode 100644 index 64674066b2956f7f695794c181bcba9f47deacc3..0000000000000000000000000000000000000000 --- a/pkgs/development/web/nodejs/v4.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "4.8.7"; - sha256 = "1y21wq092d3gmccm2zldbflbbbx7a71wi9l0bpkxvzmgws69liq3"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 79f364be20004a4c40ee8eb383c467df31593792..af3a8b4d22fd2985b3f855bd9ccb93ecb4894574 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.5.0"; - sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6"; + version = "9.6.1"; + sha256 = "04hi7lwdizwqqbyi77f4z12gnsh673h92brmbssrmw5kjx6h4k5q"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 751638e02da8cc38f324f6646bcfe2884d9e42ce..dde8ada0db93f08e12e0caa76cf28aa210128b40 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../node-packages/node-env.nix { @@ -13,4 +13,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 34b31cdf7ec81b686f1a7e669c7d9f58e4a58b21..317550059b455317e84ac1acaae2958b46e6b377 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.0.5"; + version = "4.1.2"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "1l7ybqmsxpsijm7iqiqjpa7lhjafxml743q4crxn8wnwrbjzbi86"; + sha256 = "1n18i8ni154ym3d32zlbxcw0zz62h66iifr0h1yvvv2kp13p5zix"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 3dae66255a3fa387568e56700bc0eedfd3ef3410..66e199a3f0d2f6ab9cd62ffadc27e2e51876fe53 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.20.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; + sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; }; patches = [ ./crawl_purify.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ lib.optional tileMode "TILES=y"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 58ca2e40246ef8103553982099e4d9f560cccfc8..f9a61ddbf8b2c1c6ebf7e4863edf910eb2cae25e 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,12 +5,12 @@ let dfVersion = "0.44.05"; - version = "${dfVersion}-alpha1"; + version = "${dfVersion}-r2"; rev = "refs/tags/${version}"; sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52"; # revision of library/xml submodule - xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e"; + xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 20f7502f27ddcba6f7469ad053b48baa584df147..8cdfc426d8304ac6c2a051f715696f5819f56169 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.2.0"; + version = "39.2.1"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy"; + sha256 = "1dgcn1a4sz649kj94ldqy4ms7zhwpaj3q4r86b0yfh6dda8jzlgp"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index dd14edf8eb128b0b6db45d33bdc4a13a32eb61ae..263bf5c29dfc3237735966d31e76c6708a4765ac 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "freecell-solver-${version}"; - version = "4.8.0"; + version = "4.16.0"; src = fetchurl { url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; - sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; + sha256 = "1ihrmxbsli7c1lm5gw9xgrakyn4nsmaj1zgk5gza2ywnfpgdb0ac"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..875af8e06642b4bc61b83df0f362d7a0f8e8b4fb --- /dev/null +++ b/pkgs/games/freedroidrpg/default.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, pkgconfig, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: + +let + version = "0.16.1"; +in stdenv.mkDerivation rec { + name = "freedroidrpg-${version}"; + + src = fetchurl { + url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; + sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; + }; + + nativeBuildInputs = [ pkgconfig gettext python3 ]; + + buildInputs = [ + SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib + ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + + meta = with stdenv.lib; { + description = "Isometric 3D RPG similar to game Diablo"; + + longDescription = '' + + FreedroidRPG is an original isometric 3D role playing game + taking place in the future, on Earth. It features action and + dialogs. + + + The game tells the story of a world destroyed by a conflict between + robots and their human masters. Play as Tux in a quest to save the + world from the murderous rebel bots who know no mercy. You get to + choose which path you wish to follow, and freedom of choice is + everywhere in the game. + + + FreedroidRPG features a real time combat system with melee and + ranged weapons, fairly similar to the proprietary game Diablo. + There is an innovative system of programs that can be run in order + to take control of enemy robots, alter their behavior, or improve one's + characteristics. You can use over 50 different kinds of items and + fight countless enemies on your way to your destiny. An advanced + dialog system provides story background and immersive role + playing situations. + + + The game is complete, fully playable, and can provide about + 12 hours of fun. It is still being actively developed, and + help is welcome in many areas. People having - or trying to acquire - + programming, map editing, or writing skills will find FreedroidRPG + to be an exciting, fast-moving project in which they can fully + express their creativity. + + ''; + + homepage = http://www.freedroid.org/; + + license = licenses.gpl2Plus; + + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ae2cbd818417c6ac26e441956d3fe75058f50b67 --- /dev/null +++ b/pkgs/games/gnujump/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: + +stdenv.mkDerivation rec { + name = "gnujump-${version}"; + version = "1.0.8"; + src = fetchurl { + url = "mirror://gnu/gnujump/${name}.tar.gz"; + sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; + }; + buildInputs = [ SDL SDL_image SDL_mixer ]; + + meta = with stdenv.lib; { + homepage = "https://jump.gnu.sinusoid.es/"; + description = "A clone of the simple yet addictive game Xjump"; + longDescription = '' + The goal in this game is to jump to the next floor trying not to fall + down. As you go upper in the Falling Tower the floors will fall faster. + Try to survive longer get upper than anyone. It might seem too simple but + once you've tried you'll realize how addictive this is. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index ffa414cac3a1c34db4c00fca8a26561e2590071d..343b2948d5ea87e4e18273ac3c769d68f6ca7b6a 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.0.1"; + version = "3.2.0"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb"; + sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a"; }; NIX_LDFLAGS = "-llua -lgcc_s"; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index c857ccc47a857adacd11b27f39bd11028a5f9e86..ba273cfb6b97a8064e6cb7a6908a1923469b394a 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lgogdownloader-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "0p1zh2l8g4y2z02xj0fndbfhcxgcpwhf5d9izwsdi3yljvqv23np"; + sha256 = "056idwwxjcp2zjqk5h7l3py1h45sax4vbsm93bz9shnfx1s1h3gc"; }; nativeBuildInputs = [ cmake pkgconfig help2man ]; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 0b0561afd24dcef4eb1f8736ae793a89ec87e511..d3fb8c7bc58e7d50dde677c78e66cc6be1828f4e 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, - libxkbcommon, epoxy, at_spi2_core, dbus, libxml2, + libxkbcommon, epoxy, at-spi2-core, dbus, libxml2, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp - pkgconfig gtest gmock readline epoxy at_spi2_core dbus libxml2 + pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 53c2cc5d073a7ea0ba5d711b4984e3ff310bb486..f64bbe4c1255024c0a1067c3454ce1a46b1375b8 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -6,12 +6,12 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; - rev = "35f1a459a4ab6da9d70427e6539bdf4faae4cc91"; - sha256 = "1s3a9dpbcc6v8d05pqin4xfv36i2031xpdja1vl8x11cw05fln91"; + rev = "2b4c8e37268e595b82da4b9aadd5507852569b87"; + sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); in stdenv.mkDerivation rec { - version = "0.42.0"; + version = "0.43.0"; name = "openmw-${version}"; src = fetchFromGitHub { diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 0da2b24b3a204381b42585133d462291f37cd30a..582cafcc4d462f59331d171574b5f76326e9439b 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.1.1b"; + version = "0.1.2"; devPakVersion = "33"; src = fetchFromGitHub { owner = "yvt"; repo = "openspades"; rev = "v${version}"; - sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn"; + sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6"; }; nativeBuildInputs = [ cmake imagemagick unzip zip file ]; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index e6989908c65f3ecc41c487d78e998efabf18fe17..ffe0841184b1bf8a0aca0f81c6ea527b8b5116a5 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pioneer-${version}"; - version = "20171001"; + version = "20180203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "0yxw1zdvidrwc28vxfi3qpx2nq2dix2d6ylwgzq9ph8kgwv9fl5n"; + sha256 = "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 3898ddba71395e45fb64fd886a92fa3489f8c694..53de9fa29e2d088c5f259ea73d87779b94dc62db 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,16 +1,14 @@ -{stdenv, fetchurl, gtk2, pkgconfig, intltool } : +{stdenv, fetchurl, gtk3, pkgconfig, intltool } : stdenv.mkDerivation rec { - name = "pioneers-0.12.3"; + name = "pioneers-15.4"; src = fetchurl { url = "mirror://sourceforge/pio/${name}.tar.gz"; - sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; + sha256 = "1p1d18hrfmqcnghip3shkzcs5qkz6j99jvkdkqfi7pqdvjc323cs"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool ]; - - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk3 ]; meta = { homepage = http://pio.sourceforge.net/; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 70e330fa1ce44b4ec7f8db40199c91559bc7f08f..4e3a50b37b9a23ec432f217e6fac29bdda8cb9d5 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, libGLU_combined, openalSoft -, curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype +{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGLU_combined, openalSoft +, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2017-07-25"; + version = "2018-02-23"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "356ae10ef65d4401958d50f03288dcb22d957c96"; - sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j"; + rev = "0d6edd227a13f1447938da1d1b020303c2545eb2"; + sha256 = "1nsagyzrai8cxhabcv2my8bbwmwckvri288j6x4qi5bmp78xl4hx"; }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ xlibsWrapper SDL2 libGLU_combined openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; + buildInputs = [ + SDL2 libGLU_combined openalSoft curl speex opusfile libogg libvorbis libopus libjpeg + freetype mumble + ]; enableParallelBuilding = true; @@ -28,11 +31,11 @@ stdenv.mkDerivation rec { mkdir -p $out/baseq3 ''; - meta = { + meta = with stdenv.lib; { homepage = https://ioquake3.org/; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco lib.maintainers.abbradar ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco abbradar ]; }; } diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index caaedc44ee0c30db00d97eceaae6e715b2840382..d563a8265b5d28d964defde35f49ca0858a50479 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.0.0.2"; + version = "4.0.1.1"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0dzn6vlayvnkjm64zwva337rn07lc21kq93m2h8zz8j3wpl11pb4"; + sha256 = "0f2m29m53sngg2kv4km91nxbr53rzhchbpqx5dzrv3p5hq1hp936"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..de91f26d95de92d0a84477338298b9d4688d4e5d --- /dev/null +++ b/pkgs/games/sil/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: +let + setup = writeScript "setup" '' + mkdir -p "$ANGBAND_PATH" + # Copy all the data files into place + cp -ar $1/* "$ANGBAND_PATH" + # The copied files are not writable, make them so + chmod +w -R "$ANGBAND_PATH" + ''; +in +stdenv.mkDerivation rec { + name = "Sil-${version}"; + version = "1.3.0"; + + src = fetchzip { + url = "http://www.amirrorclear.net/flowers/game/sil/Sil-130-src.zip"; + sha256 = "1amp2mr3fxascra0k76sdsvikjh8g76nqh46kka9379zd35lfq8w"; + stripRoot=false; + }; + + buildInputs = [ makeWrapper ncurses libX11 libXaw libXt libXext libXmu ]; + + sourceRoot = "source/Sil/src"; + + makefile = "Makefile.std"; + + prePatch = '' + # Allow usage of ANGBAND_PATH + substituteInPlace config.h --replace "#define FIXED_PATHS" "" + ''; + + preConfigure = '' + buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses") + ''; + + installPhase = '' + # the makefile doesn't have a sensible install target, so we hav to do it ourselves + mkdir -p $out/bin + cp sil $out/bin/sil + # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place + # We could just use the options for a user-local save and scores dir, but it tried to write to the + # lib directory anyway, so we might as well give everyone a copy + wrapProgram $out/bin/sil \ + --run "set -u" \ + --run "export ANGBAND_PATH=\$HOME/.sil" \ + --run "${setup} ${src}/Sil/lib" + ''; + + meta = { + description = "A rouge-like game set in the first age of Middle-earth"; + longDescription = '' + A game of adventure set in the first age of Middle-earth, when the world still + rang with elven song and gleamed with dwarven mail. + + Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining + Silmaril from Morgoth’s iron crown. + ''; + homepage = http://www.amirrorclear.net/flowers/game/sil/index.html; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.michaelpj ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 525ea8eeec815ae7b77674e19bbc7077ec32f8f9..2030425ba12952333c6bec7a12429cc81fe106f9 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -38,7 +38,7 @@ let libcap SDL2 libusb1 - dbus_glib + dbus-glib libav atk # Only libraries are needed from those two diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index ffbcd595cc3548dd7c83cc49fa7acd2da7558399..c70feca0860fa5ab535d556278a2640e6d430296 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "92.0.331"; + version = "92.5"; src = fetchFromGitHub { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax"; + sha256 = "1n15kgl4qnz55b32ddgmhrv64cl3awbds8arycn7mkf7akwdg1g6"; }; patches = [ ./fix-env.patch ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 4514735bb70941406f33c1eda3138f663c7e8361..286e408e2555615707dc52947069e0e9b0bfe3e6 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.1"; + name = "tintin-2.01.4"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc"; + sha256 = "1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 390ab1eefd18bd7c209bebfe29585be0545d3344..83f34f5b04afabae562b4d2ffe83f98867fd8c4f 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,43 +1,86 @@ -{stdenv, fetchurl, openal, libpng, libvorbis, libGLU, premake4, SDL2, SDL2_image, SDL2_ttf }: +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip +, openal, libpng, libvorbis, libGLU, SDL2, SDL2_image, SDL2_ttf }: + +let + pname = "tome4"; + + desktop = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "@out@/bin/${pname}"; + icon = "${pname}"; + terminal = "False"; + comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; + type = "Application"; + categories = "Game;RolePlaying;"; + genericName = pname; + }; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.5.5"; -stdenv.mkDerivation rec { - version = "1.4.9"; - name = "tome4-${version}"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; + sha256 = "0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03"; }; - nativeBuildInputs = [ premake4 ]; + + nativeBuildInputs = [ premake4 makeWrapper unzip ]; + + # tome4 vendors quite a few libraries so someone might want to look into avoiding that... buildInputs = [ libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; + + enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ]; - preConfigure = '' + + postPatch = '' substituteInPlace premake4.lua \ --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \ --replace "/usr/include/GL" "/run/opengl-driver/include" + ''; + + preConfigure = '' premake4 gmake ''; + makeFlags = [ "config=release" ]; + + # The wrapper needs to cd into the correct directory as tome4's detection of + # the game asset root directory is faulty. + installPhase = '' - install -Dm755 t-engine $out/opt/tome4/t-engine - cat > tome4 <3.0.0 + (fetchpatch { + url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch; + sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; + }) + ]; + buildInputs = [ Carbon Cocoa ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index ac231f2dfe3df2a8185bd4bcce0828507d166e9b..3076392ecb26612515e1a1a18a5ae249970e9821 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "kwm-${version}"; - version = "4.0.4"; + version = "4.0.5"; src = fetchzip { stripRoot = false; url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip"; - sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc"; + sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb"; }; # TODO: Build this properly once we have swiftc. diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa7bfb5c3be7267754aba0b138412d7fc94307b0 --- /dev/null +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, Carbon }: + +stdenv.mkDerivation rec { + name = "qes-${version}"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = "qes"; + rev = "ddedf008f0c38b134501ad9f328447b671423d34"; # no tag + sha256 = "1w9ppid7jg6f4q7pq40lhm0whg7xmnxcmf3pb9xqfkq2zj2f7dxv"; + }; + + buildInputs = [ Carbon ]; + + makeFlags = [ "BUILD_PATH=$(out)/bin" ]; + + meta = with stdenv.lib; { + description = "Quartz Event Synthesizer"; + homepage = https://github.com/koekeishiya/qes; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index ff32ca01a97ff074ce54229b296e27b668ff3318..88e8a9665586324312db35fa86fdcb58317228a5 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20171113"; + version = "20180112"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "11gcnk6wjc2sw05hwi4xphvx9ksmkpvsdziaczymqxkaads3f1dy"; + sha256 = "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 886aa503abbbeec87758988498ce703c1972a606..4ae449c19aa8233c6f14bb35220c3944a6260ab1 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libaio }: stdenv.mkDerivation { - name = "blktrace-1.1.0"; + name = "blktrace-1.2.0"; # Official source # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2"; - sha256 = "15cj9aki7z5i5y6bnchqry6yp40r4lmgmam6ar5gslnx0smgm8jl"; + url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2"; + sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6"; }; buildInputs = [ libaio ]; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 6ef5476f8e83db9d24b6b48904158762c9181fba..d77539fb89ed508c85ec6e34e08702a491381917 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cachefilesd-${version}"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2"; - sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8"; + sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd"; }; installFlags = [ diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index f561a65ea5cabd8de1daf91c08508256f03f17a2..55be85d33f05bcf785a5bcd1c7314f9dad9df794 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -11,17 +11,17 @@ let in stdenv.mkDerivation rec { name = "displaylink-${version}"; - version = "1.3.52"; + version = "4.1.9"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k"; + sha256 = "d762145014df7fea8ca7af12206a077d73d8e7f2259c8dc2ce7e5fb1e69ef9a3"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - http://www.displaylink.com/downloads/file?id=744 + http://www.displaylink.com/downloads/file?id=1087 Once you have downloaded the file, please use the following commands and re-run the installation: @@ -57,6 +57,9 @@ in stdenv.mkDerivation rec { fixupPhase ''; + dontStrip = true; + dontPatchELF = true; + meta = with stdenv.lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 76f9d8c128c3f3dd8526e1ac1a1680cf02640c69..534e57354474ce33bc84f5df7093b9e23c8be88c 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dmtcp-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "dmtcp"; repo = "dmtcp"; rev = version; - sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi"; + sha256 = "1sq38in4wk855yhfnzbs9xpnps97fhja93w08xjmx7szzm33g5a8"; }; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 5db64e15e0481da391deba096c885e552691f257..730df56a6429bd4512e42473d4f210ac70a96c04 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "evdi-${version}"; - version = "unstable-2018-01-12"; + version = "1.5.0"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; - rev = "e7a08d08e3876efba8007e91df1b296f2447b8de"; + rev = "v${version}"; sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - hardeningDisable = [ "pic" "format" ]; + hardeningDisable = [ "format" "pic" "fortify" ]; installPhase = '' install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; homepage = http://www.displaylink.com/; - broken = versionOlder kernel.version "4.9"; + broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15"; }; } diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index cd11a79c8f82deb81cc542c3236fb389a52ca686..e2647112f1b2b33657fe51a8ab93bf1163f09e4e 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.03.04"; + version = "0.04.03"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1"; + sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index aad4f5f61df9e4e6e087dbcfba13a1b04534e721..646c18860c5da1344c4b44a8bc90277c88710270 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, gtk_doc, pkgconfig, gobjectIntrospection, intltool -, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking +{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool +, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales , fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl -, ninja, gcab, gnutls, python3, wrapGAppsHook, json_glib -, shared_mime_info, umockdev +, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib +, shared-mime-info, umockdev }: let # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc @@ -20,12 +20,12 @@ in stdenv.mkDerivation { outputs = [ "out" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ - meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales shared_mime_info + meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook ]; buildInputs = [ polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml - libgudev colord gpgme libuuid gnutls glib_networking efivar json_glib umockdev + libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev ]; LC_ALL = "en_US.UTF-8"; # For po/make-images @@ -50,7 +50,7 @@ in stdenv.mkDerivation { doCheck = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; mesonFlags = [ diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4c393a0f3266724e51381335767939227dfad6cf --- /dev/null +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre +, json_c, flex, bison, dtc, pciutils, dmidecode, iasl }: + +stdenv.mkDerivation rec { + name = "fwts-${version}"; + version = "18.01.00"; + + src = fetchzip { + url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; + sha256 = "043wkq4hz5pz79masppya67b8i5jw61p1j8dw17jwc8w6gp8csfb"; + stripRoot = false; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl ]; + + postPatch = '' + substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" + substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" + substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl" "${iasl}/bin/iasl" + ''; + + meta = with stdenv.lib; { + homepage = "https://wiki.ubuntu.com/FirmwareTestSuite"; + description = "Firmware Test Suite"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ tadfisher ]; + }; +} diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index a299fd0f433842823b8be39fc84df011ed5ef7f5..27b85fbfc89ad09b8bca47e74e15f961ea2ffad0 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: stdenv.mkDerivation { - name = "hal-flash-0.3.0"; + name = "hal-flash-0.3.3"; src = fetchurl { - url = "https://github.com/cshorler/hal-flash/archive/v0.3.0.tar.gz"; - sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s"; + url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz"; + sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 8ebce19653017ef28b9ccf579bf90ff9d0e78156..6f2dc807fbab3b1fda6146052084b0fc9247ffa1 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.308"; + version = "0.309"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.308.tar.gz"; - sha256 = "17zcwplw41dfwb2l9jfgvm65rjzlsbv30f56d6vgiix042f92vcq"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.309.tar.gz"; + sha256 = "1njx4lhg7a0cawz82x535vk4mslmnfj7nmf8dbq8kgqxiqh6h2c7"; }; preConfigure = "patchShebangs ./configure"; diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index cdcae22a18e925755bba33c9151ceb161431e018..0ccc8acfdca9477224a9d0fd18a1e82693cda3e9 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }: +, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: stdenv.mkDerivation rec { name = "iio-sensor-proxy-${version}"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "hadess"; repo = "iio-sensor-proxy"; rev = version; - sha256 = "1x0whwm2r9g50hq5px0bgsrigy8naihqgi6qm0x5q87jz5lkhrnv"; + sha256 = "1c8izq73c00gvv0jc6zby5hcircs4cb16a1d3ivp1i1iflknj46n"; }; configurePhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gtk_doc + gtk-doc libgudev systemd ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 6039ada44e24593aabc324c0323f286155a705a4..c78a4eadfa4e00871bdfa1e8e1ff02d756c1946b 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.34"; + name = "ipset-6.35"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "106nv1ngcvap0mqmb6jm07lc1q3w796rkzc1vrfs4yhbcwdq63np"; + sha256 = "1p7l1fj3lbv6rr24zxjiwq7jk1yvazk8db6yyni0qbprw49i01rp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index b97f48af414af0bd50c72e2bf3a1074b57fdb04b..d1e40371e370ffe913e6dcbac3c54b043a0bb9e8 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") '' + ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2fa343412019fe69f57ad0fadaa1e816d6035945..5fbd9955c2a349d379088bec07a7f44419466dfc 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -134,6 +134,7 @@ with stdenv.lib; ''} NETFILTER y NETFILTER_ADVANCED y + CGROUP_BPF? y # Required by systemd per-cgroup firewalling IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y IP_VS_PROTO_TCP y diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix deleted file mode 100644 index e89222b2c6290d9a60ef34caf677eaffff5e89b7..0000000000000000000000000000000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -buildLinux (args // rec { - version = "4.13.16"; - extraMeta.branch = "4.13"; - - # TODO: perhaps try being more concrete (ideally CVE numbers). - extraMeta.knownVulnerabilities = [ - "ALSA: usb-audio: Fix potential out-of-bound access at parsing SU" - "eCryptfs: use after free in ecryptfs_release_messaging()" - ]; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 3796ed7b037cb4c54dff6a45f108462802594d90..4b8515a86d33d699831fb4f692846fc3890ba004 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.21"; + version = "4.14.24"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vda6l61755wjbqjz3xbdkhgzzvd8lhnlliga3chfprxq348kpqr"; + sha256 = "00cqhc8198f4gj6cpz7nblpgi5zh2145arjx1yp0p4gmswdjslds"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index b2a55ba4b1ff50cf805e0d6c38968bf4211426e2..1c48898924391631734062d0b9284e65bb66b655 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.5"; + version = "4.15.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08l0m6pj690v6a0jjd7369zqkwnmgnm7k74g7s8sfwfxq0dsi2wj"; + sha256 = "1in8gy82ccpri7xhbgim3jrh15lbfrfzjgg69g0yvq534d5xyi6d"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6f6a39fcff2766485d5f54a9afc1222ac1639334..4f42f7b81c7fc146f05189af7aa506cbc11a106a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.117"; + version = "4.4.120"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s2d5vaa8wzfsamf9wkafk6nv46q7809j7x6a394sy39jq7lj3qj"; + sha256 = "0y7li4vcvv04aqkrgl01i98pgwm9njzrb8y8wdvwaq9658vhfpx2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 473fa052bbd44759a53617a25b9b79428873b467..d1bf5fb5c62289acdf1325ceb1cb267f07f9a0ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.83"; + version = "4.9.86"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1csh557b9b0zsldlk1lalmy5wgn5rhk857fryn3v4nh8kj3y4mw9"; + sha256 = "11bf1jcxn5gwd1g99ml2kn65vkpciq8hdz7xc0bjy66gxysnxkx7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index e17e9045d6cd85fad5de681f482af86be29a623a..85d31048ffc2f805528aa7012b4e54390a6cd4a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.5"; + version = "4.15.7"; revision = "a"; - sha256 = "082b5mwkklf111516qld980dqh4q7g1afb2y7mhc2in5pgkgqrws"; + sha256 = "19kgy1fa4flnqm3a50hilgjczqkscay10183cvkzy3vxrnf8fl0f"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 2c32ba5731148213b1a76da30708e2ea2f9c6243..e850b33ca4709d9e608f6bf658297ba912cf4f53 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.16-rc1"; - modDirVersion = "4.16.0-rc1"; + version = "4.16-rc3"; + modDirVersion = "4.16.0-rc3"; extraMeta.branch = "4.16"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "19m1scqfcslawsxci0lypy32af315by3rg10lczv0jh2j4gyggmd"; + sha256 = "1av2fki8dxcxmm3p8w25njij0akv33ylzf10g8gi7f1qshmlysdp"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 200654909c28ec414d8a7bdfea66b63785629cfd..a825314683eaa167ee144c2bfffe0e734789db0b 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "mbpfan-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp"; + sha256 = "1l8fj92jxfp0sldvznsdsm3pn675b35clq3371h6d5wk4jx67fvg"; }; installPhase = '' mkdir -p $out/bin $out/etc diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a65f983bb36d5acb2320dad7ae612b2a08a071e2..ac176c7d3b366b7613f5dedd9d3f93ccb1216bb4 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "153"; + version = "154"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa"; + sha256 = "0vq7r3zknr62rmi9g0zd7mmxframm79vmrdw029pc7z6wrlv40cy"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 9d645fb1d8489627ddbb116af4b37ea80cc07401..7edc7b58c6c36864606ff61ec1ef6de814010a85 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.8"; + name = "nftables-0.8.2"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz"; + sha256 = "1v370wzh3fzby0cdb9iykkhdj1yjcp5qkp33xyn7w7pii2phlpv7"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index aec6e57e9144b5eacde8c54ef2059c5da3524716..99caa813b2ea5094e22a3a7b75b4b15bd785757e 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.10"; + version = "0.01.12"; src = fetchFromGitHub { - sha256 = "04dbcr7bzgp4kvhw1rsn084cz4qbfhf7ifyh3ikgdka9w98057h1"; + sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index dfcd53ec77861f19a52cba722ad534ef8b441b74..c38990bdf8fd32ac55c238126b5ba18d2130f3fd 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }: stdenv.mkDerivation rec { - name = "pam_mount-2.15"; + name = "pam_mount-2.16"; src = fetchurl { - url = "mirror://sourceforge/pam-mount/pam_mount/2.15/${name}.tar.xz"; - sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5"; + url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz"; + sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 57ef22083fe474be7e4ae0049b20b059dcc5dbc6..523f7382a2cff00c8801ea813db41b94e32c226e 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -4,17 +4,16 @@ stdenv.mkDerivation rec { name = "pipework-${version}"; - version = "2015-07-30"; + version = "2017-08-22"; src = fetchFromGitHub { owner = "jpetazzo"; repo = "pipework"; - rev = "5a46ecb5f8f933fd268ef315f58a1eb1c46bd93d"; - sha256 = "02znyg5ir37s8xqjcqqz6xnwyqxapn7c4scyqkcapxr932hf1frh"; + rev = "ae42f1b5fef82b3bc23fe93c95c345e7af65fef3"; + sha256 = "0c342m0bpq6ranr7dsxk9qi5mg3j5aw9wv85ql8gprdb2pz59qy8"; }; buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - cp pipework $out/bin + install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; ''; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index c1049d78f42ae7985a47890858c76b9383a2e908..63d159e1884298f181baf6197edf1f8a6b1682f1 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux +{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 1cdf9044b8fff6d14fee0d48425c8b083840a69a..3698b2b281f955d9288dd90b31ca233ebf22e7a8 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -3,7 +3,7 @@ , fetchurl , pciutils , confuse -, dbus, dbus_glib +, dbus, dbus-glib , alsaLib , audiofile , pkgconfig @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { dbus alsaLib audiofile - dbus_glib + dbus-glib pkgconfig gtk2 gettext diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 12b361e953ea9e6f2af421671af72fbcaaaa819d..000d11af87d1c5beece28f8dda607c985a13aee0 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,10 +1,13 @@ { stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip -, gawk, utillinux, xorg, glib, dbus_glib, zlib +, gawk, utillinux, xorg, glib, dbus-glib, zlib , kernel ? null, libsOnly ? false , undmg, fetchurl +, libelf }: assert (!libsOnly) -> kernel != null; +# Disable for kernels 4.15 and above due to compatibility issues +assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15"; let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version; xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer)); @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; # also maybe python2 to generate xorg.conf - nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ]; + nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; inherit libsOnly; @@ -65,7 +68,7 @@ stdenv.mkDerivation rec { libPath = with xorg; stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); + ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); installPhase = '' diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 77f94e544a074d105618c0e2289b441e375ba9a9..b25ed85ce4b323749e3924675cd9b62e751d13f2 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "16.1"; + version = "17"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1fixw6hpf732vzlpczx0b2y84jrhgfjr3cljqxky7makzgh2s7ng"; + sha256 = "1xql46favv8i4ni4zqkk9ra2kcqq2dyn7jyi940c869lndmjw9ni"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 4bf3ef82978ee190382fdbca1741215ab525e383..b29b1f639cf731ab6c323af4d0e9cf3705e43b64 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtlwifi_new-${version}"; - version = "2017-07-18"; + version = "2018-02-17"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtlwifi_new"; - rev = "a24cb561b4d23187ea103255336daa7ca88791a7"; - sha256 = "1w9rx5wafcp1vc4yh7lj332bv78szl6gmx3ckr8yl6c39alqcv0d"; + rev = "0588ac0cc5f530e7764705416370b70d3c2afedc"; + sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m"; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 8875d7ec4b3eec0b01235ac51fe9d8862e95e4c7..ca15571d1ede7602e958dfea7574097e54db1dfb 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2 -, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison +, docbook_xml_dtd_412, docbook_xsl, gnome-doc-utils, flex, bison , pam ? null, glibcCross ? null , buildPlatform, hostPlatform }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 - docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison + docbook_xml_dtd_412 docbook_xsl gnome-doc-utils flex bison ]; patches = diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index adfcc76c31c15478709b8ccaa42981dc67212cd9..d8e95ff74c4391833a48746551ec6a9f3facaa63 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-11.2.5"; + name = "sysstat-11.7.2"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1r7869pnylamjry5f5l5m1jn68v61js9wdkz8yn37a9a2bcrqp2d"; + sha256 = "169yh9d0ags9xrn5g0k42wd1c895117zbzs257cjxqnb2vk0a38v"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9085b1703c0a9535071e795789d44265e8554d06..fc72728cbabe2455a9de4b9f5a33b3dcaa3295a7 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -8,6 +8,7 @@ , ninja, meson, python3Packages, glibcLocales , patchelf , getent +, hostPlatform }: assert stdenv.isLinux; @@ -15,211 +16,206 @@ assert stdenv.isLinux; let pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); -in - - stdenv.mkDerivation rec { - version = "237"; - name = "systemd-${version}"; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "systemd"; - rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792"; - sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq"; - }; - - outputs = [ "out" "lib" "man" "dev" ]; - - nativeBuildInputs = - [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 - ninja meson - coreutils # meson calls date, stat etc. - pythonLxmlEnv glibcLocales - patchelf getent - ]; - buildInputs = - [ linuxHeaders libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 - libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor - iptables gnu-efi - ]; - - #dontAddPrefix = true; - - mesonFlags = [ - "-Dloadkeys-path=${kbd}/bin/loadkeys" - "-Dsetfont-path=${kbd}/bin/setfont" - "-Dtty-gid=3" # tty in NixOS has gid 3 - # "-Dtests=" # TODO - "-Dlz4=true" - "-Dhostnamed=true" - "-Dnetworkd=true" - "-Dsysusers=false" - "-Dtimedated=true" - "-Dtimesyncd=true" - "-Dfirstboot=false" - "-Dlocaled=true" - "-Dresolve=true" - "-Dsplit-usr=false" - "-Dlibcurl=false" - "-Dlibidn=false" - "-Dlibidn2=true" - "-Dquotacheck=false" - "-Dldconfig=false" - "-Dsmack=true" - "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work - "-Dsystem-gid-max=499" - # "-Dtime-epoch=1" - - (if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true") - "-Defi-libdir=${gnu-efi}/lib" - "-Defi-includedir=${gnu-efi}/include/efi" - "-Defi-ldsdir=${gnu-efi}/lib" - - "-Dsysvinit-path=" - "-Dsysvrcnd-path=" - ]; - - preConfigure = - '' - mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) - mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) - mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) - mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) - mesonFlagsArray+=(-Dsysconfdir=$out/etc) - mesonFlagsArray+=(-Drootprefix=$out) - mesonFlagsArray+=(-Dlibdir=$lib/lib) - mesonFlagsArray+=(-Drootlibdir=$lib/lib) - mesonFlagsArray+=(-Dmandir=$man/lib) - mesonFlagsArray+=(-Dincludedir=$dev/include) - mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) - mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) - - # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? - substituteInPlace meson.build \ - --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ - "includedir = '$dev/include'" \ - --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ - "libdir = '$lib/lib'" - - export LC_ALL="en_US.UTF-8"; - # FIXME: patch this in systemd properly (and send upstream). - # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do - test -e $i - substituteInPlace $i \ - --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ - --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ - --replace /bin/echo ${coreutils}/bin/echo \ - --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ - --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ - --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency - done - - for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" - done - - for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" - done - - substituteInPlace src/journal/catalog.c \ - --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ - ''; - - # These defines are overridden by CFLAGS and would trigger annoying - # warning messages - postConfigure = '' - substituteInPlace config.h \ - --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ - --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ - --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" - ''; - - hardeningDisable = [ "stackprotector" ]; - - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; - - postInstall = - '' - # sysinit.target: Don't depend on - # systemd-tmpfiles-setup.service. This interferes with NixOps's - # send-keys feature (since sshd.service depends indirectly on - # sysinit.target). - mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ - - mkdir -p $out/example/systemd - mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example - mv $out/lib/systemd/{system,user} $out/example/systemd - - rm -rf $out/etc/systemd/system - - # Install SysV compatibility commands. - mkdir -p $out/sbin - ln -s $out/lib/systemd/systemd $out/sbin/telinit - for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i - done - - # Fix reference to /bin/false in the D-Bus services. - for i in $out/share/dbus-1/system-services/*.service; do - substituteInPlace $i --replace /bin/false ${coreutils}/bin/false - done - - rm -rf $out/etc/rpm - - # "kernel-install" shouldn't be used on NixOS. - find $out -name "*kernel-install*" -exec rm {} \; - - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ - ''; # */ - - enableParallelBuilding = true; - - # The rpath to the shared systemd library is not added by meson. The - # functionality was removed by a nixpkgs patch because it would overwrite - # the existing rpath. - postFixup = '' - sharedLib=libsystemd-shared-${version}.so - for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( - patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog - ) || true - done - ''; - - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/systemd; - description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; +in stdenv.mkDerivation rec { + version = "237"; + name = "systemd-${version}"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "systemd"; + rev = "98067cc806ae0d2759cdd2334f230cd8548e5317"; + sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q"; + }; + + outputs = [ "out" "lib" "man" "dev" ]; + + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + ninja meson + coreutils # meson calls date, stat etc. + pythonLxmlEnv glibcLocales + patchelf getent + ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 + libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor + iptables gnu-efi + ]; + + #dontAddPrefix = true; + + mesonFlags = [ + "-Dloadkeys-path=${kbd}/bin/loadkeys" + "-Dsetfont-path=${kbd}/bin/setfont" + "-Dtty-gid=3" # tty in NixOS has gid 3 + # "-Dtests=" # TODO + "-Dlz4=true" + "-Dhostnamed=true" + "-Dnetworkd=true" + "-Dsysusers=false" + "-Dtimedated=true" + "-Dtimesyncd=true" + "-Dfirstboot=false" + "-Dlocaled=true" + "-Dresolve=true" + "-Dsplit-usr=false" + "-Dlibcurl=false" + "-Dlibidn=false" + "-Dlibidn2=true" + "-Dquotacheck=false" + "-Dldconfig=false" + "-Dsmack=true" + "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work + "-Dsystem-gid-max=499" + # "-Dtime-epoch=1" + + (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" + + "-Dsysvinit-path=" + "-Dsysvrcnd-path=" + ]; + + preConfigure = '' + mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") + mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) + mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) + mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) + mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) + mesonFlagsArray+=(-Drootprefix=$out) + mesonFlagsArray+=(-Dlibdir=$lib/lib) + mesonFlagsArray+=(-Drootlibdir=$lib/lib) + mesonFlagsArray+=(-Dmandir=$man/lib) + mesonFlagsArray+=(-Dincludedir=$dev/include) + mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) + mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) + + # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? + substituteInPlace meson.build \ + --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ + "includedir = '$dev/include'" \ + --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ + "libdir = '$lib/lib'" + + export LC_ALL="en_US.UTF-8"; + # FIXME: patch this in systemd properly (and send upstream). + # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do + test -e $i + substituteInPlace $i \ + --replace /usr/bin/getent ${getent}/bin/getent \ + --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ + --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ + --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/cat ${coreutils}/bin/cat \ + --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ + --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ + --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency + done + + for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" + done + + for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" + done + + substituteInPlace src/journal/catalog.c \ + --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ + ''; + + # These defines are overridden by CFLAGS and would trigger annoying + # warning messages + postConfigure = '' + substituteInPlace config.h \ + --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ + --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ + --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" + ''; + + hardeningDisable = [ "stackprotector" ]; + + NIX_CFLAGS_COMPILE = + [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; + + postInstall = '' + # sysinit.target: Don't depend on + # systemd-tmpfiles-setup.service. This interferes with NixOps's + # send-keys feature (since sshd.service depends indirectly on + # sysinit.target). + mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ + + mkdir -p $out/example/systemd + mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example + mv $out/lib/systemd/{system,user} $out/example/systemd + + rm -rf $out/etc/systemd/system + + # Install SysV compatibility commands. + mkdir -p $out/sbin + ln -s $out/lib/systemd/systemd $out/sbin/telinit + for i in init halt poweroff runlevel reboot shutdown; do + ln -s $out/bin/systemctl $out/sbin/$i + done + + # Fix reference to /bin/false in the D-Bus services. + for i in $out/share/dbus-1/system-services/*.service; do + substituteInPlace $i --replace /bin/false ${coreutils}/bin/false + done + + rm -rf $out/etc/rpm + + # "kernel-install" shouldn't be used on NixOS. + find $out -name "*kernel-install*" -exec rm {} \; + + # Keep only libudev and libsystemd in the lib output. + mkdir -p $out/lib + mv $lib/lib/security $lib/lib/libnss* $out/lib/ + ''; # */ + + enableParallelBuilding = true; + + # The rpath to the shared systemd library is not added by meson. The + # functionality was removed by a nixpkgs patch because it would overwrite + # the existing rpath. + postFixup = '' + sharedLib=libsystemd-shared-${version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; + + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + passthru.interfaceVersion = 2; + + meta = { + homepage = http://www.freedesktop.org/wiki/Software/systemd; + description = "A system and service manager for Linux"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; } diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 9c8bf559751495bed5c2b673e1ec807ec3781896..25eeb889cc28c097f514c2c1fa70ef2a453962e5 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tp_smapi-${version}-${kernel.version}"; - version = "unstable-2017-12-04"; + version = "0.43"; src = fetchFromGitHub { owner = "evgeni"; repo = "tp_smapi"; - rev = "76c5120f7be4880cf2c6801f872327e4e70c449f"; - sha256 = "0g8l7rmylspl17qnqpa2h4yj7h3zvy6xlmj5nlnixds9avnbz2vy"; + rev = "tp-smapi/${version}"; + sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"; name = "tp-smapi-${version}"; }; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 48f6ce4be7656e3d7d98109f15f352f9812d4d6c..b69bd576ed23c52819b90e4981d335290c68261b 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8"; + version = "1.8-git-2017-02-13"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "v${version}"; - sha256 = "1ss6ir3ki2hnj4c8068v5bz8bpa43xqg9zlmzhgagi94g9l05qlf"; + rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9"; + sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 8b3ebd46c325aaeade550fa11dc72eb92f55414f..56e237a9fad02cb6c5c222d08782038d1f875120 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus_glib, glib, confuse }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, confuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf udisks dbus_glib glib confuse ]; + nativeBuildInputs = [ pkgconfig automake autoconf ]; + buildInputs = [ udisks1 dbus-glib glib confuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 98cb616e2d5c400f3199da2e002db42b405f038c..aeb9deac89d20a61bcc26f62070996cafcc7d16c 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib +{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, utillinux, libgudev }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ sg3_utils udev glib dbus dbus_glib polkit parted libgudev + [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index a265395f96e56b82aa15f6cddf5ed1c7e8b81f2c..725b1cd2564348f32c01da72770624182e26559c 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gnused , expat, acl, systemd, glib, libatasmart, polkit , libxslt, docbook_xsl, utillinux, mdadm, libgudev +, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; }; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "dev" ]; patches = [ ./force-path.patch ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { --replace " sed " " ${gnused}/bin/sed " ''; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; buildInputs = [ libxslt docbook_xsl libgudev expat acl systemd glib libatasmart polkit ]; @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { "--with-udevdir=$(out)/lib/udev" ]; + makeFlags = [ + "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0" + "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + ]; + meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c46ed2d0c01523dd6bd9e654eb54138c3d4541a7..713ef974f9fba109d1197906cf3fe84e95b6bba8 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 , useSystemd ? true, systemd, gobjectIntrospection }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ dbus_glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ] + [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch deleted file mode 100644 index eb4d5df698accd1492a19b1ee072525301c5b831..0000000000000000000000000000000000000000 --- a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Library/ConfigFilePrivate.cpp b/src/Library/ConfigFilePrivate.cpp -index 8aefa65..40914f7 100644 ---- a/src/Library/ConfigFilePrivate.cpp -+++ b/src/Library/ConfigFilePrivate.cpp -@@ -51,7 +51,7 @@ namespace usbguard - - void ConfigFilePrivate::open(const std::string& path) - { -- _stream.open(path, std::ios::in|std::ios::out); -+ _stream.open(path, std::ios::in); - if (!_stream.is_open()) { - throw std::runtime_error("Can't open " + path); - } diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index b88d96e02a44dceeef5a5aea410fe77889ba49e2..2ca825a27d71e95a2bb681448ce208e75af42080 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, lib, - libxslt, pandoc, pkgconfig, - dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + libxslt, pandoc, asciidoctor, pkgconfig, + dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + audit, libgcrypt ? null, libsodium ? null }: @@ -11,34 +12,31 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.7.2"; name = "usbguard-${version}"; - repo = "https://github.com/dkopecek/usbguard"; + repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709"; + sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6"; }; - patches = [ - ./daemon_read_only_config.patch - ./documentation.patch - ]; - nativeBuildInputs = [ libxslt + asciidoctor pandoc # for rendering documentation pkgconfig ]; buildInputs = [ - dbus_glib + dbus-glib libcap_ng libqb libseccomp polkit protobuf + audit qtbase qtsvg @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "The USBGuard software framework helps to protect your computer against BadUSB."; - homepage = "https://dkopecek.github.io/usbguard/"; + homepage = "https://usbguard.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.tnias ]; }; diff --git a/pkgs/os-specific/linux/usbguard/documentation.patch b/pkgs/os-specific/linux/usbguard/documentation.patch deleted file mode 100644 index 89de627131f5c90f59b8406e9c575e38f7c81790..0000000000000000000000000000000000000000 --- a/pkgs/os-specific/linux/usbguard/documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/doc/usbguard-daemon.conf.5.md b/doc/usbguard-daemon.conf.5.md -index ea86ad1..63aec70 100644 ---- a/doc/usbguard-daemon.conf.5.md -+++ b/doc/usbguard-daemon.conf.5.md -@@ -30,21 +30,21 @@ The **usbguard-daemon.conf** file is loaded by the USBGuard daemon after it pars - **RestoreControllerDeviceState**=<*boolean*> - : The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before modification on shutdown. - -+**DeviceManagerBackend**=<*backend*> -+: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. -+ - **IPCAllowedUsers**=<*username*> [<*username*> ...] - : A space delimited list of usernames that the daemon will accept IPC connections from. - - **IPCAllowedGroups**=<*groupname*> [<*groupname*> ...] - : A space delimited list of groupnames that the daemon will accept IPC connections from. - --**IPCAccessControlFiles**=<*path*> --: Path to a directory holding the IPC access control files. -- --**DeviceManagerBackend**=<*backend*> --: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. -- - **IPCAccessControlFiles**=<*path*> - : The files at this location will be interpreted by the daemon as IPC access control definition files. See the **IPC ACCESS CONTROL** section for more details. - -+**DeviceRulesWithPort**=<*boolean*> -+: Generate device specific rules including the "via-port" attribute. -+ - **AuditFilePath**=<*filepath*> - : USBGuard audit events log file path. - diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index c24780095dbe9ce635eb148f625098f45dcccc15..ad8aeadeff06597590867b9399e9372588a0d7b5 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.10"; + version = "0.10.11"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w"; + sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6"; }; buildFlagsArray = '' diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 59d627901131832a3abdb4292e8eaec455ebe017..fe028cf812e78c99d22a5080e620f9d480327c19 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.02.9"; + version = "17.11.3"; src = fetchurl { url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "0w8v7fzbn7b3f9kg6lcj2jpkzln3vcv9s2cz37xbdifz0m2p1x7s"; + sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index dc2f0f6fd7091b1d7f6fc55a8c99abdb8163da99..145052ff8c3ad0e77d53df0042f0e73564d65a31 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "corosync-2.4.2"; + name = "corosync-2.4.3"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; - sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj"; + sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8df584435a2f6f932a57c2b7e2e61517e1d24975..f83ef4cef38816d1897c2a556bf74af9cacc9502 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -4,13 +4,13 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.0.6"; + version = "4.5.0.7"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "084c3zgwmmz4s6211i5jbkzsn13703lsg7vhc2cpacazq4sgsrhb"; + sha256 = "1781fx8lqgc54j973xzgq9d7k3g2j03va82jb4217gd3a93pa65l"; }; buildInputs = [ openssl libevent ]; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 044d4fa50ab2cb943b5e26cbb4a461ce77983fb2..ee139ea2652c637df94272c0999e2ff0277611b1 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { name = "dante-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://www.inet.no/dante/files/${name}.tar.gz"; - sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn"; + sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; configureFlags = [ diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index c530929f79e454bf2807e0c76e9e08fd8a4f90a1..8958daa1a70a3b16714e6c550b5e3291e0afb72f 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.4"; + name = "dico-2.5"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g"; + sha256 = "0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index dcda4e8c0bb44ce9612717e9b562ffe37e3acd44..a233b6ba4cf8e3ced29a7970c19dee1547414206 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "diod-${version}"; - version = "1.0.23"; + version = "1.0.24"; src = fetchurl { url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz"; - sha256 = "002vxc9fwdwshda4jydxagr63xd6nnhbc6fh73974gi2pvp6gid3"; + sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl"; }; buildInputs = [ munge lua libcap perl ncurses ]; diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch index b7e7bfc73bf9a81f56c1fbb408fa825328b559b9..8276c28c3f4b3e6f96cf4dfb1e6b15ff7475a73d 100644 --- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch +++ b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 6779cc3..4275520 100755 +index b9ad66b..a2a7382 100755 --- a/configure +++ b/configure -@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; } +@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; } *-hp-hpux*) DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ea4d4f387d8f5bdaba24c0c46fef497e6f5954d7..c0176db157699ee7edc698bd9f2e489974470e77 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.2-P1"; in +let version = "9.12.0"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"; + sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 91cae62b171536e4d0db4271683a06a7c91d61c3..5a934056d13d94c132e74981c3c40777dc127281 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,40 +1,41 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index f354cfb..2aa0cc5 100644 +index 388dc97..3c6135c 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h -@@ -71,7 +71,9 @@ EXTERN const char * ns_g_version INIT(VERSION); - EXTERN const char * ns_g_product INIT(PRODUCT); - EXTERN const char * ns_g_description INIT(DESCRIPTION); - EXTERN const char * ns_g_srcid INIT(SRCID); +@@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION); + EXTERN const char * named_g_product INIT(PRODUCT); + EXTERN const char * named_g_description INIT(DESCRIPTION); + EXTERN const char * named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char * ns_g_configargs INIT(CONFIGARGS); + EXTERN const char * named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char * ns_g_builder INIT(BUILDER); - EXTERN in_port_t ns_g_port INIT(0); - EXTERN isc_dscp_t ns_g_dscp INIT(-1); + EXTERN const char * named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/bin/named/main.c b/bin/named/main.c -index 556db54..edab41d 100644 +index 4fb0566..60d56cd 100644 --- a/bin/named/main.c +++ b/bin/named/main.c -@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) { - (*ns_g_description != '\0') ? " " : "", - ns_g_description, ns_g_srcid); - printf("running on %s\n", ns_os_uname()); -+#if 0 +@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) { + (*named_g_description != '\0') ? " " : "", + named_g_description, named_g_srcid); + printf("running on %s\n", named_os_uname()); ++ #if 0 printf("built by %s with %s\n", - ns_g_builder, ns_g_configargs); -+#endif + named_g_builder, named_g_configargs); ++ #endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else -@@ -998,8 +1000,10 @@ setup(void) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "running on %s", ns_os_uname()); +@@ -1075,9 +1077,11 @@ setup(void) { + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "running on %s", named_os_uname()); +#if 0 - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "built with %s", ns_g_configargs); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "built with %s", named_g_configargs); +#endif - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index d14233016d86aa1164007361c177bb9573f2416e..b4bd6175f3e794e8a00d5987d0fd3b6dddce2b55 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.19"; + name = "nsd-4.1.20"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1i82kvgxv4vz79dqd0ckz6syr1fdf6q60r4b926qh5klnnwjqy5h"; + sha256 = "04zph9zli3a0zx1sfphwbxx6f8whdxcjai6w0k7a565vgcfzd5wa"; }; prePatch = '' diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 05d53d4446275759221fc842fd9443ddc6368c95..12c475bfc28056d913b47506cec61784655ae35d 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.60.0"; + version = "3.2.70.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0yrbwq5dzzq5047vdpar4vkwzcgd9dj2v9basaw413hzncf2q8gj"; + sha256 = "051mbzh1igcbda43n14aijbvhhh98rqw8i13f06xqsm67afrjjcv"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 15ea30aa16cb62333217b6508b52ceca31cc05e9..29cb8c2223c06142339784924d29a2dd91d1fac0 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.1.6"; # After updating check that nixos tests pass + version = "3.3.1"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "1qgi6zxnijzr644w2da2gbn3gw2qwk6a3z3qmdln0r2rjnm70sx0"; + sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl"; }; subPackages = [ diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index 3f600b5a12212272b9c9c2ddfae1c411c4011cb9..98daab253b3c97af3d0afc7b971007a6b5408316 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fleet-${version}"; - version = "0.11.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fleet"; rev = "v${version}"; - sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig"; + sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 4e39b78b89ece5861e8b95a079c5cea639d8df0e..3728ee6c2a8ff4ab121cb75351715308150d5400 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "pure-ftpd-1.0.46"; + name = "pure-ftpd-1.0.47"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; - sha256 = "0p0arcaz63fbb03fkavbc8z6m1f90p5vbnxb8mqlvpma6mrq0286"; + sha256 = "1b97ixva8m10vln8xrfwwwzi344bkgxqji26d0nrm1yzylbc6h27"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 7670c89f0c6a9b498f0def8c2fb2eaf22711858b..b01e94187898b920e61f7aa3ebc502926c8f13b2 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus_glib +{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext + python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext libxslt libusb1 ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 43b2418db771224451f5c5e71e287256f51eec31..2b031f33555da6461818260d4f7965a305a1273b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4,435 +4,435 @@ { version = "0.63.3"; components = { - "nuimo_controller" = ps: with ps; [ ]; - "bbb_gpio" = ps: with ps; [ ]; - "doorbird" = ps: with ps; [ ]; - "isy994" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ pyjwt ]; - "sensor.mvglive" = ps: with ps; [ ]; - "arduino" = ps: with ps; [ ]; - "xiaomi_aqara" = ps: with ps; [ ]; - "rpi_gpio" = ps: with ps; [ ]; - "remember_the_milk" = ps: with ps; [ httplib2 ]; - "media_player.sonos" = ps: with ps; [ ]; - "sensor.travisci" = ps: with ps; [ ]; - "notify.twitter" = ps: with ps; [ ]; - "notify.yessssms" = ps: with ps; [ ]; "abode" = ps: with ps; [ ]; - "device_tracker.automatic" = ps: with ps; [ ]; - "sensor.dnsip" = ps: with ps; [ aiodns ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors ]; - "http" = ps: with ps; [ aiohttp-cors ]; - "sensor.imap" = ps: with ps; [ aioimaplib ]; - "light.lifx" = ps: with ps; [ ]; - "scene.hunterdouglas_powerview" = ps: with ps; [ ]; + "ads" = ps: with ps; [ ]; + "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; + "alarm_control_panel.concord232" = ps: with ps; [ ]; + "alarm_control_panel.egardia" = ps: with ps; [ ]; + "alarm_control_panel.ialarm" = ps: with ps; [ ]; + "alarm_control_panel.nx584" = ps: with ps; [ ]; + "alarm_control_panel.simplisafe" = ps: with ps; [ ]; + "alarm_control_panel.totalconnect" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; - "sensor.alpha_vantage" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ]; - "media_player.anthemav" = ps: with ps; [ ]; + "android_ip_webcam" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; - "notify.apns" = ps: with ps; [ ]; + "apple_tv" = ps: with ps; [ ]; + "arduino" = ps: with ps; [ ]; + "arlo" = ps: with ps; [ ]; "asterisk_mbox" = ps: with ps; [ ]; - "light.avion" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; - "tts.baidu" = ps: with ps; [ ]; - "sensor.modem_callerid" = ps: with ps; [ ]; - "sensor.linux_battery" = ps: with ps; [ batinfo ]; - "sensor.eddystone_temperature" = ps: with ps; [ ]; - "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; - "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; - "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; - "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; - "zha" = ps: with ps; [ ]; + "bbb_gpio" = ps: with ps; [ ]; + "binary_sensor.concord232" = ps: with ps; [ ]; + "binary_sensor.flic" = ps: with ps; [ ]; + "binary_sensor.hikvision" = ps: with ps; [ ]; + "binary_sensor.iss" = ps: with ps; [ ]; + "binary_sensor.nx584" = ps: with ps; [ ]; + "binary_sensor.tapsaff" = ps: with ps; [ ]; + "binary_sensor.trend" = ps: with ps; [ numpy ]; + "binary_sensor.workday" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; - "light.blinksticklight" = ps: with ps; [ BlinkStick ]; - "light.blinkt" = ps: with ps; [ ]; - "sensor.bitcoin" = ps: with ps; [ ]; - "light.decora" = ps: with ps; [ ]; - "sensor.bme680" = ps: with ps; [ ]; - "notify.aws_lambda" = ps: with ps; [ boto3 ]; - "notify.aws_sns" = ps: with ps; [ boto3 ]; - "notify.aws_sqs" = ps: with ps; [ boto3 ]; - "tts.amazon_polly" = ps: with ps; [ boto3 ]; - "sensor.broadlink" = ps: with ps; [ ]; - "switch.broadlink" = ps: with ps; [ ]; - "sensor.buienradar" = ps: with ps; [ ]; - "weather.buienradar" = ps: with ps; [ ]; "calendar.caldav" = ps: with ps; [ ]; - "notify.ciscospark" = ps: with ps; [ ]; + "calendar.todoist" = ps: with ps; [ todoist ]; + "camera.foscam" = ps: with ps; [ ]; + "camera.onvif" = ps: with ps; [ ]; + "camera.synology" = ps: with ps; [ ]; + "camera.uvc" = ps: with ps; [ ]; + "camera.xeoma" = ps: with ps; [ ]; + "canary" = ps: with ps; [ ]; + "climate.daikin" = ps: with ps; [ ]; + "climate.econet" = ps: with ps; [ ]; + "climate.ephember" = ps: with ps; [ ]; + "climate.eq3btsmart" = ps: with ps; [ ]; + "climate.flexit" = ps: with ps; [ ]; + "climate.heatmiser" = ps: with ps; [ ]; + "climate.honeywell" = ps: with ps; [ ]; + "climate.oem" = ps: with ps; [ ]; + "climate.proliphix" = ps: with ps; [ ]; + "climate.radiotherm" = ps: with ps; [ ]; + "climate.sensibo" = ps: with ps; [ ]; + "climate.touchline" = ps: with ps; [ ]; + "climate.venstar" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ ]; "coinbase" = ps: with ps; [ ]; - "sensor.coinmarketcap" = ps: with ps; [ ]; - "alarm_control_panel.concord232" = ps: with ps; [ ]; - "binary_sensor.concord232" = ps: with ps; [ ]; - "sensor.crimereports" = ps: with ps; [ ]; + "comfoconnect" = ps: with ps; [ ]; + "conversation" = ps: with ps; [ ]; + "cover.myq" = ps: with ps; [ ]; + "daikin" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; - "sensor.metoffice" = ps: with ps; [ ]; - "weather.metoffice" = ps: with ps; [ ]; - "light.decora_wifi" = ps: with ps; [ ]; + "deconz" = ps: with ps; [ ]; + "device_tracker.aruba" = ps: with ps; [ pexpect ]; + "device_tracker.asuswrt" = ps: with ps; [ pexpect ]; + "device_tracker.automatic" = ps: with ps; [ ]; + "device_tracker.bbox" = ps: with ps; [ ]; + "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; + "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; + "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; + "device_tracker.fritz" = ps: with ps; [ ]; + "device_tracker.icloud" = ps: with ps; [ ]; + "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; + "device_tracker.mikrotik" = ps: with ps; [ ]; + "device_tracker.netgear" = ps: with ps; [ ]; + "device_tracker.nmap_tracker" = ps: with ps; [ ]; + "device_tracker.owntracks" = ps: with ps; [ libnacl ]; + "device_tracker.owntracks_http" = ps: with ps; [ libnacl ]; + "device_tracker.snmp" = ps: with ps; [ pysnmp ]; + "device_tracker.tile" = ps: with ps; [ ]; + "device_tracker.trackr" = ps: with ps; [ ]; + "device_tracker.unifi" = ps: with ps; [ pyunifi ]; + "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; - "sensor.deluge" = ps: with ps; [ ]; - "switch.deluge" = ps: with ps; [ ]; - "media_player.denonavr" = ps: with ps; [ ]; - "media_player.directv" = ps: with ps; [ ]; - "sensor.discogs" = ps: with ps; [ discogs_client ]; - "notify.discord" = ps: with ps; [ ]; - "updater" = ps: with ps; [ distro ]; - "switch.digitalloggers" = ps: with ps; [ ]; - "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; - "sensor.dovado" = ps: with ps; [ ]; - "sensor.dsmr" = ps: with ps; [ ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; + "discovery" = ps: with ps; [ netdisco ]; + "dominos" = ps: with ps; [ ]; + "doorbird" = ps: with ps; [ ]; "dweet" = ps: with ps; [ ]; - "sensor.dweet" = ps: with ps; [ ]; - "sensor.eliqonline" = ps: with ps; [ ]; + "dyson" = ps: with ps; [ ]; + "ecobee" = ps: with ps; [ ]; + "eight_sleep" = ps: with ps; [ ]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "enocean" = ps: with ps; [ ]; - "sensor.envirophat" = ps: with ps; [ ]; - "sensor.season" = ps: with ps; [ ephem ]; - "keyboard_remote" = ps: with ps; [ ]; - "climate.honeywell" = ps: with ps; [ ]; - "image_processing.dlib_face_detect" = ps: with ps; [ ]; - "image_processing.dlib_face_identify" = ps: with ps; [ ]; - "sensor.fastdotcom" = ps: with ps; [ ]; - "sensor.fedex" = ps: with ps; [ ]; + "envisalink" = ps: with ps; [ ]; + "fan.xiaomi_miio" = ps: with ps; [ ]; "feedreader" = ps: with ps; [ feedparser ]; - "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; - "sensor.fitbit" = ps: with ps; [ ]; - "sensor.fixer" = ps: with ps; [ ]; - "light.flux_led" = ps: with ps; [ ]; - "notify.free_mobile" = ps: with ps; [ ]; - "device_tracker.fritz" = ps: with ps; [ ]; - "sensor.fritzbox_callmonitor" = ps: with ps; [ ]; - "sensor.fritzbox_netmonitor" = ps: with ps; [ ]; - "switch.fritzdect" = ps: with ps; [ ]; - "media_player.frontier_silicon" = ps: with ps; [ ]; - "conversation" = ps: with ps; [ ]; - "tts.google" = ps: with ps; [ ]; - "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; - "sensor.gearbest" = ps: with ps; [ ]; - "sensor.gitter" = ps: with ps; [ ]; - "notify.gntp" = ps: with ps; [ ]; - "google" = ps: with ps; [ google_api_python_client oauth2client ]; - "sensor.google_travel_time" = ps: with ps; [ ]; - "sensor.gpsd" = ps: with ps; [ ]; - "light.greenwave" = ps: with ps; [ ]; - "media_player.gstreamer" = ps: with ps; [ ]; "ffmpeg" = ps: with ps; [ ]; - "media_player.philips_js" = ps: with ps; [ ]; - "mqtt.server" = ps: with ps; [ hbmqtt ]; - "climate.heatmiser" = ps: with ps; [ ]; - "switch.hikvisioncam" = ps: with ps; [ ]; - "notify.hipchat" = ps: with ps; [ ]; - "binary_sensor.workday" = ps: with ps; [ ]; "frontend" = ps: with ps; [ user-agents ]; - "camera.onvif" = ps: with ps; [ ]; - "sensor.dht" = ps: with ps; [ ]; - "media_player.braviatv" = ps: with ps; [ ]; - "media_player.spotify" = ps: with ps; [ ]; - "netatmo" = ps: with ps; [ ]; - "neato" = ps: with ps; [ ]; - "sensor.sabnzbd" = ps: with ps; [ ]; - "switch.anel_pwrctrl" = ps: with ps; [ ]; - "switch.edimax" = ps: with ps; [ ]; - "sensor.gtfs" = ps: with ps; [ ]; - "binary_sensor.flic" = ps: with ps; [ ]; - "media_player.lg_netcast" = ps: with ps; [ ]; - "sensor.bh1750" = ps: with ps; [ ]; - "sensor.bme280" = ps: with ps; [ ]; - "sensor.htu21d" = ps: with ps; [ ]; - "light.iglo" = ps: with ps; [ ]; + "gc100" = ps: with ps; [ ]; + "goalfeed" = ps: with ps; [ ]; + "google" = ps: with ps; [ google_api_python_client oauth2client ]; + "hdmi_cec" = ps: with ps; [ ]; + "hive" = ps: with ps; [ ]; + "homematic" = ps: with ps; [ pyhomematic ]; + "http" = ps: with ps; [ aiohttp-cors ]; + "hue" = ps: with ps; [ ]; + "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; + "image_processing.dlib_face_detect" = ps: with ps; [ ]; + "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "image_processing.opencv" = ps: with ps; [ numpy ]; "influxdb" = ps: with ps; [ influxdb ]; - "sensor.influxdb" = ps: with ps; [ influxdb ]; "insteon_local" = ps: with ps; [ ]; "insteon_plm" = ps: with ps; [ ]; - "verisure" = ps: with ps; [ ]; - "media_player.kodi" = ps: with ps; [ ]; - "notify.kodi" = ps: with ps; [ ]; - "device_tracker.owntracks" = ps: with ps; [ libnacl ]; - "device_tracker.owntracks_http" = ps: with ps; [ libnacl ]; - "dyson" = ps: with ps; [ ]; - "camera.foscam" = ps: with ps; [ ]; - "device_tracker.mikrotik" = ps: with ps; [ ]; - "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; + "iota" = ps: with ps; [ ]; + "isy994" = ps: with ps; [ ]; + "joaoapps_join" = ps: with ps; [ ]; + "juicenet" = ps: with ps; [ ]; + "keyboard" = ps: with ps; [ ]; + "keyboard_remote" = ps: with ps; [ ]; + "kira" = ps: with ps; [ ]; + "knx" = ps: with ps; [ ]; + "lametric" = ps: with ps; [ ]; + "light.avion" = ps: with ps; [ ]; + "light.blinksticklight" = ps: with ps; [ BlinkStick ]; + "light.blinkt" = ps: with ps; [ ]; + "light.decora" = ps: with ps; [ ]; + "light.decora_wifi" = ps: with ps; [ ]; + "light.flux_led" = ps: with ps; [ ]; + "light.greenwave" = ps: with ps; [ ]; + "light.iglo" = ps: with ps; [ ]; + "light.lifx" = ps: with ps; [ ]; "light.lifx_legacy" = ps: with ps; [ ]; - "light.osramlightify" = ps: with ps; [ ]; "light.limitlessled" = ps: with ps; [ ]; + "light.mystrom" = ps: with ps; [ ]; + "light.osramlightify" = ps: with ps; [ ]; + "light.piglow" = ps: with ps; [ ]; + "light.rpi_gpio_pwm" = ps: with ps; [ ]; + "light.sensehat" = ps: with ps; [ ]; + "light.tikteck" = ps: with ps; [ ]; + "light.tplink" = ps: with ps; [ ]; + "light.xiaomi_miio" = ps: with ps; [ ]; + "light.yeelight" = ps: with ps; [ ]; + "light.yeelightsunflower" = ps: with ps; [ ]; + "light.zengge" = ps: with ps; [ ]; "linode" = ps: with ps; [ linode-api ]; - "media_player.liveboxplaytv" = ps: with ps; [ ]; - "lametric" = ps: with ps; [ ]; - "notify.lametric" = ps: with ps; [ ]; - "sensor.luftdaten" = ps: with ps; [ luftdaten ]; - "sensor.lyft" = ps: with ps; [ ]; - "notify.matrix" = ps: with ps; [ matrix-client ]; + "lirc" = ps: with ps; [ ]; + "litejet" = ps: with ps; [ ]; + "lock.nello" = ps: with ps; [ ]; + "lock.nuki" = ps: with ps; [ ]; + "lock.sesame" = ps: with ps; [ ]; + "lutron" = ps: with ps; [ ]; + "lutron_caseta" = ps: with ps; [ ]; "maxcube" = ps: with ps; [ ]; - "mercedesme" = ps: with ps; [ ]; - "notify.message_bird" = ps: with ps; [ ]; - "sensor.mfi" = ps: with ps; [ ]; - "switch.mfi" = ps: with ps; [ ]; - "sensor.miflora" = ps: with ps; [ ]; - "upnp" = ps: with ps; [ ]; - "sensor.mopar" = ps: with ps; [ ]; - "tts" = ps: with ps; [ mutagen ]; - "mychevy" = ps: with ps; [ ]; - "mycroft" = ps: with ps; [ ]; - "usps" = ps: with ps; [ ]; + "media_extractor" = ps: with ps; [ ]; + "media_player.anthemav" = ps: with ps; [ ]; + "media_player.aquostv" = ps: with ps; [ ]; + "media_player.bluesound" = ps: with ps; [ xmltodict ]; + "media_player.braviatv" = ps: with ps; [ ]; + "media_player.cast" = ps: with ps; [ PyChromecast ]; + "media_player.clementine" = ps: with ps; [ ]; + "media_player.cmus" = ps: with ps; [ ]; + "media_player.denonavr" = ps: with ps; [ ]; + "media_player.directv" = ps: with ps; [ ]; + "media_player.dunehd" = ps: with ps; [ ]; + "media_player.emby" = ps: with ps; [ ]; + "media_player.frontier_silicon" = ps: with ps; [ ]; + "media_player.gpmdp" = ps: with ps; [ ]; + "media_player.gstreamer" = ps: with ps; [ ]; + "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "media_player.lg_netcast" = ps: with ps; [ ]; + "media_player.liveboxplaytv" = ps: with ps; [ ]; + "media_player.mediaroom" = ps: with ps; [ ]; + "media_player.monoprice" = ps: with ps; [ ]; + "media_player.mpd" = ps: with ps; [ mpd2 ]; "media_player.nad" = ps: with ps; [ ]; "media_player.nadtcp" = ps: with ps; [ ]; - "discovery" = ps: with ps; [ netdisco ]; - "sensor.neurio_energy" = ps: with ps; [ ]; - "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; - "nuheat" = ps: with ps; [ ]; - "binary_sensor.trend" = ps: with ps; [ numpy ]; - "image_processing.opencv" = ps: with ps; [ numpy ]; - "climate.oem" = ps: with ps; [ ]; - "media_player.onkyo" = ps: with ps; [ ]; - "sensor.openevse" = ps: with ps; [ ]; + "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; "media_player.openhome" = ps: with ps; [ ]; - "switch.orvibo" = ps: with ps; [ ]; - "mqtt" = ps: with ps; [ paho-mqtt ]; - "shiftr" = ps: with ps; [ paho-mqtt ]; - "media_player.panasonic_viera" = ps: with ps; [ ]; - "media_player.dunehd" = ps: with ps; [ ]; - "device_tracker.aruba" = ps: with ps; [ pexpect ]; - "device_tracker.asuswrt" = ps: with ps; [ pexpect ]; - "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; - "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; + "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ]; "media_player.pandora" = ps: with ps; [ pexpect ]; - "hue" = ps: with ps; [ ]; - "rpi_pfio" = ps: with ps; [ ]; - "light.piglow" = ps: with ps; [ ]; - "pilight" = ps: with ps; [ ]; - "dominos" = ps: with ps; [ ]; + "media_player.philips_js" = ps: with ps; [ ]; "media_player.plex" = ps: with ps; [ ]; - "sensor.plex" = ps: with ps; [ ]; - "sensor.mhz19" = ps: with ps; [ ]; - "sensor.serial_pm" = ps: with ps; [ ]; - "sensor.pocketcasts" = ps: with ps; [ ]; - "climate.proliphix" = ps: with ps; [ ]; - "prometheus" = ps: with ps; [ ]; - "sensor.systemmonitor" = ps: with ps; [ psutil ]; - "wink" = ps: with ps; [ ]; + "media_player.roku" = ps: with ps; [ ]; + "media_player.russound_rio" = ps: with ps; [ ]; + "media_player.russound_rnet" = ps: with ps; [ ]; + "media_player.samsungtv" = ps: with ps; [ wakeonlan ]; + "media_player.snapcast" = ps: with ps; [ ]; + "media_player.sonos" = ps: with ps; [ ]; + "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; + "media_player.spotify" = ps: with ps; [ ]; + "media_player.vizio" = ps: with ps; [ ]; + "media_player.vlc" = ps: with ps; [ ]; + "media_player.webostv" = ps: with ps; [ websockets ]; + "media_player.yamaha" = ps: with ps; [ ]; + "media_player.yamaha_musiccast" = ps: with ps; [ ]; + "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + "melissa" = ps: with ps; [ ]; + "mercedesme" = ps: with ps; [ ]; + "mochad" = ps: with ps; [ ]; + "modbus" = ps: with ps; [ ]; + "mqtt" = ps: with ps; [ paho-mqtt ]; + "mqtt.server" = ps: with ps; [ hbmqtt ]; + "mychevy" = ps: with ps; [ ]; + "mycroft" = ps: with ps; [ ]; + "mysensors" = ps: with ps; [ ]; + "neato" = ps: with ps; [ ]; + "nest" = ps: with ps; [ ]; + "netatmo" = ps: with ps; [ ]; + "notify.apns" = ps: with ps; [ ]; + "notify.aws_lambda" = ps: with ps; [ boto3 ]; + "notify.aws_sns" = ps: with ps; [ boto3 ]; + "notify.aws_sqs" = ps: with ps; [ boto3 ]; + "notify.ciscospark" = ps: with ps; [ ]; + "notify.discord" = ps: with ps; [ ]; + "notify.free_mobile" = ps: with ps; [ ]; + "notify.gntp" = ps: with ps; [ ]; + "notify.hipchat" = ps: with ps; [ ]; + "notify.html5" = ps: with ps; [ pyjwt ]; + "notify.joaoapps_join" = ps: with ps; [ ]; + "notify.kodi" = ps: with ps; [ jsonrpc-async ]; + "notify.lametric" = ps: with ps; [ ]; + "notify.mailgun" = ps: with ps; [ ]; + "notify.matrix" = ps: with ps; [ matrix-client ]; + "notify.message_bird" = ps: with ps; [ ]; "notify.pushbullet" = ps: with ps; [ pushbullet ]; - "sensor.pushbullet" = ps: with ps; [ pushbullet ]; "notify.pushetta" = ps: with ps; [ ]; - "light.rpi_gpio_pwm" = ps: with ps; [ ]; - "canary" = ps: with ps; [ ]; - "sensor.cpuspeed" = ps: with ps; [ ]; - "melissa" = ps: with ps; [ ]; - "camera.synology" = ps: with ps; [ ]; - "hdmi_cec" = ps: with ps; [ ]; - "light.tplink" = ps: with ps; [ ]; - "switch.tplink" = ps: with ps; [ ]; + "notify.pushover" = ps: with ps; [ ]; + "notify.rocketchat" = ps: with ps; [ ]; + "notify.sendgrid" = ps: with ps; [ ]; + "notify.simplepush" = ps: with ps; [ ]; + "notify.slack" = ps: with ps; [ ]; + "notify.twitter" = ps: with ps; [ ]; + "notify.webostv" = ps: with ps; [ ]; + "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "notify.yessssms" = ps: with ps; [ ]; + "nuheat" = ps: with ps; [ ]; + "nuimo_controller" = ps: with ps; [ ]; + "pilight" = ps: with ps; [ ]; + "prometheus" = ps: with ps; [ ]; + "python_script" = ps: with ps; [ ]; + "qwikswitch" = ps: with ps; [ ]; + "rainbird" = ps: with ps; [ ]; + "raincloud" = ps: with ps; [ ]; + "raspihats" = ps: with ps; [ ]; + "recorder" = ps: with ps; [ sqlalchemy ]; + "remember_the_milk" = ps: with ps; [ httplib2 ]; + "remote.harmony" = ps: with ps; [ ]; + "remote.itach" = ps: with ps; [ ]; + "remote.xiaomi_miio" = ps: with ps; [ ]; + "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; - "sensor.tibber" = ps: with ps; [ ]; - "switch.dlink" = ps: with ps; [ ]; - "ads" = ps: with ps; [ ]; + "ring" = ps: with ps; [ ]; + "rpi_gpio" = ps: with ps; [ ]; + "rpi_pfio" = ps: with ps; [ ]; + "satel_integra" = ps: with ps; [ ]; + "scene.hunterdouglas_powerview" = ps: with ps; [ ]; + "scsgate" = ps: with ps; [ ]; "sensor.airvisual" = ps: with ps; [ ]; - "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ]; - "apple_tv" = ps: with ps; [ ]; - "device_tracker.bbox" = ps: with ps; [ ]; + "sensor.alpha_vantage" = ps: with ps; [ ]; "sensor.bbox" = ps: with ps; [ ]; - "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; - "media_player.cast" = ps: with ps; [ PyChromecast ]; - "media_player.cmus" = ps: with ps; [ ]; - "comfoconnect" = ps: with ps; [ ]; - "tts.microsoft" = ps: with ps; [ ]; + "sensor.bh1750" = ps: with ps; [ ]; + "sensor.bitcoin" = ps: with ps; [ ]; + "sensor.blockchain" = ps: with ps; [ ]; + "sensor.bme280" = ps: with ps; [ ]; + "sensor.bme680" = ps: with ps; [ ]; + "sensor.broadlink" = ps: with ps; [ ]; + "sensor.buienradar" = ps: with ps; [ ]; + "sensor.coinmarketcap" = ps: with ps; [ ]; + "sensor.cpuspeed" = ps: with ps; [ ]; + "sensor.crimereports" = ps: with ps; [ ]; "sensor.cups" = ps: with ps; [ ]; - "daikin" = ps: with ps; [ ]; - "climate.daikin" = ps: with ps; [ ]; - "deconz" = ps: with ps; [ ]; - "zwave" = ps: with ps; [ pydispatcher ]; - "android_ip_webcam" = ps: with ps; [ ]; + "sensor.darksky" = ps: with ps; [ ]; + "sensor.deluge" = ps: with ps; [ ]; + "sensor.deutsche_bahn" = ps: with ps; [ ]; + "sensor.dht" = ps: with ps; [ ]; + "sensor.discogs" = ps: with ps; [ discogs_client ]; + "sensor.dnsip" = ps: with ps; [ aiodns ]; + "sensor.dovado" = ps: with ps; [ ]; + "sensor.dsmr" = ps: with ps; [ ]; + "sensor.dweet" = ps: with ps; [ ]; "sensor.ebox" = ps: with ps; [ ]; - "climate.econet" = ps: with ps; [ ]; - "eight_sleep" = ps: with ps; [ ]; - "media_player.emby" = ps: with ps; [ ]; - "envisalink" = ps: with ps; [ ]; - "climate.ephember" = ps: with ps; [ ]; + "sensor.eddystone_temperature" = ps: with ps; [ ]; + "sensor.eliqonline" = ps: with ps; [ ]; + "sensor.envirophat" = ps: with ps; [ ]; + "sensor.etherscan" = ps: with ps; [ ]; + "sensor.fastdotcom" = ps: with ps; [ ]; + "sensor.fedex" = ps: with ps; [ ]; "sensor.fido" = ps: with ps; [ ]; - "climate.flexit" = ps: with ps; [ ]; - "ifttt" = ps: with ps; [ ]; - "remote.harmony" = ps: with ps; [ ]; - "binary_sensor.hikvision" = ps: with ps; [ ]; - "hive" = ps: with ps; [ ]; - "homematic" = ps: with ps; [ pyhomematic ]; + "sensor.fitbit" = ps: with ps; [ ]; + "sensor.fixer" = ps: with ps; [ ]; + "sensor.fritzbox_callmonitor" = ps: with ps; [ ]; + "sensor.fritzbox_netmonitor" = ps: with ps; [ ]; + "sensor.gearbest" = ps: with ps; [ ]; + "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; + "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; + "sensor.gitter" = ps: with ps; [ ]; + "sensor.google_travel_time" = ps: with ps; [ ]; + "sensor.gpsd" = ps: with ps; [ ]; + "sensor.gtfs" = ps: with ps; [ ]; + "sensor.hp_ilo" = ps: with ps; [ ]; + "sensor.htu21d" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; - "alarm_control_panel.ialarm" = ps: with ps; [ ]; - "device_tracker.icloud" = ps: with ps; [ ]; + "sensor.imap" = ps: with ps; [ aioimaplib ]; + "sensor.influxdb" = ps: with ps; [ influxdb ]; "sensor.irish_rail_transport" = ps: with ps; [ ]; - "binary_sensor.iss" = ps: with ps; [ ]; - "remote.itach" = ps: with ps; [ ]; - "kira" = ps: with ps; [ ]; "sensor.kwb" = ps: with ps; [ ]; "sensor.lacrosse" = ps: with ps; [ ]; "sensor.lastfm" = ps: with ps; [ pylast ]; - "media_player.webostv" = ps: with ps; [ websockets ]; - "notify.webostv" = ps: with ps; [ ]; - "litejet" = ps: with ps; [ ]; + "sensor.linux_battery" = ps: with ps; [ batinfo ]; "sensor.loopenergy" = ps: with ps; [ ]; - "lutron_caseta" = ps: with ps; [ ]; - "lutron" = ps: with ps; [ ]; - "notify.mailgun" = ps: with ps; [ ]; - "media_player.mediaroom" = ps: with ps; [ ]; - "mochad" = ps: with ps; [ ]; - "modbus" = ps: with ps; [ ]; - "media_player.monoprice" = ps: with ps; [ ]; - "media_player.yamaha_musiccast" = ps: with ps; [ ]; - "cover.myq" = ps: with ps; [ ]; - "mysensors" = ps: with ps; [ ]; - "lock.nello" = ps: with ps; [ ]; - "device_tracker.netgear" = ps: with ps; [ ]; - "switch.netio" = ps: with ps; [ ]; - "lock.nuki" = ps: with ps; [ ]; + "sensor.luftdaten" = ps: with ps; [ luftdaten ]; + "sensor.lyft" = ps: with ps; [ ]; + "sensor.metoffice" = ps: with ps; [ ]; + "sensor.mfi" = ps: with ps; [ ]; + "sensor.mhz19" = ps: with ps; [ ]; + "sensor.miflora" = ps: with ps; [ ]; + "sensor.modem_callerid" = ps: with ps; [ ]; + "sensor.mopar" = ps: with ps; [ ]; + "sensor.mvglive" = ps: with ps; [ ]; + "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; + "sensor.neurio_energy" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; - "alarm_control_panel.nx584" = ps: with ps; [ ]; - "binary_sensor.nx584" = ps: with ps; [ ]; - "iota" = ps: with ps; [ ]; - "sensor.otp" = ps: with ps; [ ]; + "sensor.openevse" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ ]; - "weather.openweathermap" = ps: with ps; [ ]; + "sensor.otp" = ps: with ps; [ ]; + "sensor.plex" = ps: with ps; [ ]; + "sensor.pocketcasts" = ps: with ps; [ ]; "sensor.pollen" = ps: with ps; [ ]; - "qwikswitch" = ps: with ps; [ ]; - "rainbird" = ps: with ps; [ ]; - "climate.sensibo" = ps: with ps; [ ]; + "sensor.pushbullet" = ps: with ps; [ pushbullet ]; + "sensor.qnap" = ps: with ps; [ ]; + "sensor.ripple" = ps: with ps; [ ]; + "sensor.sabnzbd" = ps: with ps; [ ]; + "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; + "sensor.season" = ps: with ps; [ ephem ]; + "sensor.sensehat" = ps: with ps; [ ]; "sensor.serial" = ps: with ps; [ ]; - "switch.acer_projector" = ps: with ps; [ pyserial ]; - "lock.sesame" = ps: with ps; [ ]; - "goalfeed" = ps: with ps; [ ]; + "sensor.serial_pm" = ps: with ps; [ ]; + "sensor.shodan" = ps: with ps; [ ]; "sensor.sma" = ps: with ps; [ ]; - "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "sensor.snmp" = ps: with ps; [ pysnmp ]; - "switch.snmp" = ps: with ps; [ pysnmp ]; - "sensor.thinkingcleaner" = ps: with ps; [ ]; - "switch.thinkingcleaner" = ps: with ps; [ ]; - "sensor.blockchain" = ps: with ps; [ ]; - "media_player.clementine" = ps: with ps; [ ]; - "digital_ocean" = ps: with ps; [ digital-ocean ]; - "ecobee" = ps: with ps; [ ]; - "climate.eq3btsmart" = ps: with ps; [ ]; - "sensor.etherscan" = ps: with ps; [ ]; - "sensor.darksky" = ps: with ps; [ ]; - "weather.darksky" = ps: with ps; [ ]; - "gc100" = ps: with ps; [ ]; - "sensor.hp_ilo" = ps: with ps; [ ]; - "joaoapps_join" = ps: with ps; [ ]; - "notify.joaoapps_join" = ps: with ps; [ ]; - "juicenet" = ps: with ps; [ ]; - "lirc" = ps: with ps; [ ]; - "fan.xiaomi_miio" = ps: with ps; [ ]; - "light.xiaomi_miio" = ps: with ps; [ ]; - "remote.xiaomi_miio" = ps: with ps; [ ]; - "switch.xiaomi_miio" = ps: with ps; [ ]; - "vacuum.xiaomi_miio" = ps: with ps; [ ]; - "media_player.mpd" = ps: with ps; [ mpd2 ]; - "light.mystrom" = ps: with ps; [ ]; - "switch.mystrom" = ps: with ps; [ ]; - "nest" = ps: with ps; [ ]; - "device_tracker.nmap_tracker" = ps: with ps; [ ]; - "notify.pushover" = ps: with ps; [ ]; - "sensor.ripple" = ps: with ps; [ ]; - "media_player.roku" = ps: with ps; [ ]; "sensor.sochain" = ps: with ps; [ ]; + "sensor.speedtest" = ps: with ps; [ ]; + "sensor.sql" = ps: with ps; [ sqlalchemy ]; + "sensor.steam_online" = ps: with ps; [ ]; + "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; + "sensor.swiss_public_transport" = ps: with ps; [ ]; "sensor.synologydsm" = ps: with ps; [ ]; - "tado" = ps: with ps; [ ]; - "telegram_bot" = ps: with ps; [ python-telegram-bot ]; + "sensor.systemmonitor" = ps: with ps; [ psutil ]; + "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; + "sensor.tank_utility" = ps: with ps; [ ]; + "sensor.ted5000" = ps: with ps; [ xmltodict ]; + "sensor.temper" = ps: with ps; [ ]; + "sensor.thinkingcleaner" = ps: with ps; [ ]; + "sensor.tibber" = ps: with ps; [ ]; + "sensor.transmission" = ps: with ps; [ transmissionrpc ]; + "sensor.travisci" = ps: with ps; [ ]; "sensor.twitch" = ps: with ps; [ ]; - "velbus" = ps: with ps; [ ]; - "media_player.vlc" = ps: with ps; [ ]; - "sensor.swiss_public_transport" = ps: with ps; [ ]; - "alarm_control_panel.egardia" = ps: with ps; [ ]; + "sensor.uber" = ps: with ps; [ ]; + "sensor.ups" = ps: with ps; [ ]; + "sensor.vasttrafik" = ps: with ps; [ ]; + "sensor.waqi" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; - "device_tracker.tile" = ps: with ps; [ ]; - "climate.touchline" = ps: with ps; [ ]; - "device_tracker.trackr" = ps: with ps; [ ]; - "tradfri" = ps: with ps; [ ]; - "device_tracker.unifi" = ps: with ps; [ ]; - "keyboard" = ps: with ps; [ ]; - "vera" = ps: with ps; [ ]; - "media_player.vizio" = ps: with ps; [ ]; - "velux" = ps: with ps; [ ]; - "wemo" = ps: with ps; [ ]; - "camera.xeoma" = ps: with ps; [ ]; - "zabbix" = ps: with ps; [ ]; - "sensor.qnap" = ps: with ps; [ ]; - "switch.rachio" = ps: with ps; [ ]; - "climate.radiotherm" = ps: with ps; [ ]; - "raincloud" = ps: with ps; [ ]; - "raspihats" = ps: with ps; [ ]; - "switch.rainmachine" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ ]; - "rflink" = ps: with ps; [ ]; - "ring" = ps: with ps; [ ]; - "notify.rocketchat" = ps: with ps; [ ]; - "vacuum.roomba" = ps: with ps; [ ]; - "switch.rpi_rf" = ps: with ps; [ ]; - "media_player.russound_rnet" = ps: with ps; [ ]; - "media_player.russound_rio" = ps: with ps; [ ]; - "media_player.yamaha" = ps: with ps; [ ]; - "media_player.samsungtv" = ps: with ps; [ ]; - "satel_integra" = ps: with ps; [ ]; - "sensor.deutsche_bahn" = ps: with ps; [ ]; - "scsgate" = ps: with ps; [ ]; - "notify.sendgrid" = ps: with ps; [ ]; - "light.sensehat" = ps: with ps; [ ]; - "sensor.sensehat" = ps: with ps; [ ]; - "media_player.aquostv" = ps: with ps; [ ]; - "sensor.shodan" = ps: with ps; [ ]; - "notify.simplepush" = ps: with ps; [ ]; - "alarm_control_panel.simplisafe" = ps: with ps; [ ]; + "sensor.xbox_live" = ps: with ps; [ ]; + "sensor.yahoo_finance" = ps: with ps; [ ]; + "sensor.yr" = ps: with ps; [ xmltodict ]; + "sensor.yweather" = ps: with ps; [ ]; + "shiftr" = ps: with ps; [ paho-mqtt ]; "skybell" = ps: with ps; [ ]; - "notify.slack" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; - "media_player.snapcast" = ps: with ps; [ ]; - "sensor.speedtest" = ps: with ps; [ ]; - "recorder" = ps: with ps; [ sqlalchemy ]; - "sensor.sql" = ps: with ps; [ sqlalchemy ]; + "spc" = ps: with ps; [ websockets ]; "statsd" = ps: with ps; [ statsd ]; - "sensor.steam_online" = ps: with ps; [ ]; + "switch.acer_projector" = ps: with ps; [ pyserial ]; + "switch.anel_pwrctrl" = ps: with ps; [ ]; + "switch.broadlink" = ps: with ps; [ ]; + "switch.deluge" = ps: with ps; [ ]; + "switch.digitalloggers" = ps: with ps; [ ]; + "switch.dlink" = ps: with ps; [ ]; + "switch.edimax" = ps: with ps; [ ]; + "switch.fritzdect" = ps: with ps; [ ]; + "switch.hikvisioncam" = ps: with ps; [ ]; + "switch.mfi" = ps: with ps; [ ]; + "switch.mystrom" = ps: with ps; [ ]; + "switch.netio" = ps: with ps; [ ]; + "switch.orvibo" = ps: with ps; [ ]; + "switch.rachio" = ps: with ps; [ ]; + "switch.rainmachine" = ps: with ps; [ ]; + "switch.rpi_rf" = ps: with ps; [ ]; + "switch.snmp" = ps: with ps; [ pysnmp ]; + "switch.thinkingcleaner" = ps: with ps; [ ]; + "switch.tplink" = ps: with ps; [ ]; + "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; + "switch.xiaomi_miio" = ps: with ps; [ ]; + "tado" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; - "sensor.tank_utility" = ps: with ps; [ ]; - "binary_sensor.tapsaff" = ps: with ps; [ ]; - "tellstick" = ps: with ps; [ ]; + "telegram_bot" = ps: with ps; [ python-telegram-bot ]; "tellduslive" = ps: with ps; [ ]; - "sensor.temper" = ps: with ps; [ ]; + "tellstick" = ps: with ps; [ ]; "tesla" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; - "light.tikteck" = ps: with ps; [ ]; - "calendar.todoist" = ps: with ps; [ todoist ]; "toon" = ps: with ps; [ ]; - "alarm_control_panel.totalconnect" = ps: with ps; [ ]; - "sensor.transmission" = ps: with ps; [ transmissionrpc ]; - "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "tradfri" = ps: with ps; [ ]; + "tts" = ps: with ps; [ mutagen ]; + "tts.amazon_polly" = ps: with ps; [ boto3 ]; + "tts.baidu" = ps: with ps; [ ]; + "tts.google" = ps: with ps; [ ]; + "tts.microsoft" = ps: with ps; [ ]; "twilio" = ps: with ps; [ twilio ]; - "sensor.uber" = ps: with ps; [ ]; - "sensor.ups" = ps: with ps; [ ]; - "camera.uvc" = ps: with ps; [ ]; - "climate.venstar" = ps: with ps; [ ]; + "updater" = ps: with ps; [ distro ]; + "upnp" = ps: with ps; [ ]; + "usps" = ps: with ps; [ ]; + "vacuum.roomba" = ps: with ps; [ ]; + "vacuum.xiaomi_miio" = ps: with ps; [ ]; + "velbus" = ps: with ps; [ ]; + "velux" = ps: with ps; [ ]; + "vera" = ps: with ps; [ ]; + "verisure" = ps: with ps; [ ]; "volvooncall" = ps: with ps; [ ]; - "sensor.vasttrafik" = ps: with ps; [ ]; "vultr" = ps: with ps; [ vultr ]; - "wake_on_lan" = ps: with ps; [ ]; - "switch.wake_on_lan" = ps: with ps; [ ]; - "sensor.waqi" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ ]; + "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waterfurnace" = ps: with ps; [ ]; - "media_player.gpmdp" = ps: with ps; [ ]; - "spc" = ps: with ps; [ websockets ]; - "zigbee" = ps: with ps; [ ]; - "sensor.xbox_live" = ps: with ps; [ ]; - "knx" = ps: with ps; [ ]; - "media_player.bluesound" = ps: with ps; [ xmltodict ]; - "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; - "sensor.ted5000" = ps: with ps; [ xmltodict ]; - "sensor.yr" = ps: with ps; [ xmltodict ]; - "sensor.yahoo_finance" = ps: with ps; [ ]; - "sensor.yweather" = ps: with ps; [ ]; + "weather.buienradar" = ps: with ps; [ ]; + "weather.darksky" = ps: with ps; [ ]; + "weather.metoffice" = ps: with ps; [ ]; + "weather.openweathermap" = ps: with ps; [ ]; "weather.yweather" = ps: with ps; [ ]; - "light.yeelight" = ps: with ps; [ ]; - "light.yeelightsunflower" = ps: with ps; [ ]; - "media_extractor" = ps: with ps; [ ]; - "light.zengge" = ps: with ps; [ ]; + "wemo" = ps: with ps; [ ]; + "wink" = ps: with ps; [ ]; + "xiaomi_aqara" = ps: with ps; [ ]; + "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ zeroconf ]; - "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + "zha" = ps: with ps; [ ]; + "zigbee" = ps: with ps; [ ]; + "zwave" = ps: with ps; [ pydispatcher ]; }; } diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 5af794e75fa41e98a3143fad58d4df15f48f6a9d..3aa9823dbe8b15d8326f2d19bfdfcb32ff812a13 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -14,6 +14,7 @@ # Then, a Nix attribute set mapping component name to dependencies is created. from urllib.request import urlopen +from collections import OrderedDict import subprocess import os import sys @@ -73,7 +74,7 @@ version = get_version() print('Generating component-packages.nix for version {}'.format(version)) requirements = fetch_reqs(version=version) build_inputs = {} -for component, reqs in requirements.items(): +for component, reqs in OrderedDict(sorted(requirements.items())).items(): attr_paths = [] for req in reqs: try: diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 1e898075d191a3887837280a5b3a7d6d22e71d3f..4d45f70a9fd46d5c93267651b5922842bb2c5abd 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "3.5"; + version = "4.5.24"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh"; + sha256 = "1anxml8i3q90x8n30xfydpmv41cxlwqrg3vr98ayzaak02maxr99"; }; buildInputs = [ apacheHttpd python2 ]; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 2267c07e6f9859b341706f9e958833fde4bbb9b6..99900bbdb3ea8466e60c9dd9ca5a1002f9ec1ef2 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null; stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.5"; + version = "10.7"; src = fetchurl { url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; - sha256 = "11nqdmmhq1glgsiza8pfh69wmpgwl51vb3xijmpcxv63a7ywp4fj"; + sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z"; }; buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 147e24c014d275af2601f4f535694a49d1312be5..093f5f0e5027822d5becf6e60a252ff44a00989d 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip -, perl }: - -assert stdenv.isLinux; +{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt, +gd, geoip, perl }: with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.9.3.1"; + version = "1.13.6.1"; src = fetchurl { - url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz"; - sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv"; + url = "http://openresty.org/download/openresty-${version}.tar.gz"; + sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i"; }; - buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]; + buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; + nativeBuildInputs = [ perl ]; + + NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"]; + + preConfigure = '' + patchShebangs . + ''; configureFlags = [ "--with-pcre-jit" "--with-http_ssl_module" - "--with-http_spdy_module" + "--with-http_v2_module" "--with-http_realip_module" "--with-http_addition_module" "--with-http_xslt_module" @@ -36,26 +41,22 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" "--with-http_degradation_module" "--with-http_stub_status_module" + "--with-http_postgres_module" "--with-ipv6" ]; - postInstall = '' - mv $out/nginx/sbin/nginx $out/bin - mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty - ln -s $out/bin/nginx $out/bin/openresty - ''; + enableParallelBuilding = true; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags" - export PATH="$PATH:${stdenv.cc.libc.bin}/bin" - patchShebangs . + postInstall = '' + ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty + ln -s $out/nginx/sbin/nginx $out/bin/nginx ''; meta = { description = "A fast web application server built on Nginx"; homepage = http://openresty.org; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice lblasc ]; }; } diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 4eb74c8cb5341aba4ebeb33465cc6699c9614047..c244b3a1000ac7b7f6cd526950e9beb39debbfb4 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pshs-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mgorny"; repo = "pshs"; rev = "v${version}"; - sha256 = "18mhxdjlyr21gghzkrrlp0imicb6bqf741p0a21c2rkvs4bv8c1w"; + sha256 = "1ffdyv5qiqdg3jq8y91fsml046g88d7fyy2k81yii11jw3yx2js0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 08e682aa71699c44c64b4730faef507249fb93e6..c234a1ae1ee7ae91206b9365ca1de1d87d08c881 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thttpd-${version}"; - version = "2.27"; + version = "2.28"; src = fetchurl { url = "http://acme.com/software/thttpd/${name}.tar.gz"; - sha256 = "0ykda5k1zzzag59zbd4bkzj1psavq0xnpy7vpk19rhx7mlvvri5i"; + sha256 = "0a03w7wg994dizdb37pf4kd9s5lf2q414721jfqnrqpdshlzjll5"; }; prePatch = '' diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 67172edfd36ec9fecb8670f5bfeb7ab7e564e329..ed7765b15403d2bbd9c0ddedee1c2705c5523392 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "2.0"; + version = "2.0.4"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6"; + sha256 = "1ig6q4waqlb6h1hhrly7hslfnqczlbm79vvhr5j7rp5a2p1pfrns"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix index 9386be321b45bdaa947adc486724fa5202619aad..7214c08d2427b018f5094225818283a1851d494c 100644 --- a/pkgs/servers/mail/clamsmtp/default.nix +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5"; }; + patches = [ ./header-order.patch ]; + meta = with stdenv.lib; { description = "SMTP filter that allows to check for viruses using the ClamAV anti-virus software"; diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/pkgs/servers/mail/clamsmtp/header-order.patch new file mode 100644 index 0000000000000000000000000000000000000000..102ae0a471ddf7fe50e3d145c6ee5a0118885ac3 --- /dev/null +++ b/pkgs/servers/mail/clamsmtp/header-order.patch @@ -0,0 +1,25 @@ +diff --git a/common/smtppass.c b/common/smtppass.c +index d9be1ba..4a366f4 100644 +--- a/common/smtppass.c ++++ b/common/smtppass.c +@@ -60,15 +60,15 @@ + + #include "usuals.h" + +-#ifdef LINUX_TRANSPARENT_PROXY +-#include +-#endif +- + #include "compat.h" + #include "sock_any.h" + #include "stringx.h" + #include "sppriv.h" + ++#ifdef LINUX_TRANSPARENT_PROXY ++#include ++#endif ++ + /* ----------------------------------------------------------------------- + * STRUCTURES + */ + diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6b2adf5721756bfbbd5941774210238a748e56d7..0060a59d807183e33fb031173cd03dce886376c0 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.0"; + name = "dovecot-2.3.0.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"; + sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb"; }; preConfigure = '' @@ -47,16 +47,6 @@ stdenv.mkDerivation rec { # so we can symlink plugins from several packages there. # The symlinking needs to be done in NixOS. ./2.2.x-module_dir.patch - (fetchpatch { - name = "CVE-2017-14132_part1.patch"; - url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch; - sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9"; - }) - (fetchpatch { - name = "CVE-2017-14132_part2.patch"; - url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch; - sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l"; - }) ]; configureFlags = [ diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index ddf4fd5d880d1b768994cdcff7f77a937ae0408e..f11400c190af90ea8b916cc72f4b031f815dcf28 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlmmj-${version}"; - version = "1.2.19.0"; + version = "1.3.0"; src = fetchurl { url = "http://mlmmj.org/releases/${name}.tar.gz"; - sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0"; + sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; postInstall = '' diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index b221bfa0dd4cc43eab1e59856a5b4dc1fbec5aa2..1836d0e5cf3637602871c5ce7cbeb1ce702fe14b 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -8,12 +8,12 @@ let policy-test-flags = mk-perl-flags (with perlPackages; [ ParseSyslog ]); - version = "1.36"; + version = "1.37"; name = "postgrey-${version}"; in runCommand name { src = fetchurl { url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; - sha256 = "09jzb246ki988389r9gryigriv9sravk40q75fih5n0q4p2ghax2"; + sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz"; }; meta = with stdenv.lib; { description = "A postfix policy server to provide greylisting"; diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d5e410a86c1f5b5418fd4213f81ca3e2219f684f --- /dev/null +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchurl, pyspf }: + +buildPythonApplication rec { + name = "pypolicyd-spf-${version}"; + majorVersion = "2.0"; + version = "${majorVersion}.2"; + + src = fetchurl { + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; + }; + + propagatedBuildInputs = [ pyspf ]; + + preBuild = '' + substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" + ''; + + meta = with lib; { + homepage = https://launchpad.net/pypolicyd-spf/; + description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 2b81edf48ba3d34707e2098c11a64dbcfeef2e22..3e31327980683fdfc71a1bc2d9243a4ff9460b01 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "1idy81absr5w677d4jlzic33hsrn0zjzbfhhdn6viym9vr8dvjx9"; + sha256 = "04jqrki7rlxywdig264kavy1h5882rspi2drkbdzrk35jjq8rh3h"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index c625ce575f2e98c237c232c9fc3a22d843f1aa95..66e586a69d94e1e53c954a407c0311e014eb8c4e 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "1m03fhzq1f9byk2agccsr0x458niqqjpips5mbcgzhm4kylczhz0"; + sha256 = "1v87gvhxih5jav20cp9zdddna31s968xdm2iskc9mqzb5li6di72"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index b84dd21c3571d4264ca25a20684c5fbe66c9b4d5..f546b0b075e54d5488cc1bac05f355ce60879f0c 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: -let version = "6.0"; in +let version = "6.1.3"; in stdenv.mkDerivation rec { name = "subsonic-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz"; - sha256 = "0aw7lz7bkhqvjj3lkk68n2aqr5l84s91cgifg2379w2j7dgd056z"; + sha256 = "1v21gfymaqcx6n6d88hvha60q9hgj5z1wsac5gcwq7cjah1893jx"; }; inherit jre; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2f9a141024b087119a5a29e6e821feef349a5a2b..876209b9b0297a1eafe42dadd3d985c2e7c4e2a2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,28 +1,28 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.3"; - name = "grafana-v${version}"; + version = "5.0.0"; + name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j"; + sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03"; + sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; postInstall = '' tar -xvf $srcStatic mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,vendor} $bin/share/grafana/ - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs + mv grafana-*/{public,conf,tools} $bin/share/grafana/ + ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 804826941f21fd459dabbddad602ebacf6bf3d90..409801e8b7dc1e03912788480b4f26d4e7703398 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kapacitor-${version}"; - version = "1.0.0"; + version = "1.4.0"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "14l9bhj6qdif79s4dyqqbnjgj3m4iarvw0ckld1wdhpdgvl8w9qh"; + sha256 = "1qanf7qljzqqkyw2cdazg0ll13q8a3fs3sqydcgfbgpdmf707sj2"; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index b0e2f29a3b4842f03b20fc2a20234806d22aa5ea..47bc6d58da90dbe05b1482564c2073840b794a30 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.2.4"; + version = "4.3.4"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0w0blbwiw0ps04b7gkyyk89qkgwsxh6gydhmggbm1kl3ar3mq1dh"; + sha256 = "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index f3d6a8d87763488352aeb63bc24a87999b96e3c3..2f9016b749911e90000903b492d6f30ffdd82385 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.13.0"; + version = "0.14.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "170q5fynwa3g3wm77g61610n1lf5kqirhrgak6slqzn52ji870nc"; + sha256 = "0f6yi19zffxnp3dlr4zs52b7bllks3kjxkdn9zvvi5lvpkzmba5j"; }; # Tests exist, but seem to clash with the firewall. diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 64585de51ff394b406ccb7d35ef5808b152c692d..b930c1ab1f613df265a915802660eb668991da39 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.12"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr"; + sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index c907f081e22ed86c3f7529e0ae9006a002790646..3b875576529fd84e9415dcffdce8f0c5b411f1e4 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.1.2"; + version = "3.3.2"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40"; + sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 2f102b58f141955de3db2aab7c8d4f41113095cd..6a65e8d03201164fecc228d66d74d9a9a358da75 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "11.0"; + version = "11.1"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"; + sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; }; patches = [ ./caps-fix.patch ] diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 68c9b7a59362215da50c191f51948c796af33af3..c6f150938ac6ba23a2fc0e57caa92ce12e78fbce 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj"; + sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73"; }; buildInputs = diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 3eba04f44fba6fc36aae15fe626cbef8c717ad1a..dc3bc22af49c2aba024bb36954a38ddf58b1cc60 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.910"; + version = "0.2.0.980"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0c4msk6hvlqyy81xkjhsvsy4igpc01s4a00zwhqnds2gj4y9yplk"; + sha256 = "1939mmlp9hsmw0hd4c8m8p5fk6igvml30gk9ffi9mfhankas6fnf"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 82818037072aaa035781d36cb0aab54586a4bea6..dcbfc40d7dddeda40b73d4b4a8eb0434eb082e3b 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { name = "rt-${version}"; - version = "4.4.0"; + version = "4.4.2"; src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "1hgz50fxv9zdcngww083aqh8vzyk148lm7mcivxflpnsqfw3696x"; + sha256 = "0s5ykc5imcii66zkzcb8lf8adkr8zlbc2ikcpkaxzcccikhndqxj"; }; patches = [ ./override-generated.patch ]; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index b754807dc9bd4f10860e7d2552b827ba58748f75..d46f5677b9f049449fe9300ab899c9623790f955 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "1.2.1"; + version = "2.3.2"; pname = "sabnzbd"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "1rw6f455p0n8qigzkvnlr0d6rzkx2mpzhcp7m0j8fwqdbq831q8y"; + sha256 = "0c0ap8bygvz643fgfvvmwshcyfblq2c5jziqwgpf30g6rsbfv2v0"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index ead0c095d5c9f97afff5f2b7cbb6f10d8ee0a1d7..7ba23f61fedb0113efa577354c1ea02e082c26b6 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, - version ? "2.2.8", + version ? "2.2.11", mainSrc ? fetchurl { url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz"; - sha256 = "1q6jdw5g81k7ciw9fhwklb5ifgb8zna39795m0x0lbvwjbk3ampv"; + sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6"; } }: diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index d9a4f4733f73b1c0babaa696419351e7e063cb44..b1d614bc5cf08890693dfaae76841fdccbf4efbd 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "0a1sgf9p39gbfrh7bhfg1hjqa6y18i7cig7bffmv7spqnvb50zx5"; + sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5a747fb85abd471430085291ef3e8bc8e05891d5..29d25b77afc8a1ec5316073cb26c3e4c929ead51 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0b277821876018d90e75fd14ddb354bd3f72063a..0c04f910e5bbb130e888bb2bf60d54cbdb408da2 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + CXXFLAGS = "-fpermissive"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 046eb6cfca98ccd77ed4c3ccef0eb853d783c5ea..7125f9ef8e9652f7c3c1ff0dd202ac6d4c9c0c76 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { - name = "mysql-connector-java-5.1.39"; + name = "mysql-connector-java-5.1.45"; builder = ./builder.sh; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; - sha256 = "0d0g51hfx7a2r6nbni8yramg4vpqk0sql0aaib6q576a0nnrq78r"; + sha256 = "1x3dygygj15p7zk825mqr0g80wlm3rfsqgbqnb11l133rk4s1ylw"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 78ad88bc9047a8554bb73303b8b2fe0577503035..1e995537c88bfa20b2a119e18c9f88c2d44f5c8b 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "1.1.9"; + version = "2.0.2"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; + sha256 = "0023747i2x3j50z54l78maq7dya5ldd2sdydn6l5l7k6b6g4yr2d"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0c6a197b1da535484f741726f6b76964c92f13f4..0f08d94a052f69eea58836c48bfcb605fc7c800d 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { name = "teleport-${version}"; - version = "2.4.0"; + version = "2.4.1"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "1x4xnqjyb87pzmn2c59fwmzfx1f2k0xhqn2xgki3722qmj2ss846"; + sha256 = "09kmlihv4aqc39f9cyv2vm0kqgdf9vmdrgds5krnzqdgy3svyg7y"; }; goPackagePath = "github.com/gravitational/teleport"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 72f5d3aa9d872685a4045589157ddd890ec9de57..d38405688fc5ec6560edf13fe1a6327f97fa0cf0 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.5.0"; + version = "1.5.2"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0yvmw99knjdfgaa3snk4fmrbf3bqnj78ix5hr0mcqj5pwjx1dihb"; + sha256 = "0cv05nm7jj1g2630l5zmzpmsrjx712ba3l7klh8nqs02mzykzsha"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index d8cfadbfab2fb36561986c2f65009badbdace5dd..c5e2b45fe96d612e442d2232ecef194f691aa226 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.4"; + version = "4.2.5"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "1kydjmgv0nrllgi2s6aczq4x9ag01c8qm8w962qb52fzdfw7fs6k"; + sha256 = "199b0xm4lfdspmrirvzzg511yh358awciz23zmccvlvq86b548pz"; }; buildInputs = [ diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 102868c0d46c0e86cef519ff22cc79d5b17011f4..40bcbc50f0ca845cacd4a58890af8489f3f2aae9 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1npfl7n1w2l0j6c6iizw1szzq0lz9wy6jb55qmwhfkzwj0zd7mqp"; + sha256 = "1alsha0mhscp0jha2wlb5mqqkx2967s7rpm0x8c2v7jws1d0m1w3"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 4614a9768b054f244cfa2e47b47737c0da52afe6..b420c673850bd5478bd9e512103dd80ac6edb626 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"; + sha256 = "1x61vipgzhzb6flbbgl0hq96j9d330gh0kmwv8pwh6n57j7z84d9"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/matomo/bootstrap.php similarity index 100% rename from pkgs/servers/web-apps/piwik/bootstrap.php rename to pkgs/servers/web-apps/matomo/bootstrap.php diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c99b20a46bd5c3b82c5c0b229a559160f0c83f8a --- /dev/null +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeWrapper, php }: + +stdenv.mkDerivation rec { + name = "matomo-${version}"; + version = "3.3.0"; + + src = fetchurl { + # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again + # url = "https://builds.matomo.org/${name}.tar.gz"; + url = "https://builds.matomo.org/piwik-${version}.tar.gz"; + sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # make-localhost-default-database-server.patch: + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + patches = [ ./make-localhost-default-database-host.patch ]; + + # this bootstrap.php adds support for getting PIWIK_USER_PATH + # from an environment variable. Point it to a mutable location + # to be able to use matomo read-only from the nix store + postPatch = '' + cp ${./bootstrap.php} bootstrap.php + ''; + + # TODO: future versions might rename the PIWIK_… variables to MATOMO_… + # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. + # See https://forum.matomo.org/t/bootstrap-php/5926/10 and + # https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843 + installPhase = '' + runHook preInstall + + # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed + mkdir -p $out/share + cp -ra * $out/share/ + # tmp/ is created by matomo in PIWIK_USER_PATH + rmdir $out/share/tmp + # config/ needs to be copied to PIWIK_USER_PATH anyway + mv $out/share/config $out/ + + makeWrapper ${php}/bin/php $out/bin/matomo-console \ + --add-flags "$out/share/console" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A real-time web analytics application"; + license = licenses.gpl3Plus; + homepage = https://matomo.org/; + platforms = platforms.all; + maintainers = [ maintainers.florianjacob ]; + }; +} diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch new file mode 100644 index 0000000000000000000000000000000000000000..48808ac2cccaa8e1b0043471a5923839a77cd25a --- /dev/null +++ b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php +index 9364f49870..2625cbb91b 100644 +--- a/plugins/Installation/FormDatabaseSetup.php ++++ b/plugins/Installation/FormDatabaseSetup.php +@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2 + + // default values + $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( +- 'host' => '127.0.0.1', ++ 'host' => 'localhost', + 'type' => $defaultDatabaseType, + 'tables_prefix' => 'matomo_', + ))); diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix deleted file mode 100644 index 697240e81c7559face74827b39fd6d07d5e235ca..0000000000000000000000000000000000000000 --- a/pkgs/servers/web-apps/piwik/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, php }: - -stdenv.mkDerivation rec { - name = "piwik-${version}"; - version = "3.2.1"; - - src = fetchurl { - url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "1yisgywz7dm6kygh9mc207xnqpvdxbw4pa2l9gjh495a6979x3chi7z5rf410z4dmrg0kbj8wqm8mmmslfn276xvw37l2d4h73ij1h2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - # regarding the 127.0.0.1 substitute: - # This replaces the default value of the database server field. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - postPatch = '' - substituteInPlace plugins/Installation/FormDatabaseSetup.php \ - --replace "=> '127.0.0.1'," "=> 'localhost'," - cp ${./bootstrap.php} bootstrap.php - ''; - - # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. - # See https://forum.piwik.org/t/bootstrap-php/5926/10 and - # https://github.com/piwik/piwik/issues/11654#issuecomment-297730843 - installPhase = '' - runHook preInstall - - # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed - mkdir -p $out/share - cp -ra * $out/share/ - # tmp/ is created by piwik in PIWIK_USER_PATH - rmdir $out/share/tmp - # config/ needs to be copied to PIWIK_USER_PATH anyway - mv $out/share/config $out/ - - makeWrapper ${php}/bin/php $out/bin/piwik-console \ - --add-flags "$out/share/console" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "A real-time web analytics application"; - license = licenses.gpl3Plus; - homepage = https://piwik.org/; - platforms = platforms.all; - maintainers = [ maintainers.florianjacob ]; - }; -} diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix deleted file mode 100644 index ee4dab5ad64a5388463a6a8504dc30b284e3a374..0000000000000000000000000000000000000000 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix deleted file mode 100644 index f888566cad664eacf85a35bcf2d08f30df863b04..0000000000000000000000000000000000000000 --- a/pkgs/servers/web-apps/pump.io/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ pkgs, system, stdenv, fetchurl, makeWrapper, nodejs, graphicsmagick }: - -with stdenv.lib; - -let - # To regenerate composition.nix, run generate.sh. - nodePackages = import ./composition.nix { - inherit pkgs system nodejs; - }; -in -nodePackages.package.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ makeWrapper ]; - - postInstall = '' - for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do - wrapProgram "$out/bin/$prog" \ - --prefix PATH : ${graphicsmagick}/bin:$out/bin - done - ''; - - passthru.names = ["pump.io"]; - - meta = { - description = "Social server with an ActivityStreams API"; - homepage = http://pump.io/; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.rvl ]; - longDescription = '' - This is pump.io. It's a stream server that does most of what - people really want from a social network. - - What's it for? - - I post something and my followers see it. That's the rough idea - behind the pump. - - There's an API defined in the API.md file. It uses - activitystrea.ms JSON as the main data and command format. - - You can post almost anything that can be represented with - activity streams -- short or long text, bookmarks, images, - video, audio, events, geo checkins. You can follow friends, - create lists of people, and so on. - - The software is useful for at least these scenarios: - - * Mobile-first social networking - * Activity stream functionality for an existing app - * Experimenting with social software - ''; - }; -}) diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh deleted file mode 100755 index 6dc91c72c09ea1cfd634b3dde169ee83f0d4888b..0000000000000000000000000000000000000000 --- a/pkgs/servers/web-apps/pump.io/generate.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix curl jshon - -set -e - -# Normally, this node2nix invocation would be sufficient: -# exec node2nix --input node-packages.json --composition composition.nix -# -# But pump.io soft-depends on extra modules, which have to be *inside* -# its own node_modules, not beside them. -# -# So we hack these extra deps into package.json and feed that into -# node2nix. -# -# Also jshon does funny things with slashes in strings, which can be -# fixed with sed. - -VERSION="3.0.0" -URL="https://registry.npmjs.org/pump.io/-/pump.io-$VERSION.tgz" -SHA1="ycfm7ak83xi8mgafhp9q0n6n3kzmdz16" - -curl https://raw.githubusercontent.com/e14n/pump.io/v$VERSION/package.json | \ - jshon -e dependencies \ - -s '*' -i databank-mongodb \ - -s '*' -i databank-redis \ - -s '*' -i databank-lrucache \ - -p | sed 's=\\/=/=g' > full-package.json - -node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix - -# overriding nodePackages src doesn't seem to work, so... -sed -i "s|src = ./.|src = fetchurl { url = \"$URL\"; sha1 = \"$SHA1\"; }|" node-packages.nix - -# fetchgit or node2nix is having problems with submodules or something. -# This is the sha256 for connect-auth which is a npm dep hosted on -# github and containing submodules. -sed -i "s|d08fecbb72aff14ecb39dc310e8965ba92228f0c0def41fbde3db5ea7a1aac19|1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b|" node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/node-packages.json b/pkgs/servers/web-apps/pump.io/node-packages.json deleted file mode 100644 index 294da7ab2f1c8d3ec4f35feabb8f33e62728b7e2..0000000000000000000000000000000000000000 --- a/pkgs/servers/web-apps/pump.io/node-packages.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "pump.io", - "databank-mongodb", - "databank-redis", - "databank-memcached", - "databank-lrucache" -] diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix deleted file mode 100644 index ca27c79fab9088e894df397c680ece49a8c86c96..0000000000000000000000000000000000000000 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ /dev/null @@ -1,4889 +0,0 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "bcrypt-0.8.7" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "0.8.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; - sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; - }; - }; - "bunyan-1.8.9" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; - sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; - }; - }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; - "connect-2.30.2" = { - name = "connect"; - packageName = "connect"; - version = "2.30.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; - sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; - }; - }; - "connect-auth-git://github.com/e14n/connect-auth" = { - name = "connect-auth"; - packageName = "connect-auth"; - version = "0.6.0"; - src = fetchgit { - url = "git://github.com/e14n/connect-auth"; - rev = "ae4e3c4c86a5d266be7bd91c2b99856f9a37b1ec"; - sha256 = "1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b"; - }; - }; - "connect-databank-1.0.3" = { - name = "connect-databank"; - packageName = "connect-databank"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-databank/-/connect-databank-1.0.3.tgz"; - sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02"; - }; - }; - "connect-multiparty-2.0.0" = { - name = "connect-multiparty"; - packageName = "connect-multiparty"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz"; - sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab"; - }; - }; - "crypto-cacerts-0.1.0" = { - name = "crypto-cacerts"; - packageName = "crypto-cacerts"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; - sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; - }; - }; - "databank-0.19.8" = { - name = "databank"; - packageName = "databank"; - version = "0.19.8"; - src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-0.19.8.tgz"; - sha1 = "bf73d6b4fc002045793faeff2b1c3fabc9999844"; - }; - }; - "dateformat-1.0.12" = { - name = "dateformat"; - packageName = "dateformat"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; - }; - }; - "dialback-client-0.2.0" = { - name = "dialback-client"; - packageName = "dialback-client"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dialback-client/-/dialback-client-0.2.0.tgz"; - sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; - }; - }; - "dompurify-0.8.5" = { - name = "dompurify"; - packageName = "dompurify"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.5.tgz"; - sha1 = "5bc591b61e222243cc827ca382d7a2e2660c1a44"; - }; - }; - "emailjs-1.0.8" = { - name = "emailjs"; - packageName = "emailjs"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/emailjs/-/emailjs-1.0.8.tgz"; - sha1 = "d4240db7670dc78aff97352092d8460edc130f66"; - }; - }; - "express-3.21.2" = { - name = "express"; - packageName = "express"; - version = "3.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; - sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; - }; - }; - "express-session-1.15.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; - sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; - }; - }; - "gm-1.23.0" = { - name = "gm"; - packageName = "gm"; - version = "1.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz"; - sha1 = "80a2fe9cbf131515024846444658461269f52661"; - }; - }; - "helmet-3.5.0" = { - name = "helmet"; - packageName = "helmet"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.5.0.tgz"; - sha1 = "e1d6de27d2e3317d3182e00d672df3d0e1e12539"; - }; - }; - "jade-1.11.0" = { - name = "jade"; - packageName = "jade"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; - sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; - }; - }; - "jankyqueue-0.1.1" = { - name = "jankyqueue"; - packageName = "jankyqueue"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; - sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; - }; - }; - "jsdom-7.2.2" = { - name = "jsdom"; - packageName = "jsdom"; - version = "7.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; - sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; - }; - }; - "method-override-2.3.8" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz"; - sha1 = "178234bf4bab869f89df9444b06fc6147b44828c"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "oauth-evanp-0.9.10-evanp.2" = { - name = "oauth-evanp"; - packageName = "oauth-evanp"; - version = "0.9.10-evanp.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; - sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; - }; - }; - "octal-1.0.0" = { - name = "octal"; - packageName = "octal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz"; - sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b"; - }; - }; - "optimist-0.6.1" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - }; - "rimraf-2.6.1" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; - sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; - }; - }; - "sanitize-html-1.14.1" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; - sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; - }; - }; - "schlock-0.2.1" = { - name = "schlock"; - packageName = "schlock"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; - sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; - }; - }; - "send-0.13.2" = { - name = "send"; - packageName = "send"; - version = "0.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; - sha1 = "765e7607c8055452bba6f0b052595350986036de"; - }; - }; - "showdown-1.6.4" = { - name = "showdown"; - packageName = "showdown"; - version = "1.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-1.6.4.tgz"; - sha1 = "056bbb654ecdb8d8643ae12d6d597893ccaf46c6"; - }; - }; - "sockjs-0.3.18" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.18"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz"; - sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207"; - }; - }; - "ssl-config-0.0.9" = { - name = "ssl-config"; - packageName = "ssl-config"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ssl-config/-/ssl-config-0.0.9.tgz"; - sha1 = "905ed1b7ddd0564aa9395cd4ae7146907351ff2c"; - }; - }; - "step-1.0.0" = { - name = "step"; - packageName = "step"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/step/-/step-1.0.0.tgz"; - sha1 = "b300e9d2ae9057d4d78633aae2303813a94bdff2"; - }; - }; - "ua-parser-js-0.7.12" = { - name = "ua-parser-js"; - packageName = "ua-parser-js"; - version = "0.7.12"; - src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz"; - sha1 = "04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"; - }; - }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - }; - "underscore-contrib-0.3.0" = { - name = "underscore-contrib"; - packageName = "underscore-contrib"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; - sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; - }; - }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; - }; - }; - "validator-4.4.0" = { - name = "validator"; - packageName = "validator"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-4.4.0.tgz"; - sha1 = "35e29555dd5f7826f970a4eaecff9e6df6df3da6"; - }; - }; - "webfinger-0.4.2" = { - name = "webfinger"; - packageName = "webfinger"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; - sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; - }; - }; - "databank-mongodb-1.0.0" = { - name = "databank-mongodb"; - packageName = "databank-mongodb"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-1.0.0.tgz"; - sha1 = "66f229698df1d4f7e9e3ad849a30174b2aae527b"; - }; - }; - "databank-redis-0.19.6" = { - name = "databank-redis"; - packageName = "databank-redis"; - version = "0.19.6"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; - sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; - }; - }; - "databank-lrucache-0.1.3" = { - name = "databank-lrucache"; - packageName = "databank-lrucache"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz"; - sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef"; - }; - }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; - }; - }; - "dtrace-provider-0.8.1" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz"; - sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f"; - }; - }; - "mv-2.1.1" = { - name = "mv"; - packageName = "mv"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; - sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; - }; - }; - "safe-json-stringify-1.0.4" = { - name = "safe-json-stringify"; - packageName = "safe-json-stringify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; - sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; - }; - }; - "moment-2.18.1" = { - name = "moment"; - packageName = "moment"; - version = "2.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; - }; - }; - "nan-2.5.1" = { - name = "nan"; - packageName = "nan"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; - }; - }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; - "rimraf-2.4.5" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; - }; - }; - "glob-6.0.4" = { - name = "glob"; - packageName = "glob"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; - sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "minimatch-3.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.6" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; - }; - }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "basic-auth-connect-1.0.0" = { - name = "basic-auth-connect"; - packageName = "basic-auth-connect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; - sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; - }; - }; - "body-parser-1.13.3" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; - sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; - }; - }; - "bytes-2.1.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; - sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; - }; - }; - "cookie-0.1.3" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; - sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; - }; - }; - "cookie-parser-1.3.5" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; - sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - }; - "compression-1.5.2" = { - name = "compression"; - packageName = "compression"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; - sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; - }; - }; - "connect-timeout-1.6.2" = { - name = "connect-timeout"; - packageName = "connect-timeout"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; - sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; - }; - }; - "content-type-1.0.2" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; - sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; - }; - }; - "csurf-1.8.3" = { - name = "csurf"; - packageName = "csurf"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; - sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; - }; - }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "depd-1.0.1" = { - name = "depd"; - packageName = "depd"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - }; - "errorhandler-1.4.3" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; - sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; - }; - }; - "express-session-1.11.3" = { - name = "express-session"; - packageName = "express-session"; - version = "1.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; - sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; - }; - }; - "finalhandler-0.4.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; - sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; - }; - }; - "fresh-0.3.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; - }; - }; - "http-errors-1.3.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; - sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; - }; - }; - "morgan-1.6.1" = { - name = "morgan"; - packageName = "morgan"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; - sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; - }; - }; - "multiparty-3.3.2" = { - name = "multiparty"; - packageName = "multiparty"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; - sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; - }; - }; - "on-headers-1.0.1" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; - }; - }; - "parseurl-1.3.1" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; - }; - }; - "pause-0.1.0" = { - name = "pause"; - packageName = "pause"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; - sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; - }; - }; - "qs-4.0.0" = { - name = "qs"; - packageName = "qs"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; - sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; - }; - }; - "response-time-2.3.2" = { - name = "response-time"; - packageName = "response-time"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; - sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; - }; - }; - "serve-favicon-2.3.2" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; - sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; - }; - }; - "serve-index-1.7.3" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; - sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; - }; - }; - "serve-static-1.10.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; - sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; - }; - }; - "type-is-1.6.14" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.14"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; - }; - }; - "utils-merge-1.0.0" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - }; - "vhost-3.0.2" = { - name = "vhost"; - packageName = "vhost"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; - sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; - }; - }; - "iconv-lite-0.4.11" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; - sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; - "raw-body-2.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; - sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "bytes-2.4.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; - sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; - }; - }; - "iconv-lite-0.4.13" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.13"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "accepts-1.2.13" = { - name = "accepts"; - packageName = "accepts"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; - }; - }; - "compressible-2.0.10" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; - sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; - }; - }; - "vary-1.0.1" = { - name = "vary"; - packageName = "vary"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; - }; - }; - "mime-types-2.1.15" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; - }; - }; - "negotiator-0.5.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - }; - "mime-db-1.27.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; - }; - }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; - "csrf-3.0.6" = { - name = "csrf"; - packageName = "csrf"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; - sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; - }; - }; - "rndm-1.2.0" = { - name = "rndm"; - packageName = "rndm"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; - }; - }; - "tsscmp-1.0.5" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; - sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; - }; - }; - "uid-safe-2.1.4" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; - sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; - }; - }; - "random-bytes-1.0.0" = { - name = "random-bytes"; - packageName = "random-bytes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; - }; - }; - "accepts-1.3.3" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; - sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; - }; - }; - "crc-3.3.0" = { - name = "crc"; - packageName = "crc"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; - sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; - }; - }; - "uid-safe-2.0.0" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; - sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; - }; - }; - "base64-url-1.2.1" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; - sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; - }; - }; - "escape-html-1.0.2" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; - sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; - }; - }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; - }; - }; - "basic-auth-1.0.4" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "stream-counter-0.2.0" = { - name = "stream-counter"; - packageName = "stream-counter"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; - sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "depd-1.1.0" = { - name = "depd"; - packageName = "depd"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; - }; - }; - "etag-1.7.0" = { - name = "etag"; - packageName = "etag"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; - }; - }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - }; - "batch-0.5.3" = { - name = "batch"; - packageName = "batch"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; - sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "oauth-0.9.7" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; - sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; - }; - }; - "openid-0.4.1" = { - name = "openid"; - packageName = "openid"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; - sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; - }; - }; - "async-1.5.2" = { - name = "async"; - packageName = "async"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; - }; - }; - "node-uuid-1.4.8" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; - }; - }; - "set-immediate-0.1.1" = { - name = "set-immediate"; - packageName = "set-immediate"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; - sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; - }; - }; - "multiparty-4.1.3" = { - name = "multiparty"; - packageName = "multiparty"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; - sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; - }; - }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "normalize-package-data-2.3.6" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz"; - sha1 = "498fa420c96401f787402ba21e600def9f981fff"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "hosted-git-info-2.4.1" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; - sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "underscore-1.5.2" = { - name = "underscore"; - packageName = "underscore"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }; - }; - "step-0.0.6" = { - name = "step"; - packageName = "step"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; - sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; - }; - }; - "addressparser-0.3.2" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; - }; - }; - "mimelib-0.2.14" = { - name = "mimelib"; - packageName = "mimelib"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; - sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; - }; - }; - "moment-2.11.2" = { - name = "moment"; - packageName = "moment"; - version = "2.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.11.2.tgz"; - sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901"; - }; - }; - "starttls-1.0.1" = { - name = "starttls"; - packageName = "starttls"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/starttls/-/starttls-1.0.1.tgz"; - sha1 = "e6081c25de6b178f5a75f8f271c1487449183b42"; - }; - }; - "bufferjs-1.1.0" = { - name = "bufferjs"; - packageName = "bufferjs"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; - sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; - }; - }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; - }; - }; - "addressparser-0.2.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; - sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; - }; - }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; - "content-disposition-0.5.0" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - }; - "commander-2.6.0" = { - name = "commander"; - packageName = "commander"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; - sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; - }; - }; - "merge-descriptors-1.0.0" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "proxy-addr-1.0.10" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; - sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; - }; - }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - }; - "send-0.13.0" = { - name = "send"; - packageName = "send"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; - sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; - }; - }; - "forwarded-0.1.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - }; - "ipaddr.js-1.0.5" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; - }; - }; - "destroy-1.0.3" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; - }; - }; - "debug-2.6.3" = { - name = "debug"; - packageName = "debug"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; - }; - }; - "array-parallel-0.1.3" = { - name = "array-parallel"; - packageName = "array-parallel"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; - sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; - }; - }; - "array-series-0.1.5" = { - name = "array-series"; - packageName = "array-series"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; - sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; - }; - }; - "cross-spawn-4.0.2" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; - }; - }; - "lru-cache-4.0.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; - sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; - }; - }; - "which-1.2.14" = { - name = "which"; - packageName = "which"; - version = "1.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; - "connect-3.6.0" = { - name = "connect"; - packageName = "connect"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; - sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; - }; - }; - "dns-prefetch-control-0.1.0" = { - name = "dns-prefetch-control"; - packageName = "dns-prefetch-control"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz"; - sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2"; - }; - }; - "dont-sniff-mimetype-1.0.0" = { - name = "dont-sniff-mimetype"; - packageName = "dont-sniff-mimetype"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz"; - sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"; - }; - }; - "frameguard-3.0.0" = { - name = "frameguard"; - packageName = "frameguard"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz"; - sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; - }; - }; - "helmet-csp-2.4.0" = { - name = "helmet-csp"; - packageName = "helmet-csp"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz"; - sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e"; - }; - }; - "hide-powered-by-1.0.0" = { - name = "hide-powered-by"; - packageName = "hide-powered-by"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz"; - sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; - }; - }; - "hpkp-2.0.0" = { - name = "hpkp"; - packageName = "hpkp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz"; - sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672"; - }; - }; - "hsts-2.0.0" = { - name = "hsts"; - packageName = "hsts"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hsts/-/hsts-2.0.0.tgz"; - sha1 = "a52234c6070decf214b2b6b70bb144d07e4776c7"; - }; - }; - "ienoopen-1.0.0" = { - name = "ienoopen"; - packageName = "ienoopen"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz"; - sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; - }; - }; - "nocache-2.0.0" = { - name = "nocache"; - packageName = "nocache"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz"; - sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; - }; - }; - "referrer-policy-1.1.0" = { - name = "referrer-policy"; - packageName = "referrer-policy"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz"; - sha1 = "35774eb735bf50fb6c078e83334b472350207d79"; - }; - }; - "x-xss-protection-1.0.0" = { - name = "x-xss-protection"; - packageName = "x-xss-protection"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.0.0.tgz"; - sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; - }; - }; - "debug-2.6.1" = { - name = "debug"; - packageName = "debug"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; - }; - }; - "finalhandler-1.0.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; - sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; - }; - }; - "encodeurl-1.0.1" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; - sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; - }; - }; - "camelize-1.0.0" = { - name = "camelize"; - packageName = "camelize"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"; - sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; - }; - }; - "content-security-policy-builder-1.1.0" = { - name = "content-security-policy-builder"; - packageName = "content-security-policy-builder"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz"; - sha1 = "d91f1b076236c119850c7dee9924bf55e05772b3"; - }; - }; - "dasherize-2.0.0" = { - name = "dasherize"; - packageName = "dasherize"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz"; - sha1 = "6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308"; - }; - }; - "lodash.reduce-4.6.0" = { - name = "lodash.reduce"; - packageName = "lodash.reduce"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; - sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; - }; - }; - "platform-1.3.3" = { - name = "platform"; - packageName = "platform"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz"; - sha1 = "646c77011899870b6a0903e75e997e8e51da7461"; - }; - }; - "dashify-0.2.2" = { - name = "dashify"; - packageName = "dashify"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dashify/-/dashify-0.2.2.tgz"; - sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe"; - }; - }; - "character-parser-1.2.1" = { - name = "character-parser"; - packageName = "character-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; - sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; - }; - }; - "clean-css-3.4.25" = { - name = "clean-css"; - packageName = "clean-css"; - version = "3.4.25"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; - sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; - }; - }; - "constantinople-3.0.2" = { - name = "constantinople"; - packageName = "constantinople"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; - sha1 = "4b945d9937907bcd98ee575122c3817516544141"; - }; - }; - "jstransformer-0.0.2" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; - sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; - }; - }; - "transformers-2.1.0" = { - name = "transformers"; - packageName = "transformers"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; - sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; - }; - }; - "uglify-js-2.8.20" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.8.20"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; - }; - }; - "void-elements-2.0.1" = { - name = "void-elements"; - packageName = "void-elements"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; - sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; - }; - }; - "with-4.0.3" = { - name = "with"; - packageName = "with"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz"; - sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e"; - }; - }; - "commander-2.8.1" = { - name = "commander"; - packageName = "commander"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; - }; - }; - "source-map-0.4.4" = { - name = "source-map"; - packageName = "source-map"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; - sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; - "promise-6.1.0" = { - name = "promise"; - packageName = "promise"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; - sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; - }; - }; - "asap-1.0.0" = { - name = "asap"; - packageName = "asap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; - sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; - }; - }; - "promise-2.0.0" = { - name = "promise"; - packageName = "promise"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; - sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; - }; - }; - "css-1.0.8" = { - name = "css"; - packageName = "css"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; - sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; - }; - }; - "uglify-js-2.2.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; - sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; - }; - }; - "is-promise-1.0.1" = { - name = "is-promise"; - packageName = "is-promise"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; - sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; - }; - }; - "css-parse-1.0.4" = { - name = "css-parse"; - packageName = "css-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; - sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; - }; - }; - "css-stringify-1.0.5" = { - name = "css-stringify"; - packageName = "css-stringify"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; - sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; - }; - }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; - }; - }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "kind-of-3.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; - "acorn-1.2.2" = { - name = "acorn"; - packageName = "acorn"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; - }; - }; - "acorn-globals-1.0.9" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; - sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; - }; - }; - "abab-1.0.3" = { - name = "abab"; - packageName = "abab"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; - sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; - }; - }; - "cssom-0.3.2" = { - name = "cssom"; - packageName = "cssom"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz"; - sha1 = "b8036170c79f07a90ff2f16e22284027a243848b"; - }; - }; - "cssstyle-0.2.37" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "0.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; - sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; - }; - }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; - }; - }; - "nwmatcher-1.3.9" = { - name = "nwmatcher"; - packageName = "nwmatcher"; - version = "1.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"; - sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a"; - }; - }; - "parse5-1.5.1" = { - name = "parse5"; - packageName = "parse5"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz"; - sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; - }; - }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "sax-1.2.2" = { - name = "sax"; - packageName = "sax"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; - sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; - }; - }; - "symbol-tree-3.2.2" = { - name = "symbol-tree"; - packageName = "symbol-tree"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; - sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; - }; - }; - "tough-cookie-2.3.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; - sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; - }; - }; - "webidl-conversions-2.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz"; - sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; - }; - }; - "whatwg-url-compat-0.6.5" = { - name = "whatwg-url-compat"; - packageName = "whatwg-url-compat"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; - sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; - }; - }; - "xml-name-validator-2.0.1" = { - name = "xml-name-validator"; - packageName = "xml-name-validator"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz"; - sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635"; - }; - }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; - }; - }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; - "esprima-2.7.3" = { - name = "esprima"; - packageName = "esprima"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; - }; - }; - "optionator-0.8.2" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; - }; - }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; - }; - }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - }; - "deep-is-0.1.3" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - }; - "wordwrap-1.0.0" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; - }; - }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "extend-3.0.0" = { - name = "extend"; - packageName = "extend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.1.2" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "ajv-4.11.5" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; - }; - }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "jsprim-1.4.0" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; - }; - }; - "sshpk-1.11.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "extsprintf-1.0.2" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "verror-1.3.6" = { - name = "verror"; - packageName = "verror"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "getpass-0.1.6" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; - sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; - }; - }; - "vary-1.1.1" = { - name = "vary"; - packageName = "vary"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; - sha1 = "67535ebb694c1d52257457984665323f587e8d37"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "minimist-0.0.10" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - }; - "glob-7.1.1" = { - name = "glob"; - packageName = "glob"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "htmlparser2-3.9.2" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; - sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; - }; - }; - "regexp-quote-0.0.0" = { - name = "regexp-quote"; - packageName = "regexp-quote"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; - sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; - }; - }; - "domhandler-2.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; - }; - }; - "domutils-1.5.1" = { - name = "domutils"; - packageName = "domutils"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; - }; - }; - "entities-1.1.1" = { - name = "entities"; - packageName = "entities"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; - }; - }; - "readable-stream-2.2.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; - }; - }; - "dom-serializer-0.1.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; - }; - }; - "domelementtype-1.1.3" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; - }; - }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "get-caller-file-1.0.2" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; - }; - }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "which-module-1.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; - }; - }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; - }; - }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; - "websocket-driver-0.6.5" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; - }; - }; - "websocket-extensions-0.1.1" = { - name = "websocket-extensions"; - packageName = "websocket-extensions"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - }; - "es6-shim-0.27.1" = { - name = "es6-shim"; - packageName = "es6-shim"; - version = "0.27.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.27.1.tgz"; - sha1 = "bd3f870663eac2ede8e8943e2a6d23c052d53fc6"; - }; - }; - "minimum-tls-version-0.0.1" = { - name = "minimum-tls-version"; - packageName = "minimum-tls-version"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimum-tls-version/-/minimum-tls-version-0.0.1.tgz"; - sha1 = "42220187e52700e253218cfa8ad974920b73ea74"; - }; - }; - "util-0.10.3" = { - name = "util"; - packageName = "util"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; - }; - }; - "inherits-2.0.1" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - }; - "xml2js-0.1.14" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; - }; - }; - "databank-1.0.1" = { - name = "databank"; - packageName = "databank"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-1.0.1.tgz"; - sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b"; - }; - }; - "mongodb-2.2.25" = { - name = "mongodb"; - packageName = "mongodb"; - version = "2.2.25"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.25.tgz"; - sha1 = "d3b25dad00eda2bdfcbc996210ba082ac686a6b6"; - }; - }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; - }; - }; - "es6-promise-3.2.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; - }; - }; - "mongodb-core-2.1.9" = { - name = "mongodb-core"; - packageName = "mongodb-core"; - version = "2.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz"; - sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5"; - }; - }; - "readable-stream-2.1.5" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; - }; - }; - "bson-1.0.4" = { - name = "bson"; - packageName = "bson"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz"; - sha1 = "93c10d39eaa5b58415cbc4052f3e53e562b0b72c"; - }; - }; - "require_optional-1.0.0" = { - name = "require_optional"; - packageName = "require_optional"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz"; - sha1 = "52a86137a849728eb60a55533617f8f914f59abf"; - }; - }; - "resolve-from-2.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; - sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "redis-0.10.3" = { - name = "redis"; - packageName = "redis"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; - }; - }; - }; - args = { - name = "pump.io"; - packageName = "pump.io"; - version = "3.0.0"; - src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-3.0.0.tgz"; sha1 = "ycfm7ak83xi8mgafhp9q0n6n3kzmdz16"; }; - dependencies = [ - (sources."bcrypt-0.8.7" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.3.5" - ]; - }) - (sources."bunyan-1.8.9" // { - dependencies = [ - (sources."dtrace-provider-0.8.1" // { - dependencies = [ - sources."nan-2.5.1" - ]; - }) - (sources."mv-2.1.1" // { - dependencies = [ - sources."ncp-2.0.0" - (sources."rimraf-2.4.5" // { - dependencies = [ - (sources."glob-6.0.4" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."safe-json-stringify-1.0.4" - sources."moment-2.18.1" - ]; - }) - sources."colors-1.1.2" - (sources."connect-2.30.2" // { - dependencies = [ - sources."basic-auth-connect-1.0.0" - (sources."body-parser-1.13.3" // { - dependencies = [ - sources."iconv-lite-0.4.11" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - (sources."raw-body-2.1.7" // { - dependencies = [ - sources."bytes-2.4.0" - sources."iconv-lite-0.4.13" - sources."unpipe-1.0.0" - ]; - }) - ]; - }) - sources."bytes-2.1.0" - sources."cookie-0.1.3" - sources."cookie-parser-1.3.5" - sources."cookie-signature-1.0.6" - (sources."compression-1.5.2" // { - dependencies = [ - (sources."accepts-1.2.13" // { - dependencies = [ - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."negotiator-0.5.3" - ]; - }) - (sources."compressible-2.0.10" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."vary-1.0.1" - ]; - }) - (sources."connect-timeout-1.6.2" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."content-type-1.0.2" - (sources."csurf-1.8.3" // { - dependencies = [ - (sources."csrf-3.0.6" // { - dependencies = [ - sources."rndm-1.2.0" - sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.4" // { - dependencies = [ - sources."random-bytes-1.0.0" - ]; - }) - ]; - }) - ]; - }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."depd-1.0.1" - (sources."errorhandler-1.4.3" // { - dependencies = [ - (sources."accepts-1.3.3" // { - dependencies = [ - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."negotiator-0.6.1" - ]; - }) - sources."escape-html-1.0.3" - ]; - }) - (sources."express-session-1.11.3" // { - dependencies = [ - sources."crc-3.3.0" - (sources."uid-safe-2.0.0" // { - dependencies = [ - sources."base64-url-1.2.1" - ]; - }) - ]; - }) - (sources."finalhandler-0.4.0" // { - dependencies = [ - sources."escape-html-1.0.2" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."unpipe-1.0.0" - ]; - }) - sources."fresh-0.3.0" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - sources."statuses-1.3.1" - ]; - }) - (sources."morgan-1.6.1" // { - dependencies = [ - sources."basic-auth-1.0.4" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - ]; - }) - (sources."multiparty-3.3.2" // { - dependencies = [ - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - ]; - }) - sources."stream-counter-0.2.0" - ]; - }) - sources."on-headers-1.0.1" - sources."parseurl-1.3.1" - sources."pause-0.1.0" - sources."qs-4.0.0" - (sources."response-time-2.3.2" // { - dependencies = [ - sources."depd-1.1.0" - ]; - }) - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."etag-1.7.0" - sources."ms-0.7.2" - ]; - }) - (sources."serve-index-1.7.3" // { - dependencies = [ - (sources."accepts-1.2.13" // { - dependencies = [ - sources."negotiator-0.5.3" - ]; - }) - sources."batch-0.5.3" - sources."escape-html-1.0.3" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - ]; - }) - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."escape-html-1.0.3" - ]; - }) - (sources."type-is-1.6.14" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - ]; - }) - sources."utils-merge-1.0.0" - sources."vhost-3.0.2" - ]; - }) - (sources."connect-auth-git://github.com/e14n/connect-auth" // { - dependencies = [ - sources."oauth-0.9.7" - sources."openid-0.4.1" - ]; - }) - (sources."connect-databank-1.0.3" // { - dependencies = [ - sources."async-1.5.2" - sources."node-uuid-1.4.8" - sources."set-immediate-0.1.1" - ]; - }) - (sources."connect-multiparty-2.0.0" // { - dependencies = [ - (sources."multiparty-4.1.3" // { - dependencies = [ - (sources."fd-slicer-1.0.1" // { - dependencies = [ - sources."pend-1.2.0" - ]; - }) - ]; - }) - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."qs-4.0.0" - (sources."type-is-1.6.14" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - ]; - }) - ]; - }) - sources."crypto-cacerts-0.1.0" - (sources."databank-0.19.8" // { - dependencies = [ - sources."set-immediate-0.1.1" - ]; - }) - (sources."dateformat-1.0.12" // { - dependencies = [ - sources."get-stdin-4.0.1" - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - sources."minimist-1.2.0" - (sources."normalize-package-data-2.3.6" // { - dependencies = [ - sources."hosted-git-info-2.4.1" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.3.0" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."strip-indent-1.0.1" - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - ]; - }) - (sources."dialback-client-0.2.0" // { - dependencies = [ - sources."underscore-1.5.2" - sources."step-0.0.6" - ]; - }) - sources."dompurify-0.8.5" - (sources."emailjs-1.0.8" // { - dependencies = [ - sources."addressparser-0.3.2" - (sources."mimelib-0.2.14" // { - dependencies = [ - (sources."encoding-0.1.12" // { - dependencies = [ - sources."iconv-lite-0.4.15" - ]; - }) - sources."addressparser-0.2.1" - ]; - }) - sources."moment-2.11.2" - sources."starttls-1.0.1" - sources."bufferjs-1.1.0" - ]; - }) - (sources."express-3.21.2" // { - dependencies = [ - sources."basic-auth-1.0.4" - sources."content-disposition-0.5.0" - sources."content-type-1.0.2" - sources."commander-2.6.0" - sources."cookie-0.1.3" - sources."cookie-signature-1.0.6" - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."depd-1.0.1" - sources."escape-html-1.0.2" - sources."etag-1.7.0" - sources."fresh-0.3.0" - sources."merge-descriptors-1.0.0" - sources."methods-1.1.2" - sources."parseurl-1.3.1" - (sources."proxy-addr-1.0.10" // { - dependencies = [ - sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" - ]; - }) - sources."range-parser-1.0.3" - (sources."send-0.13.0" // { - dependencies = [ - sources."destroy-1.0.3" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."mime-1.3.4" - sources."ms-0.7.1" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."statuses-1.2.1" - ]; - }) - sources."utils-merge-1.0.0" - sources."vary-1.0.1" - ]; - }) - (sources."express-session-1.15.2" // { - dependencies = [ - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."crc-3.4.4" - (sources."debug-2.6.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."depd-1.1.0" - sources."on-headers-1.0.1" - sources."parseurl-1.3.1" - (sources."uid-safe-2.1.4" // { - dependencies = [ - sources."random-bytes-1.0.0" - ]; - }) - sources."utils-merge-1.0.0" - ]; - }) - (sources."gm-1.23.0" // { - dependencies = [ - sources."array-parallel-0.1.3" - sources."array-series-0.1.5" - (sources."cross-spawn-4.0.2" // { - dependencies = [ - (sources."lru-cache-4.0.2" // { - dependencies = [ - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - ]; - }) - (sources."which-1.2.14" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - ]; - }) - (sources."helmet-3.5.0" // { - dependencies = [ - (sources."connect-3.6.0" // { - dependencies = [ - (sources."debug-2.6.1" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."finalhandler-1.0.0" // { - dependencies = [ - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."statuses-1.3.1" - sources."unpipe-1.0.0" - ]; - }) - sources."parseurl-1.3.1" - sources."utils-merge-1.0.0" - ]; - }) - sources."dns-prefetch-control-0.1.0" - sources."dont-sniff-mimetype-1.0.0" - sources."frameguard-3.0.0" - (sources."helmet-csp-2.4.0" // { - dependencies = [ - sources."camelize-1.0.0" - (sources."content-security-policy-builder-1.1.0" // { - dependencies = [ - sources."dashify-0.2.2" - ]; - }) - sources."dasherize-2.0.0" - sources."lodash.reduce-4.6.0" - sources."platform-1.3.3" - ]; - }) - sources."hide-powered-by-1.0.0" - sources."hpkp-2.0.0" - (sources."hsts-2.0.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."ienoopen-1.0.0" - sources."nocache-2.0.0" - sources."referrer-policy-1.1.0" - sources."x-xss-protection-1.0.0" - ]; - }) - (sources."jade-1.11.0" // { - dependencies = [ - sources."character-parser-1.2.1" - (sources."clean-css-3.4.25" // { - dependencies = [ - (sources."commander-2.8.1" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."source-map-0.4.4" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - sources."commander-2.6.0" - (sources."constantinople-3.0.2" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) - (sources."jstransformer-0.0.2" // { - dependencies = [ - sources."is-promise-2.1.0" - (sources."promise-6.1.0" // { - dependencies = [ - sources."asap-1.0.0" - ]; - }) - ]; - }) - (sources."transformers-2.1.0" // { - dependencies = [ - (sources."promise-2.0.0" // { - dependencies = [ - sources."is-promise-1.0.1" - ]; - }) - (sources."css-1.0.8" // { - dependencies = [ - sources."css-parse-1.0.4" - sources."css-stringify-1.0.5" - ]; - }) - (sources."uglify-js-2.2.5" // { - dependencies = [ - (sources."source-map-0.1.43" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - (sources."optimist-0.3.7" // { - dependencies = [ - sources."wordwrap-0.0.3" - ]; - }) - ]; - }) - ]; - }) - (sources."uglify-js-2.8.20" // { - dependencies = [ - sources."source-map-0.5.6" - (sources."yargs-3.10.0" // { - dependencies = [ - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - (sources."center-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - sources."lazy-cache-1.0.4" - ]; - }) - (sources."right-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - ]; - }) - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - ]; - }) - sources."uglify-to-browserify-1.0.2" - ]; - }) - sources."void-elements-2.0.1" - (sources."with-4.0.3" // { - dependencies = [ - sources."acorn-1.2.2" - (sources."acorn-globals-1.0.9" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) - ]; - }) - ]; - }) - sources."jankyqueue-0.1.1" - (sources."jsdom-7.2.2" // { - dependencies = [ - sources."abab-1.0.3" - sources."acorn-2.7.0" - sources."acorn-globals-1.0.9" - sources."cssom-0.3.2" - sources."cssstyle-0.2.37" - (sources."escodegen-1.8.1" // { - dependencies = [ - sources."estraverse-1.9.3" - sources."esutils-2.0.2" - sources."esprima-2.7.3" - (sources."optionator-0.8.2" // { - dependencies = [ - sources."prelude-ls-1.1.2" - sources."deep-is-0.1.3" - sources."wordwrap-1.0.0" - sources."type-check-0.3.2" - sources."levn-0.3.0" - sources."fast-levenshtein-2.0.6" - ]; - }) - (sources."source-map-0.2.0" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - sources."nwmatcher-1.3.9" - sources."parse5-1.5.1" - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.5" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.11.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.6" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.0.1" - sources."stringstream-0.0.5" - sources."tunnel-agent-0.6.0" - ]; - }) - sources."sax-1.2.2" - sources."symbol-tree-3.2.2" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."webidl-conversions-2.0.1" - (sources."whatwg-url-compat-0.6.5" // { - dependencies = [ - sources."tr46-0.0.3" - ]; - }) - sources."xml-name-validator-2.0.1" - ]; - }) - (sources."method-override-2.3.8" // { - dependencies = [ - (sources."debug-2.6.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."methods-1.1.2" - sources."parseurl-1.3.1" - sources."vary-1.1.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."oauth-evanp-0.9.10-evanp.2" - sources."octal-1.0.0" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) - (sources."rimraf-2.6.1" // { - dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - (sources."sanitize-html-1.14.1" // { - dependencies = [ - (sources."htmlparser2-3.9.2" // { - dependencies = [ - sources."domelementtype-1.3.0" - sources."domhandler-2.3.0" - (sources."domutils-1.5.1" // { - dependencies = [ - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - ]; - }) - sources."entities-1.1.1" - sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."regexp-quote-0.0.0" - sources."xtend-4.0.1" - ]; - }) - sources."schlock-0.2.1" - (sources."send-0.13.2" // { - dependencies = [ - sources."debug-2.2.0" - sources."depd-1.1.0" - sources."destroy-1.0.4" - sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."fresh-0.3.0" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."mime-1.3.4" - sources."ms-0.7.1" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."range-parser-1.0.3" - sources."statuses-1.2.1" - ]; - }) - (sources."showdown-1.6.4" // { - dependencies = [ - (sources."yargs-6.6.0" // { - dependencies = [ - sources."camelcase-3.0.0" - (sources."cliui-3.2.0" // { - dependencies = [ - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wrap-ansi-2.1.0" - ]; - }) - sources."decamelize-1.2.0" - sources."get-caller-file-1.0.2" - (sources."os-locale-1.4.0" // { - dependencies = [ - (sources."lcid-1.0.0" // { - dependencies = [ - sources."invert-kv-1.0.0" - ]; - }) - ]; - }) - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."normalize-package-data-2.3.6" // { - dependencies = [ - sources."hosted-git-info-2.4.1" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.3.0" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."set-blocking-2.0.0" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - sources."which-module-1.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" - ]; - }) - ]; - }) - (sources."sockjs-0.3.18" // { - dependencies = [ - (sources."faye-websocket-0.10.0" // { - dependencies = [ - (sources."websocket-driver-0.6.5" // { - dependencies = [ - sources."websocket-extensions-0.1.1" - ]; - }) - ]; - }) - sources."uuid-2.0.3" - ]; - }) - (sources."ssl-config-0.0.9" // { - dependencies = [ - (sources."assert-1.4.1" // { - dependencies = [ - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) - ]; - }) - sources."es6-shim-0.27.1" - sources."minimum-tls-version-0.0.1" - ]; - }) - sources."step-1.0.0" - sources."ua-parser-js-0.7.12" - sources."underscore-1.8.3" - (sources."underscore-contrib-0.3.0" // { - dependencies = [ - sources."underscore-1.6.0" - ]; - }) - sources."uuid-3.0.1" - sources."validator-4.4.0" - (sources."webfinger-0.4.2" // { - dependencies = [ - sources."step-0.0.6" - (sources."xml2js-0.1.14" // { - dependencies = [ - sources."sax-1.2.2" - ]; - }) - ]; - }) - (sources."databank-mongodb-1.0.0" // { - dependencies = [ - (sources."databank-1.0.1" // { - dependencies = [ - sources."setimmediate-1.0.5" - ]; - }) - (sources."debug-2.6.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."mongodb-2.2.25" // { - dependencies = [ - sources."es6-promise-3.2.1" - (sources."mongodb-core-2.1.9" // { - dependencies = [ - sources."bson-1.0.4" - (sources."require_optional-1.0.0" // { - dependencies = [ - sources."semver-5.3.0" - sources."resolve-from-2.0.0" - ]; - }) - ]; - }) - (sources."readable-stream-2.1.5" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - ]; - }) - (sources."databank-redis-0.19.6" // { - dependencies = [ - sources."async-0.9.2" - sources."redis-0.10.3" - sources."underscore-1.6.0" - ]; - }) - (sources."databank-lrucache-0.1.3" // { - dependencies = [ - sources."databank-1.0.1" - (sources."lru-cache-4.0.2" // { - dependencies = [ - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - ]; - }) - sources."setimmediate-1.0.5" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - homepage = http://pump.io/; - license = "Apache-2.0"; - }; - production = true; - }; -in -{ - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; -} \ No newline at end of file diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index ac60827aeb7bfe468544fa8e60542d9ba1b64563..3835f5ae33242143c1955797eb2145e8adad86ec 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "searx"; - version = "0.13.1"; + version = "0.14.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani"; + sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl"; }; postPatch = '' diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index a74221cfbd33531a796a68d7668adc8bb27cd16e..4c4cd21cddf42cca5c2d61f178741c4f762584e0 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.2"; + version = "0.9.5"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "07wn5pg7pkya8d4k2khp2jyvkdkmm5431fj1k0m1i5k65yyvfqzr"; + sha256 = "133ffxyw9bf61rky01d3rkkm34np5z4kwmgwx6ygshl83y0ylnwf"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 07b530f4ef72052f0026a806b0b013c9ecc26de3..c0d5876a3a2dec5accd3dce2d7f852e37904b77d 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.3.1"; + version = "2.3.2"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1qk7jicni5g8acpjybrwnwf7zknk3b0mxiv5876lrsajcxdxwnf4"; + sha256 = "17yczdvgl43j6wa7hksxi2b51afvyd56vdya6hbbv68iiba4jyh4"; }; outputs = [ "out" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cc2cade8ba13538953afc8dc761ac5aad100f2dc..d22565ae8db9c138de4351ecadd9fda4bcf157a5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,6 +1,6 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol +, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 1f3557dff66e704aeaf9ad145c479ec4e0afa024..acf234a1683ece0e48c7b6f22a5b3fb4e3baa0bf 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -230,7 +230,7 @@ print OUT ""; print OUT < ++#include + #include + #include + #include diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index a18051f9c126e3df16f0e557ebb43ffdf3f3847b..32b85eaa68157bebc2681557938c31b2a4eee0d7 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -86,12 +86,17 @@ let }; ceph-python-env = python2Packages.python.withPackages (ps: [ - ps.sphinx - ps.flask - ps.argparse - ps.cython - ps.setuptools - ps.pip + ps.sphinx + ps.flask + ps.argparse + ps.cython + ps.setuptools + ps.pip + # Libraries needed by the python tools + ps.Mako + ps.pecan + ps.prettytable + ps.webob ]); in @@ -103,11 +108,13 @@ stdenv.mkDerivation { patches = [ # ./ceph-patch-cmake-path.patch ./0001-kv-RocksDBStore-API-break-additional.patch + ] ++ optionals stdenv.isLinux [ + ./0002-fix-absolute-include-path.patch ]; nativeBuildInputs = [ cmake - pkgconfig which git + pkgconfig which git python2Packages.wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -122,6 +129,7 @@ stdenv.mkDerivation { ] ++ optionals hasKinetic [ optKinetic-cpp-client ]; + preConfigure ='' # rip off submodule that interfer with system libs @@ -149,6 +157,10 @@ stdenv.mkDerivation { "-DWITH_LIBCEPHFS=OFF" ]; + postFixup = '' + wrapPythonPrograms + ''; + enableParallelBuilding = true; outputs = [ "dev" "lib" "out" "doc" ]; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index e415f57e707e4e8ac993d4733dd2e4c1e775cda2..03da84f7c733fd955be0a1d6b97faf7bfdcb664e 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { - sha256 = "0isx7n4r8znk02464s0wvlzk6ry5mlnq3kgnd0rapnhjwdvwqr5y"; + sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index e9d3df026b0883b1a1fb032ab5858d22b0750d45..4594aa9370ca420062a1077e61527437055215e2 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hubicfuse-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "TurboGit"; repo = "hubicfuse"; rev = "v${version}"; - sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s"; + sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 681fc1c80ef014e5c0e028186392285a121d7dcb..59d8e8aa43893164b17187775b9ad86a701fecfe 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.1.0"; in +let version = "1.2.1"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; + sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 9d7e9eaee95ef08b268751a32937b6208cde1d10..11d836e66bccc78d88588619da08fdf157041267 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0bammbb8h10n51qk5141gabsd5p91qbaqq7cwa1q8yf5qglwlp10"; + sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx"; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 233034792e155d958545958d6f0b32c39ef4bde8..6fc7ba6499eaf6bc3fa496057ca970f8a5948e1b 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.3.2"; + version = "0.8.1"; src = fetchFromGitHub { - sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh"; + sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 593715b2068d919ccbf4c474107cd065c8783feb..3283d6789f7348ca1220a4cecee31621d5a47ddb 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zerofree-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "http://frippery.org/uml/${name}.tgz"; - sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf"; + sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; buildInputs = [ e2fsprogs ]; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 8c53882ff1b22314c57a5af013357fab9eb3b7df..a4d49edcb44766207779ad9c1e81fa362d71071c 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "cfdg-${version}"; - version = "3.0.2"; + version = "3.0.9"; src = fetchurl { - sha256 = "1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; + sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl"; url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz"; }; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 7261326633a12153b213721f6dba0e28f9d4dbc3..dc703cf02f75e1e588dd051ef42d811f477c4256 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon epoxy at_spi2_core + libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu-glib ]; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 69ae03d675031d069931a287cb4796419488607d..e9f1ad5dacd7677d836091fb1a52c7637b0939cd 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -2,14 +2,14 @@ let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.4"; name = "imgur-screenshot-${version}"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; rev = "v${version}"; - sha256 = "01wiqrc7xxvk7kzgw756jahwa0szb200l8030iwfcgxb679k3v0j"; + sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index e767b7564ecf3cf79d318273d5407bf32985899f..0fa991638457cc80b12df45444e583e8aea73a62 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.0.7"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; + sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 42ca4cf2e270358b58cd3ec9890afc0ab704ff8a..5dfed3722e09dab0d0f0ebbc47026821aefb2b55 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.4"; + version = "3.7.0.7"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q"; + sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7"; }; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index ba376af1c3cdc5305c8bfdc675cfca076c689ab1..402628f0fc8f668a057c93c64110dd7fe5180ede 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "scanbd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { - sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s"; + sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n"; url = "mirror://sourceforge/scanbd/${name}.tgz"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index e9e2e29f7fad170f215901fff4896fc72850de39..2bd4bf1c878c8d8320776455ccbafd0070abfc68 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }: +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "fcitx-rime-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; - buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ]; + buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ]; # cmake cannont automatically find our nonstandard brise install location cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 1ea7ef4251fe8cb5148d21695274ef94fa00bd83..e31d1ddfaa80d97fe2afd2c061af84128e3278d1 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa"; }; - propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; + propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein pygobject3 ]; nativeBuildInputs = [ python3Packages.wrapPython ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index f71a21b914f3078ba365bdd157bf9503ea142136..59ddab7294f56f37fd8956aeb379d615e8330d91 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 -, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true +, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh - cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make . + cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog"; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gconf - gtk_doc + gtk-doc intltool makeWrapper pkgconfig @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 isocodes - json_glib + json-glib libnotify ] ++ optionals withWayland [ libxkbcommon diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index d41ba1e791f9624cf6e8b44f28b1c8d9e9af556d..2b93274b79a20945e65cc26ac6afad63484e385f 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, makeWrapper, lndir -, dconf, hicolor_icon_theme, ibus, librsvg, plugins +, dconf, hicolor-icon-theme, ibus, librsvg, plugins }: let @@ -7,7 +7,7 @@ let env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; - propagatedUserEnvPackages = [ hicolor_icon_theme ]; + propagatedUserEnvPackages = [ hicolor-icon-theme ]; paths = [ ibus ] ++ plugins; inherit (ibus) meta; }; @@ -37,7 +37,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" done for prog in ibus-daemon; do @@ -56,7 +56,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --add-flags "--cache=refresh" done ''; diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch new file mode 100644 index 0000000000000000000000000000000000000000..b694fcabbd0dd3f12942280e351aaa0d44cc6f3e --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch @@ -0,0 +1,13 @@ +diff --git a/libinput-gestures b/libinput-gestures +index f337ba3..fe56d66 100755 +--- a/libinput-gestures ++++ b/libinput-gestures +@@ -6,7 +6,7 @@ from collections import OrderedDict + from pathlib import Path + from distutils.version import LooseVersion as Version + +-PROG = Path(sys.argv[0]).stem ++PROG = "libinput-gestures" + + # Conf file containing gesture commands. + # Search first for user file then system file. diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..c6ee123db8b6302490caf80452879c1bb9e9ee14 --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch @@ -0,0 +1,43 @@ +diff --git a/libinput-gestures b/libinput-gestures +index f337ba3..5f5b05d 100755 +--- a/libinput-gestures ++++ b/libinput-gestures +@@ -75,17 +75,13 @@ def get_libinput_vers(): + 'Return the libinput installed version number string' + # Try to use newer libinput interface then fall back to old + # (depreciated) interface. +- res = run(('libinput', '--version'), check=False) ++ res = run(('@libinput@', '--version'), check=False) + return res.strip() if res else run(('libinput-list-devices', '--version')) + + # Libinput changed the way in which it's utilities are called + libvers = get_libinput_vers() +-if Version(libvers) >= Version('1.8'): +- cmd_debug_events = 'libinput debug-events' +- cmd_list_devices = 'libinput list-devices' +-else: +- cmd_debug_events = 'libinput-debug-events' +- cmd_list_devices = 'libinput-list-devices' ++cmd_debug_events = '@libinput@ debug-events' ++cmd_list_devices = '@libinput@ list-devices' + + def get_devices_list(): + 'Get list of devices and their attributes (as a dict) from libinput' +@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND): + + def run(self): + 'Get list of current workspaces and select next one' +- stdout = run(('wmctrl', '-d'), check=False) ++ stdout = run(('@wmctrl@', '-d'), check=False) + if not stdout: + # This command can fail on GNOME when you have only a single + # dynamic workspace using Xorg (probably a GNOME bug) so let's +@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND): + + # Switch to desired workspace + if index >= minindex and index < maxindex: +- run(('wmctrl', '-s', str(index))) ++ run(('@wmctrl@', '-s', str(index))) + + # Table of gesture handlers + handlers = OrderedDict() diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e58cabc6791a92b9047ea1ab7a2fc6b0c6f1cdbb --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, + libinput, wmctrl, + xdotool ? null, + extraUtilsPath ? lib.optional (xdotool != null) xdotool +}: +stdenv.mkDerivation rec { + pname = "libinput-gestures"; + version = "2.32"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bulletmark"; + repo = "libinput-gestures"; + rev = version; + sha256 = "1by6sabx0s8sd9w5675gc26q7yccxnxxsjg4dqlb6nbs0vcg81s7"; + }; + patches = [ + ./0001-hardcode-name.patch + ./0002-paths.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = + '' + substituteInPlace libinput-gestures-setup --replace /usr/ / + + substituteInPlace libinput-gestures \ + --replace /etc "$out/etc" \ + --subst-var-by libinput "${libinput}/bin/libinput" \ + --subst-var-by wmctrl "${wmctrl}/bin/wmctrl" + ''; + installPhase = + '' + runHook preInstall + ${stdenv.shell} libinput-gestures-setup -d "$out" install + runHook postInstall + ''; + postFixup = + '' + rm "$out/bin/libinput-gestures-setup" + substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out" + chmod +x "$out/share/applications/libinput-gestures.desktop" + wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/bulletmark/libinput-gestures; + description = "Gesture mapper for libinput"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ teozkr ]; + }; +} diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 6214bc216f8bc7258019eea581cb79154bbf5d4a..168a3f887728c14f711df38f97c7478a596def87 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.1.1"; + version = "1.2.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; - sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av"; + sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; }; aptlyCompletionSrc = fetchFromGitHub { diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 4d6e90a347e73cbce61f7f4772ec59a67cb974e6..0808704ecb783cfff8502197a13c9aac8957a853 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -4,7 +4,7 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "1.4.0"; + version = "2.0.0"; buildInputs = with pythonPackages; [ nose ]; propagatedBuildInputs = with pythonPackages; [ requests ]; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2"; + sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk"; }; patchPhase = '' diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 974b7691cb935ce6c433fcf80167810b1a748705..859112d29bc23583d000f4102223f541b692d4bd 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,42 +1,27 @@ -{ stdenv, fetchurl, - boost, clasp, cmake, gringo, re2c +{ stdenv, fetchzip +, boost, clasp, cmake, gringo, re2c }: -let - version = "1.9.1"; -in - stdenv.mkDerivation rec { + version = "1.9.4"; name = "aspcud-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; - sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0"; + src = fetchzip { + url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; + sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; buildInputs = [ boost clasp cmake gringo re2c ]; - buildPhase = '' - cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${gringo}/bin/gringo \ - -DCLASP_LOC=${clasp}/bin/clasp \ - -DENCODING_LOC=$out/share/aspcud/specification.lp \ - . - - make - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/{aspcud,cudf2lp,lemon} $out/bin - - mkdir -p $out/share/aspcud - cp ../share/aspcud/specification.lp $out/share/aspcud - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo" + "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" + ]; meta = with stdenv.lib; { description = "Solver for package problems in CUDF format using ASP"; - homepage = http://potasssco.sourceforge.net/; + homepage = "https://potassco.org/aspcud/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ba38a55dda024add9cba9237bfce283d3a4f1cb6..4d3376108b7ed37628f11da88e01ddb44d35daa0 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.5.0"; + version = "22.5.1"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; + sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 02caf6e33f99e9e24af40e7b9d5e7556b4aa5521..75c7b258a449490f16f1aea27083d5face81a526 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "autorevision-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy"; + sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; }; buildInputs = [ diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 899fb5f643abaf5296fdddb94791e6ea5c0f1809..a8b6d5f3c25258635fa2a154ad94bd26989380db 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "bandwidth-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd"; + sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; buildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 7ea3b1fd279c2a27cdd3436d4ec6a90ed7d4005a..e06c2dee000d17f98c3d5b99882efc9f5f01fc6b 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.175"; + version = "1.178"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf"; + sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 8dbcd08fba6eb66b8c6b3fc6948647721f1acb44..6635f2931955016bea92f550eb8296c689a07f77 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -4,11 +4,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.5"; + name = "brltty-5.6"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; + sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 6a76906a805f83baf66dc67ef4ee141c3d1e62b5..e6ff7e99353bb64a7b6c70bfa5a10832c6d32c17 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-1.15"; + name = "convmv-2.04"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "0daiiapsrca8zlbmlz2kw2fn4vmkh48cblb70h08idchhk3sw5f3"; + sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy"; }; preBuild='' diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index ec9ca37c082e75995b532e19cfbd298f970f990d..052f52e2ebd4187a2c6fcf3764ecfdca688d44b5 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4"; + sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 418d5e38fd75012f98a6c14bec23c828e0d21e8f..894079fad84b179409f880702426b8bc3b586acd 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, python3Packages, docutils, help2man -, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc +, acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "90"; + version = "91"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1w16667j6ag2iim1xcy8y9v9965mq50k64wnf693mivddll62704"; + sha256 = "16xqy71115cj4kws6bkcjm98nlaff3a32fz82rn2l1xk9w9n3dnz"; }; patches = [ @@ -27,12 +27,12 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ docutils help2man ]; - # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript + # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl libbfd bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils - fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite - squashfsTools unzip xxd xz + acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils + dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip + libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv diff --git a/pkgs/tools/misc/diffoscope/list-tools.sh b/pkgs/tools/misc/diffoscope/list-tools.sh new file mode 100755 index 0000000000000000000000000000000000000000..9af7f0e38899295c01fedaf50b9bdc3faea33559 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/list-tools.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +diffoscope=$(nix-build --no-out-link -E 'with import ./. {}; diffoscope.override { enableBloat = true; }')/bin/diffoscope + +required=$($diffoscope --list-tools | \ + grep '^External-Tools-Required:' | \ + cut -d ' ' -f2- | \ + tr -d ,) + +# Uber-hacky! +pathScript=$(cat $diffoscope | grep PATH) + +export PATH=$(nix-build --no-out-link -A which)/bin +eval "$pathScript" + +for tool in $required; do + if ! which $tool >/dev/null 2>&1; then + echo $tool + fi +done | sort diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 4598655092f33acff87c67de60447f8dc98d80d1..15d8647ff82372f534d58b3e5ab0ef415231a9fd 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.15.0"; + version = "2.15.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "09mys14acjbrkvjy9zl2k521k3xcs6b0brg8zlhh8qadhbirfkp3"; + sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; }; postConfigure = '' diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index e1024d70bce9da4a1fd4025cedf5eadf6e7f875f..9449b7759a8c0507cfcb43c19f73239316adcb36 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diskscan-${version}"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; rev = "${version}"; - sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; }; buildInputs = [ ncurses zlib ]; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index d37655134c551dcb281050b2bae8d17eb056c60a..b8791f5f32a2cb14762d533404a39a44c7dfe18a 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.9"; + version = "4.0"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2"; + sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a"; }; postPatch = '' diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 33624302ebcc6fd4fc7e3139f875823f6d81a08e..1d7c47c2c9aba986d75c485f682adddf679e14fc 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,23 +2,23 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "137p0kcscly95qpjzgx1yxm8k2wf5y9v3srvlhp2ajniirgv8ijv"; + sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; }; - buildInputs = with python3.pkgs; [ flake8 flake8-future-import ]; + checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa openssl ]; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = https://github.com/espressif/esptool; license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 503f0df331cf6b02d6a1561ab0daae286f2fa929..c07420821ed469a712f908f4faae6664493765c0 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib +, darwin, libiconv +}: with rustPlatform; @@ -16,7 +18,10 @@ buildRustPackage rec { }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security ] + ; # Some tests fail, but Travis ensures a proper build doCheck = false; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 0d1c81c00a65a31f955eed1262a238c46e0931b0..ed210783db19c359f6eae7962f31e89395cd550c 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, tcl, makeWrapper }: stdenv.mkDerivation rec { - version = "5.45"; + version = "5.45.4"; name = "expect-${version}"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; + sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; }; buildInputs = [ tcl ]; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 55aa146d301d8a80154055e409dcdd6109294ea4..5356f8ad065fbdfb2b9b42512706262d818af0cf 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "flameshot-${version}"; - version = "0.5.0"; + version = "0.5.1"; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "lupoDharkael"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1fy4il7rdj294l9cs642hx23bry25j9phn37274r2b87hwzy1rrv"; + sha256 = "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"; }; enableParallelBuilding = true; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/lupoDharkael/flameshot; maintainers = [ maintainers.scode ]; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index b29e764131041c327a609b8fac793a05f7b5867e..394310e572dd09ed55a58290c454f50625a0890f 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fpart-${version}"; - version = "0.9.3"; + version = "1.0.0"; src = fetchurl { url = "http://contribs.martymac.org/fpart/${name}.tar.gz"; - sha256 = "0f1vm7c7v9nrd0mnz6qivpnngni6y53b11kvniclqfd25hhw6ggq"; + sha256 = "1p0ajmry18lcg82znfp8nxs4w3izic775l7df08hywlq4vfa66pg"; }; postInstall = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 71cfedcaec72191d1bd87513d9f854a14f935509..99c54b6d3964a61c94d60dcf30b7118ceb14cbb2 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 40d122242ffc3e2cfea3fd6a6d1bdf278eff7415..9719ea6fe554bfb0971b0626f688ce595adde0aa 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-12-24"; + version = "0.4.6a-2018-02-20"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; - sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; + rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; + sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index b8b7666934b8d79416e2d07f7f6bc239e08d1da1..7fd9897a71bb9e49d9a18d0a4543ce5f141ea41f 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "keychain-${version}"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = "${version}"; - sha256 = "0za2fi4g7ixzj3izgwlv71b3cviz3qhz43y4bhdkglg16x5cnzcb"; + sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index d74e2b4e12a748da547bd087eed15d23a2048f0c..f511e013f368884ee2c24d1f50599fdc25be92b3 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.1.3"; + version = "2.2.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; + sha256 = "18b2qi5b9hn8jy3yhav72n14z5l9w3p5fv5kslhbxc7rfvjr4h3x"; }; meta = with lib; { diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 57d29437a21177a13d21807e99ff56e880de6e75..b7963c3ed81734f79107881404f61d48eeef28f7 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "latex2html-${version}"; - version = "2016"; + version = "2018"; src = fetchurl { url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz"; - sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db"; + sha256 = "1qnlg8ajh0amy9gy8rh8sp1l224ak54264i3dhk7rrv9s4k7bqq9"; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 5ab05c92135a2d7e583b47a340dbc432fdc23cc1..4d7c27a39445d6eb93d549e7dde08632be7280ee 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc"; + sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.2"; + version = "0.8.3"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index fb4093d89b86121dc92c6d326399dc502d21215d..f9983cc0a7f6fe4c86722f4ef9b144c4b421d738 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; + sha256 = "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 6289c35f35a7097e2c83a201cae545eabf3f9680..2116815ed0c3cf9cb0736ce87c22c53f36aeecc3 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }: + libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: stdenv.mkDerivation { name = "mdbtools-git-2014-07-25"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib readline bison flex autoreconfHook which txt2man - gnome_doc_utils scrollkeeper libiconv + gnome-doc-utils scrollkeeper libiconv ]; preAutoreconf = '' diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 81d6d29b2bf22c76c937e1a9df3934b629d4c167..52f685b22ca644492467878c5e363032b8c93597 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: +{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; - buildInputs = [ file desktop_file_utils ]; + buildInputs = [ file desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.pyxdg ]; preConfigure = '' substituteInPlace Mimeo.py \ --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ - "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ --replace "EXE_FILE = 'file'" \ "EXE_FILE = '${file}/bin/file'" ''; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a8332ad494dadaf8ea432dfd2fb07405622dd3b8..3b220153f173189e952744af74a5168a74f7d518 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc + autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index cb55226109b467907b16019fea0076284e9d4b09..37073daa699d719db332124a8a893f540adbe3e8 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor_icon_theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkgconfig , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index fd5004302dff966761213c3eaf498f1218ab4329..a5e45dc259b9239f43a67c45720289b60c2675d5 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.5"; name = "pastebinit-${version}"; src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; + sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index d5908210cbdd7d0ab4de159007714d383548c0e5..b4cfe7b26c0e7bdc848da7efae96caa3cffdb9a3 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.4.5"; + version = "1.6.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; + sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 0f5c15241439595d48ab0074bb1873d1d12a78c1..e366a03a7f42082f3a1e246e32204fd5d2c6bab0 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay-3.0.2"; + name = "ponysay-3.0.3"; src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.2.tar.gz"; - sha256 = "03avcbl96rv718lgg6yyrq5mvg3xxzccrnnb6brf4g9mcrwqmsb9"; + url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; + sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; buildInputs = [ python3 texinfo makeWrapper ]; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix index a13f7160aa6902573a721336b7872d63bd22c08e..dfcefe09200874c3cb28dcd4dedfc14e3d590d64 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/quota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.03"; + version = "4.04"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w"; + sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ff86f5cbdf688ba069fd76c0a5a0955e4110dc0..640e641dd4772954e0955fa3d5412374c8e66067 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }: + gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; + buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index d6cad51ce75396dce2447b7e54aaf1f66965abf9..8c2845dc8ebdecf7869f4eacfbbca4045e1fdbdb 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils, + libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this acl diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a310135727db6129f6026e1c4ef1d7c0856b8d4f --- /dev/null +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: + +buildPythonApplication rec { + name = "scfbuild-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "scfbuild"; + rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; + sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -r scfbuild $out/${python.sitePackages} + cp -r bin $out + ''; + + meta = with lib; { + description = "SVGinOT color font builder"; + homepage = https://github.com/eosrei/scfbuild; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..709cbbe07912fbc1efbc2152d30e793ab5cd6541 --- /dev/null +++ b/pkgs/tools/misc/skim/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "skim-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim"; + rev = "v${version}"; + sha256 = "0spkkgjjrch1grb0115rn0wxzsh8pzmm96a7j69zy5pc1il2m5lp"; + }; + + outputs = [ "out" "vim" ]; + + cargoSha256 = "0zbjnii8r41ih2m2vqhm3wdiwgi13kipvxx75sg4vm4maf4wpmhv"; + + patchPhase = '' + sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim + ''; + + postInstall = '' + install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 444 shell/* -t $out/share/skim + install -D -m 444 plugin/skim.vim -t $vim/plugin + + cat <