Merge master into staging
This commit is contained in:
Frederik Rietdijk
commit
3e31d23d99
@ -202,7 +202,7 @@ rec {
|
||||
callPackage = self.newScope {};
|
||||
overrideScope = g:
|
||||
makeScope newScope
|
||||
(lib.fixed-points.extends f g);
|
||||
(self_: let super = f self_; in super // g super self_);
|
||||
packages = f;
|
||||
};
|
||||
in self;
|
||||
|
||||
@ -18,188 +18,6 @@
|
||||
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";
|
||||
};
|
||||
Anton-Latukha = {
|
||||
email = "anton.latuka+nixpkgs@gmail.com";
|
||||
github = "Anton-Latukha";
|
||||
name = "Anton Latukha";
|
||||
};
|
||||
ariutta = {
|
||||
email = "anders.riutta@gmail.com";
|
||||
github = "ariutta";
|
||||
name = "Anders Riutta";
|
||||
};
|
||||
Baughn = {
|
||||
email = "sveina@gmail.com";
|
||||
github = "Baughn";
|
||||
name = "Svein Ove Aas";
|
||||
};
|
||||
ChengCat = {
|
||||
email = "yu@cheng.cat";
|
||||
github = "ChengCat";
|
||||
name = "Yucheng Zhang";
|
||||
};
|
||||
CrazedProgrammer = {
|
||||
email = "crazedprogrammer@gmail.com";
|
||||
github = "CrazedProgrammer";
|
||||
name = "CrazedProgrammer";
|
||||
};
|
||||
CrystalGamma = {
|
||||
email = "nixos@crystalgamma.de";
|
||||
github = "CrystalGamma";
|
||||
name = "Jona Stubbe";
|
||||
};
|
||||
DamienCassou = {
|
||||
email = "damien@cassou.me";
|
||||
github = "DamienCassou";
|
||||
name = "Damien Cassou";
|
||||
};
|
||||
das_j = {
|
||||
email = "janne@hess.ooo";
|
||||
github = "dasJ";
|
||||
name = "Janne Heß";
|
||||
};
|
||||
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";
|
||||
};
|
||||
Dje4321 = {
|
||||
email = "dje4321@gmail.com";
|
||||
github = "dje4321";
|
||||
name = "Dje4321";
|
||||
};
|
||||
Esteth = {
|
||||
email = "adam.copp@gmail.com";
|
||||
name = "Adam Copp";
|
||||
};
|
||||
FireyFly = {
|
||||
email = "nix@firefly.nu";
|
||||
github = "FireyFly";
|
||||
name = "Jonas Höglund";
|
||||
};
|
||||
Fresheyeball = {
|
||||
email = "fresheyeball@gmail.com";
|
||||
github = "fresheyeball";
|
||||
name = "Isaac Shapira";
|
||||
};
|
||||
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";
|
||||
};
|
||||
Mogria = {
|
||||
email = "m0gr14@gmail.com";
|
||||
github = "mogria";
|
||||
name = "Mogria";
|
||||
};
|
||||
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";
|
||||
};
|
||||
roosemberth = {
|
||||
email = "roosembert.palacios+nixpkgs@gmail.com";
|
||||
github = "roosemberth";
|
||||
name = "Roosembert (Roosemberth) Palacios";
|
||||
};
|
||||
Scriptkiddi = {
|
||||
email = "nixos@scriptkiddi.de";
|
||||
github = "scriptkiddi";
|
||||
name = "Fritz Otlinghaus";
|
||||
};
|
||||
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";
|
||||
@ -260,6 +78,11 @@
|
||||
github = "adisbladis";
|
||||
name = "Adam Hose";
|
||||
};
|
||||
Adjective-Object = {
|
||||
email = "mhuan13@gmail.com";
|
||||
github = "Adjective-Object";
|
||||
name = "Maxwell Huang-Hobbs";
|
||||
};
|
||||
adnelson = {
|
||||
email = "ithinkican@gmail.com";
|
||||
github = "adnelson";
|
||||
@ -336,9 +159,9 @@
|
||||
name = "Alexander Krupenkin ";
|
||||
};
|
||||
alexchapman = {
|
||||
name = "Alex Chapman";
|
||||
email = "alex@farfromthere.net";
|
||||
github = "AJChapman";
|
||||
name = "Alex Chapman";
|
||||
};
|
||||
alexfmpe = {
|
||||
email = "alexandre.fmp.esteves@gmail.com";
|
||||
@ -393,6 +216,11 @@
|
||||
github = "AndrewMorsillo";
|
||||
name = "Andrew Morsillo";
|
||||
};
|
||||
AndersonTorres = {
|
||||
email = "torres.anderson.85@gmail.com";
|
||||
github = "AndersonTorres";
|
||||
name = "Anderson Torres";
|
||||
};
|
||||
anderspapitto = {
|
||||
email = "anderspapitto@gmail.com";
|
||||
github = "anderspapitto";
|
||||
@ -443,6 +271,11 @@
|
||||
github = "ankhers";
|
||||
name = "Justin Wood";
|
||||
};
|
||||
Anton-Latukha = {
|
||||
email = "anton.latuka+nixpkgs@gmail.com";
|
||||
github = "Anton-Latukha";
|
||||
name = "Anton Latukha";
|
||||
};
|
||||
antono = {
|
||||
email = "self@antono.info";
|
||||
github = "antono";
|
||||
@ -478,6 +311,11 @@
|
||||
github = "aristidb";
|
||||
name = "Aristid Breitkreuz";
|
||||
};
|
||||
ariutta = {
|
||||
email = "anders.riutta@gmail.com";
|
||||
github = "ariutta";
|
||||
name = "Anders Riutta";
|
||||
};
|
||||
arobyn = {
|
||||
email = "shados@shados.net";
|
||||
github = "shados";
|
||||
@ -577,6 +415,11 @@
|
||||
github = "basvandijk";
|
||||
name = "Bas van Dijk";
|
||||
};
|
||||
Baughn = {
|
||||
email = "sveina@gmail.com";
|
||||
github = "Baughn";
|
||||
name = "Svein Ove Aas";
|
||||
};
|
||||
bbarker = {
|
||||
email = "brandon.barker@gmail.com";
|
||||
github = "bbarker";
|
||||
@ -716,6 +559,11 @@
|
||||
github = "brian-dawn";
|
||||
name = "Brian Dawn";
|
||||
};
|
||||
bricewge = {
|
||||
email = "bricewge@gmail.com";
|
||||
github = "bricewge";
|
||||
name = "Brice Waegeneire";
|
||||
};
|
||||
bstrik = {
|
||||
email = "dutchman55@gmx.com";
|
||||
github = "bstrik";
|
||||
@ -814,6 +662,11 @@
|
||||
email = "me@philscotted.com";
|
||||
name = "Phil Scott";
|
||||
};
|
||||
ChengCat = {
|
||||
email = "yu@cheng.cat";
|
||||
github = "ChengCat";
|
||||
name = "Yucheng Zhang";
|
||||
};
|
||||
chiiruno = {
|
||||
email = "okinan@protonmail.com";
|
||||
github = "chiiruno";
|
||||
@ -954,11 +807,21 @@
|
||||
github = "cransom";
|
||||
name = "Casey Ransom";
|
||||
};
|
||||
CrazedProgrammer = {
|
||||
email = "crazedprogrammer@gmail.com";
|
||||
github = "CrazedProgrammer";
|
||||
name = "CrazedProgrammer";
|
||||
};
|
||||
cryptix = {
|
||||
email = "cryptix@riseup.net";
|
||||
github = "cryptix";
|
||||
name = "Henry Bubert";
|
||||
};
|
||||
CrystalGamma = {
|
||||
email = "nixos@crystalgamma.de";
|
||||
github = "CrystalGamma";
|
||||
name = "Jona Stubbe";
|
||||
};
|
||||
csingley = {
|
||||
email = "csingley@gmail.com";
|
||||
github = "csingley";
|
||||
@ -974,6 +837,11 @@
|
||||
github = "cwoac";
|
||||
name = "Oliver Matthews";
|
||||
};
|
||||
DamienCassou = {
|
||||
email = "damien@cassou.me";
|
||||
github = "DamienCassou";
|
||||
name = "Damien Cassou";
|
||||
};
|
||||
danbst = {
|
||||
email = "abcz2.uprola@gmail.com";
|
||||
github = "danbst";
|
||||
@ -994,6 +862,11 @@
|
||||
github = "danielfullmer";
|
||||
name = "Daniel Fullmer";
|
||||
};
|
||||
das_j = {
|
||||
email = "janne@hess.ooo";
|
||||
github = "dasJ";
|
||||
name = "Janne Heß";
|
||||
};
|
||||
dasuxullebt = {
|
||||
email = "christoph.senjak@googlemail.com";
|
||||
name = "Christoph-Simon Senjak";
|
||||
@ -1048,11 +921,21 @@
|
||||
github = "derchrisuk";
|
||||
name = "Christian Gerbrandt";
|
||||
};
|
||||
DerGuteMoritz = {
|
||||
email = "moritz@twoticketsplease.de";
|
||||
github = "DerGuteMoritz";
|
||||
name = "Moritz Heidkamp";
|
||||
};
|
||||
dermetfan = {
|
||||
email = "serverkorken@gmail.com";
|
||||
github = "dermetfan";
|
||||
name = "Robin Stumm";
|
||||
};
|
||||
DerTim1 = {
|
||||
email = "tim.digel@active-group.de";
|
||||
github = "DerTim1";
|
||||
name = "Tim Digel";
|
||||
};
|
||||
desiderius = {
|
||||
email = "didier@devroye.name";
|
||||
github = "desiderius";
|
||||
@ -1098,11 +981,21 @@
|
||||
github = "dizfer";
|
||||
name = "David Izquierdo";
|
||||
};
|
||||
Dje4321 = {
|
||||
email = "dje4321@gmail.com";
|
||||
github = "dje4321";
|
||||
name = "Dje4321";
|
||||
};
|
||||
dmalikov = {
|
||||
email = "malikov.d.y@gmail.com";
|
||||
github = "dmalikov";
|
||||
name = "Dmitry Malikov";
|
||||
};
|
||||
DmitryTsygankov = {
|
||||
email = "dmitry.tsygankov@gmail.com";
|
||||
github = "DmitryTsygankov";
|
||||
name = "Dmitry Tsygankov";
|
||||
};
|
||||
dmjio = {
|
||||
email = "djohnson.m@gmail.com";
|
||||
github = "dmjio";
|
||||
@ -1251,6 +1144,11 @@
|
||||
github = "proteansec";
|
||||
name = "Dejan Lukan";
|
||||
};
|
||||
eliasp = {
|
||||
email = "mail@eliasprobst.eu";
|
||||
github = "eliasp";
|
||||
name = "Elias Probst";
|
||||
};
|
||||
elijahcaine = {
|
||||
email = "elijahcainemv@gmail.com";
|
||||
github = "pop";
|
||||
@ -1272,9 +1170,9 @@
|
||||
name = "Will Fancher";
|
||||
};
|
||||
emmanuelrosa = {
|
||||
email = "emmanuel_rosa@aol.com";
|
||||
github = "emmanuelrosa";
|
||||
name = "Emmanuel Rosa";
|
||||
email = "emmanuel_rosa@aol.com";
|
||||
github = "emmanuelrosa";
|
||||
name = "Emmanuel Rosa";
|
||||
};
|
||||
endgame = {
|
||||
email = "jack@jackkelly.name";
|
||||
@ -1305,11 +1203,6 @@
|
||||
github = "ericbmerritt";
|
||||
name = "Eric Merritt";
|
||||
};
|
||||
erosennin = {
|
||||
email = "ag@sologoc.com";
|
||||
github = "erosennin";
|
||||
name = "Andrey Golovizin";
|
||||
};
|
||||
ericsagnes = {
|
||||
email = "eric.sagnes@gmail.com";
|
||||
github = "ericsagnes";
|
||||
@ -1330,11 +1223,20 @@
|
||||
github = "erikryb";
|
||||
name = "Erik Rybakken";
|
||||
};
|
||||
erosennin = {
|
||||
email = "ag@sologoc.com";
|
||||
github = "erosennin";
|
||||
name = "Andrey Golovizin";
|
||||
};
|
||||
ertes = {
|
||||
email = "esz@posteo.de";
|
||||
github = "ertes";
|
||||
name = "Ertugrul Söylemez";
|
||||
};
|
||||
Esteth = {
|
||||
email = "adam.copp@gmail.com";
|
||||
name = "Adam Copp";
|
||||
};
|
||||
ethercrow = {
|
||||
email = "ethercrow@gmail.com";
|
||||
github = "ethercrow";
|
||||
@ -1395,6 +1297,11 @@
|
||||
github = "fgaz";
|
||||
name = "Francesco Gazzetta";
|
||||
};
|
||||
FireyFly = {
|
||||
email = "nix@firefly.nu";
|
||||
github = "FireyFly";
|
||||
name = "Jonas Höglund";
|
||||
};
|
||||
flokli = {
|
||||
email = "flokli@flokli.de";
|
||||
github = "flokli";
|
||||
@ -1440,6 +1347,11 @@
|
||||
github = "fps";
|
||||
name = "Florian Paul Schmidt";
|
||||
};
|
||||
Fresheyeball = {
|
||||
email = "fresheyeball@gmail.com";
|
||||
github = "fresheyeball";
|
||||
name = "Isaac Shapira";
|
||||
};
|
||||
fridh = {
|
||||
email = "fridh@fridh.nl";
|
||||
github = "fridh";
|
||||
@ -1499,7 +1411,7 @@
|
||||
name = "Jim Garrison";
|
||||
};
|
||||
gavin = {
|
||||
email = "gavin@praxeology.co.uk";
|
||||
email = "gavin.rogers@holo.host";
|
||||
github = "gavinrogers";
|
||||
name = "Gavin Rogers";
|
||||
};
|
||||
@ -1563,6 +1475,11 @@
|
||||
github = "cillianderoiste";
|
||||
name = "Cillian de Róiste";
|
||||
};
|
||||
Gonzih = {
|
||||
email = "gonzih@gmail.com";
|
||||
github = "Gonzih";
|
||||
name = "Max Gonzih";
|
||||
};
|
||||
goodrone = {
|
||||
email = "goodrone@gmail.com";
|
||||
github = "goodrone";
|
||||
@ -1810,16 +1727,16 @@
|
||||
email = "jack@mudshark.org";
|
||||
name = "Jack Cummings";
|
||||
};
|
||||
jdagilliland = {
|
||||
email = "jdagilliland@gmail.com";
|
||||
github = "jdagilliland";
|
||||
name = "Jason Gilliland";
|
||||
};
|
||||
jD91mZM2 = {
|
||||
email = "me@krake.one";
|
||||
github = "jD91mZM2";
|
||||
name = "jD91mZM2";
|
||||
};
|
||||
jdagilliland = {
|
||||
email = "jdagilliland@gmail.com";
|
||||
github = "jdagilliland";
|
||||
name = "Jason Gilliland";
|
||||
};
|
||||
jefdaj = {
|
||||
email = "jefdaj@gmail.com";
|
||||
github = "jefdaj";
|
||||
@ -1885,6 +1802,10 @@
|
||||
github = "jluttine";
|
||||
name = "Jaakko Luttinen";
|
||||
};
|
||||
Jo = {
|
||||
email = "0x4A6F@shackspace.de";
|
||||
name = "Joachim Ernst";
|
||||
};
|
||||
joachifm = {
|
||||
email = "joachifm@fastmail.fm";
|
||||
github = "joachifm";
|
||||
@ -2042,6 +1963,11 @@
|
||||
github = "khumba";
|
||||
name = "Bryan Gardiner";
|
||||
};
|
||||
KibaFox = {
|
||||
email = "kiba.fox@foxypossibilities.com";
|
||||
github = "KibaFox";
|
||||
name = "Kiba Fox";
|
||||
};
|
||||
kierdavis = {
|
||||
email = "kierdavis@gmail.com";
|
||||
github = "kierdavis";
|
||||
@ -2110,7 +2036,7 @@
|
||||
email = "giulio.eulisse@cern.ch";
|
||||
github = "ktf";
|
||||
name = "Giuluo Eulisse";
|
||||
};
|
||||
};
|
||||
ktosiek = {
|
||||
email = "tomasz.kontusz@gmail.com";
|
||||
github = "ktosiek";
|
||||
@ -2171,6 +2097,11 @@
|
||||
github = "leenaars";
|
||||
name = "Michiel Leenaars";
|
||||
};
|
||||
lejonet = {
|
||||
email = "daniel@kuehn.se";
|
||||
github = "lejonet";
|
||||
name = "Daniel Kuehn";
|
||||
};
|
||||
leo60228 = {
|
||||
email = "iakornfeld@gmail.com";
|
||||
github = "leo60228";
|
||||
@ -2181,11 +2112,6 @@
|
||||
github = "leonardoce";
|
||||
name = "Leonardo Cecchi";
|
||||
};
|
||||
lejonet = {
|
||||
email = "daniel@kuehn.se";
|
||||
github = "lejonet";
|
||||
name = "Daniel Kuehn";
|
||||
};
|
||||
lethalman = {
|
||||
email = "lucabru@src.gnome.org";
|
||||
github = "lethalman";
|
||||
@ -2369,10 +2295,6 @@
|
||||
github = "marcweber";
|
||||
name = "Marc Weber";
|
||||
};
|
||||
markWot = {
|
||||
email = "markus@wotringer.de";
|
||||
name = "Markus Wotringer";
|
||||
};
|
||||
markus1189 = {
|
||||
email = "markus1189@gmail.com";
|
||||
github = "markus1189";
|
||||
@ -2383,6 +2305,10 @@
|
||||
github = "markuskowa";
|
||||
name = "Markus Kowalewski";
|
||||
};
|
||||
markWot = {
|
||||
email = "markus@wotringer.de";
|
||||
name = "Markus Wotringer";
|
||||
};
|
||||
marsam = {
|
||||
email = "marsam@users.noreply.github.com";
|
||||
github = "marsam";
|
||||
@ -2468,7 +2394,7 @@
|
||||
github = "meditans";
|
||||
name = "Carlo Nucera";
|
||||
};
|
||||
megheaiulian = {
|
||||
megheaiulian = {
|
||||
email = "iulian.meghea@gmail.com";
|
||||
github = "megheaiulian";
|
||||
name = "Meghea Iulian";
|
||||
@ -2621,6 +2547,11 @@
|
||||
github = "mogorman";
|
||||
name = "Matthew O'Gorman";
|
||||
};
|
||||
Mogria = {
|
||||
email = "m0gr14@gmail.com";
|
||||
github = "mogria";
|
||||
name = "Mogria";
|
||||
};
|
||||
montag451 = {
|
||||
email = "montag451@laposte.net";
|
||||
github = "montag451";
|
||||
@ -2641,11 +2572,21 @@
|
||||
github = "moretea";
|
||||
name = "Maarten Hoogendoorn";
|
||||
};
|
||||
MostAwesomeDude = {
|
||||
email = "cds@corbinsimpson.com";
|
||||
github = "MostAwesomeDude";
|
||||
name = "Corbin Simpson";
|
||||
};
|
||||
mounium = {
|
||||
email = "muoniurn@gmail.com";
|
||||
github = "mounium";
|
||||
name = "Katona László";
|
||||
};
|
||||
MP2E = {
|
||||
email = "MP2E@archlinux.us";
|
||||
github = "MP2E";
|
||||
name = "Cray Elliott";
|
||||
};
|
||||
mpcsh = {
|
||||
email = "m@mpc.sh";
|
||||
github = "mpcsh";
|
||||
@ -2745,6 +2686,10 @@
|
||||
github = "nand0p";
|
||||
name = "Fernando Jose Pando";
|
||||
};
|
||||
Nate-Devv = {
|
||||
email = "natedevv@gmail.com";
|
||||
name = "Nathan Moore";
|
||||
};
|
||||
nathan-gs = {
|
||||
email = "nathan@nathan.gs";
|
||||
github = "nathan-gs";
|
||||
@ -2800,6 +2745,11 @@
|
||||
github = "nico202";
|
||||
name = "Nicolò Balzarotti";
|
||||
};
|
||||
NikolaMandic = {
|
||||
email = "nikola@mandic.email";
|
||||
github = "NikolaMandic";
|
||||
name = "Ratko Mladic";
|
||||
};
|
||||
ninjatrappeur = {
|
||||
email = "felix@alternativebit.fr";
|
||||
github = "ninjatrappeur";
|
||||
@ -2838,7 +2788,7 @@
|
||||
nonfreeblob = {
|
||||
email = "nonfreeblob@yandex.com";
|
||||
github = "nonfreeblob";
|
||||
name ="nonfreeblob";
|
||||
name = "nonfreeblob";
|
||||
};
|
||||
notthemessiah = {
|
||||
email = "brian.cohen.88@gmail.com";
|
||||
@ -2953,11 +2903,6 @@
|
||||
github = "oyren";
|
||||
name = "Moritz Scheuren";
|
||||
};
|
||||
pSub = {
|
||||
email = "mail@pascal-wittmann.de";
|
||||
github = "pSub";
|
||||
name = "Pascal Wittmann";
|
||||
};
|
||||
paholg = {
|
||||
email = "paho@paholg.com";
|
||||
github = "paholg";
|
||||
@ -3048,6 +2993,11 @@
|
||||
github = "phile314";
|
||||
name = "Philipp Hausmann";
|
||||
};
|
||||
Phlogistique = {
|
||||
email = "noe.rubinstein@gmail.com";
|
||||
github = "Phlogistique";
|
||||
name = "Noé Rubinstein";
|
||||
};
|
||||
phreedom = {
|
||||
email = "phreedom@yandex.ru";
|
||||
github = "phreedom";
|
||||
@ -3152,6 +3102,11 @@
|
||||
github = "primeos";
|
||||
name = "Michael Weiss";
|
||||
};
|
||||
Profpatsch = {
|
||||
email = "mail@profpatsch.de";
|
||||
github = "Profpatsch";
|
||||
name = "Profpatsch";
|
||||
};
|
||||
proglodyte = {
|
||||
email = "proglodyte23@gmail.com";
|
||||
github = "proglodyte";
|
||||
@ -3171,6 +3126,11 @@
|
||||
email = "philipp@xndr.de";
|
||||
name = "Philipp Steinpaß";
|
||||
};
|
||||
pSub = {
|
||||
email = "mail@pascal-wittmann.de";
|
||||
github = "pSub";
|
||||
name = "Pascal Wittmann";
|
||||
};
|
||||
psyanticy = {
|
||||
email = "iuns@outlook.fr";
|
||||
github = "Assassinkin";
|
||||
@ -3379,6 +3339,11 @@
|
||||
github = "rongcuid";
|
||||
name = "Rongcui Dong";
|
||||
};
|
||||
roosemberth = {
|
||||
email = "roosembert.palacios+nixpkgs@gmail.com";
|
||||
github = "roosemberth";
|
||||
name = "Roosembert (Roosemberth) Palacios";
|
||||
};
|
||||
rprospero = {
|
||||
email = "rprospero+nix@gmail.com";
|
||||
github = "rprospero";
|
||||
@ -3518,11 +3483,21 @@
|
||||
github = "scolobb";
|
||||
name = "Sergiu Ivanov";
|
||||
};
|
||||
Scriptkiddi = {
|
||||
email = "nixos@scriptkiddi.de";
|
||||
github = "scriptkiddi";
|
||||
name = "Fritz Otlinghaus";
|
||||
};
|
||||
sdll = {
|
||||
email = "sasha.delly@gmail.com";
|
||||
github = "sdll";
|
||||
name = "Sasha Illarionov";
|
||||
};
|
||||
SeanZicari = {
|
||||
email = "sean.zicari@gmail.com";
|
||||
github = "SeanZicari";
|
||||
name = "Sean Zicari";
|
||||
};
|
||||
sellout = {
|
||||
email = "greg@technomadic.org";
|
||||
github = "sellout";
|
||||
@ -3706,6 +3681,11 @@
|
||||
github = "srhb";
|
||||
name = "Sarah Brofeldt";
|
||||
};
|
||||
SShrike = {
|
||||
email = "severen@shrike.me";
|
||||
github = "severen";
|
||||
name = "Severen Redwood";
|
||||
};
|
||||
stephenmw = {
|
||||
email = "stephen@q5comm.com";
|
||||
github = "stephenmw";
|
||||
@ -3726,11 +3706,26 @@
|
||||
github = "steveej";
|
||||
name = "Stefan Junker";
|
||||
};
|
||||
StijnDW = {
|
||||
email = "stekke@airmail.cc";
|
||||
github = "StijnDW";
|
||||
name = "Stijn DW";
|
||||
};
|
||||
StillerHarpo = {
|
||||
email = "florianengel39@gmail.com";
|
||||
github = "StillerHarpo";
|
||||
name = "Florian Engel";
|
||||
};
|
||||
stumoss = {
|
||||
email = "samoss@gmail.com";
|
||||
github = "stumoss";
|
||||
name = "Stuart Moss";
|
||||
};
|
||||
SuprDewd = {
|
||||
email = "suprdewd@gmail.com";
|
||||
github = "SuprDewd";
|
||||
name = "Bjarki Ágúst Guðmundsson";
|
||||
};
|
||||
suvash = {
|
||||
email = "suvash+nixpkgs@gmail.com";
|
||||
github = "suvash";
|
||||
@ -3791,6 +3786,11 @@
|
||||
github = "Radvendii";
|
||||
name = "Taeer Bar-Yam";
|
||||
};
|
||||
taha = {
|
||||
email = "xrcrod@gmail.com";
|
||||
github = "tgharib";
|
||||
name = "Taha Gharib";
|
||||
};
|
||||
tailhook = {
|
||||
email = "paul@colomiets.name";
|
||||
github = "tailhook";
|
||||
@ -3831,6 +3831,11 @@
|
||||
github = "tazjin";
|
||||
name = "Vincent Ambo";
|
||||
};
|
||||
TealG = {
|
||||
email = "~@Teal.Gr";
|
||||
github = "TealG";
|
||||
name = "Teal Gaure";
|
||||
};
|
||||
teh = {
|
||||
email = "tehunger@gmail.com";
|
||||
github = "teh";
|
||||
@ -3881,6 +3886,11 @@
|
||||
github = "ctheune";
|
||||
name = "Christian Theune";
|
||||
};
|
||||
ThomasMader = {
|
||||
email = "thomas.mader@gmail.com";
|
||||
github = "ThomasMader";
|
||||
name = "Thomas Mader";
|
||||
};
|
||||
thoughtpolice = {
|
||||
email = "aseipp@pobox.com";
|
||||
github = "thoughtpolice";
|
||||
@ -4199,6 +4209,11 @@
|
||||
github = "vyp";
|
||||
name = "vyp";
|
||||
};
|
||||
waynr = {
|
||||
name = "Wayne Warren";
|
||||
email = "wayne.warren.s@gmail.com";
|
||||
github = "waynr";
|
||||
};
|
||||
wchresta = {
|
||||
email = "wchresta.nix@chrummibei.ch";
|
||||
github = "wchresta";
|
||||
@ -4400,6 +4415,11 @@
|
||||
github = "zimbatm";
|
||||
name = "zimbatm";
|
||||
};
|
||||
Zimmi48 = {
|
||||
email = "theo.zimmermann@univ-paris-diderot.fr";
|
||||
github = "Zimmi48";
|
||||
name = "Théo Zimmermann";
|
||||
};
|
||||
zohl = {
|
||||
email = "zohl@fmap.me";
|
||||
github = "zohl";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
{ pkgs
|
||||
, storePaths
|
||||
, volumeLabel
|
||||
, uuid ? "44444444-4444-4444-8888-888888888888"
|
||||
}:
|
||||
|
||||
let
|
||||
@ -32,7 +33,7 @@ pkgs.stdenv.mkDerivation {
|
||||
echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
|
||||
|
||||
truncate -s $bytes $out
|
||||
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
|
||||
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
|
||||
|
||||
# Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
|
||||
# For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
|
||||
|
||||
@ -38,7 +38,8 @@ in {
|
||||
firmwareLinuxNonfree
|
||||
intel2200BGFirmware
|
||||
rtl8192su-firmware
|
||||
] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
|
||||
] ++ optional (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) raspberrypiWirelessFirmware
|
||||
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
|
||||
rtl8723bs-firmware
|
||||
];
|
||||
})
|
||||
|
||||
@ -16,6 +16,8 @@ let
|
||||
inherit pkgs;
|
||||
inherit (config.sdImage) storePaths;
|
||||
volumeLabel = "NIXOS_SD";
|
||||
} // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
|
||||
uuid = config.sdImage.rootPartitionUUID;
|
||||
};
|
||||
in
|
||||
{
|
||||
@ -42,6 +44,24 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
bootPartitionID = mkOption {
|
||||
type = types.string;
|
||||
default = "0x2178694e";
|
||||
description = ''
|
||||
Volume ID for the /boot partition on the SD card. This value must be a
|
||||
32-bit hexadecimal number.
|
||||
'';
|
||||
};
|
||||
|
||||
rootPartitionUUID = mkOption {
|
||||
type = types.nullOr types.string;
|
||||
default = null;
|
||||
example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7";
|
||||
description = ''
|
||||
UUID for the main NixOS partition on the SD card.
|
||||
'';
|
||||
};
|
||||
|
||||
bootSize = mkOption {
|
||||
type = types.int;
|
||||
default = 120;
|
||||
@ -95,7 +115,7 @@ in
|
||||
# type=b is 'W95 FAT32', type=83 is 'Linux'.
|
||||
sfdisk $img <<EOF
|
||||
label: dos
|
||||
label-id: 0x2178694e
|
||||
label-id: ${config.sdImage.bootPartitionID}
|
||||
|
||||
start=8M, size=$bootSizeBlocks, type=b, bootable
|
||||
start=${toString (8 + config.sdImage.bootSize)}M, type=83
|
||||
@ -108,7 +128,7 @@ in
|
||||
# Create a FAT32 /boot partition of suitable size into bootpart.img
|
||||
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
|
||||
truncate -s $((SECTORS * 512)) bootpart.img
|
||||
faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n NIXOS_BOOT bootpart.img
|
||||
faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.bootPartitionID} -n NIXOS_BOOT bootpart.img
|
||||
|
||||
# Populate the files intended for /boot
|
||||
mkdir boot
|
||||
|
||||
@ -220,6 +220,7 @@
|
||||
./services/databases/stanchion.nix
|
||||
./services/databases/virtuoso.nix
|
||||
./services/desktops/accountsservice.nix
|
||||
./services/desktops/bamf.nix
|
||||
./services/desktops/dleyna-renderer.nix
|
||||
./services/desktops/dleyna-server.nix
|
||||
./services/desktops/flatpak.nix
|
||||
|
||||
@ -242,6 +242,7 @@ with lib;
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
|
||||
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
|
||||
"Set the option `services.xserver.displayManager.sddm.package' instead.")
|
||||
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
|
||||
(mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
|
||||
|
||||
23
nixos/modules/services/desktops/bamf.nix
Normal file
23
nixos/modules/services/desktops/bamf.nix
Normal file
@ -0,0 +1,23 @@
|
||||
# Bamf
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
services.bamf = {
|
||||
enable = mkEnableOption "bamf";
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.bamf.enable {
|
||||
services.dbus.packages = [ pkgs.bamf ];
|
||||
|
||||
systemd.packages = [ pkgs.bamf ];
|
||||
};
|
||||
}
|
||||
@ -656,7 +656,7 @@ in
|
||||
message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
|
||||
];
|
||||
|
||||
warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
|
||||
warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
|
||||
|
||||
users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
|
||||
{ name = "wwwrun";
|
||||
|
||||
@ -43,12 +43,6 @@ in
|
||||
default = true;
|
||||
description = "Enable the XFWM (default) window manager.";
|
||||
};
|
||||
|
||||
screenLock = mkOption {
|
||||
type = types.enum [ "xscreensaver" "xlockmore" "slock" ];
|
||||
default = "xlockmore";
|
||||
description = "Application used by XFCE to lock the screen.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -92,7 +86,7 @@ in
|
||||
thunar-volman # TODO: drop
|
||||
] ++ (if config.hardware.pulseaudio.enable
|
||||
then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
|
||||
else [ xfce4-mixer xfce4-volumed ])
|
||||
else [ xfce4-mixer xfce4-volumed ])
|
||||
# TODO: NetworkManager doesn't belong here
|
||||
++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
|
||||
++ optionals config.powerManagement.enable [ xfce4-power-manager ]
|
||||
|
||||
@ -17,12 +17,40 @@ in {
|
||||
The size of the VirtualBox base image in MiB.
|
||||
'';
|
||||
};
|
||||
memorySize = mkOption {
|
||||
type = types.int;
|
||||
default = 1536;
|
||||
description = ''
|
||||
The amount of RAM the VirtualBox appliance can use in MiB.
|
||||
'';
|
||||
};
|
||||
vmDerivationName = mkOption {
|
||||
type = types.str;
|
||||
default = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}";
|
||||
description = ''
|
||||
The name of the derivation for the VirtualBox appliance.
|
||||
'';
|
||||
};
|
||||
vmName = mkOption {
|
||||
type = types.str;
|
||||
default = "NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})";
|
||||
description = ''
|
||||
The name of the VirtualBox appliance.
|
||||
'';
|
||||
};
|
||||
vmFileName = mkOption {
|
||||
type = types.str;
|
||||
default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova";
|
||||
description = ''
|
||||
The file name of the VirtualBox appliance.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
|
||||
name = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}";
|
||||
name = cfg.vmDerivationName;
|
||||
|
||||
inherit pkgs lib config;
|
||||
partitionTableType = "legacy";
|
||||
@ -37,11 +65,11 @@ in {
|
||||
VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
|
||||
|
||||
echo "creating VirtualBox VM..."
|
||||
vmName="NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})"
|
||||
vmName="${cfg.vmName}";
|
||||
VBoxManage createvm --name "$vmName" --register \
|
||||
--ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
|
||||
VBoxManage modifyvm "$vmName" \
|
||||
--memory 1536 --acpi on --vram 32 \
|
||||
--memory ${toString cfg.memorySize} --acpi on --vram 32 \
|
||||
${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \
|
||||
--nictype1 virtio --nic1 nat \
|
||||
--audiocontroller ac97 --audio alsa \
|
||||
@ -53,7 +81,7 @@ in {
|
||||
|
||||
echo "exporting VirtualBox VM..."
|
||||
mkdir -p $out
|
||||
fn="$out/nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova"
|
||||
fn="$out/${cfg.vmFileName}"
|
||||
VBoxManage export "$vmName" --output "$fn"
|
||||
|
||||
rm -v $diskImage
|
||||
|
||||
@ -29,7 +29,7 @@ in import ./make-test.nix {
|
||||
name = "acme";
|
||||
|
||||
nodes = {
|
||||
letsencrypt = ./common/letsencrypt.nix;
|
||||
letsencrypt = ./common/letsencrypt;
|
||||
|
||||
webserver = { config, pkgs, ... }: {
|
||||
imports = [ commonConfig ];
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# A configuration example of a full node setup using this would be this:
|
||||
#
|
||||
# {
|
||||
# letsencrypt = import ./common/letsencrypt.nix;
|
||||
# letsencrypt = import ./common/letsencrypt;
|
||||
#
|
||||
# example = { nodes, ... }: {
|
||||
# networking.nameservers = [
|
||||
@ -30,14 +30,14 @@
|
||||
# }
|
||||
#
|
||||
# By default, this module runs a local resolver, generated using resolver.nix
|
||||
# from the same directory to automatically discover all zones in the network.
|
||||
# from the parent directory to automatically discover all zones in the network.
|
||||
#
|
||||
# If you do not want this and want to use your own resolver, you can just
|
||||
# override networking.nameservers like this:
|
||||
#
|
||||
# {
|
||||
# letsencrypt = { nodes, ... }: {
|
||||
# imports = [ ./common/letsencrypt.nix ];
|
||||
# imports = [ ./common/letsencrypt ];
|
||||
# networking.nameservers = [
|
||||
# nodes.myresolver.config.networking.primaryIPAddress
|
||||
# ];
|
||||
@ -164,8 +164,8 @@ let
|
||||
-e 's,exec \./bin/,,' \
|
||||
test/startservers.py
|
||||
|
||||
cat "${snakeOilCa}/ca.key" > test/test-ca.key
|
||||
cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
|
||||
cat ${lib.escapeShellArg snakeOilCerts.ca.key} > test/test-ca.key
|
||||
cat ${lib.escapeShellArg snakeOilCerts.ca.cert} > test/test-ca.pem
|
||||
'';
|
||||
|
||||
# Until vendored pkcs11 is go 1.9 compatible
|
||||
@ -173,6 +173,21 @@ let
|
||||
rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11
|
||||
'';
|
||||
|
||||
# XXX: Temporarily brought back putting the source code in the output,
|
||||
# since e95f17e2720e67e2eabd59d7754c814d3e27a0b2 was removing that from
|
||||
# buildGoPackage.
|
||||
preInstall = ''
|
||||
mkdir -p $out
|
||||
pushd "$NIX_BUILD_TOP/go"
|
||||
while read f; do
|
||||
echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' \
|
||||
|| continue
|
||||
mkdir -p "$(dirname "$out/share/go/$f")"
|
||||
cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
|
||||
done < <(find . -type f)
|
||||
popd
|
||||
'';
|
||||
|
||||
extraSrcs = map mkGoDep [
|
||||
{ goPackagePath = "github.com/miekg/pkcs11";
|
||||
rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83";
|
||||
@ -191,53 +206,15 @@ let
|
||||
1:/var/lib/softhsm/slot1.db
|
||||
'';
|
||||
|
||||
snakeOilCa = pkgs.runCommand "snakeoil-ca" {
|
||||
buildInputs = [ pkgs.openssl ];
|
||||
allowSubstitutes = false;
|
||||
} ''
|
||||
mkdir "$out"
|
||||
openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \
|
||||
-subj '/CN=Snakeoil CA' -nodes \
|
||||
-out "$out/ca.pem" -keyout "$out/ca.key"
|
||||
'';
|
||||
snakeOilCerts = import ./snakeoil-certs.nix;
|
||||
|
||||
createAndSignCert = fqdn: let
|
||||
snakeoilCertConf = pkgs.writeText "snakeoil.cnf" ''
|
||||
[req]
|
||||
default_bits = 4096
|
||||
prompt = no
|
||||
default_md = sha256
|
||||
req_extensions = req_ext
|
||||
distinguished_name = dn
|
||||
[dn]
|
||||
CN = ${fqdn}
|
||||
[req_ext]
|
||||
subjectAltName = DNS:${fqdn}
|
||||
'';
|
||||
in pkgs.runCommand "snakeoil-certs-${fqdn}" {
|
||||
buildInputs = [ pkgs.openssl ];
|
||||
allowSubstitutes = false;
|
||||
} ''
|
||||
mkdir "$out"
|
||||
openssl genrsa -out "$out/snakeoil.key" 4096
|
||||
openssl req -new -key "$out/snakeoil.key" \
|
||||
-config ${lib.escapeShellArg snakeoilCertConf} \
|
||||
-out snakeoil.csr
|
||||
openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
|
||||
-CA "${snakeOilCa}/ca.pem" -CAkey "${snakeOilCa}/ca.key" \
|
||||
-extfile ${lib.escapeShellArg snakeoilCertConf} \
|
||||
-out "$out/snakeoil.pem" -days 36500
|
||||
'';
|
||||
|
||||
wfeCerts = createAndSignCert wfeDomain;
|
||||
wfeDomain = "acme-v01.api.letsencrypt.org";
|
||||
wfeCertFile = "${wfeCerts}/snakeoil.pem";
|
||||
wfeKeyFile = "${wfeCerts}/snakeoil.key";
|
||||
wfeCertFile = snakeOilCerts.${wfeDomain}.cert;
|
||||
wfeKeyFile = snakeOilCerts.${wfeDomain}.key;
|
||||
|
||||
siteCerts = createAndSignCert siteDomain;
|
||||
siteDomain = "letsencrypt.org";
|
||||
siteCertFile = "${siteCerts}/snakeoil.pem";
|
||||
siteKeyFile = "${siteCerts}/snakeoil.key";
|
||||
siteCertFile = snakeOilCerts.${siteDomain}.cert;
|
||||
siteKeyFile = snakeOilCerts.${siteDomain}.key;
|
||||
|
||||
# Retrieved via:
|
||||
# curl -s -I https://acme-v01.api.letsencrypt.org/terms \
|
||||
@ -350,7 +327,7 @@ let
|
||||
}) components;
|
||||
|
||||
in {
|
||||
imports = [ ./resolver.nix ];
|
||||
imports = [ ../resolver.nix ];
|
||||
|
||||
options.test-support.letsencrypt.caCert = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
@ -366,7 +343,7 @@ in {
|
||||
resolver.enable = let
|
||||
isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ];
|
||||
in lib.mkOverride 900 isLocalResolver;
|
||||
letsencrypt.caCert = "${snakeOilCa}/ca.pem";
|
||||
letsencrypt.caCert = snakeOilCerts.ca.cert;
|
||||
};
|
||||
|
||||
# This has priority 140, because modules/testing/test-instrumentation.nix
|
||||
69
nixos/tests/common/letsencrypt/mkcerts.nix
Normal file
69
nixos/tests/common/letsencrypt/mkcerts.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ pkgs ? import <nixpkgs> {}
|
||||
, lib ? pkgs.lib
|
||||
|
||||
, domains ? [ "acme-v01.api.letsencrypt.org" "letsencrypt.org" ]
|
||||
}:
|
||||
|
||||
pkgs.runCommand "letsencrypt-snakeoil-ca" {
|
||||
nativeBuildInputs = [ pkgs.openssl ];
|
||||
} ''
|
||||
addpem() {
|
||||
local file="$1"; shift
|
||||
local storeFileName="$(IFS=.; echo "$*")"
|
||||
|
||||
echo -n " " >> "$out"
|
||||
|
||||
# Every following argument is an attribute, so let's recurse and check
|
||||
# every attribute whether it must be quoted and write it into $out.
|
||||
while [ -n "$1" ]; do
|
||||
if expr match "$1" '^[a-zA-Z][a-zA-Z0-9]*$' > /dev/null; then
|
||||
echo -n "$1" >> "$out"
|
||||
else
|
||||
echo -n '"' >> "$out"
|
||||
echo -n "$1" | sed -e 's/["$]/\\&/g' >> "$out"
|
||||
echo -n '"' >> "$out"
|
||||
fi
|
||||
shift
|
||||
[ -z "$1" ] || echo -n . >> "$out"
|
||||
done
|
||||
|
||||
echo " = builtins.toFile \"$storeFileName\" '''" >> "$out"
|
||||
sed -e 's/^/ /' "$file" >> "$out"
|
||||
|
||||
echo " ''';" >> "$out"
|
||||
}
|
||||
|
||||
echo '# Generated via mkcert.sh in the same directory.' > "$out"
|
||||
echo '{' >> "$out"
|
||||
|
||||
openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \
|
||||
-subj '/CN=Snakeoil CA' -nodes -out ca.pem -keyout ca.key
|
||||
|
||||
addpem ca.key ca key
|
||||
addpem ca.pem ca cert
|
||||
|
||||
${lib.concatMapStrings (fqdn: let
|
||||
opensslConfig = pkgs.writeText "snakeoil.cnf" ''
|
||||
[req]
|
||||
default_bits = 4096
|
||||
prompt = no
|
||||
default_md = sha256
|
||||
req_extensions = req_ext
|
||||
distinguished_name = dn
|
||||
[dn]
|
||||
CN = ${fqdn}
|
||||
[req_ext]
|
||||
subjectAltName = DNS:${fqdn}
|
||||
'';
|
||||
in ''
|
||||
export OPENSSL_CONF=${lib.escapeShellArg opensslConfig}
|
||||
openssl genrsa -out snakeoil.key 4096
|
||||
openssl req -new -key snakeoil.key -out snakeoil.csr
|
||||
openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
|
||||
-CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500
|
||||
addpem snakeoil.key ${lib.escapeShellArg fqdn} key
|
||||
addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert
|
||||
'') domains}
|
||||
|
||||
echo '}' >> "$out"
|
||||
''
|
||||
6
nixos/tests/common/letsencrypt/mkcerts.sh
Executable file
6
nixos/tests/common/letsencrypt/mkcerts.sh
Executable file
@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -p nix bash -i bash
|
||||
set -e
|
||||
cd "$(dirname "$0")"
|
||||
storepath="$(nix-build --no-out-link mkcerts.nix)"
|
||||
cat "$storepath" > snakeoil-certs.nix
|
||||
253
nixos/tests/common/letsencrypt/snakeoil-certs.nix
Normal file
253
nixos/tests/common/letsencrypt/snakeoil-certs.nix
Normal file
@ -0,0 +1,253 @@
|
||||
# Generated via mkcert.sh in the same directory.
|
||||
{
|
||||
ca.key = builtins.toFile "ca.key" ''
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
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
|
||||
Gvfq54FbDuB10XP8JdLrsy9Z6GEsmoE=
|
||||
-----END PRIVATE KEY-----
|
||||
'';
|
||||
ca.cert = builtins.toFile "ca.cert" ''
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFATCCAumgAwIBAgIJANydi4uFZr0LMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
|
||||
BAMMC1NuYWtlb2lsIENBMCAXDTE4MDcxMjAwMjIxNloYDzIxMTgwNjE4MDAyMjE2
|
||||
WjAWMRQwEgYDVQQDDAtTbmFrZW9pbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
|
||||
ADCCAgoCggIBAN91XEL/gfCG7MP2iv0IMO7dMFATmWKskjkpiZ8xm1+B3MSOA7OZ
|
||||
H0BVKSfatB4KrMzmb5gLM877bLvQV2Tu8M5GLU52Fh9RAhbr9NnbvESPHi3zaP2L
|
||||
vTnJSpMlkqMxsPzfSB5ciYnpUaM2/9aKxMebAGylYp59hA83rxm9g0KfR3mtgmD2
|
||||
5E5k8kdIjQxiP2IRFYg837GFmhLE3vggsnSsQ5B/HYYcOFOv329lgAWpsAh+Hfl9
|
||||
i6VFZqtRJ6Qj6sPFrzcUPyr1wyA4/zgqQt6nZ1FddNtRYSsZQ6kc/nkz0zvCzRFU
|
||||
12X09RJsOAKGXvJiUcJ17fbrWr/Manl0xX+3+Ndc1SBG6u9dziBQoqNLhJ9++DRd
|
||||
Wc+zewyVngk2bJwr2SWAhJWZtMpVyNFEm/wG9rY1BWwn1MivJXRAST3gO5yCwLct
|
||||
uFB9B2adZVwR3PCtkc2mT1rPmafDjZG69lb0vX1PvGkit0tIdo6KzhUSq5mORYiF
|
||||
8jPQNUx5e1gRCbCoUbbdbDS61ymYJbgU++nJizkYA+YZZ+uUzGwsP/t616i3cCF4
|
||||
L7npkGhUGcjwUW8hfapyL6B9UO4KO8OZvJL/Q2/Esaq9ILUZQ+ZY/dNHkVvUfxGn
|
||||
7f3MkdGYf6phaWFy/qnsWVjb/p31GTDxYpFNIIHvJ5R000+I+imTo3g3AgMBAAGj
|
||||
UDBOMB0GA1UdDgQWBBQ3vPWzjLmu5krbSpfhBAht9KL3czAfBgNVHSMEGDAWgBQ3
|
||||
vPWzjLmu5krbSpfhBAht9KL3czAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
|
||||
A4ICAQDF9HyC1ZFN3Ob+JA9Dj5+Rcobi7JIA5F8uW3Q92LfPoVaUGEkBrwJSiTFX
|
||||
47zvP/ySBJIpZ9rzHMbJ+1L+eJgczF1uQ91inthCKo1THTPo5TgBrpJj0YAIunsj
|
||||
9eH1tBnfWFYdVIDZoTSiwPtgIvglpyuK/eJXEe+FRzubhtdc9w1Hlzox1sd0TQuy
|
||||
Pl9KFHg7BlFZfCPig1mkB8pfwjBDgVhv5DKJ9cJXh3R5zSoiyuS2b+qYSvw8YTHq
|
||||
0WNKWUthb7BVAYE3OmcbOHgUAUjtJ6EIGIB9z/SoLe90CofXLXFR5dppuVLKCMBA
|
||||
kgL4luBIu7t8mcnN2yzobvcGHy8RVY6F5abCCy6gackLzjOzvH1SYOxP8yN74aKB
|
||||
ANgcqdWspb8JYoU8lEbA8dhBVrsgBf7XeJlrZvMdcUENlJ2PI0JWr9WvlRAM9rYY
|
||||
EY1alJqBCp6530Ggd6/f0V64cEqptejUdmN9L0zboxKjQf4LjpUNraGvg8tw/xkY
|
||||
4dT1U2HlVnhOyBVkx/tE6zIK/RU16oMqwpjCdfbK/TuWCNc/emJz5PMlp81zm83+
|
||||
dExpWwuV4rt6OQbZ/GSatNLJXOw+pkLjaEhnHgrsgI+HqAUXg3ByKol+1e76wN51
|
||||
k1ZKpB6mk4kejySGPYBHiJwED0IyXu9gUfalSczXFO4ySAvhCg==
|
||||
-----END CERTIFICATE-----
|
||||
'';
|
||||
"acme-v01.api.letsencrypt.org".key = builtins.toFile "acme-v01.api.letsencrypt.org.key" ''
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
'';
|
||||
"acme-v01.api.letsencrypt.org".cert = builtins.toFile "acme-v01.api.letsencrypt.org.cert" ''
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEtDCCApwCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
|
||||
IENBMCAXDTE4MDcxMjAwMjIxN1oYDzIxMTgwNjE4MDAyMjE3WjAnMSUwIwYDVQQD
|
||||
DBxhY21lLXYwMS5hcGkubGV0c2VuY3J5cHQub3JnMIICIjANBgkqhkiG9w0BAQEF
|
||||
AAOCAg8AMIICCgKCAgEAvG+sL4q0VkgSClBTn4NkPiUrtXx5oLyZ+CCM1jrQx/xo
|
||||
tUt5X2S4/7vMnAK/yRLsR7R2PhXO8CZPqJ7B6OfAgaDTgvipJkZYPZQSMP3KOinM
|
||||
3WJLssqKh7/HOxZIf0iyUXewrnX5eTAo/CLsUnhBjBD7E99nmQz/leLWSl82sSYD
|
||||
kO3nUk3/1qJZA8iddb4uH0IEQWcNKev3WoQQzwiVrXBiftlRQOJy5JJXm5m8229M
|
||||
CpMA1AUWmpdu6sl3/gFFdsDhUFq/a7LFrVyaUCMRIHg9szAB7ZFkixr9umQs8jKw
|
||||
uo983JHB11h2SirwgfIzHHmyhaWhCt22ucTwEXGhq63LtrzZvLsfP8Ql5S+AuqGT
|
||||
H0v8meuc784leAjulBZjkpuIFwDnVv9+YeUEbqJeo1hSHrILddora3nkH4E2dJWm
|
||||
LpqpiPr++GRi+BNgYKW/BQLTJ7C6v+vUs+kdPgYJH5z7oP6f0YZkT0Wkubp/UEz7
|
||||
UV2dfjz57d77DYx5rFWGYzJriWR/xltgL1zDpjwjwG1FDpRqwlyYbBFpjQhxI+X0
|
||||
aT98m6fCzBDQHDb/+JgvsjTHh6OZatahFAwzFIEfrceDv1BG8sBWIaZGhLzYiWQx
|
||||
afl8oXbWv1T6I1jpsTlCdCSkWzaJb4ZjxI9Ga1ynVu8F16+GR2a71wKWu7UbZQsC
|
||||
AwEAATANBgkqhkiG9w0BAQsFAAOCAgEAzeGlFMz1Bo+bbpZDQ60HLdw7qDp3SPJi
|
||||
x5LYG860yzbh9ghvyc59MIm5E6vB140LRJAs+Xo6VdVSTC4jUA2kI9k1BQsbZKds
|
||||
XT0RqA7HkqcLS3t3JWFkkKbCshMGZTSZ//hpbaUG1qEAfUfmZw1lAxqSa0kqavbP
|
||||
awf7k8qHbqcj7WORCdH7fjKAjntEQwIpl1GEkAdCSghOJz2/o9aWmiGZt27OM/sG
|
||||
MLSrcmL3QBElCjOxg14P8rnsmZ+VEp6MO93otoJ4dJL7fN7vTIh5ThbS384at/4l
|
||||
4KK/y7XctUzAtWzhnodjk/NSgrrGX2kseOGOWEM1sZc9xtinHH2tpOMqtLVOkgHD
|
||||
Lul+TArqgqeoOdEM/9OL64kgOrO/JzxBq+egLUi4wgAul2wmtecKZK1dkwYZHeqW
|
||||
74i55yeBp+TTomnPr0ZBns6xKFYldJVzC34OB+2YVDxe8y9XtWtuQOxFw0LQHhNb
|
||||
zy5aBverWzZFwiIIjJoVHTQq848uKBJec0YILfMinS1Wjif4xqW/IMfi+GFS0oka
|
||||
sKCGNE/8ur9u/Jm6cbto3f2dtV8/vkhiITQgwzM2jalyuVJ9jyPxG7EvbTvZORgw
|
||||
pRvBRTd4/eE7I1L+UDe6x8EjR/MrqfF9FWVGOZo4vPTyNbrSWYBh6s9kYy56ds1l
|
||||
IRxst1BXEfI=
|
||||
-----END CERTIFICATE-----
|
||||
'';
|
||||
"letsencrypt.org".key = builtins.toFile "letsencrypt.org.key" ''
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
'';
|
||||
"letsencrypt.org".cert = builtins.toFile "letsencrypt.org.cert" ''
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEpzCCAo8CAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
|
||||
IENBMCAXDTE4MDcxMjAwMjIxOVoYDzIxMTgwNjE4MDAyMjE5WjAaMRgwFgYDVQQD
|
||||
DA9sZXRzZW5jcnlwdC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
|
||||
AQDA++GXB6aA+Lr3X2xIPs/PqXoJF9TUb98NzQC+ww3+dOaIY0Omqf15/UID5G0u
|
||||
0649zUsvISi9x+7vn9X7opKA7iTX0TYKsUIXCMQ5YMYXgOByVPfvnVYaYUmDM8R9
|
||||
l+Fs6uZB9Bq7zorEC01lWn0XFwpu4vJD+w03F80wH7sgdtWHC/NVyd0elhkQ/qR2
|
||||
fC80s/bZui5fmrdq/FZK2WfTW5nQF9SbhfDFpQ0hTu3QO/noUr0L2Fb0Blp7R2jQ
|
||||
EkFZEXvFLAt4Mmqf25nP6xfRf+0hppJBIG5nJKPQd7lkrN1Q7S2nHbFNLYGuXdjY
|
||||
E4lo4T3we5ta90qiyUu3hfatWszEZrzpKYXNzIMvVFKjBw/+u7LLnnmXul6kvmzh
|
||||
yYyBEEFePm1eGpRNU6flY74kKUuT6u2+0BPiuiAmYyoQqYzDa3ss3LVb2uL/fvxA
|
||||
b+LcAZosgv/saw9u5E7nVJ22LhAxV7bM0XN7vabM2aPVJeiRbLv5m+NQynnmgSNF
|
||||
GxM9Rl004QclbLo6zbOe6ovtmkgcLEEbwUqeQJWJdEmoADxvNwSFH6ktqYsg4eW/
|
||||
iR3MnqmEeRK8rryq9tFF5SY6MmBK6lUEj2OEr58drL9RZHjN8lB5330fxk6iJeWs
|
||||
sJWz5U8PKdRQqvMXWdjKiU3OL81Lh7gBud9aDILkkpGmNQIDAQABMA0GCSqGSIb3
|
||||
DQEBCwUAA4ICAQAkx3jcryukAuYP7PQxMy3LElOl65ZFVqxDtTDlr7DvAkWJzVCb
|
||||
g08L6Tu+K0rKh2RbG/PqS0+8/jBgc4IwSOPfDDAX+sinfj0kwXG34WMzB0G3fQzU
|
||||
2BMplJDOaBcNqHG8pLP1BG+9HAtR/RHe9p2Jw8LG2qmZs6uemPT/nCTNoyIL4oxh
|
||||
UncjETV4ayCHDKD1XA7/icgddYsnfLQHWuIMuCrmQCHo0uQAd7qVHfUWZ+gcsZx0
|
||||
jTNCcaI8OTS2S65Bjaq2HaM7GMcUYNUD2vSyNQeQbha4ZeyZ9bPyFzznPMmrPXQe
|
||||
MJdkbJ009RQIG9As79En4m+l+/6zrdx4DNdROqaL6YNiSebWMnuFHpMW/rCnhrT/
|
||||
HYadijHOiJJGj9tWSdC4XJs7fvZW3crMPUYxpOvl01xW2ZlgaekILi1FAjSMQVoV
|
||||
NhWstdGCKJdthJqLL5MtNdfgihKcmgkJqKFXTkPv7sgAQCopu6X+S+srCgn856Lv
|
||||
21haRWZa8Ml+E0L/ticT8Fd8Luysc6K9TJ4mT8ENC5ywvgDlEkwBD3yvINXm5lg1
|
||||
xOIxv/Ye5gFk1knuM7OzpUFBrXUHdVVxflCUqNAhFPbcXwjgEQ+A+S5B0vI6Ohue
|
||||
ZnR/wuiou6Y+Yzh8XfqL/3H18mGDdjyMXI1B6l4Judk000UVyr46cnI7mw==
|
||||
-----END CERTIFICATE-----
|
||||
'';
|
||||
}
|
||||
@ -18,7 +18,7 @@
|
||||
defining this option needs to be explicitly imported.
|
||||
|
||||
The reason this option exists is for the
|
||||
<filename>nixos/tests/common/letsencrypt.nix</filename> module, which
|
||||
<filename>nixos/tests/common/letsencrypt</filename> module, which
|
||||
needs that option to disable the resolver once the user has set its own
|
||||
resolver.
|
||||
'';
|
||||
|
||||
@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }: let
|
||||
crlTemplate = pkgs.writeText "snakeoil-crl.template" ''
|
||||
expiration_days = -1
|
||||
'';
|
||||
userCertTemplace = pkgs.writeText "snakoil-user-cert.template" ''
|
||||
userCertTemplate = pkgs.writeText "snakeoil-user-cert.template" ''
|
||||
organization = snakeoil
|
||||
cn = server
|
||||
expiration_days = -1
|
||||
@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }: let
|
||||
certtool -p --bits 4096 | sed -n \
|
||||
-e '/^----* *BEGIN/,/^----* *END/p' > "$out/alice.key"
|
||||
|
||||
certtool -c --template "$userCertTemplace" \
|
||||
certtool -c --template "$userCertTemplate" \
|
||||
--load-privkey "$out/alice.key" \
|
||||
--load-ca-privkey ca.key \
|
||||
--load-ca-certificate "$cacert" \
|
||||
@ -82,8 +82,9 @@ in {
|
||||
# This is to avoid assigning a different network address to the new
|
||||
# generation.
|
||||
networking = lib.mapAttrs (lib.const lib.mkForce) {
|
||||
interfaces.eth1.ipv4 = nodes.server.config.networking.interfaces.eth1.ipv4;
|
||||
inherit (nodes.server.config.networking)
|
||||
hostName interfaces primaryIPAddress extraHosts;
|
||||
hostName primaryIPAddress extraHosts;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -12,17 +12,6 @@ buildGoPackage rec {
|
||||
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
# Only install binaries in $out, source is not interesting and takes ~50M
|
||||
outputs = [ "out" ];
|
||||
preFixup = ''
|
||||
export bin="''${out}"
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out
|
||||
dir="$NIX_BUILD_TOP/go/bin"
|
||||
[ -e "$dir" ] && cp -r $dir $out
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "go-ethereum";
|
||||
|
||||
@ -6,11 +6,11 @@ uiEnv = pkgs.callPackage ./env.nix { };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "parity-ui-${version}";
|
||||
version = "0.2.5";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
|
||||
sha256 = "1jk7ac6qqxs47hf16vhr94ix4wf51qzpm55q8h6wsx1lrgy1y3g6";
|
||||
sha256 = "1nyarq73jdknhax68cq2i868sznghzj70kvk4ixypxnjb1q6a53a";
|
||||
name = "${name}.deb";
|
||||
};
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
let
|
||||
version = "1.10.8";
|
||||
sha256 = "0q6blsbxn48afqf3cmxvmdlyzvf0cpqcymsjbsk8nyx0zxzf1dpk";
|
||||
version = "1.10.9";
|
||||
sha256 = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g";
|
||||
cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf";
|
||||
patches = [ ./patches/vendored-sources-1.10.patch ];
|
||||
in
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
name = "elisa-${version}";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = "elisa";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lpzn55b8gf3byzwv9909x40p98aqlh35vidkrwnnbwgygsa85bw";
|
||||
sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy-soundcloud";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy-soundcloud";
|
||||
rev = "v${version}";
|
||||
sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi";
|
||||
sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mopidy ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "musescore-${version}";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rmnqblh4irrwdszh0glpnf3q6f8xk8gxfmmjk8swxr59bmqk3gz";
|
||||
sha256 = "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -13,9 +13,9 @@ let
|
||||
sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "3.3.0.1"; # "Android Studio 3.3 Canary 2"
|
||||
build = "181.4869471";
|
||||
sha256Hash = "1v2v09gd5vxh4nzbnrjfh0blpzz71i3i7lq5bkjsfl0g82r8j512";
|
||||
version = "3.3.0.2"; # "Android Studio 3.3 Canary 3"
|
||||
build = "181.4884283";
|
||||
sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh";
|
||||
};
|
||||
in rec {
|
||||
# Old alias
|
||||
@ -43,9 +43,9 @@ in rec {
|
||||
beta = mkStudio (latestVersion // {
|
||||
pname = "android-studio-preview";
|
||||
#pname = "android-studio-beta"; # TODO: Rename and provide symlink
|
||||
version = "3.2.0.19"; # "Android Studio 3.2 Beta 2"
|
||||
build = "181.4860949";
|
||||
sha256Hash = "1v1h42xp2fxj8366q9l9b0shk0y1vz9kny0rf7y48kyr5h9glnwr";
|
||||
version = "3.2.0.20"; # "Android Studio 3.2 Beta 3"
|
||||
build = "181.4868252";
|
||||
sha256Hash = "17r7gvy317vh2r56yvhnn7dym0q6gs8r04fdr7hx53s9rb79sd1j";
|
||||
|
||||
meta = stable.meta // {
|
||||
description = "The Official IDE for Android (beta channel)";
|
||||
|
||||
24
pkgs/applications/gis/whitebox-tools/default.nix
Normal file
24
pkgs/applications/gis/whitebox-tools/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, rustPlatform , fetchFromGitHub, Security }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "whitebox_tools-${version}";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jblindsay";
|
||||
repo = "whitebox-tools";
|
||||
rev = "6221cdf327be70f0ee4f2053b76bfa01c3f37caa";
|
||||
sha256 = "1423ga964mz7qkl88vkcm8qfprsksx04aq4sz9v5ghnmdzzvl89x";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoSha256 = "1gbgirng21ak0kl3fiyr6lxwzrjd5v79gcrbzf941nb8y8rlvz7k";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An advanced geospatial data analysis platform";
|
||||
homepage = http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mpickering ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -14,8 +14,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.8-2";
|
||||
sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267";
|
||||
version = "7.0.8-6";
|
||||
sha256 = "1v7m1g9a7fqc8nravvv3dy54nzd3ip75hcnkdrpb5wbiz9pqgzi3";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
|
||||
|
||||
assert fltk.glSupport;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name ="openexr_viewers-2.2.1";
|
||||
|
||||
@ -14,14 +12,14 @@ stdenv.mkDerivation {
|
||||
./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
|
||||
'';
|
||||
|
||||
buildPahse = ''
|
||||
buildPhase = ''
|
||||
make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
|
||||
|
||||
meta = {
|
||||
meta = {
|
||||
description = "Application for viewing OpenEXR images on a display at various exposure settings";
|
||||
homepage = http://openexr.com;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
|
||||
, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran, fetchpatch
|
||||
, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran, fetchpatch
|
||||
, soqt, libf2c, makeWrapper, makeDesktopItem
|
||||
, mpi ? null }:
|
||||
|
||||
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts
|
||||
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts
|
||||
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
|
||||
] ++ (with pythonPackages; [
|
||||
matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost
|
||||
|
||||
@ -4,11 +4,11 @@ with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "cherrytree-${version}";
|
||||
version = "0.38.4";
|
||||
version = "0.38.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.giuspen.com/software/${name}.tar.xz";
|
||||
sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2";
|
||||
sha256 = "1ja3b14vm3yd26pf82p2qlld0flqkqvgdg2g33r5dav6wfq3pz6y";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chirp-daily-${version}";
|
||||
version = "20180623";
|
||||
version = "20180707";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
|
||||
sha256 = "0s7b5w98rblqfcpvaxkkri0sfqxmqjwgdf8syzva50vm7swrg946";
|
||||
sha256 = "09siq74k0ss65ssck7i7h515dxp7fhdz5klc3y0yp9wajn706ic3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, postgresql, makeWrapper }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ephemeralpg-${version}";
|
||||
version = "2.2";
|
||||
version = "2.5";
|
||||
src = fetchurl {
|
||||
url = "http://ephemeralpg.org/code/${name}.tar.gz";
|
||||
sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz";
|
||||
sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk";
|
||||
};
|
||||
buildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "IPMIView-${version}";
|
||||
version = "2.13.0";
|
||||
buildVersion = "170504";
|
||||
version = "2.14.0";
|
||||
buildVersion = "180213";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
|
||||
sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6";
|
||||
sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
|
||||
};
|
||||
|
||||
buildInputs = [ patchelf makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jgmenu-${version}";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johanmalm";
|
||||
repo = "jgmenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "068mm0b2npz6qh9j8m9xd8sbznjp5g195vfav8a6016wgm6fhrx7";
|
||||
sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,24 +1,16 @@
|
||||
{ stdenv, fetchurl, pythonPackages }:
|
||||
{ stdenv, fetchFromGitHub, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
name = "wikicurses-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/ids1024/wikicurses/archive/v${version}.tar.gz";
|
||||
sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ids1024";
|
||||
repo = "wikicurses";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This is necessary to build without a config file.
|
||||
# It can be safely removed after updating to wikicurses to 1.4
|
||||
# or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included
|
||||
(fetchurl {
|
||||
url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch";
|
||||
sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];
|
||||
|
||||
meta = {
|
||||
@ -26,6 +18,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
homepage = https://github.com/ids1024/wikicurses/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ pSub ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wsjtx-${version}";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
# This is a composite source tarball containing both wsjtx and a hamlib fork
|
||||
src = fetchurl {
|
||||
url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
|
||||
sha256 = "1qxwiylnykh37kw780hh9xfphzbj8ndpfqz4xazld16v3qx2g0jc";
|
||||
sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc";
|
||||
};
|
||||
|
||||
# Hamlib builds with autotools, wsjtx builds with cmake
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmrig-${version}";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ssiq2yv8b3xg4kfp2cfzl41m5apjw2r2k74lh3fz0g0ix3cq55b";
|
||||
sha256 = "1c68qg7433chri6q1yhyggy4mbq2vnn3p2fxs8gqmgij9vpqn3m2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmrig-proxy-${version}";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig-proxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f573shf0qv1kh0sb9sljagpb2q1rn8h7qc1hxlb5nlchs9qcnnn";
|
||||
sha256 = "0h6ihrrkgwi8k642iqq13qx3zlxl9r8q7wm417hb7j35rnmwn8lq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
24
pkgs/applications/misc/xscope/default.nix
Normal file
24
pkgs/applications/misc/xscope/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libXt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "xscope";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/${name}.tar.bz2";
|
||||
sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libXt ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "program to monitor X11/Client conversations";
|
||||
homepage = https://cgit.freedesktop.org/xorg/app/xscope/;
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -98,12 +98,11 @@ let
|
||||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
name = "flashplayer-ppapi-${version}";
|
||||
version = "30.0.0.113";
|
||||
version = "30.0.0.134";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
|
||||
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k";
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1g6695w1ijqs8jbkbrb403ca1vvrf298ayvxslrvk70x6l7lp2ys";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -73,7 +73,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flashplayer-${version}";
|
||||
version = "30.0.0.113";
|
||||
version = "30.0.0.134";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 =
|
||||
if debug then
|
||||
if arch == "x86_64" then
|
||||
"1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j"
|
||||
"1ld9ldsqd5vgghpidskxqmlz8gwdyf3mi3wmfdiaabdjxgzbg8sk"
|
||||
else
|
||||
"1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4"
|
||||
"1n96rx95spj4r34amapqr1i1klhv944fpvhdmn7gqjawr2hf36js"
|
||||
else
|
||||
if arch == "x86_64" then
|
||||
"05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l"
|
||||
"0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw"
|
||||
else
|
||||
"0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8";
|
||||
"01ibzqzlscpkfqp33bx7qcpz6gfqp4dq9ny3zasvjhi5xqd78j1k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -55,7 +55,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flashplayer-standalone-${version}";
|
||||
version = "30.0.0.113";
|
||||
version = "30.0.0.134";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
|
||||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
|
||||
sha256 =
|
||||
if debug then
|
||||
"0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0"
|
||||
"0snkhs9w192azgv3nykxmgb47z395yrx7faxshasmc7abvvnfpx1"
|
||||
else
|
||||
"10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8";
|
||||
"1wgcsbm9w46sp8347agd5m05x3xrki8vi6pf208ifihljw04hbx3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -28,12 +28,12 @@ let
|
||||
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "169xgwizw9kpdg0xll5jrxkb1k107cl4j1zx3jhmpsfbgykcnxpz";
|
||||
sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
||||
@ -340,7 +340,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "An unofficial version of the tor browser bundle, built from source";
|
||||
homepage = https://torproject.org/;
|
||||
license = licenses.unfreeRedistributable; # TODO: check this
|
||||
license = licenses.free;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
hydraPlatforms = [ ];
|
||||
maintainers = with maintainers; [ joachifm ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre
|
||||
, version ? "1.4" }:
|
||||
, version ? "1.5" }:
|
||||
|
||||
let
|
||||
versionMap = {
|
||||
"1.3" = {
|
||||
flinkVersion = "1.3.2";
|
||||
flinkVersion = "1.3.3";
|
||||
scalaVersion = "2.11";
|
||||
sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp";
|
||||
sha256 = "0gfm48k5adr14gnhqri9cd01i9dprd0nwmnnz3yrpd20nq4ap4qy";
|
||||
hadoopBundle = "-hadoop27";
|
||||
};
|
||||
"1.4" = {
|
||||
@ -15,6 +15,12 @@ let
|
||||
sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
|
||||
hadoopBundle = "";
|
||||
};
|
||||
"1.5" = {
|
||||
flinkVersion = "1.5.0";
|
||||
scalaVersion = "2.11";
|
||||
sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
|
||||
hadoopBundle = "";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -24,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
name = "flink-${flinkVersion}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/flink/${name}/${name}-bin-scala_${hadoopBundle}${scalaVersion}.tgz";
|
||||
url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "heptio-ark-${version}";
|
||||
version = "0.7.1";
|
||||
version = "0.9.0";
|
||||
|
||||
goPackagePath = "github.com/heptio/ark";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
rev = "v${version}";
|
||||
owner = "heptio";
|
||||
repo = "ark";
|
||||
sha256 = "0j3x9zxcffxhlw0fxq2cw9ph37bqw90cbmf9xshmnj8yl9rbxp7y";
|
||||
sha256 = "0b3jsgs35l8kk63pjnqn3911pyb397fyvsmd3jd8vzjawisgpdp7";
|
||||
};
|
||||
|
||||
postInstall = "rm $bin/bin/generate";
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, ... }:
|
||||
|
||||
let version = "0.3.1"; in
|
||||
|
||||
buildGoPackage {
|
||||
name = "hetzner-kube-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xetys";
|
||||
repo = "hetzner-kube";
|
||||
rev = "${version}";
|
||||
sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/xetys/hetzner-kube";
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
|
||||
homepage = https://github.com/xetys/hetzner-kube;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ eliasp ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,17 +2,17 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
colorize (0.8.1)
|
||||
commander (4.4.4)
|
||||
commander (4.4.5)
|
||||
highline (~> 1.7.2)
|
||||
diffy (3.2.0)
|
||||
diffy (3.2.1)
|
||||
highline (1.7.10)
|
||||
polyglot (0.3.5)
|
||||
terraform_landscape (0.1.17)
|
||||
terraform_landscape (0.1.18)
|
||||
colorize (~> 0.7)
|
||||
commander (~> 4.4)
|
||||
diffy (~> 3.0)
|
||||
treetop (~> 1.6)
|
||||
treetop (1.6.9)
|
||||
treetop (1.6.10)
|
||||
polyglot (~> 0.3)
|
||||
|
||||
PLATFORMS
|
||||
|
||||
@ -11,18 +11,18 @@
|
||||
dependencies = ["highline"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9";
|
||||
sha256 = "0sry6raysvg9qsx5nqqw09n8r8hvcsqzvci7xp2qk7jq3s9mgvnn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.4.4";
|
||||
version = "4.4.5";
|
||||
};
|
||||
diffy = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941";
|
||||
sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
};
|
||||
highline = {
|
||||
source = {
|
||||
@ -44,18 +44,18 @@
|
||||
dependencies = ["colorize" "commander" "diffy" "treetop"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl";
|
||||
sha256 = "0476q2kx88w9srj7rlzl6skrza3pdgyym7zksw78infsb2105lg9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.17";
|
||||
version = "0.1.18";
|
||||
};
|
||||
treetop = {
|
||||
dependencies = ["polyglot"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
|
||||
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
};
|
||||
}
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "terraform-provider-ibm-${version}";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
|
||||
subPackages = [ "./" ];
|
||||
@ -20,7 +20,7 @@ buildGoPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM-Cloud";
|
||||
repo = "terraform-provider-ibm";
|
||||
sha256 = "03drvhhh6pkk8yzzp8iiq478kcky9swxvxadxzxh0v4jzdprg9lr";
|
||||
sha256 = "0zgzzs2l9p06angqw6vjpkd88gcn2mswmmwycc31ihkglzs6yw2p";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "quaternion-${version}";
|
||||
version = "0.0.9";
|
||||
version = "0.0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QMatrixClient";
|
||||
repo = "Quaternion";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408";
|
||||
sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
let configFile = writeText "riot-config.json" conf; in
|
||||
stdenv.mkDerivation rec {
|
||||
name= "riot-web-${version}";
|
||||
version = "0.15.6";
|
||||
version = "0.15.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
|
||||
sha256 = "032svv30dhj9gl0v37djn9bnwh7f9bfg2czhmcszdygsd0879x08";
|
||||
sha256 = "09sa2qcmns4b9by3hzmyppc6fi3845vppkal2ylrf2vi9yczb2ch";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -40,11 +40,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "signal-desktop-${version}";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1iapkkfqssbjcksgic7i8x0cwp6gwcbbrfxlw7vp6k1cfvjwv9pf";
|
||||
sha256 = "1f76dzm9qq12i4s95c51d9s923n69y8cbg8yz79qjpd6k30j8vkq";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
|
||||
, qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine
|
||||
# Runtime
|
||||
, libjpeg_turbo, pciutils, procps
|
||||
, libjpeg_turbo, pciutils, procps, qtimageformats
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
@ -30,7 +30,7 @@ in stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative
|
||||
qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine
|
||||
libjpeg_turbo pciutils procps
|
||||
libjpeg_turbo
|
||||
];
|
||||
|
||||
runtimeDependencies = optional pulseaudioSupport libpulseaudio;
|
||||
@ -70,6 +70,8 @@ in stdenv.mkDerivation {
|
||||
makeWrapper $packagePath/zoom $out/bin/zoom-us \
|
||||
--prefix PATH : "${makeBinPath [ pciutils procps ]}" \
|
||||
--set QSG_INFO 1 \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.qtCompatVersion}/plugins/platforms \
|
||||
--set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} \
|
||||
--run "cd $packagePath"
|
||||
|
||||
runHook postInstall
|
||||
@ -92,7 +94,7 @@ in stdenv.mkDerivation {
|
||||
description = "zoom.us video conferencing application";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
platforms = builtins.attrNames srcs;
|
||||
maintainers = with stdenv.lib.maintainers; [ danbst ];
|
||||
maintainers = with stdenv.lib.maintainers; [ danbst tadfisher ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig
|
||||
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig
|
||||
, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
|
||||
, alsaLib, python
|
||||
, jackSupport ? false, libjack2 ? null
|
||||
@ -126,14 +126,16 @@ let
|
||||
};
|
||||
|
||||
gitSource = rec {
|
||||
version = "2018-01-12";
|
||||
version = "2018-07-01";
|
||||
qtVersion = 5;
|
||||
|
||||
# Needs submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mumble-voip/mumble";
|
||||
rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e";
|
||||
sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mumble-voip";
|
||||
repo = "mumble";
|
||||
rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418";
|
||||
sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
in {
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.6.7";
|
||||
version = "6.7.0";
|
||||
name = "frostwire-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
|
||||
sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh";
|
||||
sha256 = "1qvk4w2ly2nz3ibsd6qdxaqb3g1a3l9f5a15b5zpzhsziln1fbxf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -3,11 +3,11 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "x2goclient-${version}";
|
||||
version = "4.1.2.0";
|
||||
version = "4.1.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
|
||||
sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn";
|
||||
sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w";
|
||||
};
|
||||
|
||||
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.2.1";
|
||||
version = "6.2.2";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "02nzihs720pmgr5139s7fz88f7gm19dn1x2kqdpi81k7gdwqq0bp";
|
||||
sha256 = "19204fqi4x4q7hsc500y6gj0qdfzf4kjgfsr808w13qnh1lxhvr4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, qmake, qtsvg }:
|
||||
|
||||
let
|
||||
version = "1.42.2";
|
||||
version = "1.43.27";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "mytetra-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
|
||||
sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
|
||||
sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "igv-${version}";
|
||||
version = "2.4.11";
|
||||
version = "2.4.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
|
||||
sha256 = "11zbbasqpvf7inbgrk6jzd9pqdfn4v4g4nl149bivg475mmqpnwl";
|
||||
sha256 = "0cl6fs1v9rqkzjq4syx0m1pr71hbhvidwa3ym57pvz8ardfs3qa1";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip jre ];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, makeDesktopItem
|
||||
@ -16,15 +17,15 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "${baseVersion}.${patchVersion}";
|
||||
baseVersion = "14.29";
|
||||
patchVersion = "12";
|
||||
version = "14.29.17";
|
||||
pname = "jmol";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv";
|
||||
sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -1,20 +1,21 @@
|
||||
{ fetchhg, stdenv, readline }:
|
||||
{ fetchFromGitHub, stdenv, readline, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abc-verifier-${version}";
|
||||
version = "20160818";
|
||||
version = "2018-07-08";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://bitbucket.org/alanmi/abc";
|
||||
rev = "a2e5bc66a68a72ccd267949e5c9973dd18f8932a";
|
||||
sha256 = "09yvhj53af91nc54gmy7cbp7yljfcyj68a87494r5xvdfnsj11gy";
|
||||
src = fetchFromGitHub {
|
||||
owner = "berkeley-abc";
|
||||
repo = "abc";
|
||||
rev = "24407e13db4b8ca16c3996049b2d33ec3722de39";
|
||||
sha256 = "1rckji7nk81n6v1yajz7daqwipxacv7zlafknvmbiwji30j47sq5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ readline ];
|
||||
preBuild = ''
|
||||
export buildFlags="CC=$CC CXX=$CXX LD=$CXX"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv abc $out/bin
|
||||
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A tool for squential logic synthesis and formal verification";
|
||||
homepage = "https://people.eecs.berkeley.edu/~alanmi/abc/abc.htm";
|
||||
homepage = https://people.eecs.berkeley.edu/~alanmi/abc;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
|
||||
@ -1,17 +1,20 @@
|
||||
{stdenv, fetchurl, gmp, cmake, python}:
|
||||
{stdenv, fetchFromGitHub, gmp, cmake, python}:
|
||||
|
||||
let version = "0.1.4";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "libpoly";
|
||||
version = "0.1.7";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libpoly-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz";
|
||||
sha256 = "16x1pk2a3pcb5a0dzyw28ccjwkhmbsck4hy80ss7kx0dd7qgpi7j";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SRI-CSL";
|
||||
repo = "libpoly";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i5ar4lhs88glk0rvkmag656ii434i6i1q5dspx6d0kyg78fii64";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake gmp python ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ gmp python ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/SRI-CSL/libpoly;
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yices-${version}";
|
||||
version = "2.5.4";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
|
||||
name = "${name}-src.tar.gz";
|
||||
sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p";
|
||||
sha256 = "10ikq7ib8jhx7hlxfm6mp5qg6r8dflqs8242q5zaicn80qixpm12";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
@ -26,9 +26,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Includes a fix for the embedded soname being libyices.so.2.5, but
|
||||
# only installing the libyices.so.2.5.x file.
|
||||
installPhase = ''
|
||||
installPhase = let
|
||||
ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version));
|
||||
in ''
|
||||
make install LDCONFIG=true
|
||||
(cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5)
|
||||
ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -20,6 +20,20 @@ stdenv.mkDerivation rec {
|
||||
cd build
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev $lib $python/lib
|
||||
|
||||
mv $out/lib/python* $python/lib/
|
||||
mv $out/lib $lib/lib
|
||||
mv $out/include $dev/include
|
||||
|
||||
# clean up a copy of libz3.so and symlink it instead
|
||||
rm $python/${python.sitePackages}/z3/lib/libz3.so
|
||||
ln -s $lib/lib/libz3.so $python/${python.sitePackages}/z3/lib/libz3.so
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "dev" "python" ];
|
||||
|
||||
meta = {
|
||||
description = "A high-performance theorem prover and SMT solver";
|
||||
homepage = "https://github.com/Z3Prover/z3";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qalculate-gtk-${version}";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b2g9ziypcplczsm14b4i2k7vpiw9ll28qskv1fdhyqb0fij3qcx";
|
||||
sha256 = "19jw1w29x0r1qq5r8gmqrqr00ml2pfi2w433723vjzxpfg2pp70r";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -14,16 +14,6 @@ let
|
||||
|
||||
cvxopt = super.cvxopt.override { inherit glpk; };
|
||||
|
||||
# https://github.com/sagemath/sagenb/issues/437
|
||||
flask-babel = super.flask-babel.overridePythonAttrs (attrs: rec {
|
||||
version = "0.9";
|
||||
src = attrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# python packages that appear unmaintained and were not accepted into the nixpkgs
|
||||
# tree because of that. These packages are only dependencies of the more-or-less
|
||||
# deprecated sagenb. However sagenb is still a default dependency and the doctests
|
||||
|
||||
@ -36,6 +36,14 @@ buildPythonPackage rec {
|
||||
# tests depend on sage
|
||||
doCheck = false;
|
||||
|
||||
patches = [
|
||||
# work with latest flask-babel
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sagemath/sagenb/commit/ba065eca63dd34a383e4c7ba7561430a90fcd087.patch";
|
||||
sha256 = "1lamzsrgymdd618imrasjp6ivhw2aynh83gkybsd7pm1rzjcq4x8";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Sage Notebook";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}:
|
||||
stdenv.mkDerivation rec {
|
||||
baseName="golly";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
name="${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7";
|
||||
sha256 = "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd";
|
||||
url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
make install
|
||||
make install-doc
|
||||
mkdir -p $out/etc/bash_completion.d/
|
||||
cp contrib/tig-completion.bash $out/etc/bash_completion.d/
|
||||
install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash
|
||||
install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig
|
||||
cp contrib/vim.tigrc $out/etc/
|
||||
|
||||
wrapProgram $out/bin/tig \
|
||||
--prefix PATH ':' "${git}/bin"
|
||||
|
||||
@ -5,13 +5,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "containerd-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8";
|
||||
sha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "singularity-${version}";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "singularityware";
|
||||
repo = "singularity";
|
||||
rev = version;
|
||||
sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d";
|
||||
sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper ];
|
||||
|
||||
@ -1,30 +1,29 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3 }:
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "paper-icon-theme";
|
||||
version = "2017-11-20";
|
||||
version = "2018-06-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snwh";
|
||||
repo = pname;
|
||||
rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8";
|
||||
sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m";
|
||||
rev = "c7cd013fba06dd8fd5cdff9f885520e2923266b8";
|
||||
sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gtk3 ];
|
||||
nativeBuildInputs = [ meson ninja gtk3 ];
|
||||
|
||||
postFixup = ''
|
||||
for theme in $out/share/icons/*; do
|
||||
gtk-update-icon-cache $theme
|
||||
done
|
||||
postPatch = ''
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Modern icon theme designed around bold colours and simple geometric shapes";
|
||||
homepage = https://snwh.org/paper;
|
||||
license = with licenses; [ cc-by-sa-40 lgpl3 ];
|
||||
platforms = platforms.all;
|
||||
# darwin cannot deal with file names differing only in case
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/532d9c821a36f220c928be40465a6ace52bc3818.tar.gz";
|
||||
sha256 = "1yqn87r75cdf45wkbfa5vqxvsaxqsmypwjl4pw5w1g8qfrdilr18";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/0986b1ed62a71528e09a660493955d79f0bf2fbf.tar.gz";
|
||||
sha256 = "1s8xffqpkwv1x038mi1vw0rk6k3scwpp2l1phq9zs2vxrhblriaw";
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "caja-${version}";
|
||||
version = "1.21.1";
|
||||
version = "1.21.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "013lmngnm0i2746qrkkyhg62kyh4cjdd0i634cz5fm7ah65ylxg4";
|
||||
sha256 = "0kswpghpsz69l417ammniy1ja0dsg1hrsm2k0rx28q9mhdfdmnwq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "engrampa-${version}";
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "09p9jaljaihc723zp17la6lw7h7q16ysk7q0fr0al0k11ss16w6f";
|
||||
sha256 = "0y79rzmv3i03la443bp8f6gsgm03vr4nd88npwrvjqlxs59lg1gw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
mkDerivation, lib, fetchpatch,
|
||||
|
||||
extra-cmake-modules, kdoctools,
|
||||
|
||||
@ -66,7 +66,13 @@ mkDerivation {
|
||||
# Add upstream patches to the list below. For new patchs, particularly if not
|
||||
# submitted upstream, please make a pull request and add it to
|
||||
# ./plasma-workspace.patch.
|
||||
patches = [ ./plasma-workspace.patch ];
|
||||
patches = [
|
||||
./plasma-workspace.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KDE/plasma-workspace/commit/11e570d861858f3b3e2694e5f9ec242d7f9f12b9.patch";
|
||||
sha256 = "1vk9yacb59k0v5mgbpgmciflca9r0ll4wh1d83ffx2y2v8sqwiv2";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\""
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchurl, perl, gcc, llvm_39
|
||||
, ncurses5, gmp, libiconv
|
||||
, ncurses5, gmp, glibc, libiconv
|
||||
}:
|
||||
|
||||
# Prebuilt only does native
|
||||
@ -14,6 +14,13 @@ let
|
||||
libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
|
||||
+ "LD_LIBRARY_PATH";
|
||||
|
||||
glibcDynLinker = assert stdenv.isLinux;
|
||||
if stdenv.hostPlatform.libc == "glibc" then
|
||||
# Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
|
||||
''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
|
||||
else
|
||||
"${stdenv.lib.getLib glibc}/lib/ld-linux*";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -95,7 +102,7 @@ stdenv.mkDerivation rec {
|
||||
find . -type f -perm -0100 -exec patchelf \
|
||||
--replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
|
||||
--replace-needed libtinfo.so libtinfo.so.5 \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
|
||||
--interpreter ${glibcDynLinker} {} \;
|
||||
|
||||
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
|
||||
|
||||
@ -107,7 +114,8 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
|
||||
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
|
||||
|
||||
# Stripping combined with patchelf breaks the executables (they die
|
||||
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
@ -124,6 +124,22 @@ stdenv.mkDerivation (rec {
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
||||
echo "patching llvm-targets for musl targets..."
|
||||
echo "Cloning these existing '*-linux-gnu*' targets:"
|
||||
grep linux-gnu llvm-targets | sed 's/^/ /'
|
||||
echo "(go go gadget sed)"
|
||||
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
||||
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
||||
grep linux-musl llvm-targets | sed 's/^/ /'
|
||||
|
||||
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
|
||||
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
|
||||
for x in configure aclocal.m4; do
|
||||
substituteInPlace $x \
|
||||
--replace '*-android*|*-gnueabi*)' \
|
||||
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||
done
|
||||
'';
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
@ -116,6 +116,22 @@ stdenv.mkDerivation (rec {
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
||||
echo "patching llvm-targets for musl targets..."
|
||||
echo "Cloning these existing '*-linux-gnu*' targets:"
|
||||
grep linux-gnu llvm-targets | sed 's/^/ /'
|
||||
echo "(go go gadget sed)"
|
||||
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
||||
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
||||
grep linux-musl llvm-targets | sed 's/^/ /'
|
||||
|
||||
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
|
||||
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
|
||||
for x in configure aclocal.m4; do
|
||||
substituteInPlace $x \
|
||||
--replace '*-android*|*-gnueabi*)' \
|
||||
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||
done
|
||||
'';
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
|
||||
@ -44,7 +44,7 @@ let
|
||||
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
|
||||
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
|
||||
};
|
||||
|
||||
|
||||
virtualenvVersion = "15.0.0";
|
||||
virtualenv = fetchurl {
|
||||
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
|
||||
@ -53,7 +53,7 @@ let
|
||||
|
||||
majorVersion = "0";
|
||||
minorVersion = "6";
|
||||
maintenanceVersion = "2";
|
||||
maintenanceVersion = "4";
|
||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
||||
in
|
||||
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0ym4n9vn6w8vj175mmsc2nzvdk2ij0cdrs44lkr3p0signji73b5";
|
||||
sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
|
||||
};
|
||||
prePatch = ''
|
||||
mkdir deps/srccache
|
||||
@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_LIBGIT2=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
|
||||
|
||||
"USE_SYSTEM_LLVM=1"
|
||||
"LLVM_VER=3.9.1"
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation ( rec {
|
||||
name = "ponyc-${version}";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = "ponyc";
|
||||
rev = version;
|
||||
sha256 = "1m0zvl30926652akyzpvy5m7jn35697d5mkg3xbn3yqwbsfk4yhk";
|
||||
sha256 = "1yq82jj0c9nxrx4vxcb3s6yr154kaj2a3wrk12m6fm3dscsqsqq1";
|
||||
};
|
||||
|
||||
buildInputs = [ llvm makeWrapper which ];
|
||||
|
||||
@ -12,16 +12,3 @@ index baf29e7..b63f368 100644
|
||||
test(_TestTCPWritev)
|
||||
test(_TestTCPExpect)
|
||||
test(_TestTCPMute)
|
||||
diff --git a/packages/net/http/_test.pony b/packages/net/http/_test.pony
|
||||
index e55d5a7..40a4cb6 100644
|
||||
--- a/packages/net/http/_test.pony
|
||||
+++ b/packages/net/http/_test.pony
|
||||
@@ -29,8 +29,6 @@ actor Main is TestList
|
||||
test(_Valid)
|
||||
test(_ToStringFun)
|
||||
|
||||
- test(_HTTPConnTest)
|
||||
-
|
||||
class iso _Encode is UnitTest
|
||||
fun name(): String => "net/http/URLEncode.encode"
|
||||
|
||||
|
||||
@ -176,15 +176,6 @@ go.stdenv.mkDerivation (
|
||||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
pushd "$NIX_BUILD_TOP/go"
|
||||
while read f; do
|
||||
echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
|
||||
mkdir -p "$(dirname "$out/share/go/$f")"
|
||||
cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
|
||||
done < <(find . -type f)
|
||||
popd
|
||||
|
||||
mkdir -p $bin
|
||||
dir="$NIX_BUILD_TOP/go/bin"
|
||||
[ -e "$dir" ] && cp -r $dir $bin
|
||||
|
||||
@ -81,35 +81,26 @@ self: super: {
|
||||
|
||||
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
|
||||
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
|
||||
git-annex = ((overrideCabal super.git-annex (drv: {
|
||||
git-annex = (overrideSrc super.git-annex {
|
||||
src = pkgs.fetchgit {
|
||||
name = "git-annex-${drv.version}-src";
|
||||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + drv.version;
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb";
|
||||
};
|
||||
})).overrideScope (self: super: {
|
||||
aws = dontCheck (self.aws_0_18);
|
||||
conduit = self.conduit_1_2_13_1;
|
||||
conduit-extra = self.conduit-extra_1_2_3_2;
|
||||
cryptonite-conduit = dontCheck super.cryptonite-conduit; # test suite does not compile with old versions used here
|
||||
html-conduit = self.html-conduit_1_2_1_2;
|
||||
http-conduit = self.http-conduit_2_2_4;
|
||||
persistent = self.persistent_2_7_3_1;
|
||||
persistent-sqlite = self.persistent-sqlite_2_6_4;
|
||||
resourcet = self.resourcet_1_1_11;
|
||||
xml-conduit = self.xml-conduit_1_7_1_2;
|
||||
yesod = self.yesod_1_4_5;
|
||||
yesod-core = self.yesod-core_1_4_37_3;
|
||||
yesod-form = self.yesod-form_1_4_16;
|
||||
yesod-persistent = self.yesod-persistent_1_4_3;
|
||||
yesod-static = self.yesod-static_1_5_3_1;
|
||||
yesod-test = self.yesod-test_1_5_9_1;
|
||||
})).override {
|
||||
}).override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
|
||||
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
|
||||
};
|
||||
esqueleto = overrideSrc (addBuildDepend (dontCheck (dontHaddock super.esqueleto)) self.unliftio) {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "bitemyapp";
|
||||
repo = "esqueleto";
|
||||
rev = "b81e0d951e510ebffca03c5a58658ad884cc6fbd";
|
||||
sha256 = "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa";
|
||||
};
|
||||
};
|
||||
|
||||
# Fix test trying to access /home directory
|
||||
shell-conduit = (overrideCabal super.shell-conduit (drv: {
|
||||
@ -212,7 +203,7 @@ self: super: {
|
||||
# https://github.com/jputcu/serialport/issues/25
|
||||
serialport = dontCheck super.serialport;
|
||||
|
||||
serialise = dontCheck super.serialise;
|
||||
# Test suite build depends on ancient tasty 0.11.x.
|
||||
cryptohash-sha512 = dontCheck super.cryptohash-sha512;
|
||||
|
||||
# https://github.com/kazu-yamamoto/simple-sendfile/issues/17
|
||||
@ -264,6 +255,7 @@ self: super: {
|
||||
})
|
||||
];
|
||||
testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
|
||||
broken = true; # can't cope with deriving-compat 0.5.x.
|
||||
}));
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
@ -538,8 +530,8 @@ self: super: {
|
||||
# https://github.com/alphaHeavy/lzma-enumerator/issues/3
|
||||
lzma-enumerator = dontCheck super.lzma-enumerator;
|
||||
|
||||
# https://github.com/haskell-hvr/lzma/pull/11
|
||||
lzma = appendPatch super.lzma ./patches/lzma-tests.patch;
|
||||
# https://github.com/haskell-hvr/lzma/issues/14
|
||||
lzma = dontCheck super.lzma;
|
||||
|
||||
# https://github.com/BNFC/bnfc/issues/140
|
||||
BNFC = dontCheck super.BNFC;
|
||||
@ -632,18 +624,15 @@ self: super: {
|
||||
|
||||
# Build the latest git version instead of the official release. This isn't
|
||||
# ideal, but Chris doesn't seem to make official releases any more.
|
||||
structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: {
|
||||
structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "chrisdone";
|
||||
repo = "structured-haskell-mode";
|
||||
rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d";
|
||||
sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c";
|
||||
rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e";
|
||||
sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa";
|
||||
};
|
||||
version = "20170523-git";
|
||||
version = "20170205-git";
|
||||
editedCabalFile = null;
|
||||
# Statically linked Haskell libraries make the tool start-up much faster,
|
||||
# which is important for use in Emacs.
|
||||
enableSharedExecutables = false;
|
||||
# Make elisp files available at a location where people expect it. We
|
||||
# cannot easily byte-compile these files, unfortunately, because they
|
||||
# depend on a new version of haskell-mode that we don't have yet.
|
||||
@ -652,8 +641,15 @@ self: super: {
|
||||
mkdir -p $data/share/emacs
|
||||
ln -s $lispdir $data/share/emacs/site-lisp
|
||||
'';
|
||||
})).override {
|
||||
haskell-src-exts = self.haskell-src-exts_1_19_1;
|
||||
});
|
||||
descriptive = overrideSrc super.descriptive {
|
||||
version = "20180514-git";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "chrisdone";
|
||||
repo = "descriptive";
|
||||
rev = "c088960113b2add758553e41cbe439d183b750cd";
|
||||
sha256 = "17p65ihcvm1ghq23ww6phh8gdj7hwxlypjvh9jabsxvfbp2s8mrk";
|
||||
};
|
||||
};
|
||||
|
||||
# Make elisp files available at a location where people expect it.
|
||||
@ -668,12 +664,6 @@ self: super: {
|
||||
doCheck = false; # https://github.com/chrisdone/hindent/issues/299
|
||||
}));
|
||||
|
||||
# Need newer versions of their dependencies than the ones we have in LTS-11.x.
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
|
||||
dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
|
||||
graphviz = (addBuildTool super.graphviz pkgs.buildPackages.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
|
||||
status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
|
||||
|
||||
# https://github.com/bos/configurator/issues/22
|
||||
configurator = dontCheck super.configurator;
|
||||
|
||||
@ -890,9 +880,6 @@ self: super: {
|
||||
testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
|
||||
});
|
||||
|
||||
# Needs newer versions than what we have in LTS-11.x at the moment.
|
||||
stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; });
|
||||
|
||||
# These packages depend on each other, forming an infinite loop.
|
||||
scalendar = markBroken (super.scalendar.override { SCalendar = null; });
|
||||
SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
|
||||
@ -963,9 +950,11 @@ self: super: {
|
||||
happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
|
||||
hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
|
||||
servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;
|
||||
servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;
|
||||
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
|
||||
|
||||
# requires a release including https://github.com/haskell-servant/servant-swagger/commit/249530d9f85fe76dfb18b100542f75a27e6a3079
|
||||
servant-swagger = dontCheck super.servant-swagger;
|
||||
|
||||
# Tries to read a file it is not allowed to in the test suite
|
||||
load-env = dontCheck super.load-env;
|
||||
|
||||
@ -1005,8 +994,8 @@ self: super: {
|
||||
done
|
||||
mkdir -p $out/share/info
|
||||
cp -v *.info* $out/share/info/
|
||||
''; # hledger-ui 1.10 needs newer fsnotify than lts-11 provides.
|
||||
})).overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; });
|
||||
'';
|
||||
}));
|
||||
hledger-web = overrideCabal super.hledger-web (drv: {
|
||||
postInstall = ''
|
||||
for i in $(seq 1 9); do
|
||||
@ -1051,10 +1040,10 @@ self: super: {
|
||||
# This package refers to the wrong library (itself in fact!)
|
||||
vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
|
||||
|
||||
# Builds only with the latest version of indexed-list-literals.
|
||||
vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override {
|
||||
indexed-list-literals = self.indexed-list-literals_0_2_1_1;
|
||||
};
|
||||
# # Builds only with the latest version of indexed-list-literals.
|
||||
# vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override {
|
||||
# indexed-list-literals = self.indexed-list-literals_0_2_1_1;
|
||||
# };
|
||||
|
||||
# https://github.com/dmwit/encoding/pull/3
|
||||
encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
|
||||
@ -1062,41 +1051,53 @@ self: super: {
|
||||
# Work around overspecified constraint on github ==0.18.
|
||||
github-backup = doJailbreak super.github-backup;
|
||||
|
||||
# Work around large number of repeated arguments
|
||||
# https://github.com/NixOS/nixpkgs/issues/40013
|
||||
taffybar = super.taffybar.overrideDerivation (drv: {
|
||||
strictDeps = true;
|
||||
});
|
||||
|
||||
# dhall-json requires a very particular dhall version
|
||||
dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; };
|
||||
|
||||
# dhall-nix requires a very particular dhall version
|
||||
dhall-nix = super.dhall-nix.override { dhall = self.dhall_1_15_0; };
|
||||
|
||||
# https://github.com/fpco/streaming-commons/issues/49
|
||||
streaming-commons = dontCheck super.streaming-commons;
|
||||
|
||||
# cabal2nix generates a dependency on base-compat, which is the wrong version
|
||||
base-compat-batteries = super.base-compat-batteries.override {
|
||||
base-compat = super.base-compat_0_10_4;
|
||||
};
|
||||
# Test suite depends on old QuickCheck 2.10.x.
|
||||
cassava = dontCheck super.cassava;
|
||||
|
||||
# Test suite depends on cabal-install
|
||||
doctest = dontCheck super.doctest;
|
||||
|
||||
# Over-specified constraint on X11 ==1.8.*.
|
||||
xmonad = doJailbreak super.xmonad;
|
||||
|
||||
# Test has either build errors or fails anyway, depending on the compiler.
|
||||
vector-algorithms = dontCheck super.vector-algorithms;
|
||||
|
||||
# The test suite attempts to use the network.
|
||||
dhall = dontCheck super.dhall;
|
||||
|
||||
# https://github.com/well-typed/cborg/issues/174
|
||||
cborg = doJailbreak super.cborg;
|
||||
serialise = doJailbreak (dontCheck super.serialise);
|
||||
|
||||
# https://github.com/phadej/tree-diff/issues/19
|
||||
tree-diff = doJailbreak super.tree-diff;
|
||||
|
||||
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
|
||||
haddock-library = doJailbreak (dontCheck super.haddock-library);
|
||||
haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
|
||||
|
||||
# The test suite does not know how to find the 'cabal2nix' binary.
|
||||
cabal2nix = overrideCabal super.cabal2nix (drv: {
|
||||
preCheck = ''
|
||||
export PATH="$PWD/dist/build/cabal2nix:$PATH"
|
||||
export HOME="$TMPDIR/home"
|
||||
'';
|
||||
});
|
||||
|
||||
# Break out of "aeson <1.3, temporary <1.3".
|
||||
stack = doJailbreak super.stack;
|
||||
|
||||
# https://github.com/pikajude/stylish-cabal/issues/11
|
||||
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
|
||||
hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
|
||||
|
||||
# musl fixes
|
||||
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
|
||||
unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
|
||||
# dontCheck: printf double rounding behavior
|
||||
prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter;
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
(let
|
||||
amazonkaOverrides = self: super: {
|
||||
conduit = self.conduit_1_2_13_1;
|
||||
conduit-extra = self.conduit-extra_1_2_3_2;
|
||||
resourcet = self.resourcet_1_1_11;
|
||||
xml-conduit = self.xml-conduit_1_7_1_2;
|
||||
http-conduit = self.http-conduit_2_2_4;
|
||||
};
|
||||
amazonka-core = super.amazonka-core.overrideScope amazonkaOverrides;
|
||||
amazonka = super.amazonka.overrideScope amazonkaOverrides;
|
||||
amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides;
|
||||
in {
|
||||
inherit amazonka amazonka-core amazonka-test;
|
||||
})
|
||||
|
||||
@ -36,6 +36,13 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# These are now core libraries in GHC 8.4.x.
|
||||
mtl = self.mtl_2_2_2;
|
||||
parsec = self.parsec_3_1_13_0;
|
||||
parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
|
||||
stm = self.stm_2_4_5_0;
|
||||
text = self.text_1_2_3_0;
|
||||
|
||||
# Build jailbreak-cabal with the latest version of Cabal.
|
||||
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
|
||||
|
||||
@ -195,7 +202,6 @@ self: super: {
|
||||
mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
|
||||
natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
|
||||
optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
|
||||
parsec = addBuildDepends super.parsec [self.fail self.semigroups];
|
||||
parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
|
||||
QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
|
||||
reflection = addBuildDepend super.reflection self.semigroups;
|
||||
|
||||
@ -35,6 +35,12 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# These are now core libraries in GHC 8.4.x.
|
||||
mtl = self.mtl_2_2_2;
|
||||
parsec = self.parsec_3_1_13_0;
|
||||
stm = self.stm_2_4_5_0;
|
||||
text = self.text_1_2_3_0;
|
||||
|
||||
# https://github.com/bmillwood/applicative-quoters/issues/6
|
||||
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
|
||||
@ -44,9 +50,6 @@ self: super: {
|
||||
# Requires ghc 8.2
|
||||
ghc-proofs = dontDistribute super.ghc-proofs;
|
||||
|
||||
# http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
|
||||
vector-algorithms = dontCheck super.vector-algorithms;
|
||||
|
||||
# https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
|
||||
yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
|
||||
|
||||
|
||||
@ -36,6 +36,12 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# These are now core libraries in GHC 8.4.x.
|
||||
mtl = self.mtl_2_2_2;
|
||||
parsec = self.parsec_3_1_13_0;
|
||||
stm = self.stm_2_4_5_0;
|
||||
text = self.text_1_2_3_0;
|
||||
|
||||
# Make sure we can still build Cabal 1.x.
|
||||
Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
|
||||
prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
|
||||
@ -50,10 +56,6 @@ self: super: {
|
||||
sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
|
||||
});
|
||||
|
||||
# http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
|
||||
vector-algorithms = dontCheck super.vector-algorithms;
|
||||
|
||||
|
||||
# https://github.com/nominolo/ghc-syb/issues/20
|
||||
ghc-syb-utils = dontCheck super.ghc-syb-utils;
|
||||
|
||||
@ -94,16 +96,4 @@ self: super: {
|
||||
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
|
||||
}));
|
||||
|
||||
# Hledger depends indirectly on different versions of base-compat. The
|
||||
# override can probably be removed once we update to LTS 12.x.
|
||||
hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_4; });
|
||||
hledger = super.hledger.overrideScope (self: super: {
|
||||
base-compat = self.base-compat_0_10_4;
|
||||
aeson = self.aeson_1_4_0_0;
|
||||
});
|
||||
hledger-web = super.hledger-web.overrideScope (self: super: {
|
||||
base-compat = self.base-compat_0_10_4;
|
||||
aeson = self.aeson_1_4_0_0;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@ -39,381 +39,27 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Use to be a core-library, but no longer is since GHC 8.4.x.
|
||||
hoopl = self.hoopl_3_10_2_2;
|
||||
|
||||
doctest = dontCheck super.doctest_0_16_0; # tests depend on very recent QuickCheck
|
||||
hackage-db = super.hackage-db_2_0_1;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
haddock-library = overrideCabal super.haddock-library_1_5_0_1 (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
## Older versions don't compile
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck ==2.11.*
|
||||
doCheck = false;
|
||||
## Running Haddock on library for haddock-library-1.5.0.1..
|
||||
## Setup: internal error when calculating transitive package dependencies.
|
||||
## Debug info: []
|
||||
doHaddock = false;
|
||||
});
|
||||
|
||||
## On Hackage:
|
||||
|
||||
## 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:
|
||||
## aeson >=0.9 && <0.12,
|
||||
## base >=4.7 && <4.10,
|
||||
## directory ==1.2.*,
|
||||
## megaparsec ==5.0.*,
|
||||
## vector ==0.11.*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "lambdacube3d";
|
||||
repo = "lambdacube-compiler";
|
||||
rev = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8";
|
||||
sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m";
|
||||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
lambdacube-ir = overrideCabal super.lambdacube-ir (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## aeson >=0.9 && <0.12, base >=4.8 && <4.10, vector ==0.11.*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "lambdacube3d";
|
||||
repo = "lambdacube-ir";
|
||||
rev = "b86318b510ef59606c5b7c882cad33af52ce257c";
|
||||
sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x";
|
||||
};
|
||||
prePatch = "cd lambdacube-ir.haskell; ";
|
||||
});
|
||||
|
||||
singletons = dontCheck super.singletons_2_4_1;
|
||||
th-desugar = super.th-desugar_1_8;
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
websockets = overrideCabal super.websockets (drv: {
|
||||
## • No instance for (Semigroup SizeLimit)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid SizeLimit’
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jaspervdj";
|
||||
repo = "websockets";
|
||||
rev = "11ba6d15cf47bace1936b13a58192e37908b0300";
|
||||
sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf";
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged
|
||||
|
||||
## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3
|
||||
bytestring-trie = overrideCabal super.bytestring-trie (drv: {
|
||||
## • Could not deduce (Semigroup (Trie a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: Monoid a
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "RyanGlScott";
|
||||
repo = "bytestring-trie";
|
||||
rev = "e0ae0cb1ad40dedd560090d69cc36f9760797e29";
|
||||
sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl";
|
||||
};
|
||||
## Setup: Encountered missing dependencies:
|
||||
## HUnit >=1.3.1.1 && <1.7,
|
||||
## QuickCheck >=2.4.1 && <2.11,
|
||||
## lazysmallcheck ==0.6.*,
|
||||
## smallcheck >=1.1.1 && <1.2
|
||||
doCheck = false;
|
||||
## Setup: Encountered missing dependencies:
|
||||
## data-or ==1.0.*
|
||||
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3
|
||||
monadplus = overrideCabal super.monadplus (drv: {
|
||||
## • No instance for (Semigroup (Partial a b))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid (Partial a b)’
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "asr";
|
||||
repo = "monadplus";
|
||||
rev = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb";
|
||||
sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc";
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158
|
||||
reflex = overrideCabal super.reflex (drv: {
|
||||
## • Could not deduce (Semigroup (Event t a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: (Semigroup a, Reflex t)
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "deepfire";
|
||||
repo = "reflex";
|
||||
rev = "4fb50139db45a37493b91973eeaad9885b4c63ca";
|
||||
sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx";
|
||||
};
|
||||
## haddock: internal error: internal: extractDecl (ClsInstD)
|
||||
## CallStack (from HasCallStack):
|
||||
## error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1067:16 in main:Haddock.Interface.Create
|
||||
doHaddock = false;
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5
|
||||
jailbreak = true;
|
||||
## Setup: Encountered missing dependencies:
|
||||
## data-default -any,
|
||||
## lens -any,
|
||||
## monad-control -any,
|
||||
## prim-uniq -any,
|
||||
## reflection -any,
|
||||
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]);
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/bos/text-format/pull/21
|
||||
text-format = overrideCabal super.text-format (drv: {
|
||||
## • No instance for (Semigroup Format)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Format’
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "deepfire";
|
||||
repo = "text-format";
|
||||
rev = "a1cda87c222d422816f956c7272e752ea12dbe19";
|
||||
sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr";
|
||||
};
|
||||
});
|
||||
|
||||
## Non-code, configuration-only change
|
||||
|
||||
adjunctions = overrideCabal super.adjunctions (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## free ==4.*
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
async = overrideCabal super.async (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.3 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## template-haskell >=2.10 && <2.13
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
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;
|
||||
});
|
||||
|
||||
exception-transformers = overrideCabal super.exception-transformers (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## HUnit >=1.2 && <1.6
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
github = overrideCabal super.github (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.7 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck ==2.11.*
|
||||
doCheck = false;
|
||||
doHaddock = false;
|
||||
});
|
||||
|
||||
hashable = overrideCabal super.hashable (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.4 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
hashable-time = overrideCabal super.hashable-time (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.7 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
haskell-src-meta = overrideCabal super.haskell-src-meta (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
hnix = overrideCabal super.hnix (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## deriving-compat ==0.3.*
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
integer-logarithms = overrideCabal super.integer-logarithms (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.3 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
kan-extensions = overrideCabal super.kan-extensions (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## free ==4.*
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
keys = overrideCabal super.keys (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## free ==4.*
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
lambdacube-gl = overrideCabal super.lambdacube-gl (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## vector ==0.11.*
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
lifted-async = overrideCabal super.lifted-async (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
newtype-generics = overrideCabal super.newtype-generics (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.6 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
protolude = overrideCabal super.protolude (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.6 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
rapid = overrideCabal super.rapid (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.8 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
resolv = overrideCabal super.resolv (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## tasty >=0.11.2 && <0.12
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
setlocale = overrideCabal super.setlocale (drv: {
|
||||
## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
stylish-cabal = overrideCabal super.stylish-cabal (drv: {
|
||||
## https://github.com/pikajude/stylish-cabal/issues/6
|
||||
doHaddock = false;
|
||||
});
|
||||
|
||||
tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.8 && <4.11
|
||||
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 1899912238
|
||||
## Finished in 0.0027 seconds
|
||||
doCheck = false;
|
||||
## Setup: Encountered missing dependencies:
|
||||
## extra >=1.4.10 && <1.5, lens ==4.14.*
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
## Issue: https://github.com/phadej/tree-diff/issues/15
|
||||
tree-diff = overrideCabal super.tree-diff (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.7 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
vector-algorithms = overrideCabal super.vector-algorithms (drv: {
|
||||
## • Ambiguous type variable ‘mv0’
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
wavefront = overrideCabal super.wavefront (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.8 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
# https://github.com/jcristovao/enclosed-exceptions/issues/12
|
||||
enclosed-exceptions = dontCheck super.enclosed-exceptions;
|
||||
|
||||
# Older versions don't compile.
|
||||
base-compat = self.base-compat_0_10_4;
|
||||
brick = self.brick_0_37_1;
|
||||
criterion = super.criterion_1_5_0_0;
|
||||
dhall = self.dhall_1_15_0;
|
||||
# This is probably obsolete:
|
||||
# dhall_1_15_0 = doJailbreak super.dhall_1_15_0; # support ansi-terminal 0.8.x
|
||||
HaTeX = self.HaTeX_3_19_0_0;
|
||||
hpack = self.hpack_0_28_2;
|
||||
hspec = dontCheck super.hspec_2_5_4;
|
||||
hspec-core = dontCheck super.hspec-core_2_5_4;
|
||||
hspec-discover = self.hspec-discover_2_5_4;
|
||||
hspec-smallcheck = self.hspec-smallcheck_0_5_2;
|
||||
matrix = self.matrix_0_3_6_1;
|
||||
pandoc = self.pandoc_2_2_1;
|
||||
pandoc-types = self.pandoc-types_1_17_5_1;
|
||||
wl-pprint-text = self.wl-pprint-text_1_2_0_0;
|
||||
|
||||
# https://github.com/xmonad/xmonad/issues/155
|
||||
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
|
||||
{ url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
|
||||
sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
|
||||
})) self.semigroups;
|
||||
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch {
|
||||
url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
|
||||
sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
|
||||
})) self.semigroups;
|
||||
|
||||
# https://github.com/xmonad/xmonad-contrib/issues/235
|
||||
xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
|
||||
|
||||
# Our xmonad claims that it's version 0.14, which is outside of this
|
||||
# package's version constraints.
|
||||
xmonad-extras = doJailbreak super.xmonad-extras;
|
||||
|
||||
# This package desperately needs a maintainer.
|
||||
xmobar = super.xmobar.overrideScope (self: super: {
|
||||
hinotify = self.hinotify_0_3_9; # https://github.com/jaor/xmobar/issues/356
|
||||
dbus = self.dbus_0_10_15; # https://github.com/jaor/xmobar/issues/346
|
||||
});
|
||||
hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
|
||||
|
||||
}
|
||||
|
||||
@ -7,11 +7,10 @@ self: super: {
|
||||
# Use the latest LLVM.
|
||||
inherit (pkgs) llvmPackages;
|
||||
|
||||
# Disable GHC 7.11.x core libraries.
|
||||
# Disable GHC 8.7.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
binary = null;
|
||||
bin-package-db = null;
|
||||
bytestring = null;
|
||||
Cabal = null;
|
||||
containers = null;
|
||||
@ -24,14 +23,17 @@ self: super: {
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haskeline = null;
|
||||
hoopl = null;
|
||||
hpc = null;
|
||||
integer-gmp = null;
|
||||
mtl = null;
|
||||
parsec = null;
|
||||
pretty = null;
|
||||
process = null;
|
||||
rts = null;
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
terminfo = null;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
unix = null;
|
||||
@ -92,5 +94,5 @@ self: super: {
|
||||
test-framework = doJailbreak super.test-framework;
|
||||
atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch);
|
||||
hashable = doJailbreak super.hashable;
|
||||
stm = doJailbreak super.stm;
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -146,11 +146,7 @@ self: super: builtins.intersectAttrs super {
|
||||
gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
|
||||
|
||||
# Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
|
||||
taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })).override { dbus = self.dbus_1_0_1; };
|
||||
|
||||
# Specify needed dbus version
|
||||
dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; };
|
||||
status-notifier-item = super.status-notifier-item.override { dbus = self.dbus_1_0_1; };
|
||||
taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; }));
|
||||
|
||||
# Add necessary reference to gtk3 package
|
||||
gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;
|
||||
@ -508,6 +504,7 @@ self: super: builtins.intersectAttrs super {
|
||||
# Break cyclic reference that results in an infinite recursion.
|
||||
partial-semigroup = dontCheck super.partial-semigroup;
|
||||
colour = dontCheck super.colour;
|
||||
manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; };
|
||||
|
||||
LDAP = dontCheck (overrideCabal super.LDAP (drv: {
|
||||
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
|
||||
@ -516,4 +513,5 @@ self: super: builtins.intersectAttrs super {
|
||||
# Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
|
||||
blank-canvas = dontCheck super.blank-canvas;
|
||||
blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
|
||||
|
||||
}
|
||||
|
||||
11115
pkgs/development/haskell-modules/hackage-packages.nix
generated
11115
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
--- a/lzma.cabal
|
||||
+++ b/lzma.cabal
|
||||
@@ -76,7 +76,7 @@
|
||||
-- additional dependencies that require version bounds
|
||||
build-depends: HUnit >= 1.2 && <1.7
|
||||
, QuickCheck >= 2.8 && <2.11
|
||||
- , tasty >= 0.10 && <0.13
|
||||
+ , tasty >= 0.10 && <1.1
|
||||
, tasty-hunit >= 0.9 && <0.11
|
||||
, tasty-quickcheck >= 0.8.3.2 && <0.10
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "joker-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
goPackagePath = "github.com/candid82/joker";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "1738gr25hlffc8ppzy6kik21jfix9iy316kv1kj1lqxr8giirhf6";
|
||||
sha256 = "15q9w93yjc5zl9z45mkcfizgz5r3mzbkah0ng0hdxf0qqy6b09w8";
|
||||
};
|
||||
|
||||
preBuild = "go generate ./...";
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
else throw "Unsupported system!";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "aws-sdk-cpp-${version}";
|
||||
version = "1.4.78";
|
||||
version = "1.4.82";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "15nrrv94vp8i1azi2bcpi08wxb2dbqlmy9y6jyfw0n1vkr6gz2fw";
|
||||
sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69";
|
||||
};
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
|
||||
, libstartup_notification, gobjectIntrospection, gtk-doc
|
||||
, python27, pythonPackages, libxml2 }:
|
||||
, xorgserver, dbus, python2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bamf";
|
||||
version = "0.5.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
|
||||
sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
|
||||
@ -16,22 +18,40 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
gtk-doc
|
||||
gobjectIntrospection
|
||||
vala
|
||||
# Tests
|
||||
xorgserver
|
||||
dbus
|
||||
(python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
|
||||
];
|
||||
|
||||
buildInputs = [ libgtop libwnck3 vala libstartup_notification
|
||||
python27 pythonPackages.libxslt libxml2 glib ];
|
||||
buildInputs = [
|
||||
libgtop
|
||||
libwnck3
|
||||
libstartup_notification
|
||||
glib
|
||||
];
|
||||
|
||||
# Fix hard-coded path
|
||||
# https://bugs.launchpad.net/bamf/+bug/1780557
|
||||
postPatch = ''
|
||||
substituteInPlace data/Makefile.in \
|
||||
--replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user'
|
||||
--replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-headless-tests"
|
||||
];
|
||||
|
||||
# fix paths
|
||||
makeFlags = [
|
||||
"INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
|
||||
"INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
|
||||
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
|
||||
];
|
||||
|
||||
# TODO: Requires /etc/machine-id
|
||||
doCheck = false;
|
||||
|
||||
# ignore deprecation errors
|
||||
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "curlcpp-${version}";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JosephP91";
|
||||
repo = "curlcpp";
|
||||
rev = "${version}";
|
||||
sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q";
|
||||
sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake curl ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user