From 7490e96e38f6db4327554551c705e0a4856c5917 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Dec 2018 21:48:00 +0100 Subject: [PATCH 001/467] nixos/iotop: add module The `iotop` program can't be started by an unprivileged user because of missing root privileges. The issue can be fixed by creating a setcap wrapper for `iotop` which contains `cap_net_admin`. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/iotop.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/modules/programs/iotop.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5ffb0c5ab223..8fa6117d2f56 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -98,6 +98,7 @@ ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/iftop.nix + ./programs/iotop.nix ./programs/java.nix ./programs/kbdlight.nix ./programs/less.nix diff --git a/nixos/modules/programs/iotop.nix b/nixos/modules/programs/iotop.nix new file mode 100644 index 000000000000..986d562ad0f8 --- /dev/null +++ b/nixos/modules/programs/iotop.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.iotop; +in { + options = { + programs.iotop.enable = mkEnableOption "iotop + setcap wrapper"; + }; + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.iotop ]; + security.wrappers.iotop = { + source = "${pkgs.iotop}/bin/iotop"; + capabilities = "cap_net_admin+p"; + }; + }; +} From 65128f72118907d05880570a04702ea820b2afab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 21 Dec 2018 08:15:17 -0500 Subject: [PATCH 002/467] dive: init at 0.5.0 --- pkgs/development/tools/dive/default.nix | 26 + pkgs/development/tools/dive/deps.nix | 712 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 740 insertions(+) create mode 100644 pkgs/development/tools/dive/default.nix create mode 100644 pkgs/development/tools/dive/deps.nix diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix new file mode 100644 index 000000000000..c93321638099 --- /dev/null +++ b/pkgs/development/tools/dive/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "dive"; + version = "0.5.0"; + + goPackagePath = "github.com/wagoodman/dive"; + + src = fetchFromGitHub { + owner = "wagoodman"; + repo = "dive"; + rev = "v${version}"; + sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns"; + }; + + goDeps = ./deps.nix; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A tool for exploring each layer in a docker image"; + homepage = https://github.com/wagoodman/dive; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix new file mode 100644 index 000000000000..c140b2ae7748 --- /dev/null +++ b/pkgs/development/tools/dive/deps.nix @@ -0,0 +1,712 @@ +[ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + }; + } + + { + goPackagePath = "github.com/Azure/go-ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ansiterm"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; + }; + } + + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.11"; + sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; + }; + } + + { + goPackagePath = "github.com/Nvveen/Gotty"; + fetch = { + type = "git"; + url = "https://github.com/Nvveen/Gotty"; + rev = "cd527374f1e5"; + sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; + }; + } + + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "93e082742a009850ac46962150b2f652a822c5ff"; + sha256 = "0cvfxfmilriwdsv3iqy6p5m8m3zya4b8slwyqxljss1bnz0p8z1v"; + }; + } + + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "0b7cb16dde4a20d024c7be59801d63bcfd18611b"; + sha256 = "1sk55s1ghm06d1qq4jic05dvmplvzw2sl6d4j8vamajwa6harlwj"; + }; + } + + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + }; + } + + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.3.3"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "v0.4.0"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + + { + goPackagePath = "github.com/k0kubun/go-ansi"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/go-ansi"; + rev = "3bf9e2903213"; + sha256 = "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq"; + }; + } + + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.3"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.0.0"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.0.0"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + }; + } + + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "60ab7e3d12ed"; + sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; + }; + } + + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + }; + } + + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + + { + goPackagePath = "github.com/phayes/permbits"; + fetch = { + type = "git"; + url = "https://github.com/phayes/permbits"; + rev = "59f2482cd460"; + sha256 = "0ydc5d9kqmjvmscik98jvr6n19sj30v33mnw8akmq0s1lxij58hm"; + }; + } + + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.2.0"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.2"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + }; + } + + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.2.1"; + sha256 = "0y7czxki8zhjhanh5ydnx4sf2darw70z2i5dskgarbk4gjmagx6k"; + }; + } + + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3d3f9f413869"; + sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; + }; + } + + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "adae6a3d119a"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + }; + } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93218def8b18"; + sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951c"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "c66870c02cf8"; + sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; + }; + } + + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.16.0"; + sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + }; + } + + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + }; + } + + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7082c1ff536a..d99bba7edcac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8576,6 +8576,8 @@ in binutils = binutils; }; + dive = callPackage ../development/tools/dive { }; + doclifter = callPackage ../development/tools/misc/doclifter { }; docutils = pythonPackages.docutils; From 74dcd2b49c1e1b15431723ec38c82e34c408ceb1 Mon Sep 17 00:00:00 2001 From: embr Date: Fri, 21 Dec 2018 22:40:08 +0000 Subject: [PATCH 003/467] cardpeek: init at 0.8.4 --- maintainers/maintainer-list.nix | 5 ++++ pkgs/applications/misc/cardpeek/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/cardpeek/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a0ff6fe4379..d52044041ba3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1250,6 +1250,11 @@ github = "edef1c"; name = "edef"; }; + embr = { + email = "hi@liclac.eu"; + github = "liclac"; + name = "embr"; + }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix new file mode 100644 index 000000000000..c46242bebe94 --- /dev/null +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook, + glib, gtk3, pcsclite, lua5_2, curl, readline }: +let + version = "0.8.4"; +in + stdenv.mkDerivation { + name = "cardpeek-${version}"; + + src = fetchFromGitHub { + owner = "L1L1"; + repo = "cardpeek"; + rev = "cardpeek-${version}"; + sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/L1L1/cardpeek; + description = "A tool to read the contents of ISO7816 smart cards"; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ embr ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209a90a16017..c690bfb67984 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1130,6 +1130,8 @@ in catclock = callPackage ../applications/misc/catclock { }; + cardpeek = callPackage ../applications/misc/cardpeek { }; + cde = callPackage ../tools/package-management/cde { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; From 9a96bfa0372cc33ed9b39e4c388a159181c9be90 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Dec 2018 00:03:54 +0000 Subject: [PATCH 004/467] Update pkgs/applications/misc/cardpeek/default.nix Co-Authored-By: liclac --- pkgs/applications/misc/cardpeek/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index c46242bebe94..9b2192708090 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -21,7 +21,7 @@ in meta = with stdenv.lib; { homepage = https://github.com/L1L1/cardpeek; description = "A tool to read the contents of ISO7816 smart cards"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ embr ]; }; From c66f2c322cc88cfb2a80ff97d22e240beaef3cb0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Dec 2018 00:52:34 -0800 Subject: [PATCH 005/467] openvdb: 5.2.0 -> 6.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openvdb/versions --- pkgs/development/libraries/openvdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index c11a93373dd1..8058891615f2 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; + sha256 = "07m012a966l821f09jmrrhs25cs2rcmhlxcicywibllaac10wk5k"; }; outputs = [ "out" ]; From b0f912b6d94aa56ada9065a2676f6bd71a7cfecb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Dec 2018 06:55:30 -0800 Subject: [PATCH 006/467] libsForQt5.mlt: 6.10.0 -> 6.12.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mlt/versions --- pkgs/development/libraries/mlt/qt-5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 804c3f8ed228..1f41696a4e33 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.12.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; }; buildInputs = [ From 53ff7c73dac53ac7caedda0e64ee98d2f640bd1b Mon Sep 17 00:00:00 2001 From: Jaanus Torp Date: Mon, 31 Dec 2018 00:06:54 +0000 Subject: [PATCH 007/467] aws-sam-translator: 1.8.0 > 1.9.0 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 307cd9b84b0a..917a93798820 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b"; + sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d"; }; # Tests are not included in the PyPI package From 2a66cb4f4cc7da7d8a27839237db3ba41484a25a Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 18 Dec 2018 09:56:37 +0000 Subject: [PATCH 008/467] qolibri: init at 2018-11-14 --- pkgs/applications/misc/qolibri/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/qolibri/default.nix diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix new file mode 100644 index 000000000000..e395ae9c070d --- /dev/null +++ b/pkgs/applications/misc/qolibri/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase +, qtmultimedia, qttools, qtwebengine }: + +stdenv.mkDerivation rec { + name = "qolibri-${version}"; + version = "2018-11-14"; + + src = fetchFromGitHub { + owner = "ludios"; + repo = "qolibri"; + rev = "133a1c33e74d931ad54407f70d84a0016d96981f"; + sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ + libeb lzo qtbase qtmultimedia qttools qtwebengine + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/ludios/qolibri; + description = "EPWING reader for viewing Japanese dictionaries"; + platforms = platforms.linux; + maintainers = with maintainers; [ ivan ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34bf096fcd99..6d6a7d47f4d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12102,6 +12102,8 @@ in qoauth = callPackage ../development/libraries/qoauth { }; + qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = libGLSupported; libpng = libpng12; From 1b5491fc4f5124bb81d394519e56fe69a6b3d2d5 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 1 Sep 2018 15:13:10 +0200 Subject: [PATCH 009/467] rls: init at 1.31.7 --- pkgs/development/tools/rust/rls/default.nix | 43 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/rust/rls/default.nix diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix new file mode 100644 index 000000000000..accdc7678c60 --- /dev/null +++ b/pkgs/development/tools/rust/rls/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, openssh, openssl, pkgconfig, cmake, zlib, curl }: + +rustPlatform.buildRustPackage rec { + name = "rls-${version}"; + # with rust 1.x you can only build rls version 1.x.y + version = "1.31.7"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rls"; + rev = version; + sha256 = "0n33pf7sm31y55rllb8wv3mn75srspr4yj2y6cpcdyf15n47c8cf"; + }; + + cargoSha256 = "0jcsggq4ay8f4vb8n6gh8z995icvvbjkzapxf6jq6qkg6jp3vv17"; + + # a nightly compiler is required unless we use this cheat code. + RUSTC_BOOTSTRAP=1; + + # clippy is hard to build with stable rust so we disable clippy lints + cargoBuildFlags = [ "--no-default-features" ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ openssh openssl curl zlib ]; + + doCheck = true; + # the default checkPhase has no way to pass --no-default-features + checkPhase = '' + runHook preCheck + echo "Running cargo test" + cargo test --no-default-features + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; + homepage = https://github.com/rust-lang/rls/; + license = licenses.mit; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03fa56c02138..27496ae5e0f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7497,6 +7497,7 @@ in pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; + rls = callPackage ../development/tools/rust/rls { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; From b66b0c58cae9e9f7e400f61de01c078b9466934d Mon Sep 17 00:00:00 2001 From: Ryan Fitzsimon Date: Wed, 2 Jan 2019 14:03:20 +1000 Subject: [PATCH 010/467] vagrant: Add vagrant-libvirt utility dependencies When using vagrant-libvirt as provider, the 'vagrant package' command requires 'qemu-img' and 'virt-sysprep'. --- pkgs/development/tools/vagrant/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index f2e6b00c09b3..b8ba30361aa8 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: let # NOTE: bumping the version and updating the hash is insufficient; @@ -48,10 +48,22 @@ in buildRubyGem rec { # PATH additions: # - libarchive: Make `bsdtar` available for extracting downloaded boxes - postInstall = '' + # withLibvirt only: + # - libguestfs: Make 'virt-sysprep' available for 'vagrant package' + # - qemu: Make 'qemu-img' available for 'vagrant package' + postInstall = + let + pathAdditions = lib.makeSearchPath "bin" + (map (x: "${lib.getBin x}") ([ + libarchive + ] ++ lib.optionals withLibvirt [ + libguestfs + qemu + ])); + in '' wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' "${lib.getBin libarchive}/bin" + --prefix PATH ':' ${pathAdditions} mkdir -p "$out/vagrant-plugins/plugins.d" echo '{}' > "$out/vagrant-plugins/plugins.json" From 32e5482e92a0005830785fc84227a62ad3a5be8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jan 2019 17:56:34 -0800 Subject: [PATCH 011/467] osinfo-db: 20181203 -> 20181214 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db/versions --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 893707395ae5..d8f5ebf56b97 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20181203"; + name = "osinfo-db-20181214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2"; + sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From c7cb749dd238b29feeb2f42fbe027b6a4e4b2757 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jan 2019 04:46:48 -0800 Subject: [PATCH 012/467] lsp-plugins: 1.1.4 -> 1.1.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lsp-plugins/versions --- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index d567dc584d8b..2e70bebc88d2 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.4"; + version = "1.1.5"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sadko4u"; repo = "${pname}"; rev = "${name}"; - sha256 = "0vb8ax0w4d2a153wxrhkpi21fxsv7c24k57vhfgmm1lqwv6pbl69"; + sha256 = "0xcxm47j7mz5vprjqqhi95gz62syp4y737h7cssxd3flqkgar7xr"; }; nativeBuildInputs = [ pkgconfig php expat ]; From 855d370a2036aecd2029f21012149772a55fb99c Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Tue, 25 Dec 2018 15:13:44 -0500 Subject: [PATCH 013/467] gping: init at 1.1 gping is a utility to display a graph of ping timing in a terminal --- pkgs/tools/networking/gping/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/networking/gping/default.nix diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix new file mode 100644 index 000000000000..467f6f1586d5 --- /dev/null +++ b/pkgs/tools/networking/gping/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, iputils +, python3 +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "gping"; + version = "1.1"; + + propagatedBuildInputs = with python3Packages; [ colorama ]; + + src = python3Packages.fetchPypi { + inherit version; + pname = "pinggraph"; + sha256 = "0q5ma98457zb6vxsnhmrr3p38j1vg0gl155y0adzfg67wlniac92"; + }; + + # Make path to ping explicit + postFixup = '' + substituteInPlace $out/${python3.sitePackages}/gping/pinger.py \ + --replace 'subprocess.getoutput("ping ' 'subprocess.getoutput("${iputils}/bin/ping ' \ + --replace 'args = ["ping"]' 'args = ["${iputils}/bin/ping"]' + ''; + + meta = with lib; { + description = "Ping, but with a graph"; + homepage = https://github.com/orf/gping; + license = licenses.gpl2; + maintainers = with maintainers; [ andrew-d ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbf1c2e4e39d..bb203c115d2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1477,6 +1477,8 @@ in gosu = callPackage ../tools/misc/gosu { }; + gping = callPackage ../tools/networking/gping { }; + greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; From 1db3185eea44da57fd2008687ca38946f59e6b4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jan 2019 16:19:26 -0800 Subject: [PATCH 014/467] lxc: 3.0.3 -> 3.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxc/versions --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3af8ceab80e0..1adf820c68ef 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0hcql4srcs2dlf2f67i8v92y2i352zv7nr9hsgs3pih2rhrbh332"; + sha256 = "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd"; }; nativeBuildInputs = [ From 2f9b85855bff4a6a35edacc776336425f76eea64 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Thu, 10 Jan 2019 18:06:54 +0200 Subject: [PATCH 015/467] emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc//comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`. --- pkgs/applications/editors/emacs/default.nix | 1 + .../editors/emacs/tramp-detect-wrapped-gvfsd.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 948d8cb98672..4f268a3a104e 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch + ./tramp-detect-wrapped-gvfsd.patch ]; postPatch = lib.optionalString srcRepo '' diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch new file mode 100644 index 000000000000..5d16194fd202 --- /dev/null +++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch @@ -0,0 +1,14 @@ +diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el +index f370abba31..f2806263a9 100644 +--- a/lisp/net/tramp-gvfs.el ++++ b/lisp/net/tramp-gvfs.el +@@ -164,7 +164,8 @@ tramp-gvfs-enabled + (and (featurep 'dbusbind) + (tramp-compat-funcall 'dbus-get-unique-name :system) + (tramp-compat-funcall 'dbus-get-unique-name :session) +- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") ++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") ++ (tramp-compat-process-running-p "gvfs-fuse-daemon") + (tramp-compat-process-running-p "gvfsd-fuse")))) + "Non-nil when GVFS is available.") + From 3791c991bf54ff228a875c5f773913978ec67972 Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Sun, 13 Jan 2019 16:29:41 +0800 Subject: [PATCH 016/467] emacsPackages.emacsql-sqlite: build sqlite binary --- pkgs/top-level/emacs-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d7c196376cb0..9151975bec75 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -147,6 +147,32 @@ let }; }; + emacsql-sqlite = melpaBuild rec { + pname = "emacsql-sqlite"; + ename = "emacsql-sqlite"; + version = "20180128.1252"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "emacsql"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; + sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; + name = "recipe"; + }; + preBuild = '' + cd sqlite + make + ''; + packageRequires = [ emacs emacsql ]; + meta = { + homepage = "https://melpa.org/#/emacsql-sqlite"; + license = lib.licenses.free; + }; + }; + elpy = melpaBuild rec { pname = "elpy"; version = external.elpy.version; From 12024266ad750711f4cae2740605db1982f907aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 15 Jan 2019 21:52:40 -0800 Subject: [PATCH 017/467] x42-plugins: 20181103 -> 20190105 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/x42-plugins/versions --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index e6041dc9b1c5..e86a690ec6b3 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20181103"; + version = "20190105"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "085d6qjj7nl22f0xamqdrnfxwi8zrfwgkwm1svm73bjkdv270438"; + sha256 = "1bb7k3ly4qa05zgkbpm7d3x9cjch1fklgh279m6hp0ac3hhncdxp"; }; nativeBuildInputs = [ pkgconfig ]; From cfbe9a43dd5162e6af44dd0df9a649145bc75665 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jan 2019 02:34:41 -0800 Subject: [PATCH 018/467] libtoxcore: 0.2.8 -> 0.2.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libtoxcore/versions --- pkgs/development/libraries/libtoxcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 026674e44fc4..1605abf6efa1 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -48,7 +48,7 @@ in rec { }; libtoxcore_0_2 = generic { - version = "0.2.8"; - sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm"; + version = "0.2.9"; + sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j"; }; } From b7f1cf88331aa65f094b7ba91b1e7c34c1747172 Mon Sep 17 00:00:00 2001 From: "Scott W. Dunlop" Date: Wed, 16 Jan 2019 17:02:21 -0800 Subject: [PATCH 019/467] gnatsd: 1.2.0 -> 1.4.0 --- pkgs/servers/gnatsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix index 81ea4056e091..e8e08271b3bc 100644 --- a/pkgs/servers/gnatsd/default.nix +++ b/pkgs/servers/gnatsd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "gnatsd-${version}"; - version = "1.2.0"; + version = "1.4.0"; rev = "v${version}"; goPackagePath = "github.com/nats-io/gnatsd"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "nats-io"; repo = "gnatsd"; - sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; + sha256 = "0wxdvaxl273kd3wcas634hx1wx5piljgbfr6vhf669b1frkgrh2b"; }; meta = { From 1ecc25dd4bb58cbad6e0d2c02bfa070d3bd8c8c6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Jan 2019 10:25:01 -0500 Subject: [PATCH 020/467] nodejs-11_x: 11.6.0 -> 11.7.0 --- pkgs/development/web/nodejs/v11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix index 7378729581fc..b2711d29b5ba 100644 --- a/pkgs/development/web/nodejs/v11.nix +++ b/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.6.0"; - sha256 = "1czrpxmk6calqn0p92rm0bv2vlgbnx6q4z7n2j8r7aw0khwbxwll"; + version = "11.7.0"; + sha256 = "18md1xz055rxds4i831rmmya0xda7cc0wdmr1jnj8vigfbcbvzh7"; } From a97966a9799cf3fd9f39f89d066dd1e18402629f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 12 Jan 2019 16:25:08 +0100 Subject: [PATCH 021/467] xsuspender: init at 1.1 --- pkgs/applications/misc/xsuspender/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/xsuspender/default.nix diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix new file mode 100644 index 000000000000..ef9ce3393619 --- /dev/null +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +, glib, libwnck3, procps }: + +with lib; + +stdenv.mkDerivation rec { + name = "xsuspender-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "kernc"; + repo = "xsuspender"; + rev = version; + sha256 = "03lbga68dxg89d227sdwk1f5xj4r1pmj0qh2kasi2cqh8ll7qv4b"; + }; + + outputs = [ "out" "man" "doc" ]; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ glib libwnck3 ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/xsuspender \ + --prefix PATH : "${makeBinPath [ procps ]}" + ''; + + meta = { + description = "Auto-suspend inactive X11 applications."; + homepage = "https://kernc.github.io/xsuspender/"; + license = licenses.wtfpl; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd1df25b4e13..56500fe5eae8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20305,6 +20305,8 @@ in inherit (gnome2) libglade; }; + xsuspender = callPackage ../applications/misc/xsuspender { }; + xss-lock = callPackage ../misc/screensavers/xss-lock { }; xloadimage = callPackage ../tools/X11/xloadimage { }; From da0c791c4555b2c647cd226a5d5b71d5833e126a Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 21 Jan 2019 03:15:18 +0000 Subject: [PATCH 022/467] signal-cli: init at 0.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit is based on work by Christopher Fredén in https://github.com/icetan/dot-nixpkgs/blob/8867ed07f78d7632ffefa1a3aceb8136a8c46a03/overlays/pkgs/signal-cli.nix --- .../instant-messengers/signal-cli/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/signal-cli/default.nix diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix new file mode 100644 index 000000000000..3336c05aae74 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchurl, makeWrapper, jre_headless }: + +stdenv.mkDerivation rec { + name = "signal-cli-${version}"; + version = "0.6.2"; + + # Building from source would be preferred, but is much more involved. + src = fetchurl { + url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; + sha256 = "050nizf7v10jlrwr8f4awzi2368qr01pzpvl2qkrwhdk25r505yr"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r lib $out/lib + cp bin/signal-cli $out/bin/signal-cli + wrapProgram $out/bin/signal-cli \ + --prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ + --set JAVA_HOME ${jre_headless} + ''; + + # Execution in the macOS (10.13) sandbox fails with + # dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa + # Referenced from: /nix/store/5ghc2l65p8jcjh0bsmhahd5m9k5p8kx0-zulu1.8.0_121-8.20.0.5/bin/java + # Reason: no suitable image found. Did find: + # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() + # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() + # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version + doInstallCheck = stdenv.isLinux; + installCheckPhase = '' + export PATH=$PATH:$out/bin + # --help returns non-0 exit code even when working + signal-cli --version + ''; + + meta = with lib; { + homepage = https://github.com/AsamK/signal-cli; + description = "Command-line and dbus interface for communicating with the Signal messaging service"; + license = licenses.gpl3; + maintainers = with maintainers; [ ivan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86670b314507..4a2486efb82d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5449,6 +5449,8 @@ in sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; + signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; From c26f2458d246e4a1d15911dcf444c10978506016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 20 Jan 2019 18:46:06 +0100 Subject: [PATCH 023/467] srt: init at 1.3.1 --- pkgs/development/libraries/srt/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/srt/default.nix diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix new file mode 100644 index 000000000000..b1882ff030b6 --- /dev/null +++ b/pkgs/development/libraries/srt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, openssl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "srt"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Haivision"; + repo = "srt"; + rev = "v${version}"; + sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + cmakeFlags = [ + # TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs + # Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified, + # see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330 + "-UCMAKE_INSTALL_LIBDIR" + ]; + + meta = { + description = "Secure, Reliable, Transport"; + homepage = https://www.srtalliance.org; + license = licenses.mpl20; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65dfadb8263..e4c0f2ba0326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12658,6 +12658,8 @@ in srm = callPackage ../tools/security/srm { }; + srt = callPackage ../development/libraries/srt { }; + srtp = callPackage ../development/libraries/srtp { libpcap = if stdenv.isLinux then libpcap else null; }; From 31981d2cd9ae4eb3bf77e3fb904f0e8b45ea828d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 20 Jan 2019 18:59:47 +0100 Subject: [PATCH 024/467] gstreamer: Add srt support to gst-plugins-bad --- pkgs/development/libraries/gstreamer/bad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 5d9c03b19190..8179806859c9 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -9,6 +9,7 @@ , libwebp, xvidcore, gnutls, mjpegtools , libGLU_combined, libintl, libgme , openssl, x265, libxml2 +, srt }: assert faacSupport -> faac != null; @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 libintl + srt ] ++ optional faacSupport faac ++ optional stdenv.isLinux wayland From 12ab4c330373c58284e936798e6db1f5a325d81f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 24 Jan 2019 22:23:22 +0100 Subject: [PATCH 025/467] libLAS: fix build --- pkgs/development/libraries/libLAS/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 7bd2a1ec5738..15ef9ee890a6 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" "-DLASZIP_INCLUDE_DIR=${LASzip}/include" + "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' From 76b1610a35a6fe1082a892afa89345021dbdb475 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 24 Jan 2019 22:23:52 +0100 Subject: [PATCH 026/467] qgis: 2.18.22 -> 2.18.28 --- pkgs/applications/gis/qgis/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b98d048d0343..61061a6d6721 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.22"; + name = "qgis-2.18.28"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig @@ -35,14 +35,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a"; + sha256 = "18pijqls1isd2bpg0mkrw07jqvdfaiwwb9mvz7p2xrgqcjx7dxsq"; }; patches = [ - # https://github.com/qgis/QGIS/pull/7765 + # already merged upstream in QGIS-3.*, but needs to be backported to QGIS-2 (fetchpatch { - url = "https://github.com/qgis/QGIS/commit/6b61ef361a77f057dc29eb07463007bd9012b253.patch"; - sha256 = "1xibcahm18n7nxff1xvwwzjf505hvhiw5dk12is7aclv49h0rdf7"; + url = "https://patch-diff.githubusercontent.com/raw/qgis/QGIS/pull/7263.patch"; + name = "Ensure_qgis.db_is_writable_when_copied_from_RO_source"; + sha256 = "19wr2kz0x8x6p2n0ylzd4lqrdmbkxyxr0zpwf2vl9hdp92rdjxbv"; }) ]; From 694c351cc30eb76623651c2809036508c3b59f2c Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 5 Jan 2019 13:13:10 +0100 Subject: [PATCH 027/467] nixos/tests: add osrm-backend test --- nixos/tests/all-tests.nix | 1 + nixos/tests/osrm-backend.nix | 53 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 nixos/tests/osrm-backend.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8c2df2435a79..e25a7e9ea1d4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -158,6 +158,7 @@ in opensmtpd = handleTest ./opensmtpd.nix {}; openssh = handleTest ./openssh.nix {}; osquery = handleTest ./osquery.nix {}; + osrm-backend = handleTest ./osrm-backend.nix {}; ostree = handleTest ./ostree.nix {}; pam-oath-login = handleTest ./pam-oath-login.nix {}; peerflix = handleTest ./peerflix.nix {}; diff --git a/nixos/tests/osrm-backend.nix b/nixos/tests/osrm-backend.nix new file mode 100644 index 000000000000..6e2d098d4adb --- /dev/null +++ b/nixos/tests/osrm-backend.nix @@ -0,0 +1,53 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +let + port = 5000; +in { + name = "osrm-backend"; + meta.maintainers = [ lib.maintainers.erictapen ]; + + machine = { config, pkgs, ... }:{ + + services.osrm = { + enable = true; + inherit port; + dataFile = let + filename = "monaco"; + osrm-data = pkgs.stdenv.mkDerivation { + name = "osrm-data"; + + buildInputs = [ pkgs.osrm-backend ]; + + # This is a pbf file of monaco, downloaded at 2019-01-04 from + # http://download.geofabrik.de/europe/monaco-latest.osm.pbf + # as apparently no provider of OSM files guarantees immutability, + # this is hosted as a gist on GitHub. + src = pkgs.fetchgit { + url = "https://gist.github.com/erictapen/01e39f73a6c856eac53ba809a94cdb83"; + rev = "9b1ff0f24deb40e5cf7df51f843dbe860637b8ce"; + sha256 = "1scqhmrfnpwsy5i2a9jpggqnvfgj4hv9p4qyvc79321pzkbv59nx"; + }; + + buildCommand = '' + cp $src/${filename}.osm.pbf . + ${pkgs.osrm-backend}/bin/osrm-extract -p ${pkgs.osrm-backend}/share/osrm/profiles/car.lua ${filename}.osm.pbf + ${pkgs.osrm-backend}/bin/osrm-partition ${filename}.osrm + ${pkgs.osrm-backend}/bin/osrm-customize ${filename}.osrm + mkdir -p $out + cp ${filename}* $out/ + ''; + }; + in "${osrm-data}/${filename}.osrm"; + }; + + environment.systemPackages = [ pkgs.jq ]; + }; + + testScript = let + query = "http://localhost:${toString port}/route/v1/driving/7.41720,43.73304;7.42463,43.73886?steps=true"; + in '' + $machine->waitForUnit("osrm.service"); + $machine->waitForOpenPort(${toString port}); + $machine->succeed("curl --silent '${query}' | jq .waypoints[0].name | grep -F 'Boulevard Rainier III'"); + $machine->succeed("curl --silent '${query}' | jq .waypoints[1].name | grep -F 'Avenue de la Costa'"); + ''; +}) From f15bdea8c3860eb78b17de609f93ddcca457dc4f Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 26 Jan 2019 16:32:19 +0100 Subject: [PATCH 028/467] buid-support: Add Ubuntu bionic base images --- pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7880d98e6b6a..f31c2cdcff3f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -964,6 +964,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu1804i386 = { + name = "ubuntu-18.04-bionic-i386"; + fullName = "Ubuntu 18.04 Bionic (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz; + sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; + }) + (fetchurl { + url = mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz; + sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1804x86_64 = { + name = "ubuntu-18.04-bionic-amd64"; + fullName = "Ubuntu 18.04 Bionic (amd64)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz; + sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; + }) + (fetchurl { + url = mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz; + sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian8i386 = { name = "debian-8.11-jessie-i386"; fullName = "Debian 8.11 Jessie (i386)"; From c72f8be60c52dfec9c4d243be13b68a3599aa7f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 16:40:39 -0800 Subject: [PATCH 029/467] yoshimi: 1.5.10 -> 1.5.10.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yoshimi/versions --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9d57095a26aa..24c033001cb6 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.10"; + version = "1.5.10.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0mazzn5pc4xnjci3yy1yfsx9l05gkxqzkmscaq1h75jpa7qfsial"; + sha256 = "02mmy17sa3dlwmjjahn8rfd6h67c5s0q3fvkf6ljrc2mbbpwc375"; }; buildInputs = [ From 6fa6fa5e621056ef470e582240d9d17968a21f90 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 23:38:36 -0800 Subject: [PATCH 030/467] sile: 0.9.5 -> 0.9.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sile/versions --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 609c782667e3..d12d39016ff1 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { name = "sile-${version}"; - version = "0.9.5"; + version = "0.9.5.1"; src = fetchurl { url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0m80rkbkma11xsr7bbrmq5mdwi5k79clsrmc75blbnsf9wqil8dp"; + sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0"; }; nativeBuildInputs = [pkgconfig makeWrapper]; From d16ccbefad8bf2295758ab5bd62d418c0fdba308 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 23:43:39 -0800 Subject: [PATCH 031/467] sundials: 4.0.1 -> 4.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sundials/versions --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 8fe2431d142b..40bb8b8c43b7 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "4.0.1"; + version = "4.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "1m5f2glxmgc6imjr0yqqp448r8q3kvsfp8dxxn83k00fcb40kr19"; + sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6"; }; preConfigure = '' From 467c4934a4cb26033c6b0d104d41c730fb5e8582 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 17:20:37 -0800 Subject: [PATCH 032/467] obs-linuxbrowser: 0.5.2 -> 0.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/obs-linuxbrowser/versions --- pkgs/applications/video/obs-studio/linuxbrowser.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index b8bd6ce07eb9..6d02233be321 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1vwgdgcmab5442wh2rjww6lzij9g2c5ccnv79rs7vx3rdl8wqg4f"; + sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; From da0fbf4dd7deff4ed879171675e8f83c4e1a12d5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 27 Jan 2019 20:46:55 -0500 Subject: [PATCH 033/467] linux_testing_bcachefs: 4.18.2018.10.12 -> 4.20.2019.01.23 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index b4df3b7b33e8..a3275786b338 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.18.2018.10.12"; - modDirVersion = "4.18.0"; + version = "4.20.2019.01.23"; + modDirVersion = "4.20.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "d7f6da1d60ec24266301231538ff6f09716537ed"; - sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk"; + rev = "99750eab4d583132cf61f071082c7cf21f5295c0"; + sha256 = "05wg9w5f68qg02yrciir9h1wx448869763hg3w7j23wc2qywhwqb"; }; extraConfig = "BCACHEFS_FS m"; From efb1b47f9e74ff70272b9300d90de5fffaab410d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 27 Jan 2019 20:47:24 -0500 Subject: [PATCH 034/467] bcachefs-tools: 2019-01-13 -> 2019-01-23 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 9f81db437134..eefc0beb1fcc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-01-13"; + version = "2019-01-23"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "47bd483d27ec13418978b24ec5951661d564ba35"; - sha256 = "0h0mi68f8hxjplh0f8yw9h1ax9y6cz9c9hlvl95nqhs352lkdrfj"; + rev = "35fca2f044d375b1590f499cfd34bef38ca0f8f1"; + sha256 = "1mmpwksszdi4n7zv3fm7qnmfk94m56d65lfw30553bnfm3yaz3k7"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; - + preInstall = '' substituteInPlace Makefile \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ From 0f490eab3eb54fd881d590d56319771b895366e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 01:04:08 -0800 Subject: [PATCH 035/467] mill: 0.3.5 -> 0.3.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mill/versions --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index b909b3953fa5..e200884bf940 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mill-${version}"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "19ka81f6vjr85gd8cadn0fv0i0qcdspx2skslfksklxdxs2gasf8"; + sha256 = "1dal08l96a5w8g27vxpsykbwcpfbna4prxqvqk89n0y9jn9s44l1"; }; nativeBuildInputs = [ makeWrapper ]; From 86ad1c32c2b732c7eea89d181d54465a5b16d556 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 04:28:10 -0800 Subject: [PATCH 036/467] lbdb: 0.48 -> 0.48.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lbdb/versions --- pkgs/tools/misc/lbdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 0aadfa580154..a00da33d8c91 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.48"; + version = "0.48.1"; in with stdenv.lib; with perlPackages; @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; - sha256 = "1j1ac0nnf6j5mwb6rh61ax9aidj4lvv2vrj5b1p71d4d1m3g180z"; + sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] From f89b4fc4b150d4c8a281fc1a4c48e239502a8e51 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 28 Jan 2019 16:17:54 +0100 Subject: [PATCH 037/467] gauge: 1.0.3 -> 1.0.4 Signed-off-by: Vincent Demeester --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 82a7b4b0e276..c750b5537913 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gauge-${version}"; - version = "1.0.3"; + version = "1.0.4"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "0dcsgszg6ilf3sxan3ahf9cfpw66z3mh2svg2srxv8ici3ak8a2x"; + sha256 = "1b52kpv5561pyjvqi8xmidarqp6lcyyy4sjsl4qjx4cr7hmk8kc7"; }; meta = with stdenv.lib; { From 98c93c84e5307eb79b13ca644227d79bcc576d44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 08:42:33 -0800 Subject: [PATCH 038/467] hivex: 1.3.15 -> 1.3.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hivex/versions --- pkgs/development/libraries/hivex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 740d2d3244df..3a2e08e4b5bc 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.15"; + version = "1.3.17"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "02vzipzrp1gr87rn7mkhyzr4zdjkp2dzcvvb223x7i0ch8ci7r4c"; + sha256 = "1nsjijgcpcl6vm7whbbpxqrjycajf7vy0sp5hfg4vmvjmf3lpjqk"; }; patches = [ ./hivex-syms.patch ]; From 4ad82dd6cdd01d195a929a786d006e63ada7a90f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 31 Mar 2017 15:31:17 +0100 Subject: [PATCH 039/467] nixos/lightdm: allow cursor theme customisation. --- .../display-managers/lightdm-greeters/gtk.nix | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index d1ee076e9185..8682151f8ce1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -12,6 +12,7 @@ let theme = cfg.theme.package; icons = cfg.iconTheme.package; + cursors = cfg.cursorTheme.package; # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with @@ -28,7 +29,8 @@ let --set GTK_EXE_PREFIX "${theme}" \ --set GTK_DATA_PREFIX "${theme}" \ --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ - --set XDG_CONFIG_HOME "${theme}/share" + --set XDG_CONFIG_HOME "${theme}/share" \ + --set XCURSOR_PATH "${cursors}/share/icons" cat - > $out/lightdm-gtk-greeter.desktop << EOF [Desktop Entry] @@ -44,6 +46,8 @@ let [greeter] theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} + cursor-theme-name = ${cfg.cursorTheme.name} + cursor-theme-size = ${toString cfg.cursorTheme.size} background = ${ldmcfg.background} ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} @@ -106,6 +110,33 @@ in }; + cursorTheme = { + + package = mkOption { + default = pkgs.gnome3.defaultIconTheme; + defaultText = "pkgs.gnome3.defaultIconTheme"; + description = '' + The package path that contains the cursor theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = '' + Name of the cursor theme to use for the lightdm-gtk-greeter. + ''; + }; + + size = mkOption { + type = types.int; + default = 16; + description = '' + Size of the cursor theme to use for the lightdm-gtk-greeter. + ''; + }; + }; + clock-format = mkOption { type = types.nullOr types.str; default = null; From 6e581656d1ec489c8ba17b9e4a6332fb98235e75 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 27 Jan 2019 16:29:11 +0000 Subject: [PATCH 040/467] nixos/lightdm: inherit DPI settings from xserver config --- .../services/x11/display-managers/lightdm-greeters/gtk.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index d1ee076e9185..505c90ea95ca 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -6,6 +6,7 @@ let dmcfg = config.services.xserver.displayManager; ldmcfg = dmcfg.lightdm; + xcfg = config.services.xserver; cfg = ldmcfg.greeters.gtk; inherit (pkgs) writeText; @@ -47,6 +48,7 @@ let background = ${ldmcfg.background} ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} + ${optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} ${cfg.extraConfig} ''; From eae297ed068030535dd99240a2f20da2efabf616 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 12:42:51 -0800 Subject: [PATCH 041/467] cmst: 2018.01.06 -> 2019.01.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cmst/versions --- pkgs/tools/networking/cmst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index e20d62d1f077..cc88153bab9c 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cmst-${version}"; - version = "2018.01.06"; + version = "2019.01.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = name; - sha256 = "1a3v7z75ghziymdj2w8603ql9nfac5q224ylfsqfxcqxw4bdip4r"; + sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh"; }; nativeBuildInputs = [ qmake ]; From 2ab88b7dd9c0ffda0c4369e7cb92899820de68da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 12:45:51 -0800 Subject: [PATCH 042/467] dhex: 0.68 -> 0.69 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dhex/versions --- pkgs/applications/editors/dhex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index ff9ec73a2ef6..f4581c4beceb 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dhex-${version}"; - version = "0.68"; + version = "0.69"; src = fetchurl { url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz"; - sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08"; + sha256 = "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"; }; buildInputs = [ ncurses ]; From 672a9b44867bcc45769c5d7ff842051f9b6d5065 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 13:30:27 -0800 Subject: [PATCH 043/467] cool-retro-term: 1.1.0 -> 1.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cool-retro-term/versions --- pkgs/applications/misc/cool-retro-term/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 766161e521c2..f2372aa51e68 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -2,14 +2,14 @@ , qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.1"; name = "cool-retro-term-${version}"; src = fetchFromGitHub { owner = "Swordfish90"; repo = "cool-retro-term"; rev = version; - sha256 = "0gmigjpc19q7l94q4wzbrxh7cdb6zk3zscaijzwsz9364wsgzb47"; + sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5"; }; patchPhase = '' From 32819a3f0a2216be2bbf11123ee7809d2caf19e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 13:44:03 -0800 Subject: [PATCH 044/467] dar: 2.6.0 -> 2.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dar/versions --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 29d54eea4533..80d5937973f7 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.1"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0avaffkfrgj8vhvnpqi4s21bsrlxl0xafpyd3v9n3f9hs2gnm3wg"; + sha256 = "107l9nirlqp7vx542ybza5vdsyykam4bjziq47xyb9hr7js86020"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] From 1eb59f30e5c8edb200a8328ee540d22af5174b67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 14:21:23 -0800 Subject: [PATCH 045/467] dpkg: 1.19.2 -> 1.19.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dpkg/versions --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 8cb8237c538c..3ab7aa99c8df 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.2"; + version = "1.19.4"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0w8vhvwnhvwq3k3cw9d1jiy61v4r81wv6q5rkliq2nq6z0naxwpq"; + sha256 = "1bp0zq3h1ad6rzljmmalkh9ms4y6znk1gmgjpy39as2mhvlk8ln1"; }; configureFlags = [ From c36c08e8ca4508c89f9fed9c277e7a1027626d4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 15:27:34 -0800 Subject: [PATCH 046/467] cvs_fast_export: 1.32 -> 1.45 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cvs-fast-export/versions --- .../version-management/cvs-fast-export/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 1a5ce6e369ef..5e1a0cab69d9 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.32"; + version = "1.45"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz"; - sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.45.tar.gz"; + sha256 = "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z"; }; buildInputs = [ From 6cb6b90f1a67f0513fa34c3db880684e6ae533a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 15:22:28 +0100 Subject: [PATCH 047/467] home-assistant: 0.85.1 -> 0.86.4 --- .../home-assistant/component-packages.nix | 97 +++++++++++-------- pkgs/servers/home-assistant/default.nix | 16 +-- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 65 insertions(+), 52 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 66dfc4069ed6..73595c1d67bc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.85.1"; + version = "0.86.4"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -21,17 +21,16 @@ "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; + "alarm_control_panel.homekit_controller" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "alarm_control_panel.lupusec" = ps: with ps; [ ]; "alarm_control_panel.manual" = ps: with ps; [ ]; "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ]; - "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ]; "alarm_control_panel.ness_alarm" = ps: with ps; [ ]; "alarm_control_panel.nx584" = ps: with ps; [ ]; "alarm_control_panel.satel_integra" = ps: with ps; [ ]; - "alarm_control_panel.simplisafe" = ps: with ps; [ ]; "alarm_control_panel.spc" = ps: with ps; [ ]; "alarm_control_panel.totalconnect" = ps: with ps; [ ]; "alarm_control_panel.verisure" = ps: with ps; [ ]; @@ -71,6 +70,7 @@ "automation.sun" = ps: with ps; [ ]; "automation.template" = ps: with ps; [ ]; "automation.time" = ps: with ps; [ ]; + "automation.time_pattern" = ps: with ps; [ ]; "automation.webhook" = ps: with ps; [ aiohttp-cors ]; "automation.zone" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; @@ -92,7 +92,6 @@ "binary_sensor.bmw_connected_drive" = ps: with ps; [ ]; "binary_sensor.command_line" = ps: with ps; [ ]; "binary_sensor.concord232" = ps: with ps; [ ]; - "binary_sensor.deconz" = ps: with ps; [ ]; "binary_sensor.demo" = ps: with ps; [ ]; "binary_sensor.digital_ocean" = ps: with ps; [ digital-ocean ]; "binary_sensor.ecobee" = ps: with ps; [ ]; @@ -100,7 +99,6 @@ "binary_sensor.eight_sleep" = ps: with ps; [ ]; "binary_sensor.enocean" = ps: with ps; [ ]; "binary_sensor.envisalink" = ps: with ps; [ ]; - "binary_sensor.esphome" = ps: with ps; [ ]; "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.fibaro" = ps: with ps; [ ]; @@ -117,12 +115,11 @@ "binary_sensor.iss" = ps: with ps; [ ]; "binary_sensor.isy994" = ps: with ps; [ ]; "binary_sensor.knx" = ps: with ps; [ ]; - "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; "binary_sensor.lupusec" = ps: with ps; [ ]; "binary_sensor.maxcube" = ps: with ps; [ ]; "binary_sensor.modbus" = ps: with ps; [ ]; - "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ]; "binary_sensor.mychevy" = ps: with ps; [ ]; "binary_sensor.mysensors" = ps: with ps; [ ]; "binary_sensor.mystrom" = ps: with ps; [ aiohttp-cors ]; @@ -132,14 +129,12 @@ "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; "binary_sensor.opentherm_gw" = ps: with ps; [ ]; - "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.point" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; "binary_sensor.rachio" = ps: with ps; [ ]; "binary_sensor.raincloud" = ps: with ps; [ ]; - "binary_sensor.rainmachine" = ps: with ps; [ ]; "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; @@ -174,7 +169,6 @@ "binary_sensor.wirelesstag" = ps: with ps; [ ]; "binary_sensor.workday" = ps: with ps; [ ]; "binary_sensor.xiaomi_aqara" = ps: with ps; [ ]; - "binary_sensor.zha" = ps: with ps; [ ]; "binary_sensor.zigbee" = ps: with ps; [ ]; "binary_sensor.zwave" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; @@ -204,7 +198,6 @@ "camera.local_file" = ps: with ps; [ ]; "camera.logi_circle" = ps: with ps; [ ]; "camera.mjpeg" = ps: with ps; [ ]; - "camera.mqtt" = ps: with ps; [ paho-mqtt ]; "camera.neato" = ps: with ps; [ pybotvac ]; "camera.nest" = ps: with ps; [ ]; "camera.netatmo" = ps: with ps; [ ]; @@ -247,7 +240,6 @@ "climate.melissa" = ps: with ps; [ ]; "climate.mill" = ps: with ps; [ ]; "climate.modbus" = ps: with ps; [ ]; - "climate.mqtt" = ps: with ps; [ paho-mqtt ]; "climate.mysensors" = ps: with ps; [ ]; "climate.nest" = ps: with ps; [ ]; "climate.netatmo" = ps: with ps; [ ]; @@ -301,20 +293,18 @@ "cover.aladdin_connect" = ps: with ps; [ ]; "cover.brunt" = ps: with ps; [ ]; "cover.command_line" = ps: with ps; [ ]; - "cover.deconz" = ps: with ps; [ ]; "cover.demo" = ps: with ps; [ ]; - "cover.esphome" = ps: with ps; [ ]; "cover.fibaro" = ps: with ps; [ ]; "cover.garadget" = ps: with ps; [ ]; "cover.gogogate2" = ps: with ps; [ ]; "cover.group" = ps: with ps; [ ]; + "cover.homekit_controller" = ps: with ps; [ ]; "cover.homematic" = ps: with ps; [ pyhomematic ]; "cover.insteon" = ps: with ps; [ ]; "cover.isy994" = ps: with ps; [ ]; "cover.knx" = ps: with ps; [ ]; "cover.lutron" = ps: with ps; [ ]; "cover.lutron_caseta" = ps: with ps; [ ]; - "cover.mqtt" = ps: with ps; [ paho-mqtt ]; "cover.myq" = ps: with ps; [ ]; "cover.mysensors" = ps: with ps; [ ]; "cover.opengarage" = ps: with ps; [ ]; @@ -337,9 +327,16 @@ "daikin.const" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; "deconz" = ps: with ps; [ ]; + "deconz.binary_sensor" = ps: with ps; [ ]; "deconz.config_flow" = ps: with ps; [ ]; "deconz.const" = ps: with ps; [ ]; + "deconz.cover" = ps: with ps; [ ]; + "deconz.deconz_device" = ps: with ps; [ ]; "deconz.gateway" = ps: with ps; [ ]; + "deconz.light" = ps: with ps; [ ]; + "deconz.scene" = ps: with ps; [ ]; + "deconz.sensor" = ps: with ps; [ ]; + "deconz.switch" = ps: with ps; [ ]; "demo" = ps: with ps; [ aiohttp-cors ]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; @@ -358,7 +355,6 @@ "device_tracker.demo" = ps: with ps; [ ]; "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; - "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ]; "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.googlehome" = ps: with ps; [ ]; "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ]; @@ -419,26 +415,33 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; "emulated_hue.upnp" = ps: with ps; [ ]; + "emulated_roku" = ps: with ps; [ ]; + "emulated_roku.binding" = ps: with ps; [ ]; + "emulated_roku.config_flow" = ps: with ps; [ ]; + "emulated_roku.const" = ps: with ps; [ ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "esphome" = ps: with ps; [ ]; + "esphome.binary_sensor" = ps: with ps; [ ]; "esphome.config_flow" = ps: with ps; [ ]; + "esphome.cover" = ps: with ps; [ ]; + "esphome.fan" = ps: with ps; [ ]; + "esphome.light" = ps: with ps; [ ]; + "esphome.sensor" = ps: with ps; [ ]; + "esphome.switch" = ps: with ps; [ ]; "eufy" = ps: with ps; [ ]; "evohome" = ps: with ps; [ ]; "fan" = ps: with ps; [ ]; "fan.comfoconnect" = ps: with ps; [ ]; "fan.demo" = ps: with ps; [ ]; "fan.dyson" = ps: with ps; [ ]; - "fan.esphome" = ps: with ps; [ ]; "fan.insteon" = ps: with ps; [ ]; "fan.isy994" = ps: with ps; [ ]; - "fan.mqtt" = ps: with ps; [ paho-mqtt ]; "fan.template" = ps: with ps; [ ]; "fan.tuya" = ps: with ps; [ ]; "fan.wemo" = ps: with ps; [ ]; "fan.wink" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; - "fan.zha" = ps: with ps; [ ]; "fan.zwave" = ps: with ps; [ ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; @@ -456,6 +459,7 @@ "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; "geo_location.usgs_earthquakes_feed" = ps: with ps; [ ]; "geofency" = ps: with ps; [ aiohttp-cors ]; + "geofency.device_tracker" = ps: with ps; [ aiohttp-cors ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; @@ -465,6 +469,7 @@ "google_assistant.smart_home" = ps: with ps; [ ]; "google_assistant.trait" = ps: with ps; [ ]; "google_domains" = ps: with ps; [ ]; + "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; @@ -512,6 +517,7 @@ "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; + "hue.light" = ps: with ps; [ aiohue ]; "hydrawise" = ps: with ps; [ ]; "idteck_prox" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -550,7 +556,7 @@ "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; - "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "konnected" = ps: with ps; [ aiohttp-cors ]; "lametric" = ps: with ps; [ ]; "lcn" = ps: with ps; [ ]; "lifx" = ps: with ps; [ ]; @@ -560,13 +566,11 @@ "light.avion" = ps: with ps; [ ]; "light.blinksticklight" = ps: with ps; [ BlinkStick ]; "light.blinkt" = ps: with ps; [ ]; - "light.deconz" = ps: with ps; [ ]; "light.decora" = ps: with ps; [ ]; "light.decora_wifi" = ps: with ps; [ ]; "light.demo" = ps: with ps; [ ]; "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; - "light.esphome" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.fibaro" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; @@ -578,7 +582,6 @@ "light.homematic" = ps: with ps; [ pyhomematic ]; "light.homematicip_cloud" = ps: with ps; [ ]; "light.homeworks" = ps: with ps; [ ]; - "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; "light.ihc" = ps: with ps; [ defusedxml ]; @@ -595,7 +598,6 @@ "light.lutron_caseta" = ps: with ps; [ ]; "light.lw12wifi" = ps: with ps; [ ]; "light.mochad" = ps: with ps; [ ]; - "light.mqtt" = ps: with ps; [ paho-mqtt ]; "light.mysensors" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ]; @@ -629,23 +631,23 @@ "light.yeelight" = ps: with ps; [ ]; "light.yeelightsunflower" = ps: with ps; [ ]; "light.zengge" = ps: with ps; [ ]; - "light.zha" = ps: with ps; [ ]; "light.zigbee" = ps: with ps; [ ]; "light.zwave" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; "linode" = ps: with ps; [ linode-api ]; "lirc" = ps: with ps; [ ]; "litejet" = ps: with ps; [ ]; + "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "lock.abode" = ps: with ps; [ ]; "lock.august" = ps: with ps; [ ]; "lock.bmw_connected_drive" = ps: with ps; [ ]; "lock.demo" = ps: with ps; [ ]; + "lock.homekit_controller" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; "lock.kiwi" = ps: with ps; [ ]; "lock.lockitron" = ps: with ps; [ ]; - "lock.mqtt" = ps: with ps; [ paho-mqtt ]; "lock.nello" = ps: with ps; [ ]; "lock.nuki" = ps: with ps; [ ]; "lock.sesame" = ps: with ps; [ ]; @@ -673,6 +675,7 @@ "mailbox.asterisk_mbox" = ps: with ps; [ ]; "mailbox.demo" = ps: with ps; [ ]; "mailgun" = ps: with ps; [ aiohttp-cors ]; + "mailgun.notify" = ps: with ps; [ aiohttp-cors ]; "map" = ps: with ps; [ ]; "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; @@ -713,7 +716,6 @@ "media_player.mpchc" = ps: with ps; [ ]; "media_player.mpd" = ps: with ps; [ mpd2 ]; "media_player.nad" = ps: with ps; [ ]; - "media_player.nadtcp" = ps: with ps; [ ]; "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; "media_player.openhome" = ps: with ps; [ ]; "media_player.panasonic_bluray" = ps: with ps; [ ]; @@ -749,11 +751,22 @@ "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "mqtt" = ps: with ps; [ paho-mqtt ]; + "mqtt.alarm_control_panel" = ps: with ps; [ paho-mqtt ]; + "mqtt.binary_sensor" = ps: with ps; [ paho-mqtt ]; + "mqtt.camera" = ps: with ps; [ paho-mqtt ]; + "mqtt.climate" = ps: with ps; [ paho-mqtt ]; "mqtt.config_flow" = ps: with ps; [ ]; "mqtt.const" = ps: with ps; [ ]; + "mqtt.cover" = ps: with ps; [ paho-mqtt ]; "mqtt.discovery" = ps: with ps; [ ]; + "mqtt.fan" = ps: with ps; [ paho-mqtt ]; + "mqtt.light" = ps: with ps; [ paho-mqtt ]; + "mqtt.lock" = ps: with ps; [ paho-mqtt ]; + "mqtt.sensor" = ps: with ps; [ paho-mqtt ]; "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ]; "mqtt.subscription" = ps: with ps; [ ]; + "mqtt.switch" = ps: with ps; [ paho-mqtt ]; + "mqtt.vacuum" = ps: with ps; [ paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ paho-mqtt ]; "mychevy" = ps: with ps; [ ]; @@ -805,7 +818,6 @@ "notify.lametric" = ps: with ps; [ ]; "notify.lannouncer" = ps: with ps; [ ]; "notify.llamalab_automate" = ps: with ps; [ ]; - "notify.mailgun" = ps: with ps; [ aiohttp-cors ]; "notify.mastodon" = ps: with ps; [ ]; "notify.matrix" = ps: with ps; [ matrix-client ]; "notify.message_bird" = ps: with ps; [ ]; @@ -844,8 +856,10 @@ "onboarding.views" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ]; + "openuv.binary_sensor" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; + "openuv.sensor" = ps: with ps; [ ]; "owntracks" = ps: with ps; [ aiohttp-cors libnacl ]; "owntracks.config_flow" = ps: with ps; [ ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; @@ -865,8 +879,11 @@ "rainbird" = ps: with ps; [ ]; "raincloud" = ps: with ps; [ ]; "rainmachine" = ps: with ps; [ ]; + "rainmachine.binary_sensor" = ps: with ps; [ ]; "rainmachine.config_flow" = ps: with ps; [ ]; "rainmachine.const" = ps: with ps; [ ]; + "rainmachine.sensor" = ps: with ps; [ ]; + "rainmachine.switch" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recorder.const" = ps: with ps; [ ]; @@ -880,11 +897,13 @@ "remote.harmony" = ps: with ps; [ ]; "remote.itach" = ps: with ps; [ ]; "remote.kira" = ps: with ps; [ ]; + "remote.roku" = ps: with ps; [ ]; "remote.xiaomi_miio" = ps: with ps; [ construct ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; + "roku" = ps: with ps; [ ]; "route53" = ps: with ps; [ boto3 ]; "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; @@ -892,7 +911,6 @@ "sabnzbd" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; - "scene.deconz" = ps: with ps; [ ]; "scene.elkm1" = ps: with ps; [ ]; "scene.fibaro" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ]; @@ -956,7 +974,6 @@ "sensor.currencylayer" = ps: with ps; [ ]; "sensor.daikin" = ps: with ps; [ ]; "sensor.darksky" = ps: with ps; [ python-forecastio ]; - "sensor.deconz" = ps: with ps; [ ]; "sensor.deluge" = ps: with ps; [ deluge-client ]; "sensor.demo" = ps: with ps; [ ]; "sensor.deutsche_bahn" = ps: with ps; [ ]; @@ -985,7 +1002,6 @@ "sensor.entur_public_transport" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.envisalink" = ps: with ps; [ ]; - "sensor.esphome" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; "sensor.fail2ban" = ps: with ps; [ ]; "sensor.fastdotcom" = ps: with ps; [ ]; @@ -1068,7 +1084,6 @@ "sensor.mold_indicator" = ps: with ps; [ ]; "sensor.moon" = ps: with ps; [ ]; "sensor.mopar" = ps: with ps; [ ]; - "sensor.mqtt" = ps: with ps; [ paho-mqtt ]; "sensor.mqtt_room" = ps: with ps; [ paho-mqtt ]; "sensor.mvglive" = ps: with ps; [ PyMVGLive ]; "sensor.mychevy" = ps: with ps; [ ]; @@ -1093,7 +1108,6 @@ "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; "sensor.opentherm_gw" = ps: with ps; [ ]; - "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ pyotp ]; "sensor.pi_hole" = ps: with ps; [ ]; @@ -1113,7 +1127,6 @@ "sensor.radarr" = ps: with ps; [ ]; "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; - "sensor.rainmachine" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; @@ -1220,7 +1233,6 @@ "sensor.zabbix" = ps: with ps; [ ]; "sensor.zamg" = ps: with ps; [ ]; "sensor.zestimate" = ps: with ps; [ xmltodict ]; - "sensor.zha" = ps: with ps; [ ]; "sensor.zigbee" = ps: with ps; [ ]; "sensor.zoneminder" = ps: with ps; [ zm-py ]; "sensor.zwave" = ps: with ps; [ ]; @@ -1228,6 +1240,7 @@ "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; "simplisafe" = ps: with ps; [ ]; + "simplisafe.alarm_control_panel" = ps: with ps; [ ]; "simplisafe.config_flow" = ps: with ps; [ ]; "simplisafe.const" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; @@ -1258,7 +1271,6 @@ "switch.bbb_gpio" = ps: with ps; [ ]; "switch.broadlink" = ps: with ps; [ broadlink ]; "switch.command_line" = ps: with ps; [ ]; - "switch.deconz" = ps: with ps; [ ]; "switch.deluge" = ps: with ps; [ deluge-client ]; "switch.demo" = ps: with ps; [ ]; "switch.digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -1269,7 +1281,6 @@ "switch.edp_redy" = ps: with ps; [ ]; "switch.elkm1" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; - "switch.esphome" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; "switch.fibaro" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; @@ -1290,7 +1301,7 @@ "switch.isy994" = ps: with ps; [ ]; "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; - "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "switch.konnected" = ps: with ps; [ aiohttp-cors ]; "switch.lightwave" = ps: with ps; [ ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; @@ -1300,7 +1311,6 @@ "switch.mfi" = ps: with ps; [ ]; "switch.mochad" = ps: with ps; [ ]; "switch.modbus" = ps: with ps; [ ]; - "switch.mqtt" = ps: with ps; [ paho-mqtt ]; "switch.mysensors" = ps: with ps; [ ]; "switch.mystrom" = ps: with ps; [ ]; "switch.neato" = ps: with ps; [ pybotvac ]; @@ -1313,7 +1323,6 @@ "switch.rachio" = ps: with ps; [ ]; "switch.rainbird" = ps: with ps; [ ]; "switch.raincloud" = ps: with ps; [ ]; - "switch.rainmachine" = ps: with ps; [ ]; "switch.raspihats" = ps: with ps; [ ]; "switch.raspyrfm" = ps: with ps; [ ]; "switch.recswitch" = ps: with ps; [ ]; @@ -1356,7 +1365,6 @@ "switch.wirelesstag" = ps: with ps; [ ]; "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; - "switch.zha" = ps: with ps; [ ]; "switch.zigbee" = ps: with ps; [ ]; "switch.zoneminder" = ps: with ps; [ zm-py ]; "switch.zwave" = ps: with ps; [ ]; @@ -1408,7 +1416,6 @@ "vacuum.demo" = ps: with ps; [ ]; "vacuum.dyson" = ps: with ps; [ ]; "vacuum.ecovacs" = ps: with ps; [ ]; - "vacuum.mqtt" = ps: with ps; [ paho-mqtt ]; "vacuum.neato" = ps: with ps; [ pybotvac ]; "vacuum.roomba" = ps: with ps; [ ]; "vacuum.xiaomi_miio" = ps: with ps; [ construct ]; @@ -1458,11 +1465,17 @@ "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zha" = ps: with ps; [ ]; + "zha.api" = ps: with ps; [ ]; + "zha.binary_sensor" = ps: with ps; [ ]; "zha.config_flow" = ps: with ps; [ ]; "zha.const" = ps: with ps; [ ]; "zha.entities" = ps: with ps; [ ]; "zha.event" = ps: with ps; [ ]; + "zha.fan" = ps: with ps; [ ]; "zha.helpers" = ps: with ps; [ ]; + "zha.light" = ps: with ps; [ ]; + "zha.sensor" = ps: with ps; [ ]; + "zha.switch" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zone.config_flow" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c56423adcdd0..27eff24d7043 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -18,16 +18,16 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - (mkOverride "aiohttp" "3.5.1" - "c115744b2a0bf666fd8cde52a6d3e9319ffeb486009579743f5adfdcf0bf0773") + (mkOverride "aiohttp" "3.5.4" + "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf") (mkOverride "astral" "1.7.1" "88086fd2006c946567285286464b2da3294a3b0cbba4410b7008ec2458f82a07") (mkOverride "async-timeout" "3.0.1" "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") - (mkOverride "bcrypt" "3.1.4" - "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d") + (mkOverride "bcrypt" "3.1.5" + "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f") (mkOverride "pyjwt" "1.6.4" "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") (mkOverride "cryptography" "2.3.1" @@ -38,8 +38,8 @@ let "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.81" - "6cbe7273a2e7667cd2ca7b12bec1c715a8259ad80f09c6f12c378f664d29fa5e") + (mkOverride "ruamel_yaml" "0.15.85" + "34af6e2f9787acd3937b55c0279f46adff43124c5d72dced84aab6c89d1a960f") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.0.0" @@ -87,7 +87,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.85.1"; + hassVersion = "0.86.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -102,7 +102,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0i9s0mgzfs3s6k4vw2zvwgqziz77fghpijrjrxx5nbrmm592h01a"; + sha256 = "13yyzcwz44gz6j0fh1awws83p6fmpib9ribm1453qr172knanhjy"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index d4be40c73685..1ea9e96d8f98 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190109.1"; + version = "20190121.1"; src = fetchPypi { inherit pname version; - sha256 = "2ca035461c06591dc793c7651ed3f7c17ab3addf5859e89d2f956215433140ba"; + sha256 = "7d1e127249dbefd0c8e101d8b178eeae6bf76a0296d8b22ed33759e23ef07856"; }; propagatedBuildInputs = [ user-agents ]; From 7cc7c5374c1bbad10774d81d81e644662b06acb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 15:52:05 +0100 Subject: [PATCH 048/467] nixos/home-assistant: add lovelaceConfig option --- .../modules/services/misc/home-assistant.nix | 41 +++++++++++++++++-- nixos/tests/home-assistant.nix | 11 +++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 2e9aa33aeeee..48271eeacc38 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -8,7 +8,10 @@ let # cfg.config != null can be assumed here configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig then - (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config)); + (recursiveUpdate defaultConfig cfg.config) else cfg.config)); + + lovelaceConfigFile = pkgs.writeText "ui-lovelace.json" + (builtins.toJSON cfg.lovelaceConfig); availableComponents = pkgs.home-assistant.availableComponents; @@ -45,6 +48,8 @@ let defaultConfig = { homeassistant.time_zone = config.time.timeZone; http.server_port = (toString cfg.port); + } // optionalAttrs (cfg.lovelaceConfig != null) { + lovelace.mode = "yaml"; }; in { @@ -99,6 +104,31 @@ in { ''; }; + lovelaceConfig = mkOption { + default = null; + type = with types; nullOr attrs; + # from https://www.home-assistant.io/lovelace/yaml-mode/ + example = literalExample '' + { + title = "My Awesome Home"; + views = [ { + title = "Example"; + cards = [ { + type = "markdown"; + title = "Lovelace"; + content = "Welcome to your **Lovelace UI**."; + } ]; + } ]; + } + ''; + description = '' + Your ui-lovelace.yaml as a Nix attribute set. + Setting this option will automatically add + lovelace.mode = "yaml"; to your . + Beware that setting this option will delete your previous ui-lovelace.yaml + ''; + }; + package = mkOption { default = pkgs.home-assistant; defaultText = "pkgs.home-assistant"; @@ -144,11 +174,16 @@ in { systemd.services.home-assistant = { description = "Home Assistant"; after = [ "network.target" ]; - preStart = lib.optionalString (cfg.config != null) '' - config=${cfg.configDir}/configuration.yaml + preStart = optionalString (cfg.config != null) '' + config="${cfg.configDir}/configuration.yaml" rm -f $config ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config chmod 444 $config + '' + optionalString (cfg.lovelaceConfig != null) '' + config="${cfg.configDir}/ui-lovelace.yaml" + rm -f $config + ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigFile} -o $config + chmod 444 $config ''; serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 73c1e71eb516..6e8eda30e766 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -50,6 +50,17 @@ in { } ]; }; + lovelaceConfig = { + title = "My Awesome Home"; + views = [ { + title = "Example"; + cards = [ { + type = "markdown"; + title = "Lovelace"; + content = "Welcome to your **Lovelace UI**."; + } ]; + } ]; + }; }; }; }; From f908f6c9827288cdd0dda84d28738d300377a8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 16:49:06 +0100 Subject: [PATCH 049/467] nixos/home-assistant: don't run json2yaml at every start --- .../modules/services/misc/home-assistant.nix | 22 ++++++++++--------- nixos/tests/home-assistant.nix | 3 ++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 48271eeacc38..628dd7c39b14 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -6,12 +6,18 @@ let cfg = config.services.home-assistant; # cfg.config != null can be assumed here - configFile = pkgs.writeText "configuration.json" + configJSON = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig then (recursiveUpdate defaultConfig cfg.config) else cfg.config)); + configFile = pkgs.runCommand "configuration.yaml" { } '' + ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out + ''; - lovelaceConfigFile = pkgs.writeText "ui-lovelace.json" + lovelaceConfigJSON = pkgs.writeText "ui-lovelace.json" (builtins.toJSON cfg.lovelaceConfig); + lovelaceConfigFile = pkgs.runCommand "ui-lovelace.yaml" { } '' + ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out + ''; availableComponents = pkgs.home-assistant.availableComponents; @@ -175,15 +181,11 @@ in { description = "Home Assistant"; after = [ "network.target" ]; preStart = optionalString (cfg.config != null) '' - config="${cfg.configDir}/configuration.yaml" - rm -f $config - ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config - chmod 444 $config + rm -f "${cfg.configDir}/configuration.yaml" + ln -s ${configFile} "${cfg.configDir}/configuration.yaml" '' + optionalString (cfg.lovelaceConfig != null) '' - config="${cfg.configDir}/ui-lovelace.yaml" - rm -f $config - ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigFile} -o $config - chmod 444 $config + rm -f "${cfg.configDir}/ui-lovelace.yaml" + ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" ''; serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 6e8eda30e766..9e97ed4c47e8 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -71,7 +71,8 @@ in { # The config is specified using a Nix attribute set, # but then converted from JSON to YAML - $hass->succeed("test -f ${configDir}/configuration.yaml"); + $hass->succeed("test -L ${configDir}/configuration.yaml"); + $hass->succeed("test -L ${configDir}/ui-lovelace.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); From f8c229e12f47954a026aa19785a60057e948d9e2 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 14 Jan 2019 18:07:44 -0500 Subject: [PATCH 050/467] Remove obsolete GHCJS package sets --- pkgs/top-level/haskell-packages.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2b8078a7fa9f..642eeb96219c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -156,18 +156,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; ghcjs = packages.ghcjs84; - ghcjs710 = callPackage ../development/haskell-modules rec { - buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjs710; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; - ghcjs80 = callPackage ../development/haskell-modules rec { - buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjs80; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; ghcjs82 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs82; From 27a48b714db69dcf45ff47330969a2fe4029fd07 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 14 Jan 2019 18:03:57 -0500 Subject: [PATCH 051/467] GHCJS: Fix 8.4 build --- pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix index 2d0ed55c6cd1..efba0dc8634f 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix @@ -2,6 +2,8 @@ let inherit (haskellLib) dontCheck doJailbreak; in self: super: { - haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs; + haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs); haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs; + + template-haskell-ghcjs = doJailbreak super.template-haskell-ghcjs; } From 57cb854e42b5b01b61db84c17015ca0930442dcc Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 14 Jan 2019 18:04:19 -0500 Subject: [PATCH 052/467] GHCJS: Add 8.6 --- .../compilers/ghcjs-ng/8.6/dep-overrides.nix | 7 + .../compilers/ghcjs-ng/8.6/git.json | 6 + .../compilers/ghcjs-ng/8.6/stage0.nix | 176 ++++++++++++++++++ .../ghcjs-ng/configured-ghcjs-src.nix | 2 + pkgs/top-level/haskell-packages.nix | 17 +- 5 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/8.6/git.json create mode 100644 pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix new file mode 100644 index 000000000000..8681aceacd7f --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -0,0 +1,7 @@ +{ haskellLib }: + +let inherit (haskellLib) dontCheck doJailbreak dontHaddock; +in self: super: { + haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; + haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); +} diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/pkgs/development/compilers/ghcjs-ng/8.6/git.json new file mode 100644 index 000000000000..37861b96e7aa --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.6/git.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/ghcjs/ghcjs", + "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075", + "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj", + "fetchSubmodules": true +} diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix new file mode 100644 index 000000000000..4e5d656cb064 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -0,0 +1,176 @@ +{ callPackage, configuredSrc }: + +{ + + ghcjs = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring + , base64-bytestring, binary, bytestring, Cabal, containers + , cryptohash, data-default, deepseq, directory, executable-path + , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs + , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts + , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl + , network, optparse-applicative, parallel, parsec, process, random + , regex-posix, safe, shelly, split, stdenv, stringsearch, syb + , system-fileio, system-filepath, tar, template-haskell + , template-haskell-ghcjs, terminfo, test-framework + , test-framework-hunit, text, time, transformers + , transformers-compat, unix, unix-compat, unordered-containers + , vector, wai, wai-app-static, wai-extra, wai-websockets, warp + , webdriver, websockets, wl-pprint-text, yaml + }: + mkDerivation { + pname = "ghcjs"; + version = "8.6.0.1"; + src = configuredSrc + /.; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + aeson array attoparsec base base16-bytestring base64-bytestring + binary bytestring Cabal containers cryptohash data-default deepseq + directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs + ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl + optparse-applicative parallel parsec process regex-posix safe split + stringsearch syb template-haskell template-haskell-ghcjs text time + transformers unordered-containers vector wl-pprint-text yaml + ]; + executableHaskellDepends = [ + aeson base binary bytestring Cabal containers directory + executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs + lens mtl optparse-applicative process shelly system-fileio + system-filepath tar terminfo text time transformers + transformers-compat unix unix-compat unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default deepseq directory http-types + HUnit lens lifted-base network optparse-applicative process random + shelly system-fileio system-filepath test-framework + test-framework-hunit text time transformers unordered-containers + wai wai-app-static wai-extra wai-websockets warp webdriver + websockets yaml + ]; + description = "Haskell to JavaScript compiler"; + license = stdenv.lib.licenses.mit; + }) {}; + + ghc-api-ghcjs = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap + , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs + , terminfo, time, transformers, unix + }: + mkDerivation { + pname = "ghc-api-ghcjs"; + version = "8.6.2"; + src = configuredSrc + /lib/ghc-api-ghcjs; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process + template-haskell-ghcjs terminfo time transformers unix + ]; + homepage = "http://www.haskell.org/ghc/"; + description = "The GHC API (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + ghci-ghcjs = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv + , template-haskell-ghcjs, transformers, unix + }: + mkDerivation { + pname = "ghci-ghcjs"; + version = "8.6.1"; + src = configuredSrc + /lib/ghci-ghcjs; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq filepath ghc-boot + ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix + ]; + description = "The library supporting GHC's interactive interpreter (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + ghcjs-th = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc-prim + , ghci-ghcjs, stdenv, template-haskell-ghcjs + }: + mkDerivation { + pname = "ghcjs-th"; + version = "0.1.0.0"; + src = configuredSrc + /lib/ghcjs-th; + libraryHaskellDepends = [ + base binary bytestring containers ghc-prim ghci-ghcjs + template-haskell-ghcjs + ]; + homepage = "http://github.com/ghcjs"; + license = stdenv.lib.licenses.mit; + }) {}; + + haddock-api-ghcjs = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq + , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths + , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv + , transformers, xhtml + }: + mkDerivation { + pname = "haddock-api-ghcjs"; + version = "2.20.0"; + src = configuredSrc + /lib/haddock-api-ghcjs; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers + xhtml + ]; + testHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec + QuickCheck transformers xhtml + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + haddock-library-ghcjs = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, deepseq + , directory, filepath, haddock-library, hspec, hspec-discover + , optparse-applicative, parsec, QuickCheck, stdenv, text + , transformers, tree-diff + }: + mkDerivation { + pname = "haddock-library-ghcjs"; + version = "1.6.0"; + src = configuredSrc + /lib/haddock-library-ghcjs; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers + ]; + testHaskellDepends = [ + base base-compat bytestring containers deepseq directory filepath + haddock-library hspec optparse-applicative parsec QuickCheck text + transformers tree-diff + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + template-haskell-ghcjs = callPackage + ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }: + mkDerivation { + pname = "template-haskell-ghcjs"; + version = "2.14.0.0"; + src = configuredSrc + /lib/template-haskell-ghcjs; + libraryHaskellDepends = [ base ghc-boot-th pretty ]; + description = "Support library for Template Haskell (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + +} diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix index df1394e4a24b..56b69ea267f9 100644 --- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix +++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix @@ -43,6 +43,8 @@ runCommand "configured-ghcjs-src" { # TODO: How to actually fix this? # Seems to work fine and produce the right files. touch ghc/includes/ghcautoconf.h + mkdir -p ghc/compiler/vectorise + mkdir -p ghc/utils/haddock/haddock-library/vendor patchShebangs . ./utils/makePackages.sh copy diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 642eeb96219c..0eb7df45920a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -11,6 +11,7 @@ let "ghcjs" "ghcjs82" "ghcjs84" + "ghcjs86" "integer-simple" ]; @@ -83,7 +84,7 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; - ghcjs = compiler.ghcjs84; + ghcjs = compiler.ghcjs86; ghcjs82 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc822; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; @@ -95,6 +96,12 @@ in { stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; }; + ghcjs86 = callPackage ../development/compilers/ghcjs-ng { + bootPkgs = packages.ghc863; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; + ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -155,7 +162,7 @@ in { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs84; + ghcjs = packages.ghcjs86; ghcjs82 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs82; @@ -168,6 +175,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjs86 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs86; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. From 96360a3a49ce89e8b757738177c45382649634ca Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 14 Jan 2019 18:16:39 -0500 Subject: [PATCH 053/467] GHCJS: Add elvishjerricco as maintainer --- pkgs/development/compilers/ghcjs-ng/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 6fd844adbe56..14a210783896 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -104,7 +104,5 @@ in stdenv.mkDerivation { inherit passthru; meta.platforms = passthru.bootPkgs.ghc.meta.platforms; - meta.hydraPlatforms = []; - meta.broken = true; # does not compile: https://hydra.nixos.org/build/88052615 - + meta.maintainers = [lib.maintainers.elvishjerricco]; } From d2362209c6237463171945fc19a48205e9aba4eb Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 30 Jan 2019 04:44:42 -0500 Subject: [PATCH 054/467] Fix aeson on GHC 8.4 --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 04e0a755d100..bd51e4f6c85f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -76,4 +76,7 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); + # cabal2nix doesn't list this because of a conditional on the GHC version. + aeson = addBuildDepend super.aeson self.contravariant; + } From 0969e9138903c80f1c43a90193e05934bc346cb4 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 30 Jan 2019 04:45:41 -0500 Subject: [PATCH 055/467] Remove GHCJS 8.2 --- .../compilers/ghcjs-ng/8.2/git.json | 6 - .../compilers/ghcjs-ng/8.2/stage0.nix | 168 ------------------ pkgs/top-level/haskell-packages.nix | 12 -- 3 files changed, 186 deletions(-) delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/git.json delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/git.json b/pkgs/development/compilers/ghcjs-ng/8.2/git.json deleted file mode 100644 index efe7794a103e..000000000000 --- a/pkgs/development/compilers/ghcjs-ng/8.2/git.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "url": "https://github.com/ghcjs/ghcjs", - "rev": "0cff73c3ee13b464adba90f308b77751c75b9f26", - "sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv", - "fetchSubmodules": true -} diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix deleted file mode 100644 index 0680ff156e14..000000000000 --- a/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ callPackage, configuredSrc }: - -{ - - ghcjs = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring - , base64-bytestring, binary, bytestring, Cabal, containers - , cryptohash, data-default, deepseq, directory, executable-path - , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs - , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts - , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl - , network, optparse-applicative, parallel, parsec, process, random - , regex-posix, safe, shelly, split, stdenv, stringsearch, syb - , system-fileio, system-filepath, tar, template-haskell - , template-haskell-ghcjs, terminfo, test-framework - , test-framework-hunit, text, time, transformers - , transformers-compat, unix, unix-compat, unordered-containers - , vector, wai, wai-app-static, wai-extra, wai-websockets, warp - , webdriver, websockets, wl-pprint-text, yaml - }: - mkDerivation { - pname = "ghcjs"; - version = "8.2.0.1"; - src = configuredSrc + /.; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ - base Cabal containers directory filepath process template-haskell - transformers - ]; - libraryHaskellDepends = [ - aeson array attoparsec base base16-bytestring base64-bytestring - binary bytestring Cabal containers cryptohash data-default deepseq - directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs - ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl - optparse-applicative parallel parsec process regex-posix safe split - stringsearch syb template-haskell template-haskell-ghcjs text time - transformers unordered-containers vector wl-pprint-text yaml - ]; - executableHaskellDepends = [ - aeson base binary bytestring Cabal containers directory - executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs - lens mtl optparse-applicative process shelly system-fileio - system-filepath tar terminfo text time transformers - transformers-compat unix unix-compat unordered-containers vector - yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default deepseq directory http-types - HUnit lens lifted-base network optparse-applicative process random - shelly system-fileio system-filepath test-framework - test-framework-hunit text time transformers unordered-containers - wai wai-app-static wai-extra wai-websockets warp webdriver - websockets yaml - ]; - description = "Haskell to JavaScript compiler"; - license = stdenv.lib.licenses.mit; - }) {}; - - ghc-api-ghcjs = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs - , hoopl, hpc, process, stdenv, template-haskell-ghcjs, terminfo - , time, transformers, unix - }: - mkDerivation { - pname = "ghc-api-ghcjs"; - version = "8.2.2"; - src = configuredSrc + /lib/ghc-api-ghcjs; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghci-ghcjs hoopl hpc process - template-haskell-ghcjs terminfo time transformers unix - ]; - homepage = "http://www.haskell.org/ghc/"; - description = "The GHC API (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - ghci-ghcjs = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv - , template-haskell-ghcjs, transformers, unix - }: - mkDerivation { - pname = "ghci-ghcjs"; - version = "8.2.2"; - src = configuredSrc + /lib/ghci-ghcjs; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq filepath ghc-boot - ghc-boot-th template-haskell-ghcjs transformers unix - ]; - description = "The library supporting GHC's interactive interpreter (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - ghcjs-th = callPackage - ({ mkDerivation, base, binary, bytestring, containers, ghc-prim - , ghci-ghcjs, stdenv, template-haskell-ghcjs - }: - mkDerivation { - pname = "ghcjs-th"; - version = "0.1.0.0"; - src = configuredSrc + /lib/ghcjs-th; - libraryHaskellDepends = [ - base binary bytestring containers ghc-prim ghci-ghcjs - template-haskell-ghcjs - ]; - homepage = "http://github.com/ghcjs"; - license = stdenv.lib.licenses.mit; - }) {}; - - haddock-api-ghcjs = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq - , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths - , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv - , transformers, xhtml - }: - mkDerivation { - pname = "haddock-api-ghcjs"; - version = "2.18.1"; - src = configuredSrc + /lib/haddock-api-ghcjs; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers - xhtml - ]; - testHaskellDepends = [ - base containers ghc-api-ghcjs hspec QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - haddock-library-ghcjs = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , hspec-discover, QuickCheck, stdenv, transformers - }: - mkDerivation { - pname = "haddock-library-ghcjs"; - version = "1.4.4"; - src = configuredSrc + /lib/haddock-library-ghcjs; - libraryHaskellDepends = [ base bytestring deepseq transformers ]; - testHaskellDepends = [ - base base-compat bytestring deepseq hspec QuickCheck transformers - ]; - testToolDepends = [ hspec-discover ]; - homepage = "http://www.haskell.org/haddock/"; - description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - template-haskell-ghcjs = callPackage - ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }: - mkDerivation { - pname = "template-haskell-ghcjs"; - version = "2.12.0.0"; - src = configuredSrc + /lib/template-haskell-ghcjs; - libraryHaskellDepends = [ base ghc-boot-th pretty ]; - description = "Support library for Template Haskell (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0eb7df45920a..15d4cf3f213a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -9,7 +9,6 @@ let "ghc863Binary" "ghc844" "ghcjs" - "ghcjs82" "ghcjs84" "ghcjs86" "integer-simple" @@ -85,11 +84,6 @@ in { llvmPackages = pkgs.llvmPackages_6; }; ghcjs = compiler.ghcjs86; - ghcjs82 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc822; - ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; - stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; - }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc844; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; @@ -163,12 +157,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; ghcjs = packages.ghcjs86; - ghcjs82 = callPackage ../development/haskell-modules rec { - buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjs82; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; ghcjs84 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs84; From 048016e8c8c2d3a8e5af21034f8819baca060a84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Jan 2019 05:04:42 -0500 Subject: [PATCH 056/467] gitAndTools.lab: specify subPackages Otherwise it builds an internal `docs` command. --- .../version-management/git-and-tools/lab/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index f2d1f1d85568..daec9ce9d2af 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -6,6 +6,8 @@ buildGoPackage rec { goPackagePath = "github.com/zaquestion/lab"; + subPackages = [ "." ]; + src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; From d80b81ab5d3505cd5810620e61c8e38fa5e67d90 Mon Sep 17 00:00:00 2001 From: Duarte David Date: Wed, 30 Jan 2019 12:50:31 +0100 Subject: [PATCH 057/467] coredns: 005 -> 1.3.1 --- pkgs/servers/dns/coredns/default.nix | 9 +- pkgs/servers/dns/coredns/deps.nix | 317 ++++----------------------- 2 files changed, 46 insertions(+), 280 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index bc01d9946c71..76452ae9d8d0 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "coredns-${version}"; - version = "005"; + version = "1.3.1"; - goPackagePath = "github.com/miekg/coredns"; - subPackages = [ "." ]; + goPackagePath = "github.com/coredns/coredns"; src = fetchFromGitHub { - owner = "miekg"; + owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "15q8l4apspaw1xbbb9j1d8s2cc5zrgycan6iq597ga9m0vyf7wiw"; + sha256 = "0aflm0c3qcjcq4dy7yx9f5xlvdm4k0b2awsp3qvbfgyp74by0584"; }; goDeps = ./deps.nix; diff --git a/pkgs/servers/dns/coredns/deps.nix b/pkgs/servers/dns/coredns/deps.nix index 18bd2b1f85d8..4dd8228c8a6a 100644 --- a/pkgs/servers/dns/coredns/deps.nix +++ b/pkgs/servers/dns/coredns/deps.nix @@ -1,119 +1,11 @@ [ - { - goPackagePath = "github.com/cockroachdb/cmux"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "30d10be492927e2dcae0089c374c455d42414fcb"; - sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "5e3acbb5668c4c3deb4842615c4098eb61fb6b1e"; - sha256 = "0kbfr8q7s10z2r01xvbv6i31n4wq6z1qvgfj7njgbcgb65bkjjrh"; - }; - } - { - goPackagePath = "github.com/eapache/go-xerial-snappy"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-xerial-snappy"; - rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c"; - sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; - sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f856818214da2e1057f8ad84803971cff"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "a904159b9206978bb6d53fcc7a769e5cd726c737"; - sha256 = "0qq758fcnhlqa1913jki79a1ic7p2iczdx1l2mn8s886nxydn0fi"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; - sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; - }; - } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "1bab8b35b6bb565f92cbc97939610af9369f942a"; - sha256 = "0n71bf2xkrk3b6svzsph3brwvam0cbz21pcwyymdw8scdn7mmyak"; - }; - } { goPackagePath = "github.com/mholt/caddy"; fetch = { type = "git"; url = "https://github.com/mholt/caddy"; - rev = "60838710883baa70cf6aae08e73820b21134ee72"; - sha256 = "15dx12sap8ziwyn2wkgiy7fj1s320444zh0pn32mwjvn065c2k3z"; - }; - } - { - goPackagePath = "github.com/miekg/coredns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/coredns"; - rev = "a7c9fd5d6b5157958a3df8dba0cdc1f24407957b"; - sha256 = "11zbwx74hhgrd3qlwm91gqw6zcj4yf7af54cn3183ca8v66f3xyf"; + rev = "v0.11.1"; + sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l"; }; } { @@ -121,143 +13,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "75229eecb7af00b2736e93b779a78429dcb19472"; - sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "6edb48674bd9467b8e91fda004f2bd7202d60ce4"; - sha256 = "0kwighhdm187b1yzcccm4hpy7m5sv1dij5ckg31n2614xvpippby"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go-opentracing"; - rev = "6022d4d3ed39632fad842942bda1813a9b4f63c8"; - sha256 = "0gg9g2nxjf9almgzhx5sgqvbcx4zwvs873nl1d62jb6kqhsr8sjd"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df"; - sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "a1dba9ce8baed984a2495b658c82687f8157b98f"; - sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"; - sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj"; - }; - } - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "1416bd78f804d523005322194994f08c2a0ad797"; - sha256 = "1skfkb1yhwf8w2n31dawr1kk145h3nwdf7xmm6yrwn69vbv8jqns"; - }; - } - { - goPackagePath = "github.com/apache/thrift"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift"; - rev = "655b9b6ef86c45b423a194abee2a9cd057a16a74"; - sha256 = "1kagirgxy2a9iabm8i32i5hdr36v5p0h651bsbyr0l99970myqfp"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "2533c2a50c4b6114ad6fd4c0000175fac3b6ee06"; - sha256 = "0z8byms8hfn7ncq8sqcw9avn9nfal5hw75ckbladd6gzjc8jay02"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; - sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8"; - sha256 = "1fh4jyxv1drh9jmadidrlszcnjp4zfazysbq5075lqd1mhq99lz0"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "69b215d01a5606c843240eab4937eab3acee6530"; - sha256 = "1cy9jxqi6ba5qnjmvznlq49n2zzr5vqgky6pa9mckrbli8ssvzw7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pierrec/xxHash"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/xxHash"; - rev = "5a004441f897722c627870a981d02b29924215fa"; - sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; + rev = "v1.1.3"; + sha256 = "1xs1k9jm9f04y8callww9x4s0jrxmsn7882iyy4br8sbpl3wzkw4"; }; } { @@ -265,8 +22,36 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "6ab3432d241cbe3cb7543da7e7e9a934c7e9fe76"; - sha256 = "19phcsvq1gn53af3nnh1lvvyzg8kpwribka9mszk18jv7l6nq9mf"; + rev = "v0.9.1"; + sha256 = "01gnylazia30pcp069xcng482gwmm3xcx5zgrlwdkhic1lyb6i9l"; + }; + } + # client_golang dependencies + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "347cf4a86c1cb8d262994d8ef5924d4576c5b331"; + sha256 = "0c5j5c2dnj1452653c8nnpx4jwijwafi1p8685g7ddm6kng9q1wz"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; + sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; }; } { @@ -274,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; - sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + rev = "56726106282f1985ea77d5305743db7231b0c0a8"; + sha256 = "19y4qs9mkxiiab5sh3b7cccjpl3xbp6sy8812ig9f1zg8vzkzj7j"; }; } { @@ -283,35 +68,17 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "3007b6072c17c8d985734e6e19b1dea9174e13d3"; - sha256 = "0jpvnmzqbzy2krwzan7pp3bc8pj9f1qic98lqq4hanccr0g5cmk3"; + rev = "2998b132700a7d019ff618c06a234b47c1f3f681"; + sha256 = "131qmx0rs1nz0ci3qzkks4i6fdmr5c69i48h5cngjizlb9xxwir2"; }; } { - goPackagePath = "github.com/ugorji/go"; + goPackagePath = "github.com/prometheus/procfs"; fetch = { type = "git"; - url = "https://github.com/ugorji/go"; - rev = "c88ee250d0221a57af388746f5cf03768c21d6e2"; - sha256 = "0ylb5p5i9hln8chq8whk5iy8qypjpzyrp07zpwjd1zbf5nsm1nmv"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6b27048ae5e6ad1ef927e72e437531493de612fe"; - sha256 = "08zk0vavl7g6jzklhxhwrgcjh42mn2flbx2d2rxsblyxkbqri07j"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547"; - sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km"; + url = "https://github.com/prometheus/procfs"; + rev = "bf6a532e95b1f7a62adf0ab5050a5bb2237ad2f4"; + sha256 = "0k65i2ikf3jp6863mpc1raf928i78r8jd7zn9djx6f4izls6l6j1"; }; } ] From cec3c69837cf360640b519c7faa24047308e93a3 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Wed, 30 Jan 2019 13:31:20 +0100 Subject: [PATCH 058/467] mfcl8690cdwlpr: 1.2.0-0 -> 1.3.0-0 --- pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 3b6ae73c70d1..a521b3ea0218 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -3,11 +3,11 @@ makeWrapper, perl, pkgs, stdenv, which }: stdenv.mkDerivation rec { name = "mfcl8690cdwlpr-${version}"; - version = "1.2.0-0"; + version = "1.3.0-0"; src = fetchurl { url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb"; - sha256 = "02k43nh51pn4lf7gaid9yhil0a3ikpy4krw7dhgphmm5pap907sx"; + sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v"; }; nativeBuildInputs = [ dpkg makeWrapper ]; From a0c9490b3790a0549e264e3edd89e94671642f88 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Wed, 30 Jan 2019 13:30:49 +0100 Subject: [PATCH 059/467] mfcl8690cdwcupswrapper: 1.3.0-0 -> 1.4.0-0 --- pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 9aa127dd6305..17040498acc0 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -3,11 +3,11 @@ mfcl8690cdwlpr, perl, stdenv}: stdenv.mkDerivation rec { name = "mfcl8690cdwcupswrapper-${version}"; - version = "1.3.0-0"; + version = "1.4.0-0"; src = fetchurl { url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb"; - sha256 = "16nnh3hd5yv0m4191wja9fvxxzngzfccfj2rfhcswbakajyk5ywn"; + sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2"; }; nativeBuildInputs = [ dpkg makeWrapper ]; From b99cc81d49d7136eca28d350a3033a855234535d Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 30 Jan 2019 08:30:39 -0500 Subject: [PATCH 060/467] iperf2: 2.0.12 -> 2.0.13 --- pkgs/tools/networking/iperf/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6d26cf591bae..0c90047e05e4 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.12"; + name = "iperf-2.0.13"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn"; + sha256 = "1bbq6xr0vrd88zssfiadvw3awyn236yv94fsdl9q2sh9cv4xx2n8"; }; hardeningDisable = [ "format" ]; From 3bdd1156b8738a1f504b17616b0722f63c9bad32 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 30 Jan 2019 08:30:57 -0500 Subject: [PATCH 061/467] iperf2: enable fastsampling config option From ./configure --help --enable-fastsampling enable support for 100 microsecond report intervals --- pkgs/tools/networking/iperf/2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 0c90047e05e4..9faa0f953510 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-fastsampling" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/iperf/; From 071c7e8d53ae6980c17eccea468ac1c59d03320e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 30 Jan 2019 14:05:26 +0100 Subject: [PATCH 062/467] python.pkgs.keras-preprocessing: 1.0.5 -> 1.0.8 --- .../keras-preprocessing/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index a57b6f7dfa38..9d6202337441 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -1,24 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six }: +{ lib, buildPythonPackage, fetchPypi, numpy, six, scipy, pillow, pytest, Keras }: buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.0.5"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "ef2e482c4336fcf7180244d06f4374939099daa3183816e82aee7755af35b754"; + sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d"; }; - # Cyclic dependency: keras-preprocessing requires keras, which requires keras-preprocessing - postPatch = '' - sed -i "s/keras>=[^']*//" setup.py + propagatedBuildInputs = [ + # required + numpy six + # optional + scipy pillow + ]; + + checkInputs = [ + pytest Keras + ]; + + checkPhase = '' + py.test tests/ ''; - # No tests in PyPI tarball + # Cyclic dependency: keras-preprocessing's tests require Keras, which requires keras-preprocessing doCheck = false; - propagatedBuildInputs = [ numpy scipy six ]; - meta = with lib; { description = "Easy data preprocessing and data augmentation for deep learning models"; homepage = https://github.com/keras-team/keras-preprocessing; From 677f8c1e771161543e9cd0fd9101bd62c29787f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 30 Jan 2019 14:15:09 +0100 Subject: [PATCH 063/467] python.pkgs.Keras: remove obsolete postPatch phase --- pkgs/development/python-modules/keras/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 83ef23282797..dde820876d81 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -25,14 +25,6 @@ buildPythonPackage rec { keras-applications keras-preprocessing ]; - # Keras 2.2.2 expects older versions of keras_applications - # and keras_preprocessing. These substitutions can be removed - # for for the next Keras release. - postPatch = '' - substituteInPlace setup.py --replace "keras_applications==1.0.4" "keras_applications==1.0.5" - substituteInPlace setup.py --replace "keras_preprocessing==1.0.2" "keras_preprocessing==1.0.3" - ''; - # Couldn't get tests working doCheck = false; From 059e5e0ba01d720cadd6678230c13a47f438e4ad Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Wed, 30 Jan 2019 11:29:32 -0800 Subject: [PATCH 064/467] gitlab: add openssh dependency to gitaly --- nixos/modules/services/misc/gitlab.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 769a9526cf64..25c258ebe134 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -497,7 +497,12 @@ in { systemd.services.gitaly = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ]; + path = with pkgs; [ + openssh + gitAndTools.git + cfg.packages.gitaly.rubyEnv + cfg.packages.gitaly.rubyEnv.wrappedRuby + ]; serviceConfig = { Type = "simple"; User = cfg.user; From cca9df9d11db2c1e9cda6878307715b9d590e2b7 Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Tue, 29 Jan 2019 01:33:21 +0100 Subject: [PATCH 065/467] openra: updated engines and mods --- pkgs/games/openra/common.nix | 2 +- pkgs/games/openra/engines.nix | 24 ++-- pkgs/games/openra/mod-launch-game.sh | 2 +- pkgs/games/openra/mod-update.sh | 151 +++++++++++++++++++++++++ pkgs/games/openra/mod.nix | 5 +- pkgs/games/openra/mods.nix | 163 ++++++++++++++------------- 6 files changed, 252 insertions(+), 95 deletions(-) create mode 100755 pkgs/games/openra/mod-update.sh diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index e90f8170e18e..200b9da4a7eb 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -79,7 +79,7 @@ in { dontStrip = true; meta = { - maintainers = with maintainers; [ msteen rardiol ]; + maintainers = with maintainers; [ fusion809 msteen rardiol ]; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index e0d97f3c548b..7454d32c1139 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -11,9 +11,9 @@ let repo = "OpenRA" ; inherit rev sha256 extraPostFetch; }; - } name).overrideAttrs (oldAttrs: { + } name).overrideAttrs (origAttrs: { postInstall = '' - ${oldAttrs.postInstall} + ${origAttrs.postInstall} cp -r mods/ts $out/lib/openra/mods/ cp mods/ts/icon.png $(mkdirp $out/share/pixmaps)/openra-ts.png ( cd $out/share/applications; sed -e 's/Dawn/Sun/g' -e 's/cnc/ts/g' openra-cnc.desktop > openra-ts.desktop ) @@ -21,21 +21,21 @@ let }); in { - release = buildUpstreamOpenRAEngine rec { + release = name: (buildUpstreamOpenRAEngine rec { version = "20181215"; - rev = "release-${version}"; + rev = "${name}-${version}"; sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; - }; + } name); - playtest = buildUpstreamOpenRAEngine rec { + playtest = name: (buildUpstreamOpenRAEngine rec { version = "20190106"; - rev = "playtest-${version}"; + rev = "${name}-${version}"; sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; - }; + } name); - bleed = let commit = "6de92de8d982094a766eab97a92225c240d85493"; in buildUpstreamOpenRAEngine { - version = abbrevCommit commit; - rev = commit; - sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; + bleed = buildUpstreamOpenRAEngine { + version = "9c9cad1"; + rev = "9c9cad1a15c3a34dc2a61b305e4a9a735381a5f8"; + sha256 = "0100p7wrnnlvkmy581m0gbyg3cvi4i1w3lzx2gq91ndz1sbm8nd2"; }; } diff --git a/pkgs/games/openra/mod-launch-game.sh b/pkgs/games/openra/mod-launch-game.sh index ec03353bee54..c0b6feb69c88 100644 --- a/pkgs/games/openra/mod-launch-game.sh +++ b/pkgs/games/openra/mod-launch-game.sh @@ -21,5 +21,5 @@ mono --debug OpenRA.Game.exe Game.Mod=@name@ Engine.LaunchPath="@out@/bin/openra # Show a crash dialog if something went wrong if [ $? -ne 0 -a $? -ne 1 ]; then - show_error "OpenRA - @title@ has encountered a fatal error.\nPlease refer to the crash logs for more information.\n\nLog files are located in ~/.openra/Logs" + show_error $'OpenRA - @title@ has encountered a fatal error.\nPlease refer to the crash logs for more information.\n\nLog files are located in ~/.openra/Logs' fi diff --git a/pkgs/games/openra/mod-update.sh b/pkgs/games/openra/mod-update.sh new file mode 100755 index 000000000000..52bcada8f9a1 --- /dev/null +++ b/pkgs/games/openra/mod-update.sh @@ -0,0 +1,151 @@ +#!/usr/bin/env bash + +# for mod in $(nix eval --raw '( +# with import { }; +# with lib; +# let mods = attrNames (removeAttrs openraPackages.mods [ "recurseForDerivations" ]); +# in concatStringsSep " " mods +# )'); do +# ./mod-update.sh "$mod" +# done + +# Uses: +# https://github.com/msteen/nix-prefetch +# https://github.com/msteen/nix-update-fetch + +mod=$1 +commit_count=$2 +token= +nixpkgs='' + +die() { + ret=$? + echo "$*" >&2 + exit $ret +} + +curl() { + command curl --silent --show-error "$@" +} + +get_sha1() { + local owner=$1 repo=$2 ref=$3 + # https://developer.github.com/v3/#authentication + curl -H "Authorization: token $token" -H 'Accept: application/vnd.github.VERSION.sha' "https://api.github.com/repos/$owner/$repo/commits/$ref" +} + +[[ -n $token ]] || die "Please edit this script to include a GitHub API access token, which is required for API v4: +https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/" + +# Get current mod_owner and mod_repo. +vars=$(nix-prefetch --file "$nixpkgs" "openraPackages.mods.$mod" --index 0 --quiet --output json --skip-hash > >( + jq --raw-output 'with_entries(select(.value | contains("\n") | not)) | to_entries | .[] | .key + "=" + .value')) || exit + +while IFS='=' read -r key val; do + declare "mod_${key}=${val}" +done <<< "$vars" + +if [[ -n $commit_count ]]; then + query_on_commit='{ + history(first: 10) { + nodes { + abbreviatedOid + oid + } + totalCount + } +}' +else + query_on_commit='{ + history(first: 0) { + totalCount + } + abbreviatedOid + oid +}' +fi + +query='query { + repository(owner: \"'"$mod_owner"'\", name: \"'"$mod_repo"'\") { + defaultBranchRef { + target { + ... on Commit '"$query_on_commit"' + } + } + licenseInfo { + key + } + } +}' + +# Newlines are not allowed in a query. +# https://developer.github.com/v4/guides/forming-calls/#communicating-with-graphql +query=$(echo $query) + +# https://developer.github.com/v4/guides/using-the-explorer/#configuring-graphiql +json=$(curl -H "Authorization: bearer $token" -X POST -d '{ "query": "'"$query"'" }' https://api.github.com/graphql) || exit + +if [[ -n $commit_count ]]; then + json=$(jq "$commit_count"' as $commit_count + | .data.repository.defaultBranchRef.target + |= (.history |= (. | del(.nodes) | .totalCount = $commit_count)) + + (.history | .nodes[.totalCount - $commit_count])' <<< "$json") || exit +fi + +vars=$(jq --raw-output '.data.repository | { + license_key: .licenseInfo.key, +} + (.defaultBranchRef.target | { + version: ((.history.totalCount | tostring) + ".git." + .abbreviatedOid), + rev: .oid, +}) | to_entries | .[] | .key + "=" + (.value | tostring)' <<< "$json") || exit + +while IFS='=' read -r key val; do + declare "mod_${key}=${val}" +done <<< "$vars" + +mod_config=$(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/mod.config") || exit + +while IFS='=' read -r key val; do + declare "${key,,}=$(jq --raw-output . <<< "$val")" +done < <(grep '^\(MOD_ID\|ENGINE_VERSION\|AUTOMATIC_ENGINE_MANAGEMENT\|AUTOMATIC_ENGINE_SOURCE\)=' <<< "$mod_config") + +for var in mod_id engine_version automatic_engine_management automatic_engine_source; do + echo "$var=${!var}" >&2 +done +echo >&2 + +[[ $mod_id == "$mod" ]] || + die "The mod '$mod' reports being mod '$mod_id' instead." +[[ $mod_license_key == gpl-3.0 ]] || +[[ $(echo $(head -2 <(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/COPYING"))) == 'GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007' ]] || + die "The mod '$mod' is licensed under '$mod_license_key' while expecting 'gpl-3.0'." +[[ $automatic_engine_management == True ]] || + die "The mod '$mod' engine is not managed as a read-only dependency." +[[ $automatic_engine_source =~ https://github.com/([a-zA-Z0-9_\-]+)/([a-zA-Z0-9_\-]+)/archive/([a-zA-Z0-9_\-\$\{\}]+).zip ]] || + die "The mod '$mod' engine is not hosted on GitHub as an archive." + +engine_owner=${BASH_REMATCH[1]} +engine_repo=${BASH_REMATCH[2]} +[[ ${BASH_REMATCH[3]} == '${ENGINE_VERSION}' ]] || engine_version=${BASH_REMATCH[3]} +engine_rev=$(get_sha1 "$engine_owner" "$engine_repo" "$engine_version") + +for type in mod engine; do + for name in version owner repo rev; do + var="${type}_${name}" + echo "$var=${!var}" >&2 + done + echo >&2 +done + +i=0 +for type in mod engine; do + fetcher_args=() + for name in owner repo rev; do + var="${type}_${name}" + fetcher_args+=( "--$name" "${!var}" ) + done + var="${type}_version" + version=${!var} + nix-update-fetch --yes --version "$version" "$(nix-prefetch --quiet --file "$nixpkgs" "openraPackages.mods.$mod" --index $i --output json --with-position --diff -- "${fetcher_args[@]}")" + (( i++ )) +done diff --git a/pkgs/games/openra/mod.nix b/pkgs/games/openra/mod.nix index ebc65b2f5c4e..8df5922a4418 100644 --- a/pkgs/games/openra/mod.nix +++ b/pkgs/games/openra/mod.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { make -C ${engineSourceName} install-engine install-common-mod-files DATA_INSTALL_DIR=$out/lib/${pname} - cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/${mod.name} \ + cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \ $out/lib/${pname}/mods/ substitute ${./mod-launch-game.sh} $out/lib/${pname}/launch-game.sh \ @@ -81,7 +81,8 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { substitute ${./openra-mod.desktop} $(mkdirp $out/share/applications)/${pname}.desktop \ --subst-var-by name ${escapeShellArg mod.name} \ - --subst-var-by title ${escapeShellArg mod.title} + --subst-var-by title ${escapeShellArg mod.title} \ + --subst-var-by description ${escapeShellArg mod.description} cp README.md $(mkdirp $out/share/doc/packages/${pname})/README.md diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index 5bfc5a224a5c..ddc34dbda8f6 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -7,22 +7,22 @@ let in { ca = buildOpenRAMod { - version = "93"; + version = "96.git.fc3cf0b"; title = "Combined Arms"; description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods"; homepage = https://github.com/Inq8/CAmod; src = fetchFromGitHub { owner = "Inq8"; repo = "CAmod"; - rev = "16fb77d037be7005c3805382712c33cec1a2788c"; - sha256 = "11fjyr3692cy2a09bqzk5ya1hf6plh8hmdrgzds581r9xbj0q4pr"; + rev = "fc3cf0baf2b827650eaae9e1d2335a3eed24bac9"; + sha256 = "15w91xs253gyrlzsgid6ixxjazx0fbzick6vlkiay0znb58n883m"; }; - engine = let commit = "b8a7dd52ff893ed8225726d4ed4e14ecad748404"; in { - version = abbrevCommit commit; + engine = { + version = "b8a7dd5"; src = fetchFromGitHub { owner = "Inq8"; repo = "CAengine" ; - rev = commit; + rev = "b8a7dd52ff893ed8225726d4ed4e14ecad748404"; sha256 = "0dyk861qagibx8ldshz7d2nrki9q550f6f0wy8pvayvf1gv1dbxj"; name = "engine"; inherit extraPostFetch; @@ -31,23 +31,23 @@ in { }; d2 = unsafeBuildOpenRAMod rec { - version = "128"; + version = "134.git.69a4aa7"; title = "Dune II"; description = "A modernization of the original ${title} game"; homepage = https://github.com/OpenRA/d2; src = fetchFromGitHub { owner = "OpenRA"; repo = "d2"; - rev = "bc969207b532a2def69e0d6ac09a4e8fb5d4e946"; - sha256 = "18v154kf1fmfk2gnymb3ggsfy73ql8rr7jvbhiw60yhzwx89cdk8"; + rev = "69a4aa708e2c26376469c0048fac13592aa452ca"; + sha256 = "1mfch4s6c05slyqvxllklbxpqq8dqcbx3515n3gyylyq43gq481r"; }; engine = rec { - version = "20181215"; + version = "release-20181215"; mods = [ "cnc" "d2k" "ra" ]; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; + rev = version; sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; name = "engine"; inherit extraPostFetch; @@ -60,23 +60,23 @@ in { }; dr = buildOpenRAMod rec { - version = "244"; + version = "266.git.920b476"; title = "Dark Reign"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/drogoganor/DarkReign; src = fetchFromGitHub { owner = "drogoganor"; repo = "DarkReign"; - rev = "e21db398f4d995c91b9e1a0f31ffaa7d54f43742"; - sha256 = "1gzvdf6idmx0rr8afaxd9dsbnxljif2kic6znkd9vcrwnqmp1fjr"; + rev = "920b476be1b7751db087f1f7acd504b8a048d1e2"; + sha256 = "11ir4pnichrnv4z9532fp9g166jl8fvy5kk03a2fgxssp3g40zz2"; }; - engine = let commit = "7fcfb1dcb2bd472fa6680ffa37bd3bbedb2c44c5"; in { - version = abbrevCommit commit; + engine = { + version = "DarkReign"; src = fetchFromGitHub { owner = "drogoganor"; repo = "OpenRA" ; - rev = commit; - sha256 = "0x7k96j3q16dgay4jjlyv9kcgn4sc4v9ksw6ijnjws7q1r2rjs0m"; + rev = "e08b75c2add30439228ea3dd61d6be60d1800329"; + sha256 = "125vf962p69ajrh5pxgfwsi0ksczqwvlw5kn2fvffiwvh8d5in23"; name = "engine"; inherit extraPostFetch; }; @@ -84,71 +84,76 @@ in { }; gen = buildOpenRAMod { - version = "1133"; + version = "1157.git.4f5e11d"; title = "Generals Alpha"; description = "Re-imagination of the original Command & Conquer: Generals game"; homepage = https://github.com/MustaphaTR/Generals-Alpha; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Generals-Alpha"; - rev = "277d20d5a8b5e11eac9443031af133dc110c653f"; - sha256 = "1k37545l99q7zphnh1ykvimsyp5daykannps07d4dgr2w9l7bmhg"; + rev = "4f5e11d916e4a03d8cf1c97eef484ce2d77d7df2"; + sha256 = "1wnl4qrlhynnlahgdlxwhgsdba5wgdg9yrv9f8hkgi69j60szypd"; }; engine = rec { - version = "gen-20180905"; + version = "gen-20190128_3"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "OpenRA" ; rev = version; - sha256 = "0wy1h7fg0n8dpy6y91md7x0qnr9rk4xf6155jali4bi8gghw2g5v"; + sha256 = "1x6byz37s8qcpqj902zvkvbv95rv2mv2kj35c12gbpyc92xkqkq0"; name = "generals-alpha-engine"; inherit extraPostFetch; }; }; }; - kknd = buildOpenRAMod rec { - version = "142"; + kknd = let version = "145.git.5530bab"; in name: (buildOpenRAMod rec { + inherit version; title = "Krush, Kill 'n' Destroy"; description = "Re-imagination of the original ${title} game"; homepage = https://kknd-game.com/; src = fetchFromGitHub { owner = "IceReaper"; repo = "KKnD"; - rev = "54d34292168d5c47529688c8d5ca7693c4001ef3"; - sha256 = "1rsdig282cfr8b4iamr9ri6sshgppp8gllfyib6c2hvqqr301720"; + rev = "5530babcb05170e0959e4cf2b079161e9fedde4f"; + sha256 = "07jczrarmgm6zdk0myzwgq200x19yvpjyxrnhdac08mjgyz75zk1"; }; - engine = let commit = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; in { - version = abbrevCommit commit; + engine = { + version = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; src = fetchFromGitHub { - owner = "OpenRA"; + owner = "IceReaper"; repo = "OpenRA" ; - rev = commit; + rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq"; name = "engine"; inherit extraPostFetch; }; }; - }; + } name).overrideAttrs (origAttrs: { + postPatch = '' + ${origAttrs.postPatch} + sed -i 's/{DEV_VERSION}/${version}/' mods/*/mod.yaml + ''; + }); mw = buildOpenRAMod rec { - version = "235"; + version = "257.git.c9be8f2"; title = "Medieval Warfare"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/CombinE88/Medieval-Warfare; src = fetchFromGitHub { owner = "CombinE88"; repo = "Medieval-Warfare"; - rev = "1e4fc7ea24d0806c5a7cd753490e967d804a3567"; - sha256 = "0swa66mzb6wr8vf1yivrss54dl98jzzwh9b8qrjfwmfrq2i356iq"; + rev = "c9be8f2a6f1dd710b1aedd9d5b00b4cf5020e2fe"; + sha256 = "09fp7k95jd6hjqdasbspbd43z5670wkyzbbgqkll9dfsrv0sky0v"; }; - engine = let commit = "9f9617aa359ebc1923252b7a4a79def73ecfa8a2"; in { - version = abbrevCommit commit; + engine = { + version = "MedievalWarfareEngine"; src = fetchFromGitHub { owner = "CombinE88"; repo = "OpenRA" ; - rev = commit; - sha256 = "02h29xnc1cb5zr001cnmaww5qnfnfaza4v28251jgzkby593r32q"; + rev = "52109c0910f479753704c46fb19e8afaab353c83"; + sha256 = "0ga3855j6bc7h81q03cw6laiaiz12915zg8aqah1idvxbzicfy7l"; name = "engine"; inherit extraPostFetch; }; @@ -156,22 +161,22 @@ in { }; ra2 = buildOpenRAMod rec { - version = "876"; + version = "881.git.b37f4f9"; title = "Red Alert 2"; description = "Re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/OpenRA/ra2; src = fetchFromGitHub { owner = "OpenRA"; repo = "ra2"; - rev = "6a864b2a5887ae42291768fb3dec73082fee44ee"; - sha256 = "19m4z9r00dj67746ps2f9a8i1icq8nm0iiww6dl975yl6gaxp5qy"; + rev = "b37f4f9f07404127062d9061966e9cc89dd86445"; + sha256 = "1jiww66ma3qdk9hzyvhbcaa5h4p2mxxk22kvrw92ckpxy0bqba3h"; }; engine = rec { - version = "20180923"; + version = "release-20180923"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; + rev = version; sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; name = "engine"; inherit extraPostFetch; @@ -184,23 +189,23 @@ in { }; raclassic = buildOpenRAMod { - version = "171"; + version = "181.git.8240890"; title = "Red Alert Classic"; description = "A modernization of the original Command & Conquer: Red Alert game"; homepage = https://github.com/OpenRA/raclassic; src = fetchFromGitHub { owner = "OpenRA"; repo = "raclassic"; - rev = "a2319b3dfb367a8d4278bf7baf55a10abf615fbc"; - sha256 = "1k67fx4d9hg8mckzp7pp8lxa6ngqxnnrnbqyfls99dqc4df1iw0a"; + rev = "8240890b32191ce34241c22158b8a79e8c380879"; + sha256 = "0dznyb6qa4n3ab87g1c4bihfc2nx53k6z0kajc7ynjdnwzvx69ww"; }; engine = rec { - version = "20181215"; + version = "playtest-20190106"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; - sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; + rev = version; + sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; name = "engine"; inherit extraPostFetch; }; @@ -208,24 +213,24 @@ in { }; rv = unsafeBuildOpenRAMod { - version = "1294"; + version = "1330.git.9230e6f"; title = "Romanov's Vengeance"; description = "Re-imagination of the original Command & Conquer: Red Alert 2 game"; homepage = https://github.com/MustaphaTR/Romanovs-Vengeance; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Romanovs-Vengeance"; - rev = "c21cb11579d7e12354c5ccb5c3c47e567c6b3d4f"; - sha256 = "1vmc5b9awx8q0mahwv11fzgplw9w7m8kzvnx5cl7xr1w5wk87428"; + rev = "9230e6f1dd9758467832aee4eda115e18f0e635f"; + sha256 = "0bwbmmlhp1kh8rgk2nx1ca9vqssj849amndacf318d61gksc1w9n"; }; - engine = let commit = "e9e99074b294c32fbe88dd8727581cb8c512c2e2"; in { - version = abbrevCommit commit; + engine = { + version = "f3873ae"; mods = [ "as" ]; src = fetchFromGitHub { - owner = "GraionDilach"; - repo = "OpenRA" ; - rev = commit; - sha256 = "0bibnakpmbxwglf2dka6g04xp8dzwyms1zk5kqlbm8gpdp0aqmxp"; + owner = "AttacqueSuperior"; + repo = "Engine"; + rev = "f3873ae242803051285994d77eb26f4b951594b5"; + sha256 = "02rv29wja0p5d083pd087daz7x7pp5b9ym7sci2fhg3mrnaqgwkp"; name = "engine"; inherit extraPostFetch; }; @@ -237,24 +242,24 @@ in { }; sp = unsafeBuildOpenRAMod { - version = "153"; + version = "176.git.fc89ae8"; title = "Shattered Paradise"; description = "Re-imagination of the original Command & Conquer: Tiberian Sun game"; homepage = https://github.com/ABrandau/OpenRAModSDK; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRAModSDK"; - rev = "89148b8cf89bf13911fafb74a1aa2b4cacf027e0"; - sha256 = "1bb8hzd3mhnn76iqiah1161qz98f0yvyryhmrghq03xlbin3mhbi"; + rev = "fc89ae8a10e0f765ac735f923e01aa24dd20e8d2"; + sha256 = "0xyxhipmjlld0kp23fwsdwnspr7fci0mdnjd60gcsh34c7m0341p"; }; - engine = let commit = "82a2f234bdf3b768cea06408e3de30f9fbbe9412"; in { - version = abbrevCommit commit; + engine = { + version = "SP-Bleed-Branch"; mods = [ "as" "ts" ]; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRA" ; - rev = commit; - sha256 = "1nl3brvx1bikxm5rmpc7xmd32n722jiyjh86pnar6b6idr1zj2ws"; + rev = "d3545c0b751aea2105748eddaab5919313e35314"; + sha256 = "1jsldl6vnf3r9dzppdm4z7kqbrzkidda5k74wc809i8c4jjnq9rq"; name = "engine"; inherit extraPostFetch; }; @@ -262,23 +267,23 @@ in { }; ss = buildOpenRAMod rec { - version = "72"; + version = "77.git.23e1f3e"; title = "Sole Survivor"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/MustaphaTR/sole-survivor; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "sole-survivor"; - rev = "fad65579c8b487cef9a8145e872390ed77c16c69"; - sha256 = "0h7is7x2qyvq7vqp0jgw5zrdkw8g7ndd82d843ldhnb0a3vyrk34"; + rev = "23e1f3e5d8b98c936797b6680d95d56a69a9e2ab"; + sha256 = "104clmxphchs7r8y7hpmw103bychayz80bqj98bp89i64nv9d89x"; }; - engine = let commit = "becfc154c5cd3891d695339ff86883db8b5790a5"; in { - version = abbrevCommit commit; + engine = { + version = "6de92de"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = commit; - sha256 = "0id8vf3cjr7h5pz4sw8pdaz3sc45lxr21k1fk4309kixsrpa7i0y"; + rev = "6de92de8d982094a766eab97a92225c240d85493"; + sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; name = "engine"; inherit extraPostFetch; }; @@ -286,7 +291,7 @@ in { }; ura = buildOpenRAMod { - version = "431"; + version = "431.git.128dc53"; title = "Red Alert Unplugged"; description = "Re-imagination of the original Command & Conquer: Red Alert game"; homepage = http://redalertunplugged.com/; @@ -310,22 +315,22 @@ in { }; yr = unsafeBuildOpenRAMod rec { - version = "117"; + version = "118.git.c26bf14"; homepage = https://github.com/cookgreen/yr; title = "Yuri's Revenge"; description = "Re-imagination of the original Command & Conquer: ${title} game"; src = fetchFromGitHub { owner = "cookgreen"; repo = "yr"; - rev = "1d4beeb0687fe4b39b01ec31f3702cfb90a7f4f7"; - sha256 = "1rd962ja1x72rz68kbmp19yiip3iif50hzlj3v8k1f5l94r2x2pn"; + rev = "c26bf14155d040edf33c6c5eb3677517d07b39f8"; + sha256 = "15k6gv4rx3490n0cs9q7ah7q31z89v0pddsw6nqv0fhcahhvq1bc"; }; engine = rec { - version = "20180923"; + version = "release-20180923"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; + rev = version; sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; name = "engine"; inherit extraPostFetch; From e4d2bc657e48f32af1f2dbd0866751bf98a3c953 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 22:59:23 +0100 Subject: [PATCH 066/467] maintainers: added eyJhb to the maintainers list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cf02bc641518..6670b44f6409 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1495,6 +1495,11 @@ github = "expipiplus1"; name = "Joe Hermaszewski"; }; + eyjhb = { + email = "eyjhbb@gmail.com"; + github = "eyJhb"; + name = "eyJhb"; + }; f--t = { email = "git@f-t.me"; github = "f--t"; From 648c983db6509061f5a4e725f421241dc706097c Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 23:19:15 +0100 Subject: [PATCH 067/467] maintainers: added eyJhb to maintainers list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cf02bc641518..6670b44f6409 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1495,6 +1495,11 @@ github = "expipiplus1"; name = "Joe Hermaszewski"; }; + eyjhb = { + email = "eyjhbb@gmail.com"; + github = "eyJhb"; + name = "eyJhb"; + }; f--t = { email = "git@f-t.me"; github = "f--t"; From 31c3d157aeb52814bcf4d6daf0d23978f9693dae Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 23:19:37 +0100 Subject: [PATCH 068/467] arduino-mk: init at 1.6.0 --- .../arduino/arduino-mk/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/arduino/arduino-mk/default.nix diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix new file mode 100644 index 000000000000..9cefd1dfe54f --- /dev/null +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.6.0"; + name = "arduino-mk-${version}"; + + src = fetchFromGitHub { + owner = "sudar"; + repo = "Arduino-Makefile"; + rev = "${version}"; + sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; + }; + + phases = ["installPhase"]; + installPhase = "ln -s $src $out"; + + meta = { + description = "Makefile for Arduino sketches"; + homepage = https://github.com/sudar/Arduino-Makefile; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.eyjhb ]; + platforms = stdenv.lib.platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0de7bc686c32..07e3d1b2241b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -507,6 +507,8 @@ in withGui = false; }; + arduino-mk = callPackage ../development/arduino/arduino-mk {}; + apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; arguments = callPackage ../development/libraries/arguments { }; From 66601282cca987bb23a8eac95aac0c1e4d3c9e2f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 30 Jan 2019 23:50:48 +0100 Subject: [PATCH 069/467] qt59.qtvirtualkeyboard: fix CVE-2018-19865 CVE-2018-19865 tracks the issue of qtvirtualkeyboard where it logs all user input. With this commit we are applying the recommended patches form the upstream project. More details can be obtained from the Qt annoucement [1]. [1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/ --- .../libraries/qt-5/5.9/default.nix | 21 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 4acc6a6393f1..68c6745bcb52 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, makeSetupHook, + stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, cf-private, @@ -44,6 +44,25 @@ let qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; qtwebkit = [ ./qtwebkit.patch ]; + qtvirtualkeyboard = [ + (fetchpatch { + name = "CVE-2018-19865-A.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=61780a113f02b3c62fb14516fe8ea47d91f9ed9a"; + sha256 = "0jd4nzaz9ndm9ryvrkav7kjs437l661288diklhbmgh249f8gki0"; + }) + (fetchpatch { + name = "CVE-2018-19865-B.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c0ac7a4c684e2fed60a72ceee53da89eea3f95a7"; + sha256 = "0yvxrx5vx6845vgnq8ml3q93y61py5j0bvhqj7nqvpbmyj1wy1p3"; + + }) + (fetchpatch { + name = "CVE-2018-19865-C.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=a2e7b8412f56841e12ed20a39f4a38e32d3c1e30"; + sha256 = "1yijysa9gy5xbxndx5ri0dkfrjqja0d1bsx52qz4mhzi4pkbib02"; + }) + ]; + }; mkDerivation = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8970828f43cd..ec95c8b20a47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12080,7 +12080,7 @@ in qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl makeSetupHook; + inherit stdenv fetchurl fetchpatch makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; From 295a210a23b23e165dc2a6f1f845f550ce3a2c74 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Jan 2019 00:21:51 +0100 Subject: [PATCH 070/467] qt56.qtvirtualkeyboard: init at 5.6.3 This adds the "missing" qtvirtualkeyboard module of qt56. I just add this so I can apply (& test) the patches for a CVE in the next commit. This might seem strange but in case anyone decided to add / use this in the future we are on the safe(r) side. --- pkgs/development/libraries/qt-5/5.6/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 9391999f1e90..846ec941b798 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -110,6 +110,7 @@ let /* qtwinextras = not packaged */ qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" [ From 066be85d9da2e3c99b0a03882f5c128302df6c4a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Jan 2019 00:26:03 +0100 Subject: [PATCH 071/467] qt56: fix CVE-2018-{15518,19873,19870,19871,19865,19869} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference More details can be obtained from the Qt annoucement [1]. [1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/ --- .../libraries/qt-5/5.6/default.nix | 53 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 846ec941b798..bf0ae42ea1f2 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { newScope, - stdenv, fetchurl, makeSetupHook, + stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, @@ -46,13 +46,62 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ]; + qtbase = [ + ./qtbase.patch + ./qtbase-fixguicmake.patch + (fetchpatch { + name = "CVE-2018-15518.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=28a6e642af2ccb454dd019f551c2908753f76f08"; + sha256 = "0nyssg7d0br7qgzp481f1w8b4p1bj2ggv9iyfrm1mng5v9fypdd7"; + }) + (fetchpatch { + name = "CVE-2018-19873.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c9b9f663d7243988bcb5fee9180ea9cb3a321a86"; + sha256 = "1q01cafy92c1j8cgrv4sk133mi3d48x8kbg3glbnnbijpc4k6di5"; + }) + (fetchpatch { + name = "CVE-2018-19870.patch"; + url = "http://code.qt.io/cgit/qt/qtbase.git/patch/?id=ac0a910756f91726e03c0e6a89d213bdb4f48fec"; + sha256 = "00qb9yqwvwnp202am3lqirkjxln1cj8v4wvmlyqya6hna176lj2l"; + }) + ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; qtwebengine = [ ./qtwebengine-seccomp.patch ]; qtwebkit = [ ./qtwebkit.patch ]; + qtvirtualkeyboard = [ + (fetchpatch { + name = "CVE-2018-19865-A.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c02115db1de1f3aba81e109043766d600f886522"; + sha256 = "0ncnyl8f3ypi1kcb9z2i8j33snix111h28njrx8rb49ny01ap8x2"; + }) + (fetchpatch { + name = "CVE-2018-19865-B.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=01fc537adc74d5e102c8cc93384cdf5cb08b4442"; + sha256 = "19z8kxqf2lpjqr8189ingrpadch4niviw3p5v93zgx24v7950q27"; + }) + (fetchpatch { + name = "CVE-2018-19865-C.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=993a21ba03534b172d5354405cc9d50a2a822e24"; + sha256 = "1bipqxr9bvy8z402pv9kj2w1yzcsj1v03l09pg5jyg1xh6jbgiky"; + }) + ]; + qtimageformats = [ + (fetchpatch { + name = "CVE-2018-19871.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtimageformats.git;a=patch;h=9299ab07df61c56b70e047f1fe5f06b6ff541aa3"; + sha256 = "0fd3mxdlc0s405j02bc0g72fvdfvpi31a837xfwf40m5j4jbyndr"; + }) + ]; + qtsvg = [ + (fetchpatch { + name = "CVE-2018-19869.patch"; + url = "http://code.qt.io/cgit/qt/qtsvg.git/patch/?id=c5f1dd14098d1cc2cb52448fb44f53966d331443"; + sha256 = "1kgyfsxw2f0qv5fx9y7wysjsvqikam0qc7wzhklf0406zz6rhxbl"; + }) + ]; }; mkDerivation = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec95c8b20a47..9184e41f439e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12066,7 +12066,7 @@ in qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl makeSetupHook; + inherit stdenv fetchurl fetchpatch makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; From 1a6f3bb19d7503fae771dc558e3367b56514d25e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 30 Jan 2019 18:27:24 -0600 Subject: [PATCH 072/467] sudo-font: init at 0.37 --- pkgs/data/fonts/sudo/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/sudo/default.nix diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix new file mode 100644 index 000000000000..7652f593db49 --- /dev/null +++ b/pkgs/data/fonts/sudo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchzip }: + +let + version = "0.37"; +in fetchzip rec { + name = "sudo-font-${version}"; + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099"; + + postFetch = '' + mkdir -p $out/share/fonts/truetype/ + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + ''; + meta = with stdenv.lib; { + description = "Font for programmers and command line users"; + homepage = https://www.kutilek.de/sudo-font/; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1885595c952..86535bc0ad0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15851,6 +15851,8 @@ in source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; + sudo-font = callPackage ../data/fonts/sudo { }; + inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { From 2981a7b0e339615d070a68d1a5ff5acf6e436f5d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Jan 2019 18:43:24 -0500 Subject: [PATCH 073/467] pg_topn: 2.2.0 -> 2.2.2 --- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index dae30aadabd0..8ec2d6719a4e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchFromGitHub, postgresql, protobufc }: +{ stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { name = "pg_topn-${version}"; - version = "2.2.0"; + version = "2.2.2"; - nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "1i5fn517mdvzfhlcj7fh4z0iniynanshcn7kzhsq19sgci0g31fr"; + sha256 = "1bh28nrxj06vc2cvlsxlwrwad5ff3lfj3kr5cnnggwjk2dhwbbjm"; }; installPhase = '' @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Efficient querying of 'top values' for PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = https://github.com/citusdata/postgresql-topn; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; license = licenses.agpl3; From 16a360099da91b3330ec52738254eaa81c2bb36f Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 23:00:12 +0100 Subject: [PATCH 074/467] betterlockscreen: init at 3.0.1 --- .../screensavers/betterlockscreen/default.nix | 39 +++++++++++++++++++ .../betterlockscreen/replace-i3lock.patch | 12 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/misc/screensavers/betterlockscreen/default.nix create mode 100644 pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix new file mode 100644 index 000000000000..26143a5ef442 --- /dev/null +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -0,0 +1,39 @@ +{ + stdenv, makeWrapper, fetchFromGitHub, substituteAll, + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh +}: + +stdenv.mkDerivation rec { + name = "betterlockscreen-${version}"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "pavanjadhaw"; + repo = "betterlockscreen"; + rev = version; + sha256 = "0jc8ifb69shmd0avx6vny4m1w5dfxkkf5vnm7qcrmc8yflb0s3z6"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./replace-i3lock.patch ]; + + installPhase = + let + PATH = + stdenv.lib.makeBinPath + [imagemagick i3lock-color xdpyinfo xrandr bc feh]; + in '' + mkdir -p $out/bin + cp betterlockscreen $out/bin/betterlockscreen + wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" + ''; + + meta = with stdenv.lib; { + description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + homepage = https://github.com/pavanjadhaw/betterlockscreen; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch new file mode 100644 index 000000000000..3bbbfcfd613d --- /dev/null +++ b/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch @@ -0,0 +1,12 @@ +--- a/betterlockscreen ++++ b/betterlockscreen +@@ -76,7 +76,7 @@ prelock() { + lock() { + #$1 image path + +- i3lock \ ++ i3lock-color \ + -t -i "$1" \ + --timepos='x+110:h-70' \ + --datepos='x+43:h-45' \ + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0de7bc686c32..0044ca212be3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17624,6 +17624,8 @@ in i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; + betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; From 2f5d37b77bf39ee22658e65cb748c786a1b6ee2b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Jan 2019 11:00:27 +0100 Subject: [PATCH 075/467] qt511: 5.11.1 -> 5.11.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference More details can be obtained from the Qt annoucement [1]. [1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/ --- pkgs/development/libraries/qt-5/5.11/fetch.sh | 2 +- .../libraries/qt-5/5.11/qtbase.patch | 404 +++++++++--------- pkgs/development/libraries/qt-5/5.11/srcs.nix | 320 +++++++------- 3 files changed, 352 insertions(+), 374 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh index ce82e243af77..dc1088fc371c 100644 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch index fa0b2c51c46e..7d8407f6daf8 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 5208379f9a..92fe29a0ac 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf 2019-01-31 00:42:55.843577249 +0100 +@@ -23,7 +23,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf 2019-01-31 00:42:55.843577249 +0100 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -316,7 +291,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 27f4c277d6..18b4813e25 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-01-31 00:42:55.843577249 +0100 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 27f4c277d6..18b4813e25 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 27f4c277d6..18b4813e25 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 27f4c277d6..18b4813e25 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -269,25 +225,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -269,25 +225,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 27f4c277d6..18b4813e25 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -306,25 +250,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -306,25 +250,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 27f4c277d6..18b4813e25 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -343,11 +275,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -343,11 +275,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,11 +256,10 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 21d487f1f9..a0e5c68b7e 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -24,196 +24,3 @@ qt { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf 2019-01-31 00:45:14.585621324 +0100 +@@ -62,199 +62,3 @@ } } } @@ -458,12 +454,15 @@ index 21d487f1f9..a0e5c68b7e 100644 -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX -isEmpty(xcode_product_bundle_identifier_setting.value): \ - xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-xcode_product_bundle_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +Only in qtbase-everywhere-src-5.11.3/mkspecs/features/mac: default_post.prf.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf 2019-01-31 00:42:55.843577249 +0100 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -525,10 +524,9 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf 2019-01-31 00:42:55.843577249 +0100 @@ -1,58 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ @@ -588,11 +586,10 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 4db0040dc5..65d6da1f4d 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf 2019-01-31 00:42:55.843577249 +0100 +@@ -23,13 +23,8 @@ load(qt_build_paths) @@ -608,11 +605,10 @@ index 4db0040dc5..65d6da1f4d 100644 !qml1_target:static: CONFIG += builtin_resources -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index d49f4c49c1..097dcd7d39 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -48,13 +48,8 @@ load(qt_build_paths) @@ -628,11 +624,10 @@ index d49f4c49c1..097dcd7d39 100644 target.path = $$instbase/$$TARGETPATH INSTALLS += target -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 883f8ca215..81db8eb2d4 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -33,7 +33,7 @@ host_build:force_bootstrap { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -33,7 +33,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -641,11 +636,10 @@ index 883f8ca215..81db8eb2d4 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 1848f00e90..2af93675c5 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -654,11 +648,11 @@ index 1848f00e90..2af93675c5 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 415044bb64..7163ef56cd 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { +Only in qtbase-everywhere-src-5.11.3/mkspecs/features: qt_build_paths.prf.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -32,8 +32,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -669,11 +663,10 @@ index 415044bb64..7163ef56cd 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -682,7 +675,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -693,7 +686,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -708,11 +701,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -721,11 +713,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -734,10 +725,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf 2019-01-31 00:42:55.844577264 +0100 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -797,11 +787,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index bf90adcf1e..b3de698ff7 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -88,7 +88,7 @@ } } @@ -810,84 +799,10 @@ index bf90adcf1e..b3de698ff7 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 4e32f90964..503aeffd0c 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2613,6 +2613,15 @@ QStringList QCoreApplication::libraryPaths() +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -2612,6 +2612,15 @@ QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -903,11 +818,81 @@ index 4e32f90964..503aeffd0c 100644 const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 6a5df6272a..a6136ca4cd 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; +Only in qtbase-everywhere-src-5.11.3/src/corelib/kernel: qcoreapplication.cpp.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -3,7 +3,7 @@ + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -116,7 +116,7 @@ + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -130,7 +130,7 @@ + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -920,7 +905,7 @@ index 6a5df6272a..a6136ca4cd 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -942,10 +927,9 @@ index 6a5df6272a..a6136ca4cd 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -959,7 +943,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -972,10 +956,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -985,7 +968,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -1001,11 +984,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1019,11 +1001,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index cc982b3379..0c5005d3d7 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -648,9 +648,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -650,9 +650,14 @@ #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); @@ -1040,11 +1021,11 @@ index cc982b3379..0c5005d3d7 100644 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); #endif } -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index b401100dd4..b45a290065 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +Only in qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx: qglxintegration.cpp.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-01-31 00:42:55.846577295 +0100 +@@ -316,10 +316,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1057,10 +1038,9 @@ index b401100dd4..b45a290065 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp 2019-01-31 00:42:55.846577295 +0100 @@ -39,6 +39,7 @@ #include @@ -1069,7 +1049,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1093,10 +1073,9 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -ur qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h 2019-01-31 00:42:55.846577295 +0100 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1113,11 +1092,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-01-31 00:42:55.846577295 +0100 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix index b6668a91606c..cff49b180337 100644 --- a/pkgs/development/libraries/qt-5/5.11/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.11/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "03fkbrghj40rp8pf5r5979pcvq7qjsj7db446r6fl6slwphmk1nb"; - name = "qt3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "1awyv40jgbb30yp5zxf6j9wq96nmk8zyhbh4fpn9gn35ychmr984"; + name = "qt3d-everywhere-src-5.11.3.tar.xz"; }; }; qtactiveqt = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtactiveqt-everywhere-src-5.11.1.tar.xz"; - sha256 = "1f9w3dc2wvhz7pqhrsb2p908kc2c6xrqsp82ny8akil4xx6nrvn6"; - name = "qtactiveqt-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtactiveqt-everywhere-src-5.11.3.tar.xz"; + sha256 = "0g35yhp01c34m91fp5vzzq0d2kzz0yswpjjk5cg36j0ddnfcsh4d"; + name = "qtactiveqt-everywhere-src-5.11.3.tar.xz"; }; }; qtandroidextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtandroidextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "1qiggrz2hdb7vrkvsh71hqdipj3klak0jpn2nq8qpilqxgb9dx76"; - name = "qtandroidextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtandroidextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "0clqz10ry70f0v8hbw37fhlwrsr5jddg99yjsk9db250dwbqzq27"; + name = "qtandroidextras-everywhere-src-5.11.3.tar.xz"; }; }; qtbase = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz"; - sha256 = "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"; - name = "qtbase-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz"; + sha256 = "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6"; + name = "qtbase-everywhere-src-5.11.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcanvas3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g"; - name = "qtcanvas3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m"; + name = "qtcanvas3d-everywhere-src-5.11.3.tar.xz"; }; }; qtcharts = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz"; - sha256 = "0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2"; - name = "qtcharts-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz"; + sha256 = "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627"; + name = "qtcharts-everywhere-src-5.11.3.tar.xz"; }; }; qtconnectivity = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz"; - sha256 = "0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk"; - name = "qtconnectivity-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz"; + sha256 = "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l"; + name = "qtconnectivity-everywhere-src-5.11.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdatavis3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w"; - name = "qtdatavis3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3"; + name = "qtdatavis3d-everywhere-src-5.11.3.tar.xz"; }; }; qtdeclarative = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz"; - sha256 = "0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy"; - name = "qtdeclarative-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz"; + sha256 = "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf"; + name = "qtdeclarative-everywhere-src-5.11.3.tar.xz"; }; }; qtdoc = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdoc-everywhere-src-5.11.1.tar.xz"; - sha256 = "1z0sqmn0pw5g4ycdi8igsi89151cw6p3kv9g97pxl2qx3my1ppmc"; - name = "qtdoc-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdoc-everywhere-src-5.11.3.tar.xz"; + sha256 = "06nl8lzrilj8yify5qy4fm9la6dh71aamg19jhvvi657cshiclsq"; + name = "qtdoc-everywhere-src-5.11.3.tar.xz"; }; }; qtgamepad = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgamepad-everywhere-src-5.11.1.tar.xz"; - sha256 = "1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma"; - name = "qtgamepad-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgamepad-everywhere-src-5.11.3.tar.xz"; + sha256 = "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9"; + name = "qtgamepad-everywhere-src-5.11.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; - sha256 = "1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr"; - name = "qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; + sha256 = "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l"; + name = "qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; }; }; qtimageformats = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz"; - sha256 = "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"; - name = "qtimageformats-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz"; + sha256 = "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4"; + name = "qtimageformats-everywhere-src-5.11.3.tar.xz"; }; }; qtlocation = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz"; - sha256 = "03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p"; - name = "qtlocation-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz"; + sha256 = "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q"; + name = "qtlocation-everywhere-src-5.11.3.tar.xz"; }; }; qtmacextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmacextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "1wf3n5n4gg8gmjnjq88lmymkssg8q5s3qkrpsxd1hb6pd3n32gpn"; - name = "qtmacextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmacextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "1j9sqmcwswr8v9z8mcbm10bj7nz8nv9mir0xsc5123ik1gw2c3lk"; + name = "qtmacextras-everywhere-src-5.11.3.tar.xz"; }; }; qtmultimedia = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz"; - sha256 = "0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj"; - name = "qtmultimedia-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz"; + sha256 = "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j"; + name = "qtmultimedia-everywhere-src-5.11.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtnetworkauth-everywhere-src-5.11.1.tar.xz"; - sha256 = "05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02"; - name = "qtnetworkauth-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz"; + sha256 = "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50"; + name = "qtnetworkauth-everywhere-src-5.11.3.tar.xz"; }; }; qtpurchasing = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtpurchasing-everywhere-src-5.11.1.tar.xz"; - sha256 = "0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc"; - name = "qtpurchasing-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtpurchasing-everywhere-src-5.11.3.tar.xz"; + sha256 = "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n"; + name = "qtpurchasing-everywhere-src-5.11.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz"; - sha256 = "0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms"; - name = "qtquickcontrols-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz"; + sha256 = "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf"; + name = "qtquickcontrols-everywhere-src-5.11.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; - sha256 = "0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x"; - name = "qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; + sha256 = "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl"; + name = "qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtremoteobjects-everywhere-src-5.11.1.tar.xz"; - sha256 = "1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb"; - name = "qtremoteobjects-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtremoteobjects-everywhere-src-5.11.3.tar.xz"; + sha256 = "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp"; + name = "qtremoteobjects-everywhere-src-5.11.3.tar.xz"; }; }; qtscript = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz"; - sha256 = "0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw"; - name = "qtscript-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz"; + sha256 = "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v"; + name = "qtscript-everywhere-src-5.11.3.tar.xz"; }; }; qtscxml = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz"; - sha256 = "0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph"; - name = "qtscxml-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz"; + sha256 = "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk"; + name = "qtscxml-everywhere-src-5.11.3.tar.xz"; }; }; qtsensors = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz"; - sha256 = "1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb"; - name = "qtsensors-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz"; + sha256 = "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7"; + name = "qtsensors-everywhere-src-5.11.3.tar.xz"; }; }; qtserialbus = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz"; - sha256 = "0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk"; - name = "qtserialbus-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz"; + sha256 = "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n"; + name = "qtserialbus-everywhere-src-5.11.3.tar.xz"; }; }; qtserialport = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz"; - sha256 = "18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn"; - name = "qtserialport-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz"; + sha256 = "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n"; + name = "qtserialport-everywhere-src-5.11.3.tar.xz"; }; }; qtspeech = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz"; - sha256 = "1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw"; - name = "qtspeech-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz"; + sha256 = "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr"; + name = "qtspeech-everywhere-src-5.11.3.tar.xz"; }; }; qtsvg = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz"; - sha256 = "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"; - name = "qtsvg-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz"; + sha256 = "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1"; + name = "qtsvg-everywhere-src-5.11.3.tar.xz"; }; }; qttools = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz"; - sha256 = "1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp"; - name = "qttools-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz"; + sha256 = "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2"; + name = "qttools-everywhere-src-5.11.3.tar.xz"; }; }; qttranslations = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz"; - sha256 = "01kid5dc20jnzjmd4ycjmacrsmrw4hsh2s4y5k9y9p34z8m9pn0j"; - name = "qttranslations-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz"; + sha256 = "0j8i2kabz22vqb0qj41pkjv848zblqxs71sydc3xcd5av22b517s"; + name = "qttranslations-everywhere-src-5.11.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; - sha256 = "16xzpdqn07z8j6f8iywy3967djap5bbi2myqp37s4xh9fz60scsv"; - name = "qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; + sha256 = "17jb7cbfy5c19fr9frql6q22in3ra3a4fbff0kjykllxb8j40p4c"; + name = "qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; }; }; qtwayland = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz"; - sha256 = "1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0"; - name = "qtwayland-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz"; + sha256 = "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2"; + name = "qtwayland-everywhere-src-5.11.3.tar.xz"; }; }; qtwebchannel = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz"; - sha256 = "11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r"; - name = "qtwebchannel-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz"; + sha256 = "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w"; + name = "qtwebchannel-everywhere-src-5.11.3.tar.xz"; }; }; qtwebengine = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz"; - sha256 = "136lc2kw4af4bilgn7vn9hdckpk62xvyjb4kr0gc2firr919z79q"; - name = "qtwebengine-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz"; + sha256 = "1zmqsdais85cdfh2jh8h4a5jcamp1mzdk3vgqm6xnldqf6nrxd2v"; + name = "qtwebengine-everywhere-src-5.11.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebglplugin-everywhere-src-5.11.1.tar.xz"; - sha256 = "108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x"; - name = "qtwebglplugin-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebglplugin-everywhere-src-5.11.3.tar.xz"; + sha256 = "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9"; + name = "qtwebglplugin-everywhere-src-5.11.3.tar.xz"; }; }; qtwebsockets = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz"; - sha256 = "1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks"; - name = "qtwebsockets-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz"; + sha256 = "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402"; + name = "qtwebsockets-everywhere-src-5.11.3.tar.xz"; }; }; qtwebview = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebview-everywhere-src-5.11.1.tar.xz"; - sha256 = "18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp"; - name = "qtwebview-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz"; + sha256 = "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh"; + name = "qtwebview-everywhere-src-5.11.3.tar.xz"; }; }; qtwinextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwinextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "0qxwfhg962a456lb9b6y7xhi6fvvvb42z0li6v7695vfbckifbzz"; - name = "qtwinextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwinextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "1xf9gc0wqk9jz2ayx29vx0vmm72x9h4qxp2fvgpclns621wyhw72"; + name = "qtwinextras-everywhere-src-5.11.3.tar.xz"; }; }; qtx11extras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz"; - sha256 = "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"; - name = "qtx11extras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz"; + sha256 = "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr"; + name = "qtx11extras-everywhere-src-5.11.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; - sha256 = "0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1"; - name = "qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; + sha256 = "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b"; + name = "qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; }; }; } From 73eb54db188eb90eed3a6556f9bc4447950b89bd Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 31 Jan 2019 13:00:27 +0100 Subject: [PATCH 076/467] taffybar: Remove strictDeps and restore overrideAttrs --- pkgs/development/haskell-modules/configuration-nix.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6fdb2fd54949..058fb314b086 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -153,9 +153,6 @@ self: super: builtins.intersectAttrs super { gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; 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; })); - # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; From 451c11f89fe69b5b92bf11b81fc14eca7e9be506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 31 Jan 2019 19:00:50 +0100 Subject: [PATCH 077/467] python.pkgs.isbnlib: init at 3.9.4 --- .../python-modules/isbnlib/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/isbnlib/default.nix diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix new file mode 100644 index 000000000000..1d16265242a9 --- /dev/null +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "isbnlib"; + version = "3.9.4"; + + # PyPI tarball is missing LICENSE file + # See https://github.com/xlcnd/isbnlib/pull/53 + src = fetchFromGitHub { + owner = "xlcnd"; + repo = "isbnlib"; + rev = "v${version}"; + sha256 = "0gc0k5khf34b4zz56a9zc3rscdhj3bx849lbzgmzpji30sbyy1fh"; + }; + + checkInputs = [ + nose + coverage + ]; + + # requires network connection + doCheck = false; + + meta = with lib; { + description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; + homepage = https://github.com/xlcnd/isbnlib; + license = licenses.lgpl3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94253962ba15..6d672834dd3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1879,6 +1879,8 @@ in { ipfsapi = callPackage ../development/python-modules/ipfsapi { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; iniparse = callPackage ../development/python-modules/iniparse { }; From 3613654a1fe8b49704f34c40047e6e1392164ead Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 31 Jan 2019 10:36:36 -0500 Subject: [PATCH 078/467] pyre: 0.0.18 -> 0.0.20 --- pkgs/development/tools/pyre/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index a93dedded291..7ae95679482f 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -3,12 +3,12 @@ let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - pyre-version = "0.0.18"; # also change typeshed revision below with $pyre-src/.typeshed-version + pyre-version = "0.0.20"; # also change typeshed revision below with $pyre-src/.typeshed-version pyre-src = fetchFromGitHub { owner = "facebook"; repo = "pyre-check"; rev = "v${pyre-version}"; - sha256 = "1sy1lk9j3hq20dabfkr9s4r7prrcndrs345a5iqz6yzvakr4r74d"; + sha256 = "1alkhdhvmigdhxvvarh0lr5s3b1s6q4arykip2dqb62vs8064s17"; }; versionFile = writeScript "version.ml" '' cat > "./version.ml" < Date: Fri, 1 Feb 2019 09:55:09 +0100 Subject: [PATCH 079/467] calibre: 3.38.1 -> 3.39.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index cd3ee82acebf..9cafda8eed37 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.38.1"; + version = "3.39.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "07fvpnabk17sfg81xn0bsnw36k45hawwz0fcz5cmp5qydm85ncv0"; + sha256 = "01mlv204qjr7w1lkc6kd75d62lbf5mwbkqzs14mhls84k7sgyv5w"; }; patches = [ From 5666ad28851956205868ffb75ef11783900c0875 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 1 Feb 2019 11:13:52 +0100 Subject: [PATCH 080/467] urlwatch: 2.15 -> 2.16 --- pkgs/tools/networking/urlwatch/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index c9de3f8ea574..fc77846efc39 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,17 +2,18 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.15"; + version = "2.16"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg"; + sha256 = "1bkwr151bnv72aka2r9jwaq8lkz1p6031wr5pss4sij978qn5xld"; }; propagatedBuildInputs = with python3Packages; [ appdirs + cssselect keyring lxml minidb From 17f0e6a9d4996bc7f1c362a0a61bda262bd1b50b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 1 Feb 2019 11:19:09 +0100 Subject: [PATCH 081/467] maintainers.tv: update email address --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cf02bc641518..6232cd314516 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4677,7 +4677,7 @@ name = "Thomas Tuegel"; }; tv = { - email = "tv@shackspace.de"; + email = "tv@krebsco.de"; github = "4z3"; name = "Tomislav Viljetić"; }; From a90062d46f648f53cce5f0caf0e3686f40a99f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 1 Feb 2019 11:28:09 +0100 Subject: [PATCH 082/467] moreutils: unbreak 'ts -r' Fix this: $ ts -r Can't locate Date/Parse.pm in @INC [...] --- pkgs/tools/misc/moreutils/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index a7cfed568b16..00cbc8b46295 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { buildFlags = "CC=cc"; installFlags = "PREFIX=$(out)"; - postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; + postInstall = '' + wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/ts --prefix PERL5LIB : $PERL5LIB + ''; meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; From 631b106ee698b69862fa3238d684607ec183eff4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Feb 2019 11:38:51 +0100 Subject: [PATCH 083/467] androidStudioPackages.beta: 3.4.0.11 -> 3.4.0.12 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4b53774662f9..34816b7beceb 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw"; }; betaVersion = { - version = "3.4.0.11"; # "Android Studio 3.4 Beta 2" - build = "183.5240537"; - sha256Hash = "0mv7ayqjkw97jzdifw1cdvjhnzygzkd2a9rc0h99fclhf2nii5yr"; + version = "3.4.0.12"; # "Android Studio 3.4 Beta 3" + build = "183.5256591"; + sha256Hash = "1yab2sgabgk3wa3wrzv9z1dc2k7x0079v0mlwrp32jwx8r9byvcw"; }; latestVersion = { # canary & dev version = "3.5.0.1"; # "Android Studio 3.5 Canary 2" From 17e32da1f211790864e9fac14996eaa2e11b74ad Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Feb 2019 11:41:27 +0100 Subject: [PATCH 084/467] androidStudioPackages.{dev,canary}: 3.5.0.1 -> 3.5.0.2 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 34816b7beceb..1090bb7d8947 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "1yab2sgabgk3wa3wrzv9z1dc2k7x0079v0mlwrp32jwx8r9byvcw"; }; latestVersion = { # canary & dev - version = "3.5.0.1"; # "Android Studio 3.5 Canary 2" - build = "183.5240547"; - sha256Hash = "0z52ig9v2w9i6bqiqpdvgcr6g6sgl8p5317jamg72d5csm9hgfx3"; + version = "3.5.0.2"; # "Android Studio 3.5 Canary 3" + build = "183.5256920"; + sha256Hash = "09bd80ld21hq743xjacsq0nkxwl5xzr253p86n71n580yn4rgmlb"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): From c7e3fda020c304aa5a43de3bb7f89f5726253f64 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 1 Feb 2019 11:53:09 +0100 Subject: [PATCH 085/467] kube-router: 0.2.3 -> 0.2.5 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 8caa3cd75245..2a43c23e73aa 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kube-router-${version}"; - version = "0.2.3"; + version = "0.2.5"; rev = "v${version}"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "cloudnativelabs"; repo = "kube-router"; - sha256 = "1dsr76dq6sycwgh75glrcb4scv52lrrd0aivskhc7mwq30plafcj"; + sha256 = "1j6q6kg4qj75v2mdy9ivvwq8mx9fpdf0w08959l8imrp5byd56wv"; }; buildFlagsArray = '' From 95a18ab60b736e758c490194b80e0d1d2fa8f4ea Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Feb 2019 11:55:04 +0100 Subject: [PATCH 086/467] tdesktop: 1.5.8 -> 1.5.9 tdesktopPackages.preview: 1.5.8 -> 1.5.9 --- .../instant-messengers/telegram/tdesktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 809c13d0757a..8b8cca60fcad 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.5.8"; - sha256Hash = "0sl4p4a7fyh68g01rddiy719lyr321cjar78b3c732zxfj8lxvkb"; + version = "1.5.9"; + sha256Hash = "1mq0fj29fbn8lk7jhj8gzjvqg2q1hi0hvfwfk1a5qiib0x31gfic"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "415526"; - archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; + archPatchesRevision = "428981"; + archPatchesHash = "1r58yjqdv3wgyhb391dblvij67girdwf4ggcw1lsq587sykx51yk"; }; in { stable = mkTelegram stableVersion; From 0c4786cf764907d3faa914204bbd9c637667735e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Feb 2019 12:36:05 +0100 Subject: [PATCH 087/467] gns3Packages.{server,gui}Preview: 2.1.12 -> 2.2.0a1 --- pkgs/applications/networking/gns3/default.nix | 7 +++---- pkgs/applications/networking/gns3/gui.nix | 2 +- pkgs/applications/networking/gns3/server.nix | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 368b3cd2ee68..fcaa1b2c1e87 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,8 +2,7 @@ let stableVersion = "2.1.12"; - # Currently there is no preview version. - previewVersion = stableVersion; + previewVersion = "2.2.0a1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -19,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = guiSrcHash; + sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w"; }; serverStable = mkServer { @@ -28,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = serverSrcHash; + sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni"; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index df3093504044..de624d7f6b29 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -20,7 +20,7 @@ in pythonPackages.buildPythonPackage rec { raven psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) - ]; + ] ++ stdenv.lib.optional (!stable) pythonPackages.distro; doCheck = false; # Failing diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 4d3a8ca87e56..8daa5d166c52 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,7 +3,7 @@ { stdenv, python36, fetchFromGitHub }: let - python = python36.override { + python = if stable then python36.override { packageOverrides = self: super: { async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { version = "2.0.1"; @@ -31,7 +31,7 @@ let ++ stdenv.lib.optional (pythonOlder "3.5") typing; }); }; - }; + } else python36; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -48,7 +48,7 @@ in python.pkgs.buildPythonPackage { aiohttp-cors yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema typing (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) - ]; + ] ++ stdenv.lib.optional (!stable) python.pkgs.distro; # Requires network access doCheck = false; From 902809eac682daf687d11f630d92b46b30d8612c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 31 Jan 2019 19:10:45 +0100 Subject: [PATCH 088/467] python.pkgs.filetype: init at 1.0.2 --- .../python-modules/filetype/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/filetype/default.nix diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix new file mode 100644 index 000000000000..e47c007b9678 --- /dev/null +++ b/pkgs/development/python-modules/filetype/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "filetype"; + version = "1.0.2"; + + # No tests in PyPI tarball + # See https://github.com/h2non/filetype.py/pull/33 + src = fetchFromGitHub { + owner = "h2non"; + repo = "filetype.py"; + rev = "v${version}"; + sha256 = "000gl3q2cadfnmqnbxg31ppc3ak8blzb4nfn75faxbp7b6r5qgr2"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Infer file type and MIME type of any file/buffer"; + homepage = https://github.com/h2non/filetype.py; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d672834dd3b..7f29e7eace3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1745,6 +1745,8 @@ in { fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + filetype = callPackage ../development/python-modules/filetype { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flit = callPackage ../development/python-modules/flit { }; From 5447f7028b3e3e3bd594da7906c47d9388b58aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 31 Jan 2019 19:38:32 +0100 Subject: [PATCH 089/467] papis: 0.6 -> 0.7.5 fixes https://github.com/NixOS/nixpkgs/issues/54821 --- pkgs/tools/misc/papis/default.nix | 66 +++++++++++++++---------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 52e704eb52e1..282d64befb7f 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,52 +1,52 @@ -{ lib, fetchFromGitHub, bashInteractive -, python3, vim +{ lib, fetchFromGitHub, fetchpatch +, python3, xdg_utils }: -let - python = python3; - -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "papis"; - version = "0.6"; + version = "0.7.5"; # Missing tests on Pypi src = fetchFromGitHub { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "0zy8q154zhpqb75c775nwq3mdl1szhzhkfi0nvyjmzfgsv2g1wa2"; + sha256 = "1b481sj92z9nw7gwbrpkgd4nlmqc1n73qilkc51k2r56cy1kjvss"; }; - postPatch = '' - sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py - patchShebangs tests - ''; + # Update click version to 7.0.0 + patches = fetchpatch { + url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch; + sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1"; + }; - propagatedBuildInputs = with python.pkgs; [ - argcomplete arxiv2bib beautifulsoup4 bibtexparser - configparser dmenu-python habanero papis-python-rofi - pylibgen prompt_toolkit pyparser python_magic pyyaml - requests unidecode urwid vobject tkinter whoosh - vim + propagatedBuildInputs = with python3.pkgs; [ + click requests filetype pyparsing configparser + arxiv2bib pyyaml chardet beautifulsoup4 prompt_toolkit + bibtexparser python-slugify pyparser pylibgen + habanero isbnlib + # optional dependencies + dmenu-python whoosh ]; - checkInputs = with python.pkgs; [ pytest ]; - - # Papis tries to create the config folder under $HOME during the tests - checkPhase = '' - mkdir -p check-phase - export PATH=$out/bin:$PATH - # Still don't know why this fails - sed -i 's/--set dir=hello //' tests/bash/test_default.sh - - # This test has been disabled since it requires a network connaction - sed -i 's/test_downloader_getter(self):/disabled_test_downloader_getter(self):/' papis/downloaders/tests/test_main.py - - export HOME=$(pwd)/check-phase - make test - SH=${bashInteractive}/bin/bash make test-non-pythonic + postInstall = '' + install -Dt "$out/etc/bash_completion.d" scripts/shell_completion/build/bash/papis ''; + checkInputs = (with python3.pkgs; [ + pytest + ]) ++ [ + xdg_utils + ]; + + # most of the downloader tests require a network connection + checkPhase = '' + HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders + ''; + + # FIXME: find out why 39 tests fail + doCheck = false; + meta = { description = "Powerful command-line document and bibliography manager"; homepage = http://papis.readthedocs.io/en/latest/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7d0a7bb454e..5f30be5c5e4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15734,7 +15734,7 @@ in papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; - papis = python3Packages.callPackage ../tools/misc/papis { }; + papis = callPackage ../tools/misc/papis { }; pecita = callPackage ../data/fonts/pecita {}; From 07664bcbe49b84c67cdaec079fe70ab41d3d8829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 31 Jan 2019 19:40:49 +0100 Subject: [PATCH 090/467] papis: use python36 dateparser tests fail on python37: https://github.com/NixOS/nixpkgs/issues/52766 --- pkgs/tools/misc/papis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 282d64befb7f..8bccfccfeabf 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, fetchpatch -, python3, xdg_utils +, python36, xdg_utils }: -python3.pkgs.buildPythonApplication rec { +python36.pkgs.buildPythonApplication rec { pname = "papis"; version = "0.7.5"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python36.pkgs; [ click requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 prompt_toolkit bibtexparser python-slugify pyparser pylibgen @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { install -Dt "$out/etc/bash_completion.d" scripts/shell_completion/build/bash/papis ''; - checkInputs = (with python3.pkgs; [ + checkInputs = (with python36.pkgs; [ pytest ]) ++ [ xdg_utils From c8e56ddb27b36c302edbd5a8d162e124a33be0bd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 06:44:52 -0600 Subject: [PATCH 091/467] zoom-us: 2.6.149990.1216 -> 2.7.162522.0121 (#54969) zoom-us: 2.6.149990.1216 -> 2.7.162522.0121 zoom-us: don't look for ZXMPPROOT.cer, no longer exists. --- .../networking/instant-messengers/zoom-us/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f402e075e067..3ba772eb0bfa 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.6.149990.1216"; + version = "2.7.162522.0121"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0bs5kx2601lwwr9lgdd3hlbrrwsf0dai766zrca907dl400pmzyd"; + sha256 = "01i4g4kmawk3mclifh4bwcqpdnbvrz0sz49b6l33n0k5ysky20r1"; }; }; @@ -49,7 +49,6 @@ in stdenv.mkDerivation { files = concatStringsSep " " [ "*.pcm" "*.png" - "ZXMPPROOT.cer" "ZoomLauncher" "config-dump.sh" "timezones" From 2436c97cbed621a848b87769e21749fdeefff3f7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 Feb 2019 13:55:07 +0100 Subject: [PATCH 092/467] neo4j: 3.4.10 -> 3.5.2 neo4j-shell is gone --- pkgs/servers/nosql/neo4j/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index dd84ae5732d0..0aa2101e951c 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,21 +4,22 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.10"; + version = "3.5.2"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0wxcwsnnwk08w3zaz67aa93ysrl61lsy41xynq1sy6z31a7gx9jr"; + sha256 = "0i36vgs6b24bdhckgkhw23g59x1f2zg6h07c73jv55sdmxmcdpn1"; }; buildInputs = [ makeWrapper jre8 which gawk ]; + installPhase = '' mkdir -p "$out/share/neo4j" cp -R * "$out/share/neo4j" mkdir -p "$out/bin" - for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import neo4j-shell cypher-shell + for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import cypher-shell do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ From 52bd7c5f2a4501c33c72aa89575626a1307f38ae Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 1 Feb 2019 09:17:05 -0500 Subject: [PATCH 093/467] nixos/redmine: add an extraEnv option (which could be used to turn on debug logging, etc...), enable automatic log rotation --- nixos/modules/services/misc/redmine.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3c322ba1c3e6..d7250c5f35af 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -30,6 +30,13 @@ let ${cfg.extraConfig} ''; + additionalEnvironment = pkgs.writeText "additional_environment.rb" '' + config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) + config.logger.level = Logger::INFO + + ${cfg.extraEnv} + ''; + unpackTheme = unpack "theme"; unpackPlugin = unpack "plugin"; unpack = id: (name: source: @@ -103,6 +110,19 @@ in ''; }; + extraEnv = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration in additional_environment.rb. + + See https://svn.redmine.org/redmine/trunk/config/additional_environment.rb.example + ''; + example = literalExample '' + config.logger.level = Logger::DEBUG + ''; + }; + themes = mkOption { type = types.attrsOf types.path; default = {}; @@ -249,6 +269,9 @@ in # link in the application configuration ln -fs ${configurationYml} "${cfg.stateDir}/config/configuration.yml" + # link in the additional environment configuration + ln -fs ${additionalEnvironment} "${cfg.stateDir}/config/additional_environment.rb" + # link in all user specified themes rm -rf "${cfg.stateDir}/public/themes/"* From 45c0f8956de132d9d5d7d03cb6d31ee3ef7d91cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Fri, 1 Feb 2019 00:23:22 +0800 Subject: [PATCH 094/467] racket: mark x86_64-darwin broken It does not build on this platform, and will not do so any time soon. Closes #53389 --- pkgs/development/interpreters/racket/default.nix | 1 + pkgs/development/interpreters/racket/minimal.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index efe14da5834f..feb57df2cb8a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -101,5 +101,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ kkallio henrytill vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 114023defcd4..4a743b51c818 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -15,5 +15,6 @@ racket.overrideAttrs (oldAttrs: rec { and the pkg library are still bundled. ''; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + broken = false; # Minimal build does not require working FFI }; }) From e84a23c5f75223ac217615735a826c8a71e84fa3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 Feb 2019 14:29:54 +0100 Subject: [PATCH 095/467] neo4j: add neo4j test --- nixos/tests/all-tests.nix | 1 + nixos/tests/neo4j.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 nixos/tests/neo4j.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a1cdcf839889..0c8284eb08d0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -142,6 +142,7 @@ in nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + neo4j = handleTest ./neo4j.nix {}; netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.scripted = handleTest ./networking.nix { networkd = false; }; diff --git a/nixos/tests/neo4j.nix b/nixos/tests/neo4j.nix new file mode 100644 index 000000000000..86ed8970517c --- /dev/null +++ b/nixos/tests/neo4j.nix @@ -0,0 +1,20 @@ +import ./make-test.nix { + name = "neo4j"; + + nodes = { + master = + { ... }: + + { + services.neo4j.enable = true; + }; + }; + + testScript = '' + startAll; + + $master->waitForUnit("neo4j"); + $master->sleep(20); # Hopefully this is long enough!! + $master->succeed("curl http://localhost:7474/"); + ''; +} From d1e7081596e267c7ce0f472f77726b446d531d3e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 Feb 2019 16:19:50 +0100 Subject: [PATCH 096/467] checkstyle: 8.16 -> 8.17 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 749d35474739..53f46e372ef6 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.16"; + version = "8.17"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1044imm1pmn4fb0bzg4k44qm1hwwsyf7l7lbnlrznbln7ymdy5ki"; + sha256 = "10i285kzbma9pny0vlm8wglxsbqliqrhig6n9rj2nv13x5i53ifj"; }; nativeBuildInputs = [ makeWrapper ]; From 0d17ecce2c2e7c595583c8c24f3e3e3f72b12fc7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Feb 2019 15:59:12 +0000 Subject: [PATCH 097/467] mkDerivation: cleaner handling of the `name` argument --- pkgs/stdenv/generic/make-derivation.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 9ba06995940c..8f0f12ea1a20 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,7 +12,7 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { name ? "" + { # These types of dependencies are all exhaustively documented in # the "Specifying Dependencies" section of the "Standard @@ -21,7 +21,7 @@ rec { # TODO(@Ericson2314): Stop using legacy dep attribute names # host offset -> target offset - , depsBuildBuild ? [] # -1 -> -1 + depsBuildBuild ? [] # -1 -> -1 , depsBuildBuildPropagated ? [] # -1 -> -1 , nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name , propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name @@ -177,14 +177,14 @@ rec { "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) - // (lib.optionalAttrs (name == "")) { + // (lib.optionalAttrs (!(attrs ? name))) { name = "${attrs.pname}-${attrs.version}"; } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) { # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the # hash can't be the same. See #32986. - name = "${if name != "" then name else "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}"; + name = "${attrs.name or "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}"; } // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; @@ -274,7 +274,7 @@ rec { meta = { # `name` above includes cross-compilation cruft (and is under assert), # lets have a clean always accessible version here. - name = if name != "" then name else "${attrs.pname}-${attrs.version}"; + name = attrs.name or "${attrs.pname}-${attrs.version}"; # If the packager hasn't specified `outputsToInstall`, choose a default, # which is the name of `p.bin or p.out or p`; From 59949aa55ce23ecdb8661b57df57b8fa2d84d0b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Feb 2019 15:59:45 +0000 Subject: [PATCH 098/467] Revert "coq-modules: add default to fix eval" This reverts commit e20b65156cee92d30b43f8e339bd686bd83538cb. --- pkgs/development/coq-modules/QuickChick/default.nix | 2 +- pkgs/development/coq-modules/Velisarios/default.nix | 2 +- pkgs/development/coq-modules/category-theory/default.nix | 2 +- pkgs/development/coq-modules/coq-haskell/default.nix | 2 +- pkgs/development/coq-modules/coqprime/default.nix | 2 +- pkgs/development/coq-modules/dpdgraph/default.nix | 2 +- pkgs/development/coq-modules/equations/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 34daebcdf528..96954eb43ace 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -28,7 +28,7 @@ let params = propagatedBuildInputs = [ coq-ext-lib simple-io ]; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index aa5ebb32b3ce..cd7ddfefb84a 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -20,7 +20,7 @@ let params = sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index a8fd91d9d348..59f2295e2153 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -18,7 +18,7 @@ let "8.7" = v20180709; "8.8" = v20181016; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 784e360a0dab..57f31e1847c1 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -26,7 +26,7 @@ let params = sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 265b97deca2c..191812b3f2eb 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -14,7 +14,7 @@ let params = "8.8" = v_8_8; "8.9" = v_8_8; }; - param = params."${coq.coq-version}" or params."8.9" + param = params."${coq.coq-version}" ; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 6a06c1b19875..e403f7d4fb5c 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; -param = params."${coq.coq-version}" or params."8.8"; +param = params."${coq.coq-version}"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 1bc66fcf272a..86e5687321b4 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -26,7 +26,7 @@ let sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { From 9f6b441aecfc9a359244c7bb594017712a1e0532 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 Feb 2019 17:07:52 +0100 Subject: [PATCH 099/467] pfstools: port to qt5 (#33248) Since release 2.1.0 pfsview supports qt5. --- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 4c1ff5024331..77edcd345780 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig , openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt4 +, fftw, gsl, libexif, perl, opencv, qt5 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick libGLU_combined freeglut fftwFloat - fftw gsl libexif perl opencv qt4 + fftw gsl libexif perl opencv qt5.qtbase ]; patches = [ ./threads.patch ./pfstools.patch ]; From 03c66e01dab44be31bacf5ce1570f70458f9bd72 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 1 Feb 2019 19:26:07 +0300 Subject: [PATCH 100/467] parity-beta: 2.3.0 -> 2.3.1 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index f49d1902edc5..591f6ffa86cb 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.3.0"; - sha256 = "0v79nz19riaga6iwj6m59fq8adm5llrkq61xizriz30rw8rkk04z"; - cargoSha256 = "01vdrfqh2nlghbgnbb7qmrazsjmynrb9542qrgchxq589wasb4j2"; + version = "2.3.1"; + sha256 = "13y3gczqb0rb6v17j63j1zp11cnykbv9c674hrk1i6jb3y4am4lv"; + cargoSha256 = "1pj5hzy7k1l9bbw1qpz80vvk89qz4qz4rnnkcvn2rkbmq382gxwy"; in import ./parity.nix { inherit version sha256 cargoSha256; } From d14ce9f90f717b891b7c6a34a9b6bccde7bc4a01 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 1 Feb 2019 19:26:20 +0300 Subject: [PATCH 101/467] parity: 2.2.7 -> 2.2.8 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index de43450a41ce..f62e3d5cfdd0 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.2.7"; - sha256 = "0bxq4z84vsb8hmbscr41xiw11m9xg6if231v76c2dmkbyqgpqy8p"; - cargoSha256 = "1izwqg87qxhmmkd49m0k09i7r05sfcb18m5jbpvggjzp57ips09r"; + version = "2.2.8"; + sha256 = "1l2bxra4fkbh8gnph9wnc24ddmzfdclsgcjbx8q6fflhcg6r9hf1"; + cargoSha256 = "10lg0vzikzlj927hpn59x1dz9dvhcaqsl8nz14vj2iz42vfkcm7p"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 895bc4cefea3a1f18ad8a4abdc52ca29521519ba Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 Feb 2019 16:28:34 +0100 Subject: [PATCH 102/467] gtk-doc: 1.28 -> 1.29 --- .../tools/documentation/gtk-doc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 0213eca30d22..c55b2510e650 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool , withDblatex ? false, dblatex }: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.28"; + version = "1.29"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"; + sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql"; }; patches = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = - [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl gnome-doc-utils gettext which itstool ] ++ stdenv.lib.optional withDblatex dblatex; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # Make six available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. postInstall = '' - ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/ + ln -s ${python3.pkgs.six}/${python3.sitePackages}/* $out/share/gtk-doc/python/ ''; doCheck = false; # requires a lot of stuff From 2a92edfbc4fe5a21c3a9fa33686b1b0a6fbf6401 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 23:54:25 +0100 Subject: [PATCH 103/467] =?UTF-8?q?ostree:=202018.9=20=E2=86=92=202019.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/ostree/default.nix | 47 +++++++----------------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index fc3d016757b5..0054e38ed2da 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,34 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3 +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3 , glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3 }: -let - version = "2018.9"; - - libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd"; - sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15"; - }; - - bsdiff-src = fetchFromGitHub { - owner = "mendsley"; - repo = "bsdiff"; - rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; - sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; - }; -in stdenv.mkDerivation { - name = "ostree-${version}"; +stdenv.mkDerivation rec { + pname = "ostree"; + version = "2019.1"; outputs = [ "out" "dev" "man" "installedTests" ]; - src = fetchFromGitHub { - rev = "v${version}"; - owner = "ostreedev"; - repo = "ostree"; - sha256 = "0a8gr4qqxcvz3fqv9w4dxy6iq0rq4kdzf08rzv8xg4gic3ldgyvj"; + src = fetchurl { + url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; + sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm"; }; patches = [ @@ -57,13 +40,6 @@ in stdenv.mkDerivation { (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests ]; - prePatch = '' - rmdir libglnx bsdiff - cp --no-preserve=mode -r ${libglnx-src} libglnx - cp --no-preserve=mode -r ${bsdiff-src} bsdiff - ''; - - preConfigure = '' env NOCONFIGURE=1 ./autogen.sh ''; @@ -71,17 +47,16 @@ in stdenv.mkDerivation { enableParallelBuilding = true; configureFlags = [ - "--with-systemdsystemunitdir=$(out)/lib/systemd/system" - "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators" "--enable-installed-tests" ]; makeFlags = [ - "installed_testdir=$(installedTests)/libexec/installed-tests/libostree" - "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" ]; - meta = with stdenv.lib; { description = "Git for operating system binaries"; homepage = https://ostree.readthedocs.io/en/latest/; From c0ffbe8f37df21fff6dc712d3de89ea24008d3f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Nov 2018 15:06:22 +0100 Subject: [PATCH 104/467] =?UTF-8?q?rpm-ostree:=202018.5=20=E2=86=92=202019?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/rpm-ostree/default.nix | 61 ++++++------------- .../rpm-ostree/fix-introspection-build.patch | 11 ++++ 2 files changed, 28 insertions(+), 44 deletions(-) create mode 100644 pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index feb8fa4fbc1d..6127473343c1 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,39 +1,28 @@ -{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake, +{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, + gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake, libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, bubblewrap, pcre, check, python }: -let - libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97"; - sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs"; +stdenv.mkDerivation rec { + pname = "rpm-ostree"; + version = "2019.1"; + + src = fetchurl { + url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "14qk8mq5yc67j3wl3fa9xnhh8ii8x5qdiavf7ybw7mp4ma4lwa8k"; }; - libdnf-src = fetchFromGitHub { - owner = "rpm-software-management"; - repo = "libdnf"; - rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49"; - sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci"; - }; - - version = "2018.5"; -in stdenv.mkDerivation { - name = "rpm-ostree-${version}"; + patches = [ + # gobject-introspection requires curl in cflags + # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169 + # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080 + ./fix-introspection-build.patch + ]; outputs = [ "out" "dev" "man" "devdoc" ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "projectatomic"; - repo = "rpm-ostree"; - sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx"; - }; - nativeBuildInputs = [ - pkgconfig which autoconf automake libtool cmake gperf - gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + pkgconfig which autoconf automake libtool cmake gperf cargo rustc + gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_43 ]; buildInputs = [ libcap ostree rpm glib systemd polkit bubblewrap @@ -41,14 +30,6 @@ in stdenv.mkDerivation { pcre check python ]; - patches = [ - # Use gdbus-codegen from PATH - (fetchpatch { - url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch; - sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp"; - }) - ]; - configureFlags = [ "--enable-gtk-doc" "--with-bubblewrap=${bubblewrap}/bin/bwrap" @@ -57,16 +38,9 @@ in stdenv.mkDerivation { dontUseCmakeConfigure = true; prePatch = '' - rmdir libglnx libdnf - cp --no-preserve=mode -r ${libglnx-src} libglnx - cp --no-preserve=mode -r ${libdnf-src} libdnf - # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ - # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey - substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \' - # Let's not hardcode the rpm-gpg path... substituteInPlace libdnf/libdnf/dnf-keyring.cpp \ --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' @@ -84,4 +58,3 @@ in stdenv.mkDerivation { platforms = platforms.linux; }; } - diff --git a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch b/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch new file mode 100644 index 000000000000..b82ad5b24b5c --- /dev/null +++ b/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -103,7 +103,7 @@ + ostree-1 >= 2018.9 + libsystemd + polkit-gobject-1 +- rpm librepo libsolv ++ rpm librepo libsolv libcurl + libarchive]) + + dnl -ldl: https://github.com/ostreedev/ostree/commit/1f832597fc83fda6cb8daf48c4495a9e1590774c From 212e78f7f19f710072afba1b4dc06908e991db62 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Feb 2019 18:29:15 +0100 Subject: [PATCH 105/467] python37Packages.keyutils: 0.5 -> 0.6 This also fixes the build for Python 3.7. --- pkgs/development/python-modules/keyutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 907af4d250b3..a109659ebdde 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "keyutils"; - version = "0.5"; + version = "0.6"; # github version comes bundled with tests src = fetchFromGitHub { owner = "sassoftware"; repo = "python-keyutils"; - rev = "v${version}"; - sha256 = "1gga60w8sb3r5bxa0bfp7d7wzg6s3db5y7aizr14p2pvp92d8bdi"; + rev = version; + sha256 = "0pfqfr5xqgsqkxzrmj8xl2glyl4nbq0irs0k6ik7iy3gd3mxf5g1"; }; buildInputs = [ keyutils ]; From 7d5cbcc79cc1fca4bce2eef526f1c7b0965b1323 Mon Sep 17 00:00:00 2001 From: Abhinav Sharma Date: Fri, 1 Feb 2019 16:00:24 +0530 Subject: [PATCH 106/467] Added myself as a maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6232cd314516..669baf681f77 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -68,6 +68,11 @@ github = "abbradar"; name = "Nikolay Amiantov"; }; + abhi18av = { + email = "abhi18av@gmail.com"; + github = "abhi18av"; + name = "Abhinav Sharma"; + }; abigailbuccaneer = { email = "abigailbuccaneer@gmail.com"; github = "abigailbuccaneer"; From 8e3c37baddd680cd562a33e2063f5f1a4a3fec21 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 Feb 2019 21:13:37 +0100 Subject: [PATCH 107/467] calibre: 3.39.0 -> 3.39.1 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 9cafda8eed37..b52156beac6d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.39.0"; + version = "3.39.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "01mlv204qjr7w1lkc6kd75d62lbf5mwbkqzs14mhls84k7sgyv5w"; + sha256 = "08c1wsdn0giv9zfb6bis9bbrw687rci8fs26qsal8ijmjk55dfsh"; }; patches = [ From 453baaeabd695034a02654b101000dfc2a5fec8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= Date: Fri, 1 Feb 2019 14:44:12 -0200 Subject: [PATCH 108/467] coursier: 1.0.1 -> 1.1.0-M10 --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 7e660f3fcd90..4aa28be1326d 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.1"; + version = "1.1.0-M10"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "1rn1vb33zfl9iy80fhqvi9ykdjxz029nah5yfr5xixcx9al0bai3"; + sha256 = "14iq0717vdm0mj0196idc724vmxp1y0f3gfn41sbqahfhvcx05y8"; }; nativeBuildInputs = [ makeWrapper ]; From e253fd1a95a41898f8f112be9d46f6e3af233cae Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 1 Feb 2019 14:16:52 -0500 Subject: [PATCH 109/467] ftgl: fix on darwin --- pkgs/development/libraries/ftgl/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 8808af49f9e4..289a57399854 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freetype, libGLU_combined}: +{ stdenv, fetchurl, freetype, libGLU_combined, OpenGL }: let name = "ftgl-2.1.3-rc5"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; }; - buildInputs = [ freetype libGLU_combined ]; + buildInputs = [ freetype ] + ++ (if stdenv.isDarwin then + [ OpenGL ] + else + [ libGLU_combined ]) + ; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c476c9c7fd4b..ac3f6b64712e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2728,7 +2728,9 @@ in frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - ftgl = callPackage ../development/libraries/ftgl { }; + ftgl = callPackage ../development/libraries/ftgl { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; ftop = callPackage ../os-specific/linux/ftop { }; From f4770dbbc8caeff5ff2a9967c4214fee3cceb9e8 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 23 Jan 2019 13:18:27 +0100 Subject: [PATCH 110/467] solc: 0.5.2 -> 0.5.3 --- pkgs/development/compilers/solc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 48279fd71087..b7a2f602cc63 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.5.2"; - rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d"; - sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0"; + version = "0.5.3"; + rev = "10d17f245839f208ec5085309022a32cd2502f55"; + sha256 = "1jq41pd3nj534cricy1nq6wgk4wlwg239387n785aswpwd705jbb"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; From d788874bdb3d087a70e8140db77ec1b9a1f28599 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 1 Feb 2019 14:03:21 +0100 Subject: [PATCH 111/467] NixOS/auto-upgrade: add git to service path Resolves https://github.com/NixOS/nixpkgs/issues/54946 where nixos-rebuild can not find git, when executed from inside the systemd service --- nixos/modules/tasks/auto-upgrade.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index 7b756b70e2fc..d225778a3878 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -78,7 +78,7 @@ let cfg = config.system.autoUpgrade; in HOME = "/root"; } // config.networking.proxy.envVars; - path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ]; + path = [ pkgs.gnutar pkgs.xz.bin pkgs.gitMinimal config.nix.package.out ]; script = '' ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags} From 6195a47d2594913baab5322c2a54ea606d2fc864 Mon Sep 17 00:00:00 2001 From: pmahoney Date: Fri, 1 Feb 2019 16:39:15 -0600 Subject: [PATCH 112/467] freeswitch: expose compilation option to enable postgres support (#54593) --- pkgs/servers/sip/freeswitch/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index ab4147230a92..33097888ff38 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,7 +1,10 @@ -{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline +{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre , ldns, libedit, yasm, which, lua, libopus, libsndfile +, postgresql +, enablePostgres ? true + , SystemConfiguration }: @@ -23,12 +26,16 @@ stdenv.mkDerivation rec { openssl ncurses curl gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which lua libopus libsndfile - ] ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ] + ++ lib.optionals enablePostgres [ postgresql ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; NIX_CFLAGS_COMPILE = "-Wno-error"; hardeningDisable = [ "format" ]; + configureFlags = lib.optionals enablePostgres [ "--enable-core-pgsql-support" ]; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = https://freeswitch.org/; From 3ec0eb4bbd783e6f07175c9703ec5a2a70491da9 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 2 Feb 2019 01:27:25 +0200 Subject: [PATCH 113/467] all-packages.nix: remove `res.` (next stage super) A bit more consistent version of https://github.com/NixOS/nixpkgs/pull/51527 --- pkgs/top-level/all-packages.nix | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..d81e26abe1de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,7 +3510,7 @@ in jid = callPackage ../development/tools/jid { }; - jing = res.jing-trang; + jing = jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -4805,23 +4805,23 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = res.pinentry.override { + pinentry_ncurses = pinentry.override { gtk2 = null; }; - pinentry_emacs = res.pinentry.override { + pinentry_emacs = pinentry.override { enableEmacs = true; }; - pinentry_gnome = res.pinentry.override { + pinentry_gnome = pinentry.override { inherit gcr; }; - pinentry_qt4 = res.pinentry.override { + pinentry_qt4 = pinentry.override { qt = qt4; }; - pinentry_qt5 = res.pinentry.override { + pinentry_qt5 = pinentry.override { qt = qt5.qtbase; }; @@ -8691,11 +8691,11 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = res.gradleGen.gradle_latest; - gradle_2_14 = res.gradleGen.gradle_2_14; - gradle_2_5 = res.gradleGen.gradle_2_5; - gradle_3_5 = res.gradleGen.gradle_3_5; - gradle_4_10 = res.gradleGen.gradle_4_10; + gradle = gradleGen.gradle_latest; + gradle_2_14 = gradleGen.gradle_2_14; + gradle_2_5 = gradleGen.gradle_2_5; + gradle_3_5 = gradleGen.gradle_3_5; + gradle_4_10 = gradleGen.gradle_4_10; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9179,7 +9179,7 @@ in valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; }; - valgrind-light = res.valgrind.override { gdb = null; }; + valgrind-light = valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -9753,7 +9753,7 @@ in inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; - fltk = res.fltk13; + fltk = fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9766,7 +9766,7 @@ in freetts = callPackage ../development/libraries/freetts { }; - frog = res.languageMachines.frog; + frog = languageMachines.frog; fstrcmp = callPackage ../development/libraries/fstrcmp { }; @@ -9840,11 +9840,11 @@ in }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = res.gtk2; + gtk = gtk2; }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = res.gtk2; + gtk = gtk2; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10252,7 +10252,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = res.gnome3; + gnome = gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11492,7 +11492,7 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky - name = "libxml2+py-${res.libxml2.version}"; + name = "libxml2+py-${libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv @@ -11937,9 +11937,9 @@ in }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = res.pcre.override { variant = "pcre16"; }; + pcre16 = pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = res.pcre.override { variant = "cpp"; }; + pcre-cpp = pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -15865,7 +15865,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = res.gtk2; + gtk = gtk2; }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -16110,18 +16110,18 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; + go-ethereum = altcoins.go-ethereum; + ethabi = altcoins.ethabi; - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; + parity = altcoins.parity; + parity-beta = altcoins.parity-beta; + parity-ui = altcoins.parity-ui; - polkadot = res.altcoins.polkadot; + polkadot = altcoins.polkadot; - stellar-core = res.altcoins.stellar-core; + stellar-core = altcoins.stellar-core; - particl-core = res.altcoins.particl-core; + particl-core = altcoins.particl-core; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -16907,7 +16907,7 @@ in espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = res.espeak-ng; + espeak = espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -17206,7 +17206,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; name = "firefox-beta-bin-" + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; @@ -17221,7 +17221,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; name = "firefox-devedition-bin-" + @@ -21117,7 +21117,7 @@ in ut2004Packages = callPackage ../games/ut2004 { }; - ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; + ut2004demo = ut2004Packages.ut2004 [ ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -21254,8 +21254,8 @@ in # Included for backwards compatibility libsoup libwnck gtk-doc gnome-doc-utils; - gtk = res.gtk2; - gtkmm = res.gtkmm2; + gtk = gtk2; + gtkmm = gtkmm2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -22309,7 +22309,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = res.faust2; + faust = faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -22809,7 +22809,7 @@ in samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; From 03f58a2a9da42f6c02d110bddc02ca11c45857ca Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 14:29:40 -0600 Subject: [PATCH 114/467] notmuch: 0.28 -> 0.28.1 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 69de3ef5d51c..106be4fddc4c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28"; + version = "0.28.1"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc"; + sha256 = "0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi"; }; nativeBuildInputs = [ pkgconfig ]; From 61552cf5991b6f0706990c3e5c5b57ce86e9c562 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 19:06:04 -0600 Subject: [PATCH 115/467] libva{,-utils}: 2.3.0 -> 2.4.0 --- pkgs/development/libraries/libva-utils/default.nix | 2 +- pkgs/development/libraries/libva/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index a31968a5373c..e7216e2e4274 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "01org"; repo = "libva-utils"; rev = version; - sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98"; + sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 435b7e3c915d..7f17b9af08b3 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.3.0"; + version = "2.4.0"; # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "01org"; repo = "libva"; rev = version; - sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z"; + sha256 = "1b58n6rjfsfjfw1s5kdfa0jpfiqs83g2w14s7sfp1qkckkz3988l"; }; outputs = [ "dev" "out" ]; From 63d2dbfe892ac3e8c5b986e84c5bacb180ee8802 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 14:50:21 -0600 Subject: [PATCH 116/467] libva-utils: meson, add x11 and wayland deps --- pkgs/development/libraries/libva-utils/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index e7216e2e4274..e41ca206c510 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, libdrm, libva +{ stdenv, fetchFromGitHub, pkgconfig +, libdrm, libva, libX11, libXext, libXfixes, wayland, meson, ninja }: stdenv.mkDerivation rec { @@ -13,9 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libdrm libva ]; + buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; + + mesonFlags = [ + "-Ddrm=true" + "-Dx11=true" + "-Dwayland=true" + ]; enableParallelBuilding = true; From ebf4f63ff04d2fc8b709830c138c50da468a63bf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 19:00:21 -0600 Subject: [PATCH 117/467] intel-media-driver: 18.3.0 -> 18.4.0 --- .../libraries/intel-media-driver/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 45a90ff520f9..c15a42e3f404 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,20 +5,19 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "18.3.0"; + version = "18.4.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "15kcyg9ss2v1bbw6yvxqb833h1vs0h659n8ix0x5x03cfm1wsi57"; + sha256 = "0mvb1dq2014gc60lz22dag230flqw859dcqi08hdmmci30qgw88x"; }; - cmakeFlags = [ "-DINSTALL_DRIVER_SYSCONF=OFF" ]; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DLIBVA_DRIVERS_PATH=$out/lib/dri" - ''; + cmakeFlags = [ + "-DINSTALL_DRIVER_SYSCONF=OFF" + "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" + ]; nativeBuildInputs = [ cmake pkgconfig ]; From ece22b62bb563a618386a771bb35e20d6eedb553 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Sat, 2 Feb 2019 01:16:32 +0100 Subject: [PATCH 118/467] pythonPackages.grammalecte: 0.6.1 -> 0.6.5 (#55056) --- pkgs/development/python-modules/grammalecte/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index 67f2e0bb1852..01c052bfdce8 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -7,25 +7,22 @@ buildPythonPackage rec { pname = "grammalecte"; - version = "0.6.1"; + version = "0.6.5"; src = fetchurl { url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip"; - sha256 = "0y2ck6pkd2p3cbjlxxvz3x5rnbg3ghfx97n13302rnab66cy4zkh"; + sha256 = "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0"; }; propagatedBuildInputs = [ bottle ]; preBuild = "cd .."; - postInstall = '' - rm $out/bin/bottle.py - ''; disabled = !isPy3k; meta = { description = "Grammalecte is an open source grammar checker for the French language"; - homepage = https://dicollecte.org/grammalecte/; + homepage = https://grammalecte.net; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ apeyroux ]; }; From 3f6e49097e1d366960590ef1dbca74ef8d106dbd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 29 Jan 2019 14:09:28 -0600 Subject: [PATCH 119/467] qownnotes: 19.1.8 -> 19.1.11 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7f65c4cc152a..1f5c002fff4c 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.1.8"; + version = "19.1.11"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "873ed9e3a711bc19744a13b98ac5cb3659bd97e753c7e089fbc49bd044cec4fb"; + sha256 = "fef90401c2de4cf4c69dae30d0799be13c047fa244d08de9c06b7b6cc74bd655"; }; nativeBuildInputs = [ qmake qttools ]; From f7cc6340c8591a7e66b5c342bf898ab7c01b3b89 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 13:54:05 -0600 Subject: [PATCH 120/467] qownnotes: 19.1.11 -> 19.2.0 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1f5c002fff4c..45cefbf06632 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.1.11"; + version = "19.2.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "fef90401c2de4cf4c69dae30d0799be13c047fa244d08de9c06b7b6cc74bd655"; + sha256 = "0n60cnzdfvwn126k8mh5m3wms9avjrnzfrpsvyfhg6l7vm6sbhdi"; }; nativeBuildInputs = [ qmake qttools ]; From ee124b77f3c111820d806b00a736d49e8bcd8258 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 20:27:43 -0600 Subject: [PATCH 121/467] trilium: 0.27.4 -> 0.28.3 * Fetch svg icon since no longer included. * Move to xz so don't need p7zip --- pkgs/applications/office/trilium/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 00d8bb0d275b..0fcf0c1652bd 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -10,18 +10,26 @@ let desktopName = "Trilium Notes"; categories = "Office"; }; + version = "0.28.3"; + + # Fetch from source repo, no longer included in release. + # (they did special-case icon.png but we want the scalable svg) + # Use the version here to ensure we get any changes. + trilium_svg = fetchurl { + url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; + sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + }; in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.27.4"; + inherit version; src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.7z"; - sha256 = "1qb11axaifw5xjycrc6qsyd8h36rgjd7rjql8895v8agckf3g2c1"; + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r"; }; nativeBuildInputs = [ - p7zip /* for unpacking */ autoPatchelfHook makeWrapper ]; @@ -36,7 +44,7 @@ in stdenv.mkDerivation rec { cp -r ./* $out/share/trilium ln -s $out/share/trilium/trilium $out/bin/trilium - ln -s $out/share/trilium/resources/app/src/public/images/trilium.svg $out/share/icons/hicolor/scalable/apps/trilium.svg + ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg cp ${desktopItem}/share/applications/* $out/share/applications ''; From bdc70034399d3863d7c4f0f4351efe3a8c606c50 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 1 Feb 2019 20:55:58 -0500 Subject: [PATCH 122/467] zeitgeist: 1.0.1 -> 1.0.2 --- pkgs/development/libraries/zeitgeist/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index b072fb1d4e93..c5dc775d0755 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -5,22 +5,22 @@ }: stdenv.mkDerivation rec { - version = "1.0.1"; - name = "zeitgeist-${version}"; + pname = "zeitgeist"; + version = "1.0.2"; outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "zeitgeist"; - repo = "zeitgeist"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44"; + sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv"; }; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; + configureFlags = [ "--with-session-bus-services-dir=${placeholder ''out''}/share/dbus-1/services" ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A service which logs the users's activities and events"; - homepage = http://zeitgeist.freedesktop.org/; - maintainers = with maintainers; [ lethalman ]; + homepage = https://zeitgeist.freedesktop.org/; + maintainers = with maintainers; [ lethalman worldofpeace ]; license = licenses.gpl2; platforms = platforms.linux; }; From 217c69dcd0e49ac9b356fd3be35476d1927b29d7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 22:25:32 -0600 Subject: [PATCH 123/467] trilium: move icon fetch attribute into derivation, un-hoist 'version' --- pkgs/applications/office/trilium/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0fcf0c1652bd..c09f78cf873b 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,8 +10,16 @@ let desktopName = "Trilium Notes"; categories = "Office"; }; + +in stdenv.mkDerivation rec { + name = "trilium-${version}"; version = "0.28.3"; + src = fetchurl { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r"; + }; + # Fetch from source repo, no longer included in release. # (they did special-case icon.png but we want the scalable svg) # Use the version here to ensure we get any changes. @@ -20,14 +28,6 @@ let sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; }; -in stdenv.mkDerivation rec { - name = "trilium-${version}"; - inherit version; - - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r"; - }; nativeBuildInputs = [ autoPatchelfHook From 2ebb4a358cd358e1cf2040279a46fbb8056930b4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 1 Feb 2019 23:31:50 -0500 Subject: [PATCH 124/467] lkl: install liblkl.so and liblkl-hijack.so --- pkgs/applications/virtualization/lkl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 1d22385a2732..d870e2466167 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { cp tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin ln -s cptofs $out/bin/cpfromfs cp -r tools/lkl/include $dev/ - cp tools/lkl/liblkl*.{a,so} $lib/lib + cp tools/lkl/liblkl.a \ + tools/lkl/lib/liblkl.so \ + tools/lkl/lib/hijack/liblkl-hijack.so $lib/lib ''; # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): From 1d19b5bd3173a9027d458b7fe4d72f1e1756d5df Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 2 Feb 2019 10:39:30 +0200 Subject: [PATCH 125/467] oxipng: 2.1.8 -> 2.2.0 --- pkgs/tools/graphics/oxipng/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 10b4dd4a0318..0fdabfe35888 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.1.8"; + version = "2.2.0"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "18ld65vm58s6x918g6bhfkrg7lw2lca8daidv88ff14wm5khjvik"; + sha256 = "00ys1dy8r1g84j04w50qcjas0qnfw4vphazvbfasd9q2b1p5z69l"; }; - cargoSha256 = "034i8hgi0zgv085bimlja1hl3nd096rqpi167pw6rda5aj18c625"; + cargoSha256 = "125r3jmgwcq8qddm8hjpyzaam96kkifaxixksyaw2iqk9xq0nrpm"; + + # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust + cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; @@ -19,8 +22,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - - # Needs newer/unstable rust: error[E0658]: macro is_arm_feature_detected! is unstable - broken = stdenv.isAarch64; }; } From f00335fea736f9157c690c5e13fc3ac10fe7c9f3 Mon Sep 17 00:00:00 2001 From: CrazedProgrammer Date: Sat, 2 Feb 2019 11:50:14 +0100 Subject: [PATCH 126/467] astah-community: remove Astah Community has been discontinued since september 26th, 2018. Source: http://astah.net/editions/community The downloads are not available anymore since recently, and as such, this derivation does not build. --- .../graphics/astah-community/default.nix | 63 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 65 deletions(-) delete mode 100644 pkgs/applications/graphics/astah-community/default.nix diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix deleted file mode 100644 index 72d367d8fea2..000000000000 --- a/pkgs/applications/graphics/astah-community/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }: - -let - - name = "astah-community"; - version = "7.2.0"; - postfix = "1ff236"; - desktopIcon = fetchurl { - name = "${name}.png"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; - sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm"; - }; - mimeXml = fetchurl { - name = "${name}.xml"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; - sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b"; - }; - desktopItem = makeDesktopItem { - name = name; - exec = "astah %U"; - icon = "${desktopIcon}"; - comment = "Lightweight, easy-to-use, and free UML2.x modeler"; - desktopName = "Astah* Community"; - genericName = "Astah* Community"; - mimeType = "application/x-astah"; - categories = "Application;Development;"; - extraEntries = "NoDisplay=false"; - }; - -in - -stdenv.mkDerivation { - name = "${name}-${version}"; - - src = fetchurl { - url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip"; - sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499"; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share} - cp -r . $out/share/astah - cp -r ${desktopItem}/share/applications $out/share/applications - - install -D ${desktopIcon} $out/share/pixmaps/${name}.png - install -D ${mimeXml} $out/share/mime/packages/${name}.xml - - makeWrapper ${jre}/bin/java $out/bin/astah \ - --add-flags "-jar $out/share/astah/astah-community.jar" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Lightweight, easy-to-use, and free UML2.x modeler"; - homepage = http://astah.net/editions/community; - license = licenses.unfree; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..a2a49c149986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16067,8 +16067,6 @@ in aseprite = callPackage ../applications/editors/aseprite { }; aseprite-unfree = aseprite.override { unfree = true; }; - astah-community = callPackage ../applications/graphics/astah-community { }; - astroid = callPackage ../applications/networking/mailreaders/astroid { }; audacious = callPackage ../applications/audio/audacious { }; From 6e77cef7b01e318406931df52d550326d4d51e6e Mon Sep 17 00:00:00 2001 From: CrazedProgrammer Date: Sat, 2 Feb 2019 12:25:12 +0100 Subject: [PATCH 127/467] nixos/release-notes: mention removal of astah-community --- nixos/doc/manual/release-notes/rl-1903.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7ccbf65dd46a..6c45301b91e1 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -430,6 +430,11 @@ of maintainers. + + + The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore. + + The httpd service now saves log files with a .log file extension by default for From 8ad32a7e9883b32dd34476abf9685afe6a214db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 2 Feb 2019 02:42:36 +0100 Subject: [PATCH 128/467] ifdtool: init at 4.9 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/ifdtool/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/ifdtool/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 669baf681f77..44f94b0e0791 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3485,6 +3485,11 @@ github = "pesterhazy"; name = "Paulus Esterhazy"; }; + petabyteboy = { + email = "me@pbb.lc"; + github = "petabyteboy"; + name = "Milan Pässler"; + }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix new file mode 100644 index 000000000000..7d15825c27e8 --- /dev/null +++ b/pkgs/tools/misc/ifdtool/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ifdtool-${version}"; + version = "4.9"; + + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; + }; + + buildPhase = '' + make -C util/ifdtool + ''; + + installPhase = '' + install -Dm755 util/ifdtool/ifdtool $out/bin/ifdtool + ''; + + meta = with stdenv.lib; { + description = "Extract and dump Intel Firmware Descriptor information"; + homepage = https://www.coreboot.org; + license = licenses.gpl2; + maintainers = [ maintainers.petabyteboy ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..baca1a918a6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13855,6 +13855,8 @@ in cbfstool = callPackage ../applications/virtualization/cbfstool { }; + ifdtool = callPackage ../tools/misc/ifdtool { }; + nvramtool = callPackage ../tools/misc/nvramtool { }; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; From f5d52c1949d5b209becb1a832453c73a84198f58 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 9 Jan 2019 13:15:43 +1100 Subject: [PATCH 129/467] haskellPackages.beam-*: GHC 8.6.x fixes, and relax version bounds --- .../haskell-modules/configuration-common.nix | 12 ++++ .../beam-core-fix-ghc-8.6.x-build.patch | 72 +++++++++++++++++++ .../beam-migrate-fix-ghc-8.6.x-build.patch | 29 ++++++++ .../beam-postgres-fix-ghc-8.6.x-build.patch | 45 ++++++++++++ .../beam-sqlite-fix-ghc-8.6.x-build.patch | 21 ++++++ 5 files changed, 179 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch create mode 100644 pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch create mode 100644 pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch create mode 100644 pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3ff96bf25449..174ab1a8a7ae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1178,4 +1178,16 @@ self: super: { hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); + # jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 + tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 + + # These patches contain fixes for 8.6 that should be safe for + # earlier versions, but we need the relaxed version bounds in GHC + # 8.4 builds. beam needs to release a round of updates that relax + # bounds and include the 8.6 fixes: + # https://github.com/tathougies/beam/issues/315 + beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch; + beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; + beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; + beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch new file mode 100644 index 000000000000..e5ad00ee009f --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch @@ -0,0 +1,72 @@ +diff --git a/beam-core/Database/Beam/Backend/SQL.hs b/beam-core/Database/Beam/Backend/SQL.hs +index e2cd37d0..6f9db126 100644 +--- a/Database/Beam/Backend/SQL.hs ++++ b/Database/Beam/Backend/SQL.hs +@@ -10,6 +10,7 @@ + import Database.Beam.Backend.Types + + import Control.Monad.IO.Class ++import Control.Monad.Fail (MonadFail) + + -- * MonadBeam class + +@@ -29,7 +30,7 @@ + -- strategies. More complicated strategies (for example, Postgres's @COPY@) + -- are supported in individual backends. See the documentation of those + -- backends for more details. +-class (BeamBackend be, Monad m, MonadIO m, Sql92SanityCheck syntax) => ++class (BeamBackend be, Monad m, MonadIO m, MonadFail m, Sql92SanityCheck syntax) => + MonadBeam syntax be handle m | m -> syntax be handle where + + {-# MINIMAL withDatabaseDebug, runReturningMany #-} +diff --git a/Database/Beam/Backend/SQL/Builder.hs b/Database/Beam/Backend/SQL/Builder.hs +index 9e734036..e9849912 100644 +--- a/Database/Beam/Backend/SQL/Builder.hs ++++ b/Database/Beam/Backend/SQL/Builder.hs +@@ -33,6 +33,7 @@ + import Data.Hashable + import Data.Int + import Data.String ++import qualified Control.Monad.Fail as Fail + #if !MIN_VERSION_base(4, 11, 0) + import Data.Semigroup + #endif +@@ -507,8 +508,10 @@ + type BackendFromField SqlSyntaxBackend = Trivial + + newtype SqlSyntaxM a = SqlSyntaxM (IO a) +- deriving (Applicative, Functor, Monad, MonadIO) ++ deriving (Applicative, Functor, Monad, MonadIO, Fail.MonadFail) + + instance MonadBeam SqlSyntaxBuilder SqlSyntaxBackend SqlSyntaxBackend SqlSyntaxM where +- withDatabaseDebug _ _ _ = fail "absurd" +- runReturningMany _ _ = fail "absurd" ++ withDatabaseDebug _ _ _ = Fail.fail "absurd" ++ runReturningMany _ _ = Fail.fail "absurd" ++ ++ +diff --git a/Database/Beam/Schema/Lenses.hs b/Database/Beam/Schema/Lenses.hs +index b21dddb6..5df0654c 100644 +--- a/Database/Beam/Schema/Lenses.hs ++++ b/Database/Beam/Schema/Lenses.hs +@@ -1,4 +1,5 @@ + {-# LANGUAGE PolyKinds #-} ++{-# LANGUAGE UndecidableInstances #-} + module Database.Beam.Schema.Lenses + ( tableLenses + , TableLens(..) +diff --git a/beam-core.cabal b/beam-core.cabal +index 4bf4ffd9..251d4d85 100644 +--- a/beam-core.cabal ++++ b/beam-core.cabal +@@ -64,8 +64,8 @@ + time >=1.6 && <1.10, + hashable >=1.1 && <1.3, + network-uri >=2.6 && <2.7, +- containers >=0.5 && <0.6, +- vector-sized >=0.5 && <1.1, ++ containers >=0.5 && <0.7, ++ vector-sized >=0.5 && <1.3, + tagged >=0.8 && <0.9 + Default-language: Haskell2010 + default-extensions: ScopedTypeVariables, OverloadedStrings, GADTs, RecursiveDo, FlexibleInstances, FlexibleContexts, TypeFamilies, diff --git a/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch new file mode 100644 index 000000000000..b715140be0a5 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch @@ -0,0 +1,29 @@ +diff --git a/Database/Beam/Migrate/Generics/Types.hs b/Database/Beam/Migrate/Generics/Types.hs +index 553e208b..0cf9b2c8 100644 +--- a/Database/Beam/Migrate/Generics/Types.hs ++++ b/Database/Beam/Migrate/Generics/Types.hs +@@ -1,3 +1,5 @@ ++{-# LANGUAGE UndecidableInstances #-} ++ + module Database.Beam.Migrate.Generics.Types where + + import Database.Beam.Migrate.Types +diff --git a/beam-migrate.cabal b/beam-migrate.cabal +index f53b280d..9cf3722c 100644 +--- a/beam-migrate.cabal ++++ b/beam-migrate.cabal +@@ -69,13 +69,12 @@ library + mtl >=2.2 && <2.3, + scientific >=0.3 && <0.4, + vector >=0.11 && <0.13, +- containers >=0.5 && <0.6, + unordered-containers >=0.2 && <0.3, + hashable >=1.2 && <1.3, + parallel >=3.2 && <3.3, + deepseq >=1.4 && <1.5, + ghc-prim >=0.5 && <0.6, +- containers >=0.5 && <0.6, ++ containers >=0.5 && <0.7, + haskell-src-exts >=1.18 && <1.21, + pretty >=1.1 && <1.2, + dependent-map >=0.2 && <0.3, diff --git a/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch new file mode 100644 index 000000000000..ede2bce12570 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch @@ -0,0 +1,45 @@ +diff --git a/Database/Beam/Postgres/Connection.hs b/Database/Beam/Postgres/Connection.hs +index 433f55b9..5836c53d 100644 +--- a/Database/Beam/Postgres/Connection.hs ++++ b/Database/Beam/Postgres/Connection.hs +@@ -52,6 +52,8 @@ import qualified Database.PostgreSQL.Simple.Types as Pg (Null(..), Query(..)) + + import Control.Monad.Reader + import Control.Monad.State ++import Control.Monad.Fail (MonadFail) ++import qualified Control.Monad.Fail as Fail + + import Data.ByteString (ByteString) + import Data.ByteString.Builder (toLazyByteString, byteString) +@@ -302,6 +304,9 @@ deriving instance Functor PgF + newtype Pg a = Pg { runPg :: F PgF a } + deriving (Monad, Applicative, Functor, MonadFree PgF) + ++instance MonadFail Pg where ++ fail e = fail $ "Internal Error with: " <> show e ++ + instance MonadIO Pg where + liftIO x = liftF (PgLiftIO x id) + +diff --git a/beam-postgres.cabal b/beam-postgres.cabal +index e14b84f5..d29a5b67 100644 +--- a/beam-postgres.cabal ++++ b/beam-postgres.cabal +@@ -31,7 +31,7 @@ library + beam-migrate >=0.3 && <0.4, + + postgresql-libpq >=0.8 && <0.10, +- postgresql-simple >=0.5 && <0.6, ++ postgresql-simple >=0.5 && <0.7, + + text >=1.0 && <1.3, + bytestring >=0.10 && <0.11, +@@ -38,7 +38,7 @@ library + + hashable >=1.1 && <1.3, + lifted-base >=0.2 && <0.3, +- free >=4.12 && <5.1, ++ free >=4.12 && <5.2, + time >=1.6 && <1.10, + monad-control >=1.0 && <1.1, + mtl >=2.1 && <2.3, diff --git a/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch new file mode 100644 index 000000000000..ebfca8a2f655 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch @@ -0,0 +1,21 @@ +diff --git a/Database/Beam/Sqlite/Connection.hs b/Database/Beam/Sqlite/Connection.hs +index f034b272..4e459ea3 100644 +--- a/Database/Beam/Sqlite/Connection.hs ++++ b/Database/Beam/Sqlite/Connection.hs +@@ -37,6 +37,7 @@ import Database.SQLite.Simple.Types (Null) + + import Control.Exception (bracket_, onException, mask) + import Control.Monad (forM_, replicateM_) ++import Control.Monad.Fail (MonadFail) + import Control.Monad.Free.Church + import Control.Monad.IO.Class (MonadIO(..)) + import Control.Monad.Identity (Identity) +@@ -143,7 +144,7 @@ newtype SqliteM a + { runSqliteM :: ReaderT (String -> IO (), Connection) IO a + -- ^ Run an IO action with access to a SQLite connection and a debug logging + -- function, called or each query submitted on the connection. +- } deriving (Monad, Functor, Applicative, MonadIO) ++ } deriving (Monad, Functor, Applicative, MonadIO, MonadFail) + + newtype BeamSqliteParams = BeamSqliteParams [SQLData] + instance ToRow BeamSqliteParams where From 528251c37b1e55cf6b91c298c970ab0d42f7014a Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 9 Jan 2019 13:19:17 +1100 Subject: [PATCH 130/467] haskellPackages.servant-docs: jailbreak Upstream doesn't publish releases or revisions to relax test bounds. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 174ab1a8a7ae..f0fa623517c2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -931,7 +931,12 @@ self: super: { # aarch64 and armv7l fixes. 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-docs = + let + f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) + then dontCheck + else pkgs.lib.id; + in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. 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 From 038752f30b34b04692bba1e0919b5b0231bb7f9a Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 9 Jan 2019 13:20:27 +1100 Subject: [PATCH 131/467] haskellPackages.tdigest: jailbreak Upstream doesn't publish releases or revisions to relax test bounds. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f0fa623517c2..c96152502d48 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1183,7 +1183,7 @@ self: super: { hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); - # jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 + # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 # These patches contain fixes for 8.6 that should be safe for From bb6dbfef03f04cdd34e3c3f6ea2ea38ada04119e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2019 02:30:50 +0100 Subject: [PATCH 132/467] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/2b2341be91b659bbaec7103358538e0fefce2798. --- .../haskell-modules/hackage-packages.nix | 1398 ++++++++++++++--- 1 file changed, 1203 insertions(+), 195 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f42742903a9e..c8ba2138d928 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18509,8 +18509,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.5"; - sha256 = "0wd4rwbn765n2jyzwwwcghqh1qx69wb9ci7wmvw1ahzg0wbadbqz"; + version = "0.4.7.6"; + sha256 = "19388lmnld4z1vgnj9cfwhm51xn0m0rwsq76w5752sy9nzcpck91"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -22499,18 +22499,18 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base, bytestring, mtl, scientific, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, mtl + , scientific, text, transformers, unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.14.3"; - sha256 = "1ikj4kdd9qs50a5zqfhmw0f6k6b8pi9w78nk6r1vpm352xs3vsi1"; + version = "0.16"; + sha256 = "07l08rbx7xdp0jnr672skmisaa5wikpn6h43m6i9l7l7x1937b38"; libraryHaskellDepends = [ - aeson base bytestring mtl scientific text transformers + aeson attoparsec base bytestring mtl scientific text transformers unordered-containers vector ]; - description = "An API for parsing \"aeson\" JSON tree into Haskell types"; + description = "API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -27257,12 +27257,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-athena_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base + , lens, resourcet, text, unliftio-core + }: + mkDerivation { + pname = "antiope-athena"; + version = "6.3.0"; + sha256 = "0yzvzhwl92k1v50w1jzlz2zq5rp7n6x1j51fpqrqq97vj7vqzfsq"; + libraryHaskellDepends = [ + amazonka amazonka-athena amazonka-core base lens resourcet text + unliftio-core + ]; + testHaskellDepends = [ + amazonka amazonka-athena amazonka-core base lens resourcet text + unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-contract" = callPackage ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.2.0"; - sha256 = "0s2s0vq6n7zwjj1yd7kmpwxkvbnfd2ikjv9nzg1rz0hm6mz1dn4p"; + version = "6.3.0"; + sha256 = "1d9z3vm7ab6fn0b1v0795v36x36j7lczjgkn2krx7zxq7srzf77l"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -27293,6 +27313,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-core_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-core, base, bytestring + , exceptions, generic-lens, http-client, http-types, lens + , monad-logger, mtl, resourcet, text, transformers, unliftio-core + }: + mkDerivation { + pname = "antiope-core"; + version = "6.3.0"; + sha256 = "001qkmiild396pg9hnw776djygjm692k1w9bmckn6l9ahiz8yah0"; + libraryHaskellDepends = [ + amazonka amazonka-core base bytestring exceptions generic-lens + http-client http-types lens monad-logger mtl resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + amazonka amazonka-core base bytestring exceptions generic-lens + http-client http-types lens monad-logger mtl resourcet text + transformers unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-dynamodb" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core @@ -27314,6 +27357,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-dynamodb_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb + , antiope-core, base, generic-lens, lens, text, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "antiope-dynamodb"; + version = "6.3.0"; + sha256 = "0912726sm6g2ssrzni3ldiavb506wa51ib07n4gm8vapzhnwxxlb"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-dynamodb antiope-core base + generic-lens lens text unliftio-core unordered-containers + ]; + testHaskellDepends = [ + amazonka amazonka-core amazonka-dynamodb antiope-core base + generic-lens lens text unliftio-core unordered-containers + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-messages" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson @@ -27337,6 +27401,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-messages_6_3_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson + , monad-loops, network-uri, text, unliftio-core + }: + mkDerivation { + pname = "antiope-messages"; + version = "6.3.0"; + sha256 = "0yg38mayxzm7awgn0jczyh3vkyvhm3nmi47vry7knws916xrpr4x"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 + base generic-lens lens lens-aeson monad-loops network-uri text + unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 + base generic-lens lens lens-aeson monad-loops network-uri text + unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-s3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core , attoparsec, base, bytestring, conduit, conduit-extra, exceptions @@ -27363,6 +27450,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-s3_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core + , attoparsec, base, bytestring, conduit, conduit-extra, exceptions + , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog + , lens, monad-logger, mtl, network-uri, resourcet, text + , unliftio-core + }: + mkDerivation { + pname = "antiope-s3"; + version = "6.3.0"; + sha256 = "00szjn9vbb6xndzs0wpq2hw9a529ldy5y0pckfm3xkd6ap5ifx41"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 antiope-core attoparsec base + bytestring conduit conduit-extra exceptions generic-lens http-types + lens monad-logger mtl network-uri resourcet text unliftio-core + ]; + testHaskellDepends = [ + amazonka amazonka-core amazonka-s3 antiope-core attoparsec base + bytestring conduit conduit-extra exceptions generic-lens hedgehog + hspec http-types hw-hspec-hedgehog lens monad-logger mtl + network-uri resourcet text unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-sns" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , generic-lens, lens, text, unliftio-core @@ -27383,6 +27496,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-sns_6_3_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base + , generic-lens, lens, text, unliftio-core + }: + mkDerivation { + pname = "antiope-sns"; + version = "6.3.0"; + sha256 = "0fr51vp8ihlv7pnlrl73knd8wwck1rsw5v4yzm2b8299m7gqd86v"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sns base generic-lens lens + text unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sns base generic-lens lens + text unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-sqs" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-messages, antiope-s3, base, generic-lens @@ -27406,6 +27539,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-sqs_6_3_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , amazonka-sqs, antiope-messages, antiope-s3, base, conduit + , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri + , text, unliftio-core + }: + mkDerivation { + pname = "antiope-sqs"; + version = "6.3.0"; + sha256 = "0a1kkzy9nldhwgh8xvnp4lqv49gpm6q9prnv2bgwlp00izy2r5s1"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs + antiope-messages antiope-s3 base conduit generic-lens lens + lens-aeson monad-loops mtl network-uri text unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs + antiope-messages antiope-s3 base conduit generic-lens lens + lens-aeson monad-loops mtl network-uri text unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiprimes" = callPackage ({ mkDerivation, base, hspec, primes }: mkDerivation { @@ -37518,17 +37675,20 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, vector + ({ mkDerivation, base, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector }: mkDerivation { pname = "bitvec"; - version = "0.1.0.2"; - sha256 = "15a9p3wpjyq9761yjpbxgzl6mfly9gbwzbpsqi0zyza09cf51gk2"; + version = "0.1.1.0"; + sha256 = "12wvilgmibkvbd1hb15ixyidkqdyadx8i8jwm9n50q9qjp4phmm5"; + revision = "1"; + editedCabalFile = "02y6rvmgvxhmw0mqq9b20hs75x42kkgsp2c3kppwmp4pspjipmjm"; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ - base HUnit primitive QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector + base HUnit primitive QuickCheck quickcheck-classes test-framework + test-framework-hunit test-framework-quickcheck2 vector ]; description = "Unboxed vectors of bits / dense IntSets"; license = stdenv.lib.licenses.publicDomain; @@ -40379,12 +40539,14 @@ self: { }) {}; "buffon-machines" = callPackage - ({ mkDerivation, base, multiset, random, template-haskell }: + ({ mkDerivation, base, mtl, multiset, random, template-haskell }: mkDerivation { pname = "buffon-machines"; - version = "1.0.0.0"; - sha256 = "0s8gfbfilvnhkyjs94fb7s0amcar3nvhjb5lx1gzqgbxdgs1grdy"; - libraryHaskellDepends = [ base multiset random template-haskell ]; + version = "1.1.1.0"; + sha256 = "0985xh66j3f8p352gsq9balndwrsnylqilnnbk2sfb535jyh84dh"; + libraryHaskellDepends = [ + base mtl multiset random template-haskell + ]; description = "Perfect simulation of discrete random variables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -40862,6 +41024,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little_1_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , keys, mono-traversable, mono-traversable-keys, primitive + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text-show + }: + mkDerivation { + pname = "bv-little"; + version = "1.0.0"; + sha256 = "0hdzwcdm3cdiqyjkl5k9hg61za51w61j5168c17nfs1yyhh0fdms"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp keys mono-traversable + mono-traversable-keys primitive QuickCheck text-show + ]; + testHaskellDepends = [ + base deepseq hashable mono-traversable mono-traversable-keys + QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text-show + ]; + benchmarkHaskellDepends = [ + base criterion deepseq hashable mono-traversable QuickCheck + smallcheck + ]; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , prettyclass, QuickCheck, random @@ -42607,8 +42797,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.13"; - sha256 = "0qp5q40y2wsba0gykws0w6xzbvr19bcgbqbz05xacp14zxw4r4sp"; + version = "2.14.1"; + sha256 = "1bkhh5s3x6as4pz70p2rgwkrb121k5ic7j5dhmlh0rwvhrr9g1z2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42993,8 +43183,10 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.5.0"; - sha256 = "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2"; + version = "0.13.6.0"; + sha256 = "0c0b0ffxd9dx4c52ny6im420f6wyjmd822fn6vh561d07nr0y08n"; + revision = "1"; + editedCabalFile = "1mldbaa3qp0nf4jyns1cnadyk8gga2w6hl3y2xdbnbbsjm42s4m9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -43035,6 +43227,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cairo-core" = callPackage + ({ mkDerivation, base, bytestring, c2hs, Cabal, cairo, directory + , filepath, haskell-src-exts, http-client, http-client-tls, hxt + , hxt-xpath, monad-extras, transformers + }: + mkDerivation { + pname = "cairo-core"; + version = "1.16.3"; + sha256 = "1dap6697r6izvags7k43b88z7m9i9yy0znrf1lgkrwv23mg6qxmj"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath haskell-src-exts + http-client http-client-tls hxt hxt-xpath + ]; + libraryHaskellDepends = [ base monad-extras transformers ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ c2hs ]; + description = "Cairo Haskell binding (core functions)"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) cairo;}; + "cake" = callPackage ({ mkDerivation, array, base, binary, bytestring, cmdargs , containers, derive, directory, filepath, mtl, parsek, process @@ -49730,8 +49942,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.3.0.0"; - sha256 = "17fb6zralgg6linsjapbqb4l7hycfwwvpr2l8jdksdky6bf65633"; + version = "1.3.1.0"; + sha256 = "0wlpv47jj5q2kiwm1daaw4p4s9vh3xfs4rpb78y2a1qw6r6nw9vw"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; @@ -57038,6 +57250,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cubicbezier_0_6_0_6" = callPackage + ({ mkDerivation, base, containers, fast-math, integration, matrices + , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty + , tasty-hunit, vector, vector-space + }: + mkDerivation { + pname = "cubicbezier"; + version = "0.6.0.6"; + sha256 = "0s7s1ak0x89jy3q4yxrcvjzsq9w4yh23ycjcja6i7klj5gggqwss"; + libraryHaskellDepends = [ + base containers fast-math integration matrices microlens + microlens-mtl microlens-th mtl vector vector-space + ]; + testHaskellDepends = [ base parsec tasty tasty-hunit ]; + description = "Efficient manipulating of 2D cubic bezier curves"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cubicspline" = callPackage ({ mkDerivation, base, hmatrix, safe }: mkDerivation { @@ -57166,6 +57397,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cue-sheet_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cue-sheet"; + version = "2.0.1"; + sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers exceptions megaparsec mtl QuickCheck + text + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-megaparsec megaparsec + QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + description = "Support for construction, rendering, and parsing of CUE sheets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cufft" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath , template-haskell @@ -62792,8 +63047,8 @@ self: { pname = "dhall"; version = "1.20.1"; sha256 = "1p5whphy666q0h22yq3jb4aipb5bkqp45bp86m7dp12ljksfhxz0"; - revision = "1"; - editedCabalFile = "1km0zbbahhq24s84s9gcck1javhplqjg51q4qf8i19iahnxkl3rq"; + revision = "2"; + editedCabalFile = "0629z8lc97rapfcqcgvxwp9x4x3xqpzrly8m0nsn0dds7400jxrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68495,6 +68750,8 @@ self: { pname = "eap"; version = "0.9.0.2"; sha256 = "0bgx7sxpmvhd84j7kkqznazw7p1fl862w7jxlap473g2q5365kqc"; + revision = "1"; + editedCabalFile = "1lsy7pl39s02f45l7g9alw49xwh7m8m4bm3ydcz11rh9xdgcb9jv"; libraryHaskellDepends = [ base binary bytestring cryptonite memory mtl pretty-hex ]; @@ -71918,62 +72175,67 @@ self: { }) {}; "espial" = callPackage - ({ mkDerivation, aeson, base, bcrypt, bytestring, case-insensitive - , classy-prelude, classy-prelude-conduit, classy-prelude-yesod - , conduit, containers, data-default, directory, ekg, ekg-core - , esqueleto, fast-logger, file-embed, foreign-store, hjsmin - , hscolour, hspec, http-conduit, iso8601-time, microlens - , monad-control, monad-logger, monad-metrics, mtl, optparse-generic - , persistent, persistent-sqlite, persistent-template, pinboard - , pretty-show, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, vector, wai, wai-extra - , wai-logger, wai-middleware-metrics, warp, yaml, yesod, yesod-auth - , yesod-core, yesod-form, yesod-static, yesod-test + ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring + , case-insensitive, classy-prelude, classy-prelude-conduit + , classy-prelude-yesod, conduit, containers, data-default + , directory, ekg, ekg-core, entropy, esqueleto, fast-logger + , file-embed, foreign-store, hjsmin, hscolour, hspec, http-api-data + , http-client, http-client-tls, http-conduit, http-types + , iso8601-time, microlens, monad-logger, monad-metrics, mtl + , optparse-generic, parser-combinators, persistent + , persistent-sqlite, persistent-template, pretty-show, safe + , shakespeare, template-haskell, text, time, transformers + , unordered-containers, vector, wai, wai-extra, wai-logger + , wai-middleware-metrics, warp, yaml, yesod, yesod-auth, yesod-core + , yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.5.1"; - sha256 = "010a809fmi6sxh2fwiwvjqk3d293cg5acj57lb1qbm6qjzn7ir37"; + version = "0.0.7"; + sha256 = "06nlmz8j6f64dgbd9y9b7i9fd1bv32yxijx764zlvy75i6vbips5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bcrypt bytestring case-insensitive classy-prelude - classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory ekg ekg-core esqueleto fast-logger - file-embed foreign-store hjsmin hscolour http-conduit iso8601-time - microlens monad-control monad-logger monad-metrics mtl persistent - persistent-sqlite persistent-template pinboard pretty-show safe + aeson attoparsec base bcrypt bytestring case-insensitive + classy-prelude classy-prelude-conduit classy-prelude-yesod conduit + containers data-default directory ekg ekg-core entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour http-api-data + http-client http-client-tls http-conduit http-types iso8601-time + microlens monad-logger monad-metrics mtl parser-combinators + persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger wai-middleware-metrics warp yaml yesod yesod-auth yesod-core yesod-form yesod-static ]; executableHaskellDepends = [ - aeson base bcrypt bytestring case-insensitive classy-prelude - classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory ekg ekg-core esqueleto fast-logger - file-embed foreign-store hjsmin hscolour http-conduit iso8601-time - microlens monad-control monad-logger monad-metrics mtl - optparse-generic persistent persistent-sqlite persistent-template - pinboard pretty-show safe shakespeare template-haskell text time + aeson attoparsec base bcrypt bytestring case-insensitive + classy-prelude classy-prelude-conduit classy-prelude-yesod conduit + containers data-default directory ekg ekg-core entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour http-api-data + http-client http-client-tls http-conduit http-types iso8601-time + microlens monad-logger monad-metrics mtl optparse-generic + parser-combinators persistent persistent-sqlite persistent-template + pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger wai-middleware-metrics warp yaml yesod yesod-auth yesod-core yesod-form yesod-static ]; testHaskellDepends = [ - aeson base bcrypt bytestring case-insensitive classy-prelude - classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory ekg ekg-core esqueleto fast-logger - file-embed foreign-store hjsmin hscolour hspec http-conduit - iso8601-time microlens monad-control monad-logger monad-metrics mtl - persistent persistent-sqlite persistent-template pinboard + aeson attoparsec base bcrypt bytestring case-insensitive + classy-prelude classy-prelude-conduit classy-prelude-yesod conduit + containers data-default directory ekg ekg-core entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour hspec + http-api-data http-client http-client-tls http-conduit http-types + iso8601-time microlens monad-logger monad-metrics mtl + parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger wai-middleware-metrics warp yaml yesod yesod-auth yesod-core yesod-form yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -74403,6 +74665,8 @@ self: { pname = "failable"; version = "0.1.1.0"; sha256 = "0wg4jhilnyqxs6kqikbli1ia6xl4hi4hipdc1pp1f2d2gxgg0afb"; + revision = "1"; + editedCabalFile = "05952427jqydy44yqsjad3xwy62k48f7ygyby28rg6s5l59966pz"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -77471,8 +77735,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; - revision = "4"; - editedCabalFile = "0bmhd56fg4idz62maig3kykk7dyqy9dpm27fdljqg8jccl0vbwbm"; + revision = "5"; + editedCabalFile = "0rwwq8qrxd497rd5m0kidz4v69frj72ds7a6zrdqigj5f5471rhd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -77536,6 +77800,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flac-picture_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, directory, flac, hspec + , hspec-discover, JuicyPixels, temporary + }: + mkDerivation { + pname = "flac-picture"; + version = "0.1.2"; + sha256 = "02h36z65xmy0mvg7j2863h35dcf24l08ma0dxjbqcn42sca9ss0m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; + testHaskellDepends = [ + base bytestring directory flac hspec JuicyPixels temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flaccuraterip" = callPackage ({ mkDerivation, base, binary, deepseq, HTTP, optparse-applicative , process @@ -85571,6 +85854,21 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage + ({ mkDerivation, base, cairo-core, haskell-gi-base + , template-haskell + }: + mkDerivation { + pname = "gi-cairo-again"; + version = "1.16.0"; + sha256 = "1xxrcx9dsscymz2v53splzrr39gajw2bcr3ksblak46bamb67bmg"; + libraryHaskellDepends = [ + base cairo-core haskell-gi-base template-haskell + ]; + description = "Bridge between packages gi-* and cairo-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gi-cairo-connector" = callPackage ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base , mtl @@ -86467,8 +86765,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.5.0"; - sha256 = "0p1mwzbrzb74wxlykasza4qvvlck2b0wgnhvfa0j3h27x4ii8xjw"; + version = "0.13.6.0"; + sha256 = "1ck92sy9j3jrwi2w6a0nslz92aczznsz96rdqq8v78rqqislpirm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -86612,8 +86910,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190122"; - sha256 = "0z5a5sskmjmayh1w9m48v7b81s1ybcglglry2jy1awdbn2l4mxk5"; + version = "7.20190129"; + sha256 = "0gsi1ymv7dmx429vhv58979hfh23zrfvrsam6saf16ckh5hd0n81"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" @@ -86847,6 +87145,8 @@ self: { pname = "git-monitor"; version = "3.1.1.5"; sha256 = "0jqmcldnl1hd0za33jw4490qgx9ngqbh7pyy47y1pb9j1hvci9jj"; + revision = "1"; + editedCabalFile = "18s9vigsi5z5j2m5q956nj4h84bwgfh8v010dz4jahhrlkavg1ra"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87258,6 +87558,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks_0_10_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.10.1"; + sha256 = "1hjl5ygvxhh70l951zc4n4qmdf3vf2x983jyimsinyv03bl11i6x"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "githud" = callPackage ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, text, unix @@ -87424,8 +87743,8 @@ self: { }: mkDerivation { pname = "gitlib-libgit2"; - version = "3.1.2"; - sha256 = "1nj9f2qmjxb5k9b23wfyz290pgb01hnzrswbamwb7am9bnkk250b"; + version = "3.1.2.1"; + sha256 = "0gm2d8x7brcf3x3d6jy3anig158cj3961gicw1wq7xg0wz90l3mr"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops @@ -87909,8 +88228,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.6.0"; - sha256 = "1sz8mvac39sxj7skw8zasbp6srm4k92223l29lll1125d8n0cwaf"; + version = "0.13.7.0"; + sha256 = "06hdn8mprq6xclp8xfr1iqx82i0nhims3dhjblqn26ig5fdidjbw"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -90460,8 +90779,8 @@ self: { }: mkDerivation { pname = "google-server-api"; - version = "0.3.0.0"; - sha256 = "1zrgflz6pav8ygjjisjm35w7a232116f90s0pd8jqf46an2bm8i2"; + version = "0.3.1.0"; + sha256 = "12n3cd4k515z8shi6klxa2s3cbccqk8h38y45h1lqk1j8ydp3r21"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring HsOpenSSL http-api-data http-client http-client-tls mime-mail monad-control @@ -92735,8 +93054,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.15.0"; - sha256 = "110lawhnd00acllfjhimcq59wxsrl2xs68mam6wmqfc43wan5f5k"; + version = "0.15.1"; + sha256 = "1hhx6qcbd0qlwvi1d98vkmshrq1j7wiia0i3pwdidvfrjkn3aa7j"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -92925,10 +93244,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.4.0"; - sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg"; - revision = "1"; - editedCabalFile = "0nbghg11y4nvxjxrvdm4a7fzj8z12fr12hkj4b7p27imlryg3m10"; + version = "0.13.5.0"; + sha256 = "01a3q7ciinrwa6xjk0qwpyjabdjzfsy8qqfkp0iir2h8i8prnpz4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -93080,8 +93397,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.0"; - sha256 = "1q6ysw00gjaaali18iz111zqzkjiblzg7cfg6ckvzf93mg0w6g0c"; + version = "0.15.1"; + sha256 = "0kya9ag8c7zl8sqx32hmlmz9rpxghvyr2svzcr38lzizfd74bnpq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97658,8 +97975,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.15"; - sha256 = "114yzmvj96nhq37947p5kf3zc4hdh4dnbavms0f1ndszmn1q7hd9"; + version = "0.0.0.16"; + sha256 = "1759pk8w5vvgm194lbfj1z9vxwh19d1s36lwpwni1qk7l1lpvvm6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104100,6 +104417,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, stm, test-framework, test-framework-hunit + , text, time, tls, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.11.0"; + sha256 = "070m9jrv1jczrxscbrr0fln45harw2y9rcj9qnp4d9sj7m597vvy"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -107695,54 +108037,52 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, criterion, data-default, Decimal - , Diff, directory, easytest, file-embed, filepath, hashable - , haskeline, here, hledger-lib, html, lucid, math-functions - , megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show - , process, regex-tdfa, safe, shakespeare, split, tabular, temporary - , terminfo, test-framework, test-framework-hunit, text, time - , timeit, transformers, unordered-containers, utf8-string - , utility-ht, wizards + , Diff, directory, easytest, filepath, hashable, haskeline, here + , hledger-lib, html, lucid, math-functions, megaparsec, mtl + , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa + , safe, shakespeare, split, tabular, temporary, terminfo + , test-framework, test-framework-hunit, text, time, timeit + , transformers, unordered-containers, utf8-string, utility-ht + , wizards }: mkDerivation { pname = "hledger"; - version = "1.12.1"; - sha256 = "1b9zvlrhrzg0rvk90ac1z8n8sfhdx070l8hy3sg25nbcsqxzd51w"; + version = "1.13"; + sha256 = "1dhyc439r0ff3jdnbfcb06wb7xlxwvczn9p2spn5316wdza8lk53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal Diff directory easytest file-embed - filepath hashable haskeline here hledger-lib lucid math-functions - megaparsec mtl mtl-compat old-time parsec pretty-show process - regex-tdfa safe shakespeare split tabular temporary terminfo text - time transformers unordered-containers utf8-string utility-ht - wizards + containers data-default Decimal Diff directory easytest filepath + hashable haskeline here hledger-lib lucid math-functions megaparsec + mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time transformers + unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal directory easytest file-embed - filepath haskeline here hledger-lib math-functions megaparsec mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo text time transformers + containers data-default Decimal directory easytest filepath + haskeline here hledger-lib math-functions megaparsec mtl mtl-compat + old-time parsec pretty-show process regex-tdfa safe shakespeare + split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; testHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal directory easytest file-embed - filepath haskeline here hledger-lib math-functions megaparsec mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo test-framework + containers data-default Decimal directory easytest filepath + haskeline here hledger-lib math-functions megaparsec mtl mtl-compat + old-time parsec pretty-show process regex-tdfa safe shakespeare + split tabular temporary terminfo test-framework test-framework-hunit text time transformers unordered-containers utf8-string utility-ht wizards ]; benchmarkHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers criterion data-default Decimal directory easytest - file-embed filepath haskeline here hledger-lib html math-functions - megaparsec mtl mtl-compat old-time parsec pretty-show process - regex-tdfa safe shakespeare split tabular temporary terminfo text - time timeit transformers unordered-containers utf8-string - utility-ht wizards + filepath haskeline here hledger-lib html math-functions megaparsec + mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time timeit + transformers unordered-containers utf8-string utility-ht wizards ]; description = "Command-line interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -107757,8 +108097,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.12"; - sha256 = "0vl4ag5r58zag8djihmdlj9apqrvczjn51qfizs366wprdppdxax"; + version = "1.13"; + sha256 = "1pkim0qxgakbngnslw04lhlmv2ad195lw60hxz5iyrxywizkiwp3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107876,30 +108216,31 @@ self: { ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec , cmdargs, containers, data-default, Decimal, deepseq, directory - , doctest, easytest, extra, filepath, Glob, hashtables, megaparsec - , mtl, mtl-compat, old-time, parsec, parser-combinators - , pretty-show, regex-tdfa, safe, split, tabular, text, time - , transformers, uglymemo, utf8-string + , doctest, easytest, extra, file-embed, filepath, Glob, hashtables + , here, megaparsec, mtl, mtl-compat, old-time, parsec + , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular + , template-haskell, text, time, transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.12"; - sha256 = "1m38r9z6ccdxhl54k8x9drbfmj1l9hy8mnb7cj4bwprpz4xx15bh"; + version = "1.13"; + sha256 = "1pfqfc7kfy3sni5i8h73i6gj0yf3fsbn1lf1g1zx2jfpgxm36wgg"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory easytest extra filepath Glob - hashtables megaparsec mtl mtl-compat old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular text - time transformers uglymemo utf8-string + data-default Decimal deepseq directory easytest extra file-embed + filepath Glob hashtables here megaparsec mtl mtl-compat old-time + parsec parser-combinators pretty-show regex-tdfa safe split tabular + template-haskell text time transformers uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory doctest easytest extra - filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular text - time transformers uglymemo utf8-string + file-embed filepath Glob hashtables here megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular template-haskell text time transformers uglymemo + utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; @@ -107910,19 +108251,20 @@ self: { , brick, cmdargs, containers, data-default, directory, filepath , fsnotify, hledger, hledger-lib, megaparsec, microlens , microlens-platform, pretty-show, process, safe, split, text - , text-zipper, time, transformers, vector, vty + , text-zipper, time, transformers, unix, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.12.1"; - sha256 = "0ifyp2kawi4x0slnv5gkcgn8v6vx6d9q56x6zjpfzslajqfwfk8y"; + version = "1.13"; + sha256 = "1dmziyffx3bjam40j1jxbbg0wm15fkci9zpsdpdbzx39264c0n40"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal async base base-compat-batteries brick cmdargs containers data-default directory filepath fsnotify hledger hledger-lib megaparsec microlens microlens-platform pretty-show - process safe split text text-zipper time transformers vector vty + process safe split text text-zipper time transformers unix vector + vty ]; description = "Curses-style user interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -107958,8 +108300,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.12"; - sha256 = "14n3qhdr95nfgczw05dki2wy26k86z1h0li8md1bglch4j9fjs36"; + version = "1.13"; + sha256 = "045bhllvxs92r96hx9aaipc9hpaqhv7b3dm2nxc1912iq761wqnp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118542,6 +118884,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-json_1_0_0_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base + , bits-extra, bytestring, criterion, directory, dlist, hedgehog + , hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap + , optparse-applicative, text, transformers, vector, word8 + }: + mkDerivation { + pname = "hw-json"; + version = "1.0.0.1"; + sha256 = "1svynix1vilp6w5azm0nlkx3b92m5x8plnj8jnw4k6ybr4mdw32b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint array attoparsec base bits-extra bytestring dlist + hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect + hw-rankselect-base hw-simd mmap text vector word8 + ]; + executableHaskellDepends = [ + base bytestring dlist hw-balancedparens hw-json-simd hw-mquery + hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base + transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory mmap + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json-lens" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, hw-json , lens, scientific, word8 @@ -118567,8 +118947,8 @@ self: { }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.0.0"; - sha256 = "015frhg0v7vxrl1m4bjg2rfa7z0846g9xclirdhb4n5pjzr11rp9"; + version = "0.1.0.1"; + sha256 = "0pi67lyx9ysvgfsk75a4yzmfrn65f7i65pp2m6z5hd5svali37sw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -122932,6 +123312,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "instana-haskell-trace-sdk" = callPackage + ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring + , containers, directory, ekg-core, exceptions, hslogger + , http-client, http-client-tls, http-types, HUnit, network, process + , random, regex-base, regex-tdfa, retry, scientific, servant + , servant-server, stm, sysinfo, text, time, transformers, unix + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "instana-haskell-trace-sdk"; + version = "0.1.0.0"; + sha256 = "1px0p990sr2l7l7h8k5l24bjvi4ag5i3v78vwlhgzykpfsxwq3bg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-extra base bytestring containers directory ekg-core + exceptions hslogger http-client http-client-tls http-types network + process random regex-base regex-tdfa retry scientific stm sysinfo + text time unix unordered-containers wai + ]; + executableHaskellDepends = [ + aeson base binary bytestring hslogger http-client http-types + servant servant-server text time transformers unix wai warp + ]; + testHaskellDepends = [ + aeson aeson-extra base bytestring directory ekg-core exceptions + hslogger http-client http-types HUnit process random regex-base + regex-tdfa retry scientific text unix unordered-containers + ]; + description = "SDK for adding custom Instana tracing support to Haskell applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "instance-control" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -124691,28 +125104,28 @@ self: { }) {}; "iri" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , contravariant, hashable, ip, profunctors, ptr, punycode - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text - , text-builder, th-lift, th-lift-instances, unordered-containers - , vector, vector-builder, vector-instances + ({ mkDerivation, attoparsec, base, bytestring, contravariant + , hashable, ip, profunctors, ptr, punycode, QuickCheck + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-builder, th-lift + , th-lift-instances, unordered-containers, vector, vector-builder + , vector-instances }: mkDerivation { pname = "iri"; - version = "0.3.4.1"; - sha256 = "0lissbq0rajhds1s68shba227v0qsq51ffs171rnw31m92rn1c54"; + version = "0.4"; + sha256 = "0v790f2fl4hcb6069ak5cscd156ry3065cshjh9c30239allw7m5"; libraryHaskellDepends = [ - attoparsec base base-prelude bug bytestring contravariant hashable - ip profunctors ptr punycode semigroups template-haskell text - text-builder th-lift th-lift-instances unordered-containers vector - vector-builder vector-instances + attoparsec base bytestring contravariant hashable ip profunctors + ptr punycode semigroups template-haskell text text-builder th-lift + th-lift-instances unordered-containers vector vector-builder + vector-instances ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; - description = "RFC-based International Resource Identifier library"; + description = "RFC-based resource identifier library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -139736,6 +140149,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "machines-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, machines, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "machines-attoparsec"; + version = "0"; + sha256 = "0mxm1gy7kr7czhmfwskl56wnawb2l3axfig22935bliq75mpvbs4"; + libraryHaskellDepends = [ + attoparsec base bytestring machines text + ]; + testHaskellDepends = [ + attoparsec base bytestring machines tasty tasty-hunit text + ]; + description = "Parse machines streams with attoparsec parsers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "machines-binary" = callPackage ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { @@ -139773,6 +140204,17 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "machines-encoding" = callPackage + ({ mkDerivation, base, bytestring, machines, text }: + mkDerivation { + pname = "machines-encoding"; + version = "0"; + sha256 = "1n8skhf48q7dissrq7hpgsccjgh1hspjqh331m58z8id9xry133g"; + libraryHaskellDepends = [ base bytestring machines text ]; + description = "Transcode encodings with machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "machines-io" = callPackage ({ mkDerivation, base, bytestring, chunked-data, machines , transformers @@ -145273,6 +145715,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark_0_0_6_1" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-discover, hspec-megaparsec, html-entity-map, lucid + , megaparsec, microlens, microlens-th, modern-uri, mtl + , parser-combinators, QuickCheck, text, text-metrics + , unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.6.1"; + sha256 = "0riizf8qg6938w9vvf0lwaflsc3lpbqmbiqdfv8d7fhxpk10qaxw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark @@ -145329,16 +145801,19 @@ self: { "mmtf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-msgpack - , hspec, QuickCheck, text + , hspec, http-conduit, QuickCheck, text }: mkDerivation { pname = "mmtf"; - version = "0.1.0.1"; - sha256 = "100hyv6qb8jkqaw2f2h2fz9m32xrh3ffll67y52a11pkxzilyh19"; + version = "0.1.2.0"; + sha256 = "0z3x3cz4lgsnbpbi9ra179wdi3xqq0h46a6x76mq8k76c0jms51y"; libraryHaskellDepends = [ - base binary bytestring containers data-msgpack text + base binary bytestring containers data-msgpack http-conduit text + ]; + testHaskellDepends = [ + base binary bytestring containers data-msgpack hspec http-conduit + QuickCheck text ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Macromolecular Transmission Format implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147346,6 +147821,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable-keys" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, keys + , mono-traversable, semigroups, text, transformers + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "mono-traversable-keys"; + version = "0.1.0"; + sha256 = "0xyl4n0ydfqrjydm2g62r1zl36bdvvp8nbxbqkbai1z24a9r51dw"; + libraryHaskellDepends = [ + base bytestring containers hashable keys mono-traversable + semigroups text transformers unordered-containers vector + vector-instances + ]; + description = "Type-classes for interacting with monomorphic containers with a key"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mono-traversable-wrapper" = callPackage ({ mkDerivation, base, mono-traversable }: mkDerivation { @@ -152270,14 +152763,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_3_0_0_0" = callPackage + "network_3_0_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, unix }: mkDerivation { pname = "network"; - version = "3.0.0.0"; - sha256 = "1j9lhyb50k056ynyfsyh1ak9gn1knh11cyajlnbix8yhahm2mkla"; + version = "3.0.0.1"; + sha256 = "03f7gi3skz2ivack73wgn0zsppxwscl6j6xvwjal6i7y3rzajiam"; libraryHaskellDepends = [ base bytestring deepseq unix ]; testHaskellDepends = [ base bytestring directory hspec HUnit ]; testToolDepends = [ hspec-discover ]; @@ -152382,8 +152875,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.4.0.1"; - sha256 = "161l63gr2l2ncp8vaznl4izxgig43w26q91hvpd6x57k0y4r2zk9"; + version = "0.4.0.2"; + sha256 = "0n7h1vfh4iwcni8v92hkfvwdqcnv928c1pxj5mrcrvfggpq97a1a"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -158118,6 +158611,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.1"; + sha256 = "0nqr81q5rvzpgl3r79rrmf30jzkds8gwdir2w1c9775jy2wslssl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -159308,6 +159820,58 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , binary, blaze-html, blaze-markup, bytestring, case-insensitive + , cmark-gfm, containers, criterion, data-default, deepseq, Diff + , directory, doctemplates, exceptions, executable-path, filepath + , Glob, haddock-library, hslua, hslua-module-text, HsYAML, HTTP + , http-client, http-client-tls, http-types, ipynb, JuicyPixels, mtl + , network, network-uri, pandoc-types, parsec, process, QuickCheck + , random, safe, SHA, skylighting, split, syb, tagsoup, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath + , text, time, unicode-transforms, unix, unordered-containers + , vector, weigh, xml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.6"; + sha256 = "046vya7ivngv0hp5chnfxc1dm5n3krbgm0883ph45l31c7liyxma"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring binary blaze-html + blaze-markup bytestring case-insensitive cmark-gfm containers + data-default deepseq directory doctemplates exceptions filepath + Glob haddock-library hslua hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb JuicyPixels mtl + network network-uri pandoc-types parsec process random safe SHA + skylighting split syb tagsoup temporary texmath text time + unicode-transforms unix unordered-containers vector xml zip-archive + zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + executable-path filepath Glob hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + postInstall = '' + mkdir -p $out/share + mv $data/*/*/man $out/share/ + ''; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -159343,6 +159907,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-citeproc_0_16" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.16"; + sha256 = "1fs1dr7cgkzy0sb68fx85x6l5j1hx9sgkiyxzdfi90hpqnm207sy"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -159714,8 +160313,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.1.0"; - sha256 = "1hfm9a8rfjksjv8qmz8a17f9pg1qw2rizaakl108lafckbz7f4ya"; + version = "0.1.1"; + sha256 = "0x2pfvvpn7r99238ma3q6fnirx6zh2pzz86b4fijll2k7wqxkl94"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -159747,8 +160346,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.5.0"; - sha256 = "1s29dmds28ffbcbic8pw3bsixkb6lzjm78j8qv4x3r9l64kvjndz"; + version = "0.13.6.0"; + sha256 = "14qcikd9r06ra7zp557c0bffd357yj4hk9bjigyhq2kdrc2l7igr"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -163447,6 +164046,8 @@ self: { pname = "persistent-spatial"; version = "0.1.0.0"; sha256 = "0x9ialzl7mmq3h4nx79z51czddn7xgs0sngixc38cdlmddvm2g36"; + revision = "1"; + editedCabalFile = "18qd2k3b6s8nd9v8fqsdf8f8pblm6frm8q8958zi5gs44096cgz8"; libraryHaskellDepends = [ aeson base http-api-data integer-logarithms lens persistent text ]; @@ -168488,8 +169089,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-typed"; - version = "0.1.0.2"; - sha256 = "12f06lzh2kw27ykwiwgbavj1wbkf4w0xjy6gk2nf4kzm65qvj8az"; + version = "0.1.1.1"; + sha256 = "1sfp83xy797zamgyxvcm4jrg3x1jl8f0gzb5c3jsmqbg16rnx0ay"; libraryHaskellDepends = [ base postgresql-libpq postgresql-simple template-haskell transformers typedquery utf8-string @@ -171281,8 +171882,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.2.1.1"; - sha256 = "0cl1d4d4jgkqk37q2n3n7xqmd847srd6sqikciz4b8cfp57lw8m7"; + version = "0.3"; + sha256 = "02i79irax13rny953k6fvswsgbif9nnvysnnbq3k4w37b3g5maiv"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -175267,6 +175868,8 @@ self: { pname = "radius"; version = "0.6.0.1"; sha256 = "19c2bv0iq4j0709rf9k9jk5q2s756bvjnr1gy630mcgp92rg8d9j"; + revision = "1"; + editedCabalFile = "1a4q1kz21v2m4wfdfaawdlkfnq9s8c5iijzcrdprrgsbi3kplrdi"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -177760,8 +178363,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.1.0"; - sha256 = "0f16lk8apql211gy30vm5l0gjhjlp243cdbrrz6wq47pdlxns5pa"; + version = "2.2.2.0"; + sha256 = "1ij7yxh06zb7fjkba2ghq88kvhr1rw4jlc0miwqfl53f6ssvcklf"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -177784,14 +178387,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "recursion-schemes_5_1_1" = callPackage + "recursion-schemes_5_1_1_1" = callPackage ({ mkDerivation, base, base-orphans, comonad, free, HUnit , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "recursion-schemes"; - version = "5.1.1"; - sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0"; + version = "5.1.1.1"; + sha256 = "0f9f1x1vjdqk6bzgsiqv7z7fq955dlkca3m0l4sc2mnpds3b0cgj"; + revision = "1"; + editedCabalFile = "19sqa4v3knasdmfzwmal1pi0yfj3zllrdr6n1chjvy1b6fa5za7z"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -180657,6 +181262,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "req_2_0_0" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, hspec, hspec-core + , hspec-discover, http-api-data, http-client, http-client-tls + , http-types, monad-control, mtl, QuickCheck, retry, text, time + , transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "req"; + version = "2.0.0"; + sha256 = "0avwvslsb689p9afbh3k0zwmqwkrqagicz26xcyfjsd5648mh3wr"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection http-api-data http-client + http-client-tls http-types monad-control mtl retry text time + transformers transformers-base + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-client http-types monad-control mtl QuickCheck + retry text time unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -181499,6 +182134,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_8_0_0" = callPackage + ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl + , random, stm, tasty, tasty-hedgehog, tasty-hunit, time + , transformers + }: + mkDerivation { + pname = "retry"; + version = "0.8.0.0"; + sha256 = "0m44firqn9bkspj2jjf88kksf7mjmbi00xz0855lnflc8b3377cf"; + libraryHaskellDepends = [ + base exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base exceptions ghc-prim hedgehog HUnit mtl random stm tasty + tasty-hedgehog tasty-hunit time transformers + ]; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -186398,6 +187054,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scrapbook" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, data-default, drinkery + , extensible, feed, gitrev, req, rio, tasty, tasty-hunit + , xml-conduit, xml-types, yaml + }: + mkDerivation { + pname = "scrapbook"; + version = "0.3.3"; + sha256 = "17xc7ljfxxwg4l2jiqf8ffwgwq3hq7lynf6p478jp0sxf54irjr1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base data-default extensible feed req rio + xml-conduit xml-types yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty base data-default drinkery extensible feed + gitrev req rio xml-conduit xml-types yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base data-default extensible feed req rio tasty + tasty-hunit xml-conduit xml-types yaml + ]; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + }) {}; + "scrape-changes" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, cron , directory, email-validate, filepath, hashable, hslogger @@ -187657,6 +188340,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sendfile_0_7_10" = callPackage + ({ mkDerivation, base, bytestring, network }: + mkDerivation { + pname = "sendfile"; + version = "0.7.10"; + sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab"; + libraryHaskellDepends = [ base bytestring network ]; + description = "A portable sendfile library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sendgrid-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , http-conduit, monad-control, text, transformers @@ -188650,6 +189345,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-blaze_0_9" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-blaze"; + version = "0.9"; + sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; + libraryHaskellDepends = [ base blaze-html http-media servant ]; + testHaskellDepends = [ base blaze-html servant-server wai warp ]; + description = "Blaze-html support for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-cassava" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, servant-server, vector, wai, warp @@ -189330,6 +190040,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-lucid_0_9" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , text, wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.9"; + sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; + libraryHaskellDepends = [ base http-media lucid servant text ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + description = "Servant support for lucid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-machines" = callPackage ({ mkDerivation, base, base-compat, bytestring, http-client , http-media, machines, mtl, servant, servant-client @@ -195529,6 +196254,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-core_1_0_4_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , network, network-uri, old-locale, parallel, QuickCheck, random + , readable, regex-posix, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector + , zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.4.0"; + sha256 = "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath hashable HUnit io-streams lifted-base + monad-control mtl network network-uri old-locale random readable + regex-posix text time transformers transformers-base unix-compat + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl network network-uri old-locale + parallel QuickCheck random readable regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unix-compat unordered-containers + vector zlib + ]; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-cors" = callPackage ({ mkDerivation, snap-core }: mkDerivation { @@ -195737,6 +196497,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-server_1_1_1_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.1.1.0"; + sha256 = "0kjdsdgpxxsp5r4gpx8wdq5qn1b1y80mgkl9ahjbhlahjf5xyf6k"; + configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + benchmarkHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + criterion io-streams io-streams-haproxy snap-core vector + ]; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-stream" = callPackage ({ mkDerivation, attoparsec, base, bytestring, io-streams , snap-core @@ -199564,8 +200365,8 @@ self: { pname = "stack"; version = "1.9.3"; sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf"; - revision = "3"; - editedCabalFile = "0rycd09sk0c269izk35hby179ja77yya41ql7j3hp7s9ja7j6vfg"; + revision = "4"; + editedCabalFile = "15mdzgxl82j1yyhxazr4sjr1qpnc83wcf5h4c7lf7iydz60jri79"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -203458,8 +204259,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "2.5.0.2"; - sha256 = "0ds6rwzja9yrxq14ip4gxg6km6bzar4dxl5v9m3f3d64zqgm7yi5"; + version = "2.5.0.3"; + sha256 = "14kmsh3n4d6zgpqkv1v4laz2sd52317i840szp9mw3i72f012gj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204878,6 +205679,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "swagger2_2_3_1_1" = callPackage + ({ mkDerivation, aeson, base, base-compat-batteries, bytestring + , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop + , Glob, hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.3.1.1"; + sha256 = "19fslhjqcnk0da1c8sdflnnxjzbbzqb0nbknpgyd45q0psxr6xs7"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat-batteries bytestring containers cookie + generics-sop hashable http-media insert-ordered-containers lens mtl + network QuickCheck scientific template-haskell text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -207384,6 +208218,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty_1_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth + }: + mkDerivation { + pname = "tasty"; + version = "1.2.1"; + sha256 = "0yw8bb92x723md31nisd75mdbfsq9can1h5r4gchdjvwafxy98ia"; + libraryHaskellDepends = [ + ansi-terminal async base clock containers mtl optparse-applicative + stm tagged unbounded-delays unix wcwidth + ]; + description = "Modern and extensible testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -208225,8 +209077,8 @@ self: { }: mkDerivation { pname = "teardown"; - version = "0.5.0.0"; - sha256 = "0p1rjvl36gl4dqpvcjsb06jyiwsxg2qyha8rfdiddljb4ixw1sjh"; + version = "0.5.0.1"; + sha256 = "1ian64cbmw18n75p2jx8d856d3gz5lahvfxy1xbsh1isz56jzh2d"; libraryHaskellDepends = [ base prettyprinter rio typed-process unliftio ]; @@ -209384,8 +210236,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "1"; - editedCabalFile = "1af61pnf2vrkvs3hcqla5ddsrd0hd2pylv6l545yn3dcvl665rcc"; + revision = "2"; + editedCabalFile = "1kmv576j1zbms6p3vffripvas87ca3ypdb42h7pqkxsxxfi1gb8j"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -210006,6 +210858,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "texmath_0_11_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.11.2"; + sha256 = "12jkv3wa5lmlik516fp6i429vlznzybhhw4843d55hdid5yhvihf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -210129,6 +211004,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "text-builder_0_6_5" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , deferred-folds, QuickCheck, quickcheck-instances, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.5"; + sha256 = "1kf5r4cr4qw3awfshycnh9l7p3phssknlvwmkglabmdj3zf1xz5q"; + libraryHaskellDepends = [ + base base-prelude bytestring deferred-folds semigroups text + transformers + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "An efficient strict text builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -214252,8 +215151,8 @@ self: { }: mkDerivation { pname = "tonatona-google-server-api"; - version = "0.1.0.0"; - sha256 = "0mlzw51s4q3q7sf2hbx26g8chmicsv7nchqrq06x6f7ms58aiy27"; + version = "0.1.1.0"; + sha256 = "094la1rd8527a398607rsq9z2hiay59biy9fnfiw7qyigwf4zlr0"; libraryHaskellDepends = [ base google-server-api monad-logger persistent persistent-sqlite resource-pool servant-client tonalude tonaparser tonatona @@ -214358,8 +215257,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.1.0"; - sha256 = "0hilycd6m32jv3gbsq6j182mc3igcxnhsfqzn6sj5zbip0kx17h7"; + version = "0.1.2.1"; + sha256 = "08ckcp8gyhq8nhr5l7qbmyl8csz5kl22qmwapwzi4jiffwwi9yca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215100,12 +215999,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_5_0" = callPackage + "transformers_0_5_6_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.5.0"; - sha256 = "198ric8gr1y58scckr468d11y2g45mzc5pkaa40shj7xgj1bh7mi"; + version = "0.5.6.2"; + sha256 = "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -215930,6 +216829,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "trim" = callPackage + ({ mkDerivation, base, directory, hspec, optparse-applicative }: + mkDerivation { + pname = "trim"; + version = "0.1.0.0"; + sha256 = "0zpn8w4fzswwcb081hvl6cy5gdid69wx3i1gj3sgkxf01347m23m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base hspec ]; + description = "A command-line tool for trimming whitespace"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { @@ -216312,6 +217226,8 @@ self: { pname = "ttl-hashtables"; version = "1.3.0.0"; sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5"; + revision = "1"; + editedCabalFile = "0nbf825s51pls4y0nc9jzik8z6szfvqd66dfjp6ybbywrrdzckf3"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -218247,8 +219163,8 @@ self: { }: mkDerivation { pname = "typedquery"; - version = "0.1.1.1"; - sha256 = "1p6hlx2hsp7sjhspw3c95b1px6r2hylr31f4hcjq505z3i33gm7m"; + version = "0.1.1.2"; + sha256 = "1ziyc4bjxfndmfpmg8j2dl80nq1a9ay9nfpxh5856yar63lw16fi"; libraryHaskellDepends = [ aeson base bytestring haskell-src-meta parsec template-haskell text transformers @@ -224469,8 +225385,8 @@ self: { }: mkDerivation { pname = "vt-utils"; - version = "1.1.0.0"; - sha256 = "1xqcffipp5hwvmiqxg80zj3v4nzqklqcpy3kblfkw4xkvg57gh87"; + version = "1.2.0.0"; + sha256 = "1mbc4a8s6h3f5w3da2ln95050c1ssnh7pyj4i34nvmm5gqrb3jb9"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory http-client http-types HUnit parsec process text time transformers @@ -227692,8 +228608,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.2.1"; - sha256 = "1y22whxgyjkhmh4nxgkxfzwk3nkkbnrx70qn5h57fv7r2c012jxj"; + version = "0.14.3.0"; + sha256 = "1gsa7lvv0xidy4i9d8bjqc0hpbzx1vvp9npzj2q8x1l68f9vjj5j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -227829,6 +228745,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_5_3" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, bytestring-builder, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.5.3"; + sha256 = "0mkxl7iwl5pl2w0svji9248v4c0hi45k725jj5ybaknb73650ns4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy network + random SHA streaming-commons text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy HUnit + network QuickCheck random SHA streaming-commons test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers criterion entropy + network random SHA text + ]; + doCheck = false; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, mtl, QuickCheck @@ -228242,6 +229193,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "wide-word_0_1_0_8" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog + , primitive, QuickCheck, quickcheck-classes, semirings + }: + mkDerivation { + pname = "wide-word"; + version = "0.1.0.8"; + sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes + semirings + ]; + description = "Data types for large but fixed width signed and unsigned integers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wigner-symbols" = callPackage ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive , random, vector @@ -228938,8 +229907,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.45"; - sha256 = "0l3jp2qqscy2fq5fvaq83hsh68f1d5xg97k2dhyc01zc6fd5jqi8"; + version = "0.3.46"; + sha256 = "1d0i1611458dpqih73x8gcxq7lkwpxdc1c3pgj3hqb6gwjhjnxyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230967,6 +231936,8 @@ self: { pname = "xml"; version = "1.3.14"; sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j"; + revision = "1"; + editedCabalFile = "130xwqmgmg9vp988mppm5ivz1r5qbivb270fz2rwl4q0x04czdzd"; libraryHaskellDepends = [ base bytestring text ]; description = "A simple XML library"; license = stdenv.lib.licenses.bsd3; @@ -234085,8 +235056,8 @@ self: { }: mkDerivation { pname = "yesod-content-pdf"; - version = "0.2.0.3"; - sha256 = "0c1jh0rcbbdh0ld9j2pq79pifs30gadz4p10xmphz9s68bjp8n4c"; + version = "0.2.0.4"; + sha256 = "1n51prhxbbjrkvnvf2v4nk6vs8zxvwrnb1826r2vkhq0j1pyyi2k"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring conduit data-default directory network-uri process temporary transformers yesod-core @@ -234199,6 +235170,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_11" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, rio, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.11"; + sha256 = "1cpl8g2sdvv751vvs68169w9nki43h6rmj2i2wqkfzijwgd8djwr"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types monad-logger mtl + parsec path-pieces primitive random resourcet rio shakespeare + template-haskell text time transformers unix-compat unliftio + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core From dd0ce323c03b5a71e997b498a1ad07d93aa2b95a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2019 09:31:29 +0100 Subject: [PATCH 133/467] git-annex: update sha256 hash for version 7.20190129 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c96152502d48..58f1f90977a1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0vww2qf94a6dg46mynkgpk0lh3x12vvfby3flqymi4wfrx1fif1k"; + sha256 = "06385r9rlncrrmzdfl8q600bw6plbvkmkwgl3llg595xrm711a97"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From d8260d6af069cb886452080abd52944735aed9fa Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Tue, 29 Jan 2019 05:48:37 +0300 Subject: [PATCH 134/467] ghc-8.8: de-null parallel --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index d4ff521273d5..1e7450a6bd11 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -35,7 +35,6 @@ self: super: { integer-gmp = null; libiserv = null; mtl = null; - parallel = null; parsec = null; pretty = null; process = null; From e505891a5c8feafd272a1d372829df69f2a15035 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Wed, 30 Jan 2019 04:50:56 +0300 Subject: [PATCH 135/467] haskell/generic-buidler: make installPhase handle Cabal 2.5's lax fields --- pkgs/development/haskell-modules/generic-builder.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2a71e7e92d1e..2724ff5d6220 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -377,6 +377,10 @@ stdenv.mkDerivation ({ runHook postHaddock ''; + # The scary sed expression handles two cases in v2.5 Cabal's package configs: + # 1. 'id: short-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' + # 2. 'id:\n + # very-long-descriptive-useful-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' installPhase = '' runHook preInstall @@ -391,7 +395,7 @@ stdenv.mkDerivation ({ rmdir "$packageConfFile" fi for packageConfFile in "$packageConfDir/"*; do - local pkgId=$( ${gnused}/bin/sed -n -e 's|^id:[ ]\+||p' $packageConfFile ) + local pkgId=$( ${gnused}/bin/sed -n -e ':a' -e '/^id:$/N; s/id:\n[ ]*\([^\n]*\).*$/\1/p; s/id:[ ]*\([^\n]*\)$/\1/p; ta' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf done From bc845dee8a1c38cc62ece97514075395934c7ae3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 Feb 2019 12:40:15 +0100 Subject: [PATCH 136/467] tdesktop: 1.5.9 -> 1.5.11 tdesktopPackages.preview: 1.5.9 -> 1.5.11 --- .../instant-messengers/telegram/tdesktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8b8cca60fcad..69d67ca205e2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.5.9"; - sha256Hash = "1mq0fj29fbn8lk7jhj8gzjvqg2q1hi0hvfwfk1a5qiib0x31gfic"; + version = "1.5.11"; + sha256Hash = "09blyzs6mrmrrmjcfia9pa35mfv4zfc9mrqc36hqqcchmg54kx6w"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "428981"; - archPatchesHash = "1r58yjqdv3wgyhb391dblvij67girdwf4ggcw1lsq587sykx51yk"; + archPatchesRevision = "429149"; + archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli"; }; in { stable = mkTelegram stableVersion; From 56e6a52cc7c983e60d7fa6beed1a04cbed184562 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Feb 2019 08:50:42 -0600 Subject: [PATCH 137/467] compton-git: 5 -> 5.1-rc2, fix crashes and other regressions --- pkgs/applications/window-managers/compton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 9b5e190a692e..2c388c941e6c 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -63,7 +63,7 @@ let gitSource = rec { pname = "compton-git"; - version = "5"; + version = "5.1-rc2"; COMPTON_VERSION = "v${version}"; @@ -73,7 +73,7 @@ let owner = "yshui"; repo = "compton"; rev = COMPTON_VERSION; - sha256 = "1x5r2dch023imgdqhgf1zxi05cc742s7xr7jzpymvl9ldqly8ppa"; + sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08"; }; buildInputs = [ From 5463f4d903d129f928d85163bd3d738d4dcac8d6 Mon Sep 17 00:00:00 2001 From: Roosemberth Palacios Date: Sat, 2 Feb 2019 16:12:44 +0100 Subject: [PATCH 138/467] youtube-dl: 2019.01.17 -> 2019.01.30.1 (#55075) Signed-off-by: Roosembert Palacios --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index dd210498fe75..0598976ec98e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.01.17"; + version = "2019.01.30.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0fxajwv81b0bjw9qlwmxd4r93yp5nnqll79vhic0vy72ii0093r7"; + sha256 = "0wamv1fs4w8jjx67p60rgrgdi6k04yy0h4p3cwscza5pzhpmvnlf"; }; nativeBuildInputs = [ makeWrapper ]; From 0cb74f6f1400bc7550c1d2ab6a7ccb667b489678 Mon Sep 17 00:00:00 2001 From: aanderse Date: Sat, 2 Feb 2019 10:24:06 -0500 Subject: [PATCH 139/467] kdevelop: 5.2.4 -> 5.3.1, bump llvm version used from 3.8 to 7 (#55015) --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index f0ac79e2d22c..a35bd14f310c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,7 +9,7 @@ let pname = "kdevelop"; - version = "5.2.4"; + version = "5.3.1"; qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; + sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr"; }; nativeBuildInputs = [ @@ -37,6 +37,12 @@ mkDerivation rec { shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose ]; + # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b + # required as nixos seems to be unable to find CLANG_BUILTIN_DIR + cmakeFlags = [ + "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" + ]; + postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c0d3849b762..9eb901ff3070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17852,7 +17852,7 @@ in kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { - llvmPackages = llvmPackages_38; + llvmPackages = llvmPackages_7; }; keepnote = callPackage ../applications/office/keepnote { }; From 3674bdf204a8d9b2ae800c0f35528a4084a7fc5e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 2 Feb 2019 17:31:31 +0100 Subject: [PATCH 140/467] nixos/tasks/encrypted-devices: fix regression from #54637 27982b408e465554b8831f492362bc87ed0ec02a introduced a bug when refactoring the encrypted-devices module, causing some encrypted filesystem options to not be recognized anymore. See e.g. https://hydra.nixos.org/build/88145490 --- nixos/modules/tasks/encrypted-devices.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 2ffbb8777068..2c9231f55236 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -19,21 +19,21 @@ let description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; - options.blkDev = mkOption { + blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.nullOr types.str; description = "Location of the backing encrypted device."; }; - options.label = mkOption { + label = mkOption { default = null; example = "rootfs"; type = types.nullOr types.str; description = "Label of the unlocked encrypted device. Set fileSystems.<name?>.device to /dev/mapper/<label> to mount the unlocked device."; }; - options.keyFile = mkOption { + keyFile = mkOption { default = null; example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; From 8de375bf7ba8faf9d7051366aa761eb8897a643b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 2 Feb 2019 16:13:56 +0100 Subject: [PATCH 141/467] python.pkgs.wcwidth: improve expression use fetchPypi, pname, and correct indentation --- .../python-modules/wcwidth/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index fa993c593e1a..ef453ebbf33c 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "wcwidth-${version}"; - version = "0.1.7"; + pname = "wcwidth"; + version = "0.1.7"; - src = fetchurl { - url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; - sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; + }; - # Checks fail due to missing tox.ini file: - doCheck = false; + # Checks fail due to missing tox.ini file: + doCheck = false; - meta = with stdenv.lib; { - description = "Measures number of Terminal column cells of wide-character codes"; - longDescription = '' - This API is mainly for Terminal Emulator implementors -- any Python - program that attempts to determine the printable width of a string on - a Terminal. It is implemented in python (no C library calls) and has - no 3rd-party dependencies. - ''; - homepage = https://github.com/jquast/wcwidth; - license = licenses.mit; - }; - } + meta = with lib; { + description = "Measures number of Terminal column cells of wide-character codes"; + longDescription = '' + This API is mainly for Terminal Emulator implementors -- any Python + program that attempts to determine the printable width of a string on + a Terminal. It is implemented in python (no C library calls) and has + no 3rd-party dependencies. + ''; + homepage = https://github.com/jquast/wcwidth; + license = licenses.mit; + }; +} From 3b698b537c506eeb1e50edc87bb990f84d6eccc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 2 Feb 2019 16:15:32 +0100 Subject: [PATCH 142/467] python.pkgs.wcwidth: run tests --- pkgs/development/python-modules/wcwidth/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index ef453ebbf33c..861d5bcae21e 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "wcwidth"; @@ -9,8 +9,11 @@ buildPythonPackage rec { sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; }; - # Checks fail due to missing tox.ini file: - doCheck = false; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; meta = with lib; { description = "Measures number of Terminal column cells of wide-character codes"; From 196af4b359eb9dc9a9d59937c2f8058e5c247a23 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 2 Feb 2019 12:12:11 -0500 Subject: [PATCH 143/467] Revert "linuxPackages_4_{19,20}: works around bug with overlayfs." This reverts commit de86af48faa03a824917ac90f4776481c7ce9e54. (Manual revert due to conflicts.) See #54509 The patch is causing overlayfs to misbehave. --- pkgs/os-specific/linux/kernel/patches.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2ff0d5d26205..f09b9d6ea5b1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,14 +58,11 @@ rec { }; }; - # Reverts a change related to the overlayfs overhaul in 4.19 - # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626 - revert-vfs-dont-open-real = rec { - name = "revert-vfs-dont-open-real"; + raspberry_pi_wifi_fix = rec { + name = "raspberry-pi-wifi-fix"; patch = fetchpatch { - name = name + ".patch"; - url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch; - sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq"; + url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch; + sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za"; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb901ff3070..e6c96fabf908 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14556,7 +14556,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.revert-vfs-dont-open-real ]; }; @@ -14564,7 +14563,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.revert-vfs-dont-open-real + kernelPatches.raspberry_pi_wifi_fix ]; }; From 048c36ccaa0add5e5de387e9de0d3775d3fdd10d Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 2 Feb 2019 11:58:28 -0500 Subject: [PATCH 144/467] Revert "linuxPackages: 4.14 -> 4.19" This reverts commit b861ebb4c634cd474a1c688b61ab16c9c7eb7257. The current issues (See #54509 and #48828) are causing headaches to users of the unstable branches. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6c96fabf908..43636245869e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14742,7 +14742,7 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_19; + linuxPackages = linuxPackages_4_14; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! From 9080b2eadff00772cc4d9aac3c0ec362f9d8748e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 Aug 2018 19:34:03 -0400 Subject: [PATCH 145/467] minecraft-server: 1.12.2 -> 1.13.2 Update minecraft client to 1.13.2. The url is not as nice as before but it is the one provided by mojang. Adds 1_13_2, 1_13_1 as well. https://minecraft.net/en-us/download/server --- pkgs/games/minecraft-server/default.nix | 82 ++++++++++++++++--------- pkgs/top-level/all-packages.nix | 8 ++- 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 050e0126fa72..c2f20f53e9a8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,37 +1,63 @@ { stdenv, fetchurl, jre }: -stdenv.mkDerivation rec { - name = "minecraft-server-${version}"; - version = "1.13.2"; +let + common = { version, sha256, url }: + stdenv.mkDerivation (rec { + name = "minecraft-server-${version}"; + inherit version; - src = fetchurl { - # Old url - # https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar + src = fetchurl { + inherit url sha256; + }; + + preferLocalBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/lib/minecraft + cp -v $src $out/lib/minecraft/server.jar + + cat > $out/bin/minecraft-server << EOF + #!/bin/sh + exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + EOF + + chmod +x $out/bin/minecraft-server + ''; + + phases = "installPhase"; + + meta = { + description = "Minecraft Server"; + homepage = "https://minecraft.net"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; + }; + }); + +in { + minecraft-server_1_13_2 = common { + version = "1.13.2"; url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar"; sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz"; }; - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin $out/lib/minecraft - cp -v $src $out/lib/minecraft/server.jar - - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui - EOF - - chmod +x $out/bin/minecraft-server - ''; - - phases = "installPhase"; - - meta = { - description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.tomberek ]; + minecraft-server_1_13_1 = common { + version = "1.13.1"; + url = "https://launcher.mojang.com/mc/game/1.13.1/server/fe123682e9cb30031eae351764f653500b7396c9/server.jar"; + sha256 = "1lak29b7dm0w1cmzjn9gyix6qkszwg8xgb20hci2ki2ifrz099if"; }; + + minecraft-server_1_13_0 = common { + version = "1.13.0"; + url = "https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar"; + sha256 = "1fahqnylxzbvc0fdsqk0x15z40mcc5b7shrckab1qcsdj0kkjvz7"; + }; + + minecraft-server_1_12_2 = common { + version = "1.12.2"; + url = "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar"; + sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb901ff3070..78ba9f9d4427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20770,7 +20770,13 @@ in minecraft = callPackage ../games/minecraft { }; - minecraft-server = callPackage ../games/minecraft-server { }; + minecraft-server = minecraft-server_1_13_2; + + inherit (callPackages ../games/minecraft-server { }) + minecraft-server_1_13_2 + minecraft-server_1_13_1 + minecraft-server_1_13_0 + minecraft-server_1_12_2; moon-buggy = callPackage ../games/moon-buggy {}; From e856fb31158dd176d58003f4d0723cd2c9f0bf61 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 2 Feb 2019 18:59:12 +0000 Subject: [PATCH 146/467] smplayer: 18.10.0 -> 19.1.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 52876bb1bbc8..00c0d7b6dc22 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.10.0"; + name = "smplayer-19.1.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1sql1rd4h74smkapjf5c686zbdqqaf44h7k7z5bxfvfcsad7rzrd"; + sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s"; }; buildInputs = [ qtscript ]; From 09af2fb9e0d948dcf71d2008bd8426fa3ee8f25f Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 2 Feb 2019 14:29:01 -0500 Subject: [PATCH 147/467] linux: Removes the previously removed raspberry pi patch There seems to have been an oopsie with the rebase. --- pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f09b9d6ea5b1..4c338b37deca 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,12 +57,4 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; - - raspberry_pi_wifi_fix = rec { - name = "raspberry-pi-wifi-fix"; - patch = fetchpatch { - url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch; - sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za"; - }; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43636245869e..9bf1fd30b546 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14563,7 +14563,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.raspberry_pi_wifi_fix ]; }; From c85a8a1fad20f95bf60ccb95f562d787ca3a42db Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 2 Feb 2019 15:56:52 -0500 Subject: [PATCH 148/467] postgresql: No need to refer to `super` self.callPackage works fine for now. If/when that changes, we have a repo-wide thing to deal with so no reason to do anything now. --- pkgs/servers/sql/postgresql/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0624998e5deb..842d01a640cb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -153,9 +153,9 @@ let ''; }; -in self: super: { +in self: { - postgresql_9_4 = super.callPackage generic { + postgresql_9_4 = self.callPackage generic { version = "9.4.20"; psqlSchema = "9.4"; sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; @@ -163,7 +163,7 @@ in self: super: { inherit self; }; - postgresql_9_5 = super.callPackage generic { + postgresql_9_5 = self.callPackage generic { version = "9.5.15"; psqlSchema = "9.5"; sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; @@ -171,7 +171,7 @@ in self: super: { inherit self; }; - postgresql_9_6 = super.callPackage generic { + postgresql_9_6 = self.callPackage generic { version = "9.6.11"; psqlSchema = "9.6"; sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; @@ -179,7 +179,7 @@ in self: super: { inherit self; }; - postgresql_10 = super.callPackage generic { + postgresql_10 = self.callPackage generic { version = "10.6"; psqlSchema = "10.0"; sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; @@ -187,7 +187,7 @@ in self: super: { inherit self; }; - postgresql_11 = super.callPackage generic { + postgresql_11 = self.callPackage generic { version = "11.1"; psqlSchema = "11.1"; sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; @@ -195,4 +195,4 @@ in self: super: { inherit self; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d81e26abe1de..6b84b21eb0bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13870,7 +13870,7 @@ in timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; - inherit (import ../servers/sql/postgresql pkgs super) + inherit (import ../servers/sql/postgresql pkgs) postgresql_9_4 postgresql_9_5 postgresql_9_6 From 755e824291623e9610fb1a5b8656dab5901e236c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 2 Feb 2019 15:58:17 -0500 Subject: [PATCH 149/467] all-packages: Just refer to `self`, not `super`, or `res` This ends a years-long process to removoe pointless fixed points in this file! --- pkgs/top-level/all-packages.nix | 20 +++----------------- pkgs/top-level/stage.nix | 5 +---- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b84b21eb0bb..c587082053fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6,25 +6,11 @@ * Hint: ### starts category names. */ { lib, noSysDirs, config}: -res: pkgs: super: +pkgs: with pkgs; -let - self = - builtins.trace '' - It seems that you are using a patched Nixpkgs that references the self - variable in pkgs/top-level/all-packages.nix. This variable was incorrectly - named, so its usage needs attention. Please use pkgs for packages or super - for functions. - '' - res; # Do *NOT* use res in your fork. It will be removed. - - # TODO: turn self into an error - -in { - # Allow callPackage to fill in the pkgs argument inherit pkgs; @@ -16218,7 +16204,7 @@ in }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (gnome3) zenity; - inherit (res) bitwig-studio1; + inherit (pkgs) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -22528,7 +22514,7 @@ in parameter set to the right value for your deployment target. */ nixos = configuration: - (import (res.path + "/nixos/lib/eval-config.nix") { + (import (pkgs.path + "/nixos/lib/eval-config.nix") { inherit (pkgs.stdenv.hostPlatform) system; modules = [( { lib, ... }: { diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b7..0991c9138bda 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -89,10 +89,7 @@ let splice = self: super: import ./splice.nix lib self (buildPackages != null); allPackages = self: super: - let res = import ./all-packages.nix - { inherit lib noSysDirs config; } - res self super; - in res; + import ./all-packages.nix { inherit lib noSysDirs config; } self; aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); From ae0c47b4b7b8e09cd7eab8ca25a95bb91113b8ff Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 2 Feb 2019 23:29:42 +0100 Subject: [PATCH 150/467] gitea: 1.7.0 -> 1.7.1 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.7.1 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 689cf8d8de91..366314490966 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1mbr7pnzn8x05wc288855vqaf86qk2f1py5zh8s63l048bn0fld6"; + sha256 = "1r13l7h4146729lwif45bkzn36sgg6an0qbhgvj8w3zp035c00k3"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' From bb49dca6aa7db491c54197162659a57519b19943 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 2 Feb 2019 23:30:16 +0100 Subject: [PATCH 151/467] cbfstool: 4.7 -> 4.9 also fix source, followup of #55066 --- pkgs/applications/virtualization/cbfstool/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index e10d54148977..13060a50290b 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, iasl, flex, bison }: +{ stdenv, fetchurl, iasl, flex, bison }: stdenv.mkDerivation rec { name = "cbfstool-${version}"; - version = "4.7"; + version = "4.9"; - src = fetchgit { - url = "http://review.coreboot.org/p/coreboot"; - rev = "refs/tags/${version}"; - sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi"; + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; }; nativeBuildInputs = [ flex bison ]; From 52307dff2572788e79391d766158a5cda52e87cb Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 2 Feb 2019 18:25:30 -0500 Subject: [PATCH 152/467] pythonPackages.sqlalchemy_migrate: 0.11.0 -> 0.12.0 --- .../development/python-modules/sqlalchemy-migrate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 41269aa6567f..9daf2a696c25 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "sqlalchemy-migrate"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; + sha256 = "1bngmbcry97kwhrxwm0d74zg9qg7gmiws6rd78xshyfgpcqdmylc"; }; # See: https://review.openstack.org/#/c/608382/ From 8fb7706847abf856ec74874035817666e832dc6b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 26 Jan 2019 18:06:38 -0500 Subject: [PATCH 153/467] hydra: 2018-08-07 -> 2019-02-01 --- pkgs/development/tools/misc/hydra/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 42da07baca66..395ab5349c2f 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,7 +1,7 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook }: @@ -34,8 +34,8 @@ let CatalystViewDownload CatalystViewJSON CatalystViewTT - CatalystXRoleApplicator CatalystXScriptServerStarman + CatalystXRoleApplicator CryptRandPasswd DBDPg DBDSQLite @@ -71,15 +71,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2018-08-07"; + version = "2019-02-01"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; - sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; + rev = "8b5948f4cf12424c04df67a6eb136c9846fb2cfd"; + sha256 = "0ldk3li394vykl9c4v9bs8pir05pmad24s0rx9bzqgz569zfj2iv"; }; buildInputs = @@ -88,6 +88,7 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests + nlohmann_json ] ++ lib.optionals isGreaterNix20 [ boost ]; hydraPath = lib.makeBinPath ( From 58c89ec26a5d3c34e34bcb9f23db9fc62d7cf98a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 Aug 2018 19:35:22 -0400 Subject: [PATCH 154/467] nixos/mincraft-server: refactor - allow for options to (added 2 options): - agree to eula (eula.txt) true/false will create symlink over existing eula.txt to `/nix/store/...`. - whitelist users (optional and will symlink over existing whitelist.json and create backup) - server.properties can be configured with the serverProperties option. If there is an existing server.properties it will copy it to a server.properties.old to keep the old one. server.properties MUST be writable thus symlinking is not an option. - all ports that are stated in `server.properties` are exposed properly in the firewall. (infinisil) nixos/minecraft-server: Fix, refactor and polish Adds an option `declarative` (defaulted to false), in order to stay (mostly) backwards compatible. The only thing that's not backwards compatible is that you now need to agree to the EULA on evaluation time, but that's guarded by an assertion and therefore doesn't need a release note. --- .../services/games/minecraft-server.nix | 201 ++++++++++++++++-- 1 file changed, 181 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index f50d2897843a..7d26d1501650 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -4,8 +4,41 @@ with lib; let cfg = config.services.minecraft-server; -in -{ + + # We don't allow eula=false anyways + eulaFile = builtins.toFile "eula.txt" '' + # eula.txt managed by NixOS Configuration + eula=true + ''; + + whitelistFile = pkgs.writeText "whitelist.json" + (builtins.toJSON + (mapAttrsToList (n: v: { name = n; uuid = v; }) cfg.whitelist)); + + cfgToString = v: if builtins.isBool v then boolToString v else toString v; + + serverPropertiesFile = pkgs.writeText "server.properties" ('' + # server.properties managed by NixOS configuration + '' + concatStringsSep "\n" (mapAttrsToList + (n: v: "${n}=${cfgToString v}") cfg.serverProperties)); + + + # To be able to open the firewall, we need to read out port values in the + # server properties, but fall back to the defaults when those don't exist. + # These defaults are from https://minecraft.gamepedia.com/Server.properties#Java_Edition_3 + defaultServerPort = 25565; + + serverPort = cfg.serverProperties.server-port or defaultServerPort; + + rconPort = if cfg.serverProperties.enable-rcon or false + then cfg.serverProperties."rcon.port" or 25575 + else null; + + queryPort = if cfg.serverProperties.enable-query or false + then cfg.serverProperties."query.port" or 25565 + else null; + +in { options = { services.minecraft-server = { @@ -13,10 +46,32 @@ in type = types.bool; default = false; description = '' - If enabled, start a Minecraft Server. The listening port for - the server is always 25565. The server + If enabled, start a Minecraft Server. The server data will be loaded from and saved to - ${cfg.dataDir}. + . + ''; + }; + + declarative = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use a declarative Minecraft server configuration. + Only if set to true, the options + and + will be + applied. + ''; + }; + + eula = mkOption { + type = types.bool; + default = false; + description = '' + Whether you agree to + + Mojangs EULA. This option must be set to + true to run Minecraft server. ''; }; @@ -24,7 +79,7 @@ in type = types.path; default = "/var/lib/minecraft"; description = '' - Directory to store minecraft database and other state/data files. + Directory to store Minecraft database and other state/data files. ''; }; @@ -32,21 +87,84 @@ in type = types.bool; default = false; description = '' - Whether to open ports in the firewall (if enabled) for the server. + Whether to open ports in the firewall for the server. ''; }; + whitelist = mkOption { + type = let + minecraftUUID = types.strMatching + "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" // { + description = "Minecraft UUID"; + }; + in types.attrsOf minecraftUUID; + default = {}; + description = '' + Whitelisted players, only has an effect when + is + true and the whitelist is enabled + via by + setting white-list to true. + This is a mapping from Minecraft usernames to UUIDs. + You can use to get a + Minecraft UUID for a username. + ''; + example = literalExample '' + { + username1 = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"; + username2 = "yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy"; + }; + ''; + }; + + serverProperties = mkOption { + type = with types; attrsOf (either bool (either int str)); + default = {}; + example = literalExample '' + { + server-port = 43000; + difficulty = 3; + gamemode = 1; + max-players = 5; + motd = "NixOS Minecraft server!"; + white-list = true; + enable-rcon = true; + "rcon.password" = "hunter2"; + } + ''; + description = '' + Minecraft server properties for the server.properties file. Only has + an effect when + is set to true. See + + for documentation on these values. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.minecraft-server; + defaultText = "pkgs.minecraft-server"; + example = literalExample "pkgs.minecraft-server_1_12_2"; + description = "Version of minecraft-server to run."; + }; + jvmOpts = mkOption { - type = types.str; + type = types.separatedString " "; default = "-Xmx2048M -Xms2048M"; - description = "JVM options for the Minecraft Service."; + # Example options from https://minecraft.gamepedia.com/Tutorials/Server_startup_script + example = "-Xmx2048M -Xms4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing " + + "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 " + + "-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10"; + description = "JVM options for the Minecraft server."; }; }; }; config = mkIf cfg.enable { + users.users.minecraft = { - description = "Minecraft Server Service user"; + description = "Minecraft server service user"; home = cfg.dataDir; createHome = true; uid = config.ids.uids.minecraft; @@ -57,17 +175,60 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig.Restart = "always"; - serviceConfig.User = "minecraft"; - script = '' - cd ${cfg.dataDir} - exec ${pkgs.minecraft-server}/bin/minecraft-server ${cfg.jvmOpts} - ''; + serviceConfig = { + ExecStart = "${cfg.package}/bin/minecraft-server ${cfg.jvmOpts}"; + Restart = "always"; + User = "minecraft"; + WorkingDirectory = cfg.dataDir; + }; + + preStart = '' + ln -sf ${eulaFile} eula.txt + '' + (if cfg.declarative then '' + + if [ -e .declarative ]; then + + # Was declarative before, no need to back up anything + ln -sf ${whitelistFile} whitelist.json + cp -f ${serverPropertiesFile} server.properties + + else + + # Declarative for the first time, backup stateful files + ln -sb --suffix=.stateful ${whitelistFile} whitelist.json + cp -b --suffix=.stateful ${serverPropertiesFile} server.properties + + # server.properties must have write permissions, because every time + # the server starts it first parses the file and then regenerates it.. + chmod +w server.properties + echo "Autogenerated file that signifies that this server configuration is managed declaratively by NixOS" \ + > .declarative + + fi + '' else '' + if [ -e .declarative ]; then + rm .declarative + fi + ''); }; - networking.firewall = mkIf cfg.openFirewall { - allowedUDPPorts = [ 25565 ]; - allowedTCPPorts = [ 25565 ]; - }; + networking.firewall = mkIf cfg.openFirewall (if cfg.declarative then { + allowedUDPPorts = [ serverPort ]; + allowedTCPPorts = [ serverPort ] + ++ optional (! isNull queryPort) queryPort + ++ optional (! isNull rconPort) rconPort; + } else { + allowedUDPPorts = [ defaultServerPort ]; + allowedTCPPorts = [ defaultServerPort ]; + }); + + assertions = [ + { assertion = cfg.eula; + message = "You must agree to Mojangs EULA to run minecraft-server." + + " Read https://account.mojang.com/documents/minecraft_eula and" + + " set `services.minecraft-server.eula` to `true` if you agree."; + } + ]; + }; } From 3b03b901fb8e5d3ed09fbac2d44911c6db08ab75 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 2 Feb 2019 17:50:15 +0800 Subject: [PATCH 155/467] rink: init at 0.4.4 --- .../science/misc/rink/cargo-lock.patch | 1725 +++++++++++++++++ .../science/misc/rink/default.nix | 29 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 1756 insertions(+) create mode 100644 pkgs/applications/science/misc/rink/cargo-lock.patch create mode 100644 pkgs/applications/science/misc/rink/default.nix diff --git a/pkgs/applications/science/misc/rink/cargo-lock.patch b/pkgs/applications/science/misc/rink/cargo-lock.patch new file mode 100644 index 000000000000..39029713430c --- /dev/null +++ b/pkgs/applications/science/misc/rink/cargo-lock.patch @@ -0,0 +1,1725 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..c67e9ed +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1719 @@ ++[[package]] ++name = "MacTypes-sys" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "antidote" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "base64" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bincode" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bodyparser" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "persistent 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "buf_redux" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bytes" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.2.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "chrono" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "chrono-humanize" ++version = "0.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "chrono-tz" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parse-zoneinfo 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "conduit-mime-types" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "encoding" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-japanese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-korean" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-simpchinese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-singlebyte" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-tradchinese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding_index_tests" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "error" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fsevent" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "glob" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "handlebars" ++version = "0.25.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "handlebars-iron" ++version = "0.23.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "notify 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "hyper" ++version = "0.10.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hyper-native-tls" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ipc-channel" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bincode 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "irc" ++version = "0.11.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iron" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "json" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "language-tags" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "limiter" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "linefeed" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "logger" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime_guess" ++version = "1.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "modifier" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "mount" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sequence_trie 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "multipart" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "buf_redux 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nix" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nix" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "notify" ++version = "3.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-complex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-iter" ++version = "0.1.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num_cpus" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ole32-sys" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl" ++version = "0.10.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "params" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bodyparser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "multipart 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "urlencoded 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parse-zoneinfo" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "persistent" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "phf" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "plugin" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand" ++version = "0.3.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rink" ++version = "0.4.4" ++dependencies = [ ++ "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono-humanize 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono-tz 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "json 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "linefeed 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-gmp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rink-irc" ++version = "0.4.0" ++dependencies = [ ++ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "irc 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rink 0.4.4", ++] ++ ++[[package]] ++name = "rink-web" ++version = "0.4.0" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "handlebars-iron 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "limiter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "params 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rink 0.4.4", ++ "router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "staticfile 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "route-recognizer" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "router" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "route-recognizer 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust-gmp" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-serialize" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "safemem" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "sequence_trie" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.85" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_codegen" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_codegen_internals" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "0.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "shell32-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "slab" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "staticfile" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "0.10.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "traitobject" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typeable" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typemap" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicase" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unreachable" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unsafe-any" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "urlencoded" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bodyparser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "walkdir" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "xml-rs" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f" ++"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" ++"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" ++"checksum bincode 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "55eb0b7fd108527b0c77860f75eca70214e11a8b4c6ef05148c54c05a25d48ad" ++"checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3" ++"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" ++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bodyparser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6928e817538b74a73d1dd6e9a942a2a35c632a597b6bb14fd009480f859a6bf5" ++"checksum buf_redux 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "861b9d19b9f5cb40647242d10d0cb0a13de0a96d5ff8c8a01ea324fa3956eb7d" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27" ++"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" ++"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" ++"checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" ++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" ++"checksum chrono-humanize 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92afb1436280b0e4ed573c747ad30a1469cd945c201265b4d01e72cfa598da4f" ++"checksum chrono-tz 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "45438695f3f154032951a341ecca7ed200714bea615096885c9e86ca9fa3d66b" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "95ca30253581af809925ef68c2641cc140d6183f43e12e0af4992d53768bd7b8" ++"checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" ++"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" ++"checksum dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0dd841b58510c9618291ffa448da2e4e0f699d984d436122372f446dae62263d" ++"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" ++"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" ++"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" ++"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" ++"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" ++"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" ++"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" ++"checksum error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a6e606f14042bb87cc02ef6a14db6c90ab92ed6f62d87e69377bc759fd7987cc" ++"checksum filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f" ++"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++"checksum fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c4bbbf71584aeed076100b5665ac14e3d85eeb31fdbb45fbd41ef9a682b5ec05" ++"checksum fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a772d36c338d07a032d5375a36f15f9a7043bf0cb8ce7cee658e037c6032874" ++"checksum fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31" ++"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" ++"checksum handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)" = "15bdf598fc3c2de40c6b340213028301c0d225eea55a2294e6cc148074e557a1" ++"checksum handlebars-iron 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f86cf6ff931aa78e61415ad40c48a9af101b9a888eeed6ecf4f48dc52e80b76" ++"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" ++"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c" ++"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8458c07bdbdaf309c80e2c3304d14c3db64e7465d4f07cf589ccb83fd0ff31a" ++"checksum ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "675587430ede6756dd03fdfdf9888f22f83855fd131c8451d842a710b059e571" ++"checksum irc 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6a45f7136bbfeec4377afc6363b38440ce153d8a61777d56da0c6b1176cf135a" ++"checksum iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2440ae846e7a8c7f9b401db8f6e31b4ea5e7d3688b91761337da7e054520c75b" ++"checksum itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3088ea4baeceb0284ee9eea42f591226e6beaecf65373e41b38d95a1b8e7a1" ++"checksum json 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f3fb4510c0dbc38f7f43bdbe8b53defae0cd338b81ef416462a0ef69d600165c" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" ++"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" ++"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" ++"checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" ++"checksum limiter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cbc5d8bf63416df5331084dd9883b9598582f0d7ad5e42d53e55b05366931676" ++"checksum linefeed 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1301a570e4e7d2d0f324b7a3fa73eac85b05c81b656a0983b16ebc8c504e53b6" ++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92ff59f9a797ff30f711fe6b8489ad424953cee17c206de77d3c5957a9182ba7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" ++"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" ++"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" ++"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" ++"checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e" ++"checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1" ++"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" ++"checksum mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32245731923cd096899502fc4c4317cfd09f121e80e73f7f576cf3777a824256" ++"checksum multipart 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b16d6498fe5b0c2f6d973fd9753da099948834f96584d628e44a75f0d2955b03" ++"checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79" ++"checksum nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0d95c5fa8b641c10ad0b8887454ebaafa3c92b5cd5350f8fc693adafd178e7b" ++"checksum notify 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13fdd4a6894329b193f38f03a88823ce721275fdfdb29820c44a30515033524e" ++"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" ++"checksum num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" ++"checksum num-complex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" ++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" ++"checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" ++"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" ++"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" ++"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" ++"checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)" = "1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6" ++"checksum params 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "421e9f2c30e80365c9672709be664bfc84f73b088720d1cc1f4e99675814bb37" ++"checksum parse-zoneinfo 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ee19a3656dadae35a33467f9714f1228dd34766dbe49e10e656b5296867aea" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum persistent 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c9c94f2ef72dc272c6bcc8157ccf2bc7da14f4c58c69059ac2fc48492d6916" ++"checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" ++"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" ++"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" ++"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" ++"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" ++"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" ++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "080723c6145e37503a2224f801f252e14ac5531cb450f4502698542d188cb3c0" ++"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d" ++"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" ++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" ++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum route-recognizer 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3255338088df8146ba63d60a9b8e3556f1146ce2973bc05a75181a42ce2256" ++"checksum router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9b1797ff166029cb632237bb5542696e54961b4cf75a324c6f05c9cf0584e4e" ++"checksum rust-gmp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3ddf28998d5730b96a9fe188557953de503d77ff403ae175ad1417921e5d906" ++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" ++"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" ++"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" ++"checksum security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05" ++"checksum security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc" ++"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum sequence_trie 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c915714ca833b1d4d6b8f6a9d72a3ff632fe45b40a8d184ef79c81bec6327eed" ++"checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" ++"checksum serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "534b8b91a95e0f71bca3ed5824752d558da048d4248c91af873b63bd60519752" ++"checksum serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c5d8a33087d8984f9535daa62a6498a08f6476050b00ab9339dd847e4c25cc" ++"checksum serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "afad7924a009f859f380e4a2e3a509a845c2ac66435fcead74a4d983b21ae806" ++"checksum serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "ce44e5f4264b39e9d29c875357b7cc3ebdfb967bb9e22bfb5e44ffa400af5306" ++"checksum serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "67f7d2e9edc3523a9c8ec8cd6ec481b3a27810aafee3e625d311febd3e656b4c" ++"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" ++"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" ++"checksum slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d807fd58c4181bbabed77cb3b891ba9748241a552bcc5be698faaebefc54f46e" ++"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" ++"checksum staticfile 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "31493480e073d52522a94cdf56269dd8eb05f99549effd1826b0271690608878" ++"checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c" ++"checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673" ++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" ++"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" ++"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" ++"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" ++"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum urlencoded 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c28708636d6f7298a53b1cdb6af40f1ab523209a7cb83cf4d41b3ebc671d319" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a9ff57156caf7e22f37baf3c9d8f6ce8194842c23419dafcb0716024514d162" ++"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++"checksum walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780" ++"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562" diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix new file mode 100644 index 000000000000..0ccb096b8dab --- /dev/null +++ b/pkgs/applications/science/misc/rink/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, gmp, ncurses }: + +rustPlatform.buildRustPackage rec { + version = "0.4.4"; + name = "rink-${version}"; + + src = fetchFromGitHub { + owner = "tiffany352"; + repo = "rink-rs"; + rev = "v${version}"; + sha256 = "0rvck5ahg7s51fdlr2ch698cwnyc6qp84zhfgs3wkszj9r5j470k"; + }; + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0xmmxm7zwmq7w0pspx17glg4mjgh9l61w0h2k7n97x6p35i198d1"; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ openssl gmp ncurses ]; + + # Some tests fail and/or attempt to use internet servers. + doCheck = false; + + meta = with stdenv.lib; { + description = "Unit-aware calculator"; + homepage = http://rink.tiffnix.com; + license = with licenses; [ mpl20 gpl3 ]; + maintainers = [ maintainers.sb0 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..c64d4e76d99a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22107,6 +22107,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }); + rink = callPackage ../applications/science/misc/rink { }; + simgrid = callPackage ../applications/science/misc/simgrid { }; spyder = callPackage ../applications/science/spyder { }; From 36682692a087749c8c5f0e77fa77ec197869a55d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 08:59:32 +0100 Subject: [PATCH 156/467] batman-adv: 2018.4 -> 2019.0 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 390b0c9e4b47..1227d22916c9 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.4"; + ver = "2019.0"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0n6cw6inkzlgz8p6jcc83npqjmvhxp4qsh2dhbiv88ax3lh9arcd"; + sha256 = "0sml6z90kpchmn61597j7yag97gk59fscz4xjxdfh9zycd3nfsn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 1645fbef49bc..b84338ed258b 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.4"; + ver = "2019.0"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0mv2vlzcqfh5yavg2sqncca9iqgxi6llv83wwwsf3d38x2jjff74"; + sha256 = "0cdmb3zkjh8xcsicwyrimwzj8f4x3rjsfzk9im7695pkdw4j2xwr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 744d42ea9fd4..52ef018cbfeb 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2018.4"; in +let base = "batman-adv-2019.0"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0ka80l3ajfzi9plq50m79d2qpm1rlir4js5hy3g1mkj1gnyb801m"; + sha256 = "1h5xxf6nkdhk9dxf3d4fsasmiahy0y7bhlicyhnppgfdf6kxi5ry"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From e91a102453024a34b43fd1d3f60f37ecc086ccfd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 09:01:00 +0100 Subject: [PATCH 157/467] i3: 4.16 -> 4.16.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 2e18636c621b..755d1cbf2df8 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.16"; + version = "4.16.1"; src = fetchurl { url = "https://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1d2mnryn7m9c6d69awd7lwzadliapd0ahi5n8d0ppqy533ssaq6c"; + sha256 = "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; From 725a9720b1f51b05b1a84217249b2e84e3571714 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 16:23:30 -0800 Subject: [PATCH 158/467] ponyc: 0.25.0 -> 0.26.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ponyc/versions --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index d90ddcaacfb0..fbb4db72bd45 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv"; + sha256 = "1k1ysqk7j8kpysndps2ic9hprvp0z0d32d6jvqlapjrfccghy7dh"; }; buildInputs = [ llvm makeWrapper which ]; From 6802d1e3a55177f9264be753b75990c9efbb73e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 23:51:42 -0800 Subject: [PATCH 159/467] nagios: 4.4.2 -> 4.4.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nagios/versions --- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 9d79e8422ee8..3459a5fe8f7f 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0lv8fgqbxza0rwd0gy3jsy85ljgsi3vhvzacr346va3a68zr461l"; + sha256 = "0rwzlj6qp8hq931rw6s255b33ggmc2fcxs74g9x2zxwcvklg1a5v"; }; patches = [ ./nagios.patch ]; From 7b84ac219078c81b0c806527ad9e20a6695ce541 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 00:30:07 -0800 Subject: [PATCH 160/467] mysql57: 5.7.24 -> 5.7.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mysql/versions --- pkgs/servers/sql/mysql/5.7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 51fca3997591..c23bdcd24761 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.24"; + version = "5.7.25"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5"; + sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' From 69b22cb67a39481916e581493fdcb49d339b779c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 01:46:41 -0800 Subject: [PATCH 161/467] mysql-workbench: 8.0.13 -> 8.0.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mysql-workbench/versions --- pkgs/applications/misc/mysql-workbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index daeb8b159f7a..8068a8cfd7e9 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.13"; + version = "8.0.14"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj"; + sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76"; }; patches = [ From 8f20c5d3b9b646d7a8546647bee39c6c147cc08b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 13:23:12 -0800 Subject: [PATCH 162/467] debianutils: 4.8.6 -> 4.8.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debianutils/versions --- pkgs/tools/misc/debianutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index bec0cbbd2b9b..ddd0053f529a 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.6"; + version = "4.8.6.1"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "0wrz8ak4896f5i8wirijr9hdvc43xzxpg2gjs0snmpys8iqh82fv"; + sha256 = "1vamrgzsfdb2183xgj1qmfzh710iqj2dlbdsl92n3ckqfa51x7q9"; }; meta = { From 3f864c454a0c39c35d1854db01601fde5129c3cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 15:16:59 -0800 Subject: [PATCH 163/467] gitAndTools.diff-so-fancy: 1.2.0 -> 1.2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/diff-so-fancy/versions --- .../git-and-tools/diff-so-fancy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 988911d2eb7b..90b83348ef14 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "1.2.0"; + version = "1.2.5"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0j8dxfl4js7agwdpcvxwigzpp0lik33h7s3vsjg0pd413h2j4mvz"; + sha256 = "1jqq7zd75aypxchrq0vjcw5gyn3wyjqy6w79mq2lzky8m6mqn8vr"; }; # Perl is needed here for patchShebangs From 65bb12e337f0f6b473783ec60c782e677194100a Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 3 Feb 2019 20:33:13 +1100 Subject: [PATCH 164/467] haskellPackages.these: jailbreak Test require tasty >= 1.2, which isn't in hackage-packages. Maintainer has a stated policy of not publishing revisions/new versions for test dependency changes. 0.7.6 is in hackage but not yet in nixpkgs. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 58f1f90977a1..4b54ec5685bf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1185,6 +1185,7 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 + these = doJailbreak super.these; # until these >= 0.7.6 # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC From d3855995434f2b45ae79a4302c7bd513f7b50a7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 20:59:12 -0800 Subject: [PATCH 165/467] mobile-broadband-provider-info: 20151214 -> 20190116 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mobile-broadband-provider-info/versions --- pkgs/data/misc/mobile-broadband-provider-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 95c66ed029ef..9f135c423bc8 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "20151214"; + version = "20190116"; pname = "mobile-broadband-provider-info"; name = "${pname}-${version}"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; - sha256 = "1905nab1h8p4hx0m1w0rn4mkg9209x680dcr4l77bngy21pmvr4a"; + sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; }; meta = { From b9ce163127b84add78402eab4d96835f2b6a4e0d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:14:46 +0100 Subject: [PATCH 166/467] chirp: 20181018 -> 20190201 --- pkgs/applications/misc/chirp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index db67514cd077..acc35131e2d5 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -2,12 +2,12 @@ , pyserial, pygtk }: stdenv.mkDerivation rec { - name = "chirp-daily-${version}"; - version = "20181018"; + pname = "chirp-daily"; + version = "20190201"; src = fetchurl { - url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0jd7xi6q09b3djn1k7pj1sbqvw24kn7dcp9r6abvxily4pc1xhdr"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; + sha256 = "1ag3qzdq39zhpagviq9gpwk4y3h11z0j40nccsnhlq8h8bxpvwlf"; }; nativeBuildInputs = [ makeWrapper ]; From d96d17eecad56cba3fc137989b88e8eb78eb2006 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:30:33 +0100 Subject: [PATCH 167/467] fldigi: 4.0.18 -> 4.1.00 --- pkgs/applications/audio/fldigi/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index fb4454269d78..ad5b120b7883 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.18"; + version = "4.1.00"; pname = "fldigi"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0a3z9xj9gsa6fskiai9410kwqfb6156km59y36a31mhyddzk27p7"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1hm2n4p3pdd029kizgzwf3zzgsy1m6z83z7rr2kyjhrq2vp5gf0s"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio From ddc4d153fc4dc4f0c9ef41880228b3ecfc203473 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:38:43 +0100 Subject: [PATCH 168/467] flmsg: 4.0.7 -> 4.0.8 --- pkgs/applications/misc/flmsg/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/flmsg/default.nix b/pkgs/applications/misc/flmsg/default.nix index afdf0f91a910..239d392c374e 100644 --- a/pkgs/applications/misc/flmsg/default.nix +++ b/pkgs/applications/misc/flmsg/default.nix @@ -6,13 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.7"; + version = "4.0.8"; pname = "flmsg"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "1kdlwhxsw02pas9d0kakkq2713wj1m4q881f6am5aq4x8n01f4xw"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; + sha256 = "1yy9z6mchs7r3x108z5rp0h6a18zjqrn9zq5x72qwqh1byjnfwc8"; }; buildInputs = [ From f2d90080372069190e54ae14639b2952afdf3914 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:47:57 +0100 Subject: [PATCH 169/467] flrig: 1.3.41 -> 1.3.42 --- pkgs/applications/misc/flrig/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix index 64d2677d4e13..de4b448b5c37 100644 --- a/pkgs/applications/misc/flrig/default.nix +++ b/pkgs/applications/misc/flrig/default.nix @@ -6,13 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.41"; + version = "1.3.42"; pname = "flrig"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "0vh14azg3pppyg3fb7kf6q3ighw1ka9m60jf2dzsd77f4hidhqx4"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; + sha256 = "10qn710ms145zq2xzb6z2fnygxmh5pmfmyfdbphrc7mrvd0phzp0"; }; buildInputs = [ From 12fc62dde5b38f544fa917dc8169c2f7ddb573d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 Feb 2019 08:52:40 -0200 Subject: [PATCH 170/467] tetra-gtk-theme: 0.2.0 -> 201902 --- pkgs/misc/themes/tetra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix index 0d2ddb95166d..9e5e246880a2 100644 --- a/pkgs/misc/themes/tetra/default.nix +++ b/pkgs/misc/themes/tetra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tetra-gtk-theme-${version}"; - version = "0.2.0"; + version = "201902"; src = fetchFromGitHub { owner = "hrdwrrsk"; repo = "tetra-gtk-theme"; rev = version; - sha256 = "1lzkmswv3ml2zj80z067j1hj1cvpdcl86jllahqx3jwnmr0a4fhd"; + sha256 = "0xvp85mzgh5msr3s6wl9xagz2xxqmy3s9jndbmwh1cc79fycggqv"; }; preBuild = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme."; + description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; From bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sun, 3 Feb 2019 13:03:53 +0200 Subject: [PATCH 171/467] postgresql test: fix (#55106) Commit https://github.com/NixOS/nixpkgs/pull/55097 didn't modify all usages of postgresql/default.nix. Also, replaced "random" pg with pg11. Random pg was always pg10. --- nixos/tests/postgresql.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 9e1f4f235af0..cf1de2f6acbf 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let - postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs pkgs; + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; test-sql = pkgs.writeText "postgresql-test" '' CREATE EXTENSION pgcrypto; -- just to check if lib loading works CREATE TABLE sth ( @@ -67,12 +67,7 @@ let }; in - (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // ( - # just pick one version for the dump all test - let - first = head (attrNames postgresql-versions); - name = "${first}-backup-all"; - in { - ${name} = make-postgresql-test name postgresql-versions.${first} true; - } - ) + (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // { + postgresql_11-backup-all = make-postgresql-test name postgresql-versions.postgresql_11 true; + } + From d0e940e74d5ace10cb6c4dfa0db4fa154902519b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 12:13:46 +0100 Subject: [PATCH 172/467] xastir: 2.0.8 -> 2.1.0 --- pkgs/applications/misc/xastir/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index c677f7371fca..969661ea7b4e 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "xastir-${version}"; - version = "208"; + pname = "xastir"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "Xastir"; - repo = "Xastir"; - rev = "707f3aa8c7ca3e3fecd32d5a4af3f742437e5dce"; - sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl"; + owner = pname; + repo = pname; + rev = "Release-${version}"; + sha256 = "16zsgy3589snawr8f1fa22ymvpnjy6njvxmsck7q8p2xmmz2ry7r"; }; buildInputs = [ From 08be9340fbf464e10c303fae0edd1730f6eeb14c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 12:20:27 +0100 Subject: [PATCH 173/467] xlog: 2.0.15 -> 2.0.17 --- pkgs/applications/misc/xlog/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix index c0b0ef63369f..7b9cf0a4ee55 100644 --- a/pkgs/applications/misc/xlog/default.nix +++ b/pkgs/applications/misc/xlog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: stdenv.mkDerivation rec { - name = "xlog-${version}"; - version = "2.0.15"; - + pname = "xlog"; + version = "2.0.17"; + src = fetchurl { - url = "https://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; - sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; + url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; + sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; }; buildInputs = [ glib pkgconfig gtk2 hamlib ]; @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, location in latitude and longitude and distance and heading in kilometers or miles, - both for short and long path. + both for short and long path. ''; homepage = https://www.nongnu.org/xlog; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; }; - } From 055ac8e4955294a3ecf6663628d892a486bba06d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 3 Feb 2019 18:22:22 +0700 Subject: [PATCH 174/467] Partially revert 755e824 Reinstates the error message that helps migration of forks. Same should be done for super *if* it is to be removed. --- pkgs/top-level/all-packages.nix | 16 +++++++++++++++- pkgs/top-level/stage.nix | 5 ++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf7e603b231..01dccadd3b9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6,11 +6,25 @@ * Hint: ### starts category names. */ { lib, noSysDirs, config}: -pkgs: +res: pkgs: super: with pkgs; +let + self = + builtins.trace '' + It seems that you are using a patched Nixpkgs that references the self + variable in pkgs/top-level/all-packages.nix. This variable was incorrectly + named, so its usage needs attention. Please use pkgs for packages or super + for functions. + '' + res; # Do *NOT* use res in your fork. It will be removed. + + # TODO: turn self into an error + +in { + # Allow callPackage to fill in the pkgs argument inherit pkgs; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0991c9138bda..6ca370e0b9b7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -89,7 +89,10 @@ let splice = self: super: import ./splice.nix lib self (buildPackages != null); allPackages = self: super: - import ./all-packages.nix { inherit lib noSysDirs config; } self; + let res = import ./all-packages.nix + { inherit lib noSysDirs config; } + res self super; + in res; aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); From f85453f060b4756a3d55c2d3a6563be19f41dfe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Feb 2019 12:45:52 +0100 Subject: [PATCH 175/467] nixos/home-assistant: add configWritable option --- .../modules/services/misc/home-assistant.nix | 32 +++++++++++++++++-- nixos/tests/home-assistant.nix | 6 ++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 628dd7c39b14..4eabda1d4188 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -110,6 +110,17 @@ in { ''; }; + configWritable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to make configuration.yaml writable. + This only has an effect if is set. + This will allow you to edit it from Home Assistant's web interface. + However, bear in mind that it will be overwritten at every start of the service. + ''; + }; + lovelaceConfig = mkOption { default = null; type = with types; nullOr attrs; @@ -135,6 +146,17 @@ in { ''; }; + lovelaceConfigWritable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to make ui-lovelace.yaml writable. + This only has an effect if is set. + This will allow you to edit it from Home Assistant's web interface. + However, bear in mind that it will be overwritten at every start of the service. + ''; + }; + package = mkOption { default = pkgs.home-assistant; defaultText = "pkgs.home-assistant"; @@ -180,13 +202,17 @@ in { systemd.services.home-assistant = { description = "Home Assistant"; after = [ "network.target" ]; - preStart = optionalString (cfg.config != null) '' + preStart = optionalString (cfg.config != null) (if cfg.configWritable then '' + cp --no-preserve=mode ${configFile} "${cfg.configDir}/configuration.yaml" + '' else '' rm -f "${cfg.configDir}/configuration.yaml" ln -s ${configFile} "${cfg.configDir}/configuration.yaml" - '' + optionalString (cfg.lovelaceConfig != null) '' + '') + optionalString (cfg.lovelaceConfig != null) (if cfg.lovelaceConfigWritable then '' + cp --no-preserve=mode ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" + '' else '' rm -f "${cfg.configDir}/ui-lovelace.yaml" ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" - ''; + ''); serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; User = "hass"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 9e97ed4c47e8..00a0e82fedc9 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -61,6 +61,7 @@ in { } ]; } ]; }; + lovelaceConfigWritable = true; }; }; }; @@ -70,9 +71,10 @@ in { $hass->waitForUnit("home-assistant.service"); # The config is specified using a Nix attribute set, - # but then converted from JSON to YAML + # converted from JSON to YAML, and linked to the config dir $hass->succeed("test -L ${configDir}/configuration.yaml"); - $hass->succeed("test -L ${configDir}/ui-lovelace.yaml"); + # The lovelace config is copied because lovelaceConfigWritable = true + $hass->succeed("test -f ${configDir}/ui-lovelace.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); From 1bd0e155f1b7766b6cb6f58fc2031ca215efc7e2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 3 Feb 2019 13:18:58 +0100 Subject: [PATCH 176/467] hivex: 1.3.17 -> 1.3.18 --- pkgs/development/libraries/hivex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 3a2e08e4b5bc..7a42ff94fc0f 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "1nsjijgcpcl6vm7whbbpxqrjycajf7vy0sp5hfg4vmvjmf3lpjqk"; + sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; }; patches = [ ./hivex-syms.patch ]; From f1b91b5726c901ccb7056836d0882c7532883b36 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Feb 2019 16:05:12 +0100 Subject: [PATCH 177/467] nixos/tests: add ndppd test --- nixos/tests/ndppd.nix | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 nixos/tests/ndppd.nix diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix new file mode 100644 index 000000000000..9f24eb6d9d45 --- /dev/null +++ b/nixos/tests/ndppd.nix @@ -0,0 +1,61 @@ +import ./make-test.nix ({ pkgs, lib, ...} : { + name = "ndppd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ fpletz ]; + }; + + nodes = { + upstream = { pkgs, ... }: { + environment.systemPackages = [ pkgs.tcpdump ]; + networking.useDHCP = false; + networking.interfaces = { + eth1 = { + ipv6.addresses = [ + { address = "fd23::1"; prefixLength = 112; } + ]; + ipv6.routes = [ + { address = "fd42::"; + prefixLength = 112; + } + ]; + }; + }; + }; + server = { pkgs, ... }: { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = "1"; + "net.ipv6.conf.default.forwarding" = "1"; + }; + environment.systemPackages = [ pkgs.tcpdump ]; + networking.useDHCP = false; + networking.interfaces = { + eth1 = { + ipv6.addresses = [ + { address = "fd23::2"; prefixLength = 112; } + ]; + }; + }; + services.ndppd = { + enable = true; + interface = "eth1"; + network = "fd42::/112"; + }; + containers.client = { + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.255.1"; + localAddress = "192.168.255.2"; + hostAddress6 = "fd42::1"; + localAddress6 = "fd42::2"; + config = {}; + }; + }; + }; + + testScript = '' + startAll; + $server->waitForUnit("multi-user.target"); + $upstream->waitForUnit("multi-user.target"); + $upstream->waitUntilSucceeds("ping -c5 fd42::2"); + ''; +}) From 96881a6c1d069cb657bf6e648ada4dfb00b6dd8a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 13:04:07 +0100 Subject: [PATCH 178/467] hunspellDicts.en-*: 2014.11.17 -> 2018.04.16 --- .../libraries/hunspell/dictionaries.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 9f0a6c34512f..836d0128a8c1 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -137,7 +137,7 @@ let { shortName, shortDescription, dictFileName, src }: mkDict rec { inherit src dictFileName; - version = "2014.11.17"; + version = "2018.04.16"; name = "hunspell-dict-${shortName}-wordlist-${version}"; readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { @@ -259,8 +259,8 @@ in { shortDescription = "English (United States)"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_US-2014.11.17.zip; - sha256 = "4ce88a1af457ce0e256110277a150e5da798213f611929438db059c1c81e20f2"; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip; + sha256 = "18hbncvqnckzqarrmnzk58plymjqyi93k4qj98fac5mr71jbmzaf"; }; }; @@ -269,8 +269,8 @@ in { shortDescription = "English (Canada)"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_CA-2014.11.17.zip; - sha256 = "59950448440657a6fc3ede15720c1b86c0b66c4ec734bf1bd9157f6a1786673b"; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip; + sha256 = "06yf3s7y1215jmikbs18cn4j8a13csp4763w3jfgah8zlim6vc47"; }; }; @@ -279,8 +279,8 @@ in { shortDescription = "English (United Kingdom, 'ise' ending)"; dictFileName = "en_GB-ise"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ise-2014.11.17.zip; - sha256 = "97f3b25102fcadd626ae4af3cdd97f017ce39264494f98b1f36ad7d96b9d5a94"; + url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ise-2018.04.16.zip; + sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; }; }; @@ -289,8 +289,8 @@ in { shortDescription = "English (United Kingdom, 'ize' ending)"; dictFileName = "en_GB-ize"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ize-2014.11.17.zip; - sha256 = "84270673ed7c014445f3ba02f9efdb0ac44cea9ee0bfec76e3e10feae55c4e1c"; + url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ize-2018.04.16.zip; + sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; }; }; From 5b1ed0c62f0f5e699fadfd08f5fc8b9b3dbc0b14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 13:08:43 +0100 Subject: [PATCH 179/467] nuspell: init at 2.1.0 --- .../development/libraries/nuspell/default.nix | 28 +++++++++++++++++++ .../development/libraries/nuspell/wrapper.nix | 13 +++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/nuspell/default.nix create mode 100644 pkgs/development/libraries/nuspell/wrapper.nix diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix new file mode 100644 index 000000000000..1d92a15ce005 --- /dev/null +++ b/pkgs/development/libraries/nuspell/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }: + +stdenv.mkDerivation rec { + name = "nuspell-${version}"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "nuspell"; + repo = "nuspell"; + rev = "v${version}"; + sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost icu ]; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${catch2}/include/catch2/*.hpp tests/ + ''; + + meta = with stdenv.lib; { + description = "Free and open source C++ spell checking library"; + homepage = "https://nuspell.github.io/"; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix new file mode 100644 index 000000000000..4386542ff20e --- /dev/null +++ b/pkgs/development/libraries/nuspell/wrapper.nix @@ -0,0 +1,13 @@ +{ stdenv, lib, nuspell, makeWrapper, dicts ? [] }: +with lib; +let + searchPath = makeSearchPath "share/hunspell" dicts; +in +stdenv.mkDerivation { + name = (appendToName "with-dicts" nuspell).name; + buildInputs = [ makeWrapper ]; + buildCommand = '' + makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} + ''; + meta = removeAttrs nuspell.meta ["outputsToInstall"]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01dccadd3b9a..3c5cea676c31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11773,6 +11773,9 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nuspell = callPackage ../development/libraries/nuspell { }; + nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; + nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; @@ -23304,4 +23307,5 @@ in newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; }; + } From 784870046b926f64cdcc6bcf0746e30ed43197c8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 3 Feb 2019 13:55:45 +0100 Subject: [PATCH 180/467] sundials: remove name attribute (pname is present) --- pkgs/development/libraries/sundials/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 40bb8b8c43b7..b33180cec428 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "sundials"; version = "4.0.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" ''; - + nativeBuildInputs = [ cmake ]; buildInputs = [ python ]; From 4ce1c5938905eedd1050f0be8a0c6a69587f5aac Mon Sep 17 00:00:00 2001 From: elseym Date: Sat, 2 Feb 2019 15:37:48 +0100 Subject: [PATCH 181/467] ndppd module: refactor --- nixos/modules/services/networking/ndppd.nix | 174 ++++++++++++++++---- 1 file changed, 146 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 1d6c48dd8d37..54a6e393657f 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -5,43 +5,161 @@ with lib; let cfg = config.services.ndppd; - configFile = pkgs.runCommand "ndppd.conf" {} '' - substitute ${pkgs.ndppd}/etc/ndppd.conf $out \ - --replace eth0 ${cfg.interface} \ - --replace 1111:: ${cfg.network} - ''; -in { - options = { - services.ndppd = { - enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + render = s: f: concatStringsSep "\n" (mapAttrsToList f s); + prefer = a: b: if a != null then a else b; + + ndppdConf = prefer cfg.configFile (pkgs.writeText "ndppd.conf" '' + route-ttl ${toString cfg.routeTTL} + ${render cfg.proxies (proxyInterfaceName: proxy: '' + proxy ${prefer proxy.interface proxyInterfaceName} { + router ${boolToString proxy.router} + timeout ${toString proxy.timeout} + ttl ${toString proxy.ttl} + ${render proxy.rules (ruleNetworkName: rule: '' + rule ${prefer rule.network ruleNetworkName} { + ${rule.method}${if rule.method == "iface" then " ${rule.interface}" else ""} + }'')} + }'')} + ''); + + proxy = types.submodule { + options = { interface = mkOption { - type = types.string; - default = "eth0"; - example = "ens3"; - description = "Interface which is on link-level with router."; - }; - network = mkOption { - type = types.string; - default = "1111::"; - example = "2001:DB8::/32"; - description = "Network that we proxy."; - }; - configFile = mkOption { - type = types.nullOr types.path; + type = types.nullOr types.str; + description = '' + Listen for any Neighbor Solicitation messages on this interface, + and respond to them according to a set of rules. + Defaults to the name of the attrset. + ''; default = null; - description = "Path to configuration file."; }; + router = mkOption { + type = types.bool; + description = '' + Turns on or off the router flag for Neighbor Advertisement Messages. + ''; + default = true; + }; + timeout = mkOption { + type = types.int; + description = '' + Controls how long to wait for a Neighbor Advertisment Message before + invalidating the entry, in milliseconds. + ''; + default = 500; + }; + ttl = mkOption { + type = types.int; + description = '' + Controls how long a valid or invalid entry remains in the cache, in + milliseconds. + ''; + default = 30000; + }; + rules = mkOption { + type = types.attrsOf rule; + description = '' + This is a rule that the target address is to match against. If no netmask + is provided, /128 is assumed. You may have several rule sections, and the + addresses may or may not overlap. + ''; + default = {}; + }; + }; + }; + + rule = types.submodule { + options = { + network = mkOption { + type = types.nullOr types.str; + description = '' + This is the target address is to match against. If no netmask + is provided, /128 is assumed. The addresses of serveral rules + may or may not overlap. + Defaults to the name of the attrset. + ''; + default = null; + }; + method = mkOption { + type = types.enum [ "static" "iface" "auto" ]; + description = '' + static: Immediately answer any Neighbor Solicitation Messages + (if they match the IP rule). + iface: Forward the Neighbor Solicitation Message through the specified + interface and only respond if a matching Neighbor Advertisement + Message is received. + auto: Same as iface, but instead of manually specifying the outgoing + interface, check for a matching route in /proc/net/ipv6_route. + ''; + default = "auto"; + }; + interface = mkOption { + type = types.nullOr types.str; + description = "Interface to use when method is iface."; + default = null; + }; + }; + }; + +in { + options.services.ndppd = { + enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + interface = mkOption { + type = types.nullOr types.str; + description = '' + Interface which is on link-level with router. + (Legacy option, use services.ndppd.proxies.<interface>.rules.<network> instead) + ''; + default = null; + example = "eth0"; + }; + network = mkOption { + type = types.nullOr types.str; + description = '' + Network that we proxy. + (Legacy option, use services.ndppd.proxies.<interface>.rules.<network> instead) + ''; + default = null; + example = "1111::/64"; + }; + configFile = mkOption { + type = types.nullOr types.path; + description = "Path to configuration file."; + default = null; + }; + routeTTL = mkOption { + type = types.int; + description = '' + This tells 'ndppd' how often to reload the route file /proc/net/ipv6_route, + in milliseconds. + ''; + default = 30000; + }; + proxies = mkOption { + type = types.attrsOf proxy; + description = '' + This sets up a listener, that will listen for any Neighbor Solicitation + messages, and respond to them according to a set of rules. + ''; + default = {}; + example = { "eth0".rules."1111::/64" = {}; }; }; }; config = mkIf cfg.enable { - systemd.packages = [ pkgs.ndppd ]; - environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile; + warnings = mkIf (cfg.interface != null && cfg.network != null) [ '' + The options services.ndppd.interface and services.ndppd.network will probably be removed soon, + please use services.ndppd.proxies..rules. instead. + '' ]; + + services.ndppd.proxies = mkIf (cfg.interface != null && cfg.network != null) { + "${cfg.interface}".rules."${cfg.network}" = {}; + }; + systemd.services.ndppd = { - serviceConfig.RuntimeDirectory = [ "ndppd" ]; + after = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}"; }; }; - - meta.maintainers = with maintainers; [ gnidorah ]; } From c01eeda8e96c0fa63eb23df3df51403cc0589672 Mon Sep 17 00:00:00 2001 From: aanderse Date: Sun, 3 Feb 2019 08:33:31 -0500 Subject: [PATCH 182/467] nixos-generate-config: account for mount points & devices with spaces & tabs in the name (#50234) --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++++ nixos/modules/tasks/filesystems.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index e58392ad05b4..3bcf90258d79 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -340,6 +340,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { chomp $fs; my @fields = split / /, $fs; my $mountPoint = $fields[4]; + $mountPoint =~ s/\\040/ /g; # account for mount points with spaces in the name (\040 is the escape character) + $mountPoint =~ s/\\011/\t/g; # account for mount points with tabs in the name (\011 is the escape character) next unless -d $mountPoint; my @mountOptions = split /,/, $fields[5]; @@ -355,6 +357,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { my $fsType = $fields[$n]; my $device = $fields[$n + 1]; my @superOptions = split /,/, $fields[$n + 2]; + $device =~ s/\\040/ /g; # account for devices with spaces in the name (\040 is the escape character) + $device =~ s/\\011/\t/g; # account for mount points with tabs in the name (\011 is the escape character) # Skip the read-only bind-mount on /nix/store. next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions); diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 9e4057b50897..07f8214cea2c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -231,7 +231,7 @@ in fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces - escape = string: builtins.replaceStrings [ " " ] [ "\\040" ] string; + escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; in '' # This is a generated file. Do not edit! # From 2746973061f8e62c4decdf8e131c7db06f5c511f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 14:37:55 +0100 Subject: [PATCH 183/467] ndppd: don't use weird upstream systemd service unit --- nixos/modules/services/networking/ndppd.nix | 2 ++ pkgs/applications/networking/ndppd/default.nix | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 54a6e393657f..ba17f1ba825a 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -157,6 +157,8 @@ in { }; systemd.services.ndppd = { + description = "NDP Proxy Daemon"; + documentation = [ "man:ndppd(1)" "man:ndppd.conf(5)" ]; after = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}"; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index a5eb9021048e..6e6315ced7df 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,11 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip }: -let - serviceFile = fetchurl { - url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; - sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -27,11 +22,6 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cp ndppd.conf-dist $out/etc/ndppd.conf - - mkdir -p $out/lib/systemd/system - # service file needed for our module is not in release yet - substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ - --replace /usr/sbin/ndppd $out/sbin/ndppd ''; meta = { From b251a368dd3d1215e925618aa227d56433f99526 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sun, 3 Feb 2019 15:51:02 +0200 Subject: [PATCH 184/467] Revert "all-packages.nix: remove `res.` (next stage super)" (#55125) This reverts commit 3ec0eb4bbd783e6f07175c9703ec5a2a70491da9. See https://github.com/NixOS/nixpkgs/pull/55061#issuecomment-460047536 --- pkgs/top-level/all-packages.nix | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c5cea676c31..2a1aa3d30f79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,7 +3510,7 @@ in jid = callPackage ../development/tools/jid { }; - jing = jing-trang; + jing = res.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -4805,23 +4805,23 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = pinentry.override { + pinentry_ncurses = res.pinentry.override { gtk2 = null; }; - pinentry_emacs = pinentry.override { + pinentry_emacs = res.pinentry.override { enableEmacs = true; }; - pinentry_gnome = pinentry.override { + pinentry_gnome = res.pinentry.override { inherit gcr; }; - pinentry_qt4 = pinentry.override { + pinentry_qt4 = res.pinentry.override { qt = qt4; }; - pinentry_qt5 = pinentry.override { + pinentry_qt5 = res.pinentry.override { qt = qt5.qtbase; }; @@ -8691,11 +8691,11 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = gradleGen.gradle_latest; - gradle_2_14 = gradleGen.gradle_2_14; - gradle_2_5 = gradleGen.gradle_2_5; - gradle_3_5 = gradleGen.gradle_3_5; - gradle_4_10 = gradleGen.gradle_4_10; + gradle = res.gradleGen.gradle_latest; + gradle_2_14 = res.gradleGen.gradle_2_14; + gradle_2_5 = res.gradleGen.gradle_2_5; + gradle_3_5 = res.gradleGen.gradle_3_5; + gradle_4_10 = res.gradleGen.gradle_4_10; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9179,7 +9179,7 @@ in valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; }; - valgrind-light = valgrind.override { gdb = null; }; + valgrind-light = res.valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -9753,7 +9753,7 @@ in inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; - fltk = fltk13; + fltk = res.fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9766,7 +9766,7 @@ in freetts = callPackage ../development/libraries/freetts { }; - frog = languageMachines.frog; + frog = res.languageMachines.frog; fstrcmp = callPackage ../development/libraries/fstrcmp { }; @@ -9840,11 +9840,11 @@ in }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = gtk2; + gtk = res.gtk2; }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = gtk2; + gtk = res.gtk2; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10252,7 +10252,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = gnome3; + gnome = res.gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11492,7 +11492,7 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky - name = "libxml2+py-${libxml2.version}"; + name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv @@ -11940,9 +11940,9 @@ in }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = pcre.override { variant = "pcre16"; }; + pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = pcre.override { variant = "cpp"; }; + pcre-cpp = res.pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -15870,7 +15870,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = gtk2; + gtk = res.gtk2; }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -16113,18 +16113,18 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = altcoins.go-ethereum; - ethabi = altcoins.ethabi; + go-ethereum = res.altcoins.go-ethereum; + ethabi = res.altcoins.ethabi; - parity = altcoins.parity; - parity-beta = altcoins.parity-beta; - parity-ui = altcoins.parity-ui; + parity = res.altcoins.parity; + parity-beta = res.altcoins.parity-beta; + parity-ui = res.altcoins.parity-ui; - polkadot = altcoins.polkadot; + polkadot = res.altcoins.polkadot; - stellar-core = altcoins.stellar-core; + stellar-core = res.altcoins.stellar-core; - particl-core = altcoins.particl-core; + particl-core = res.altcoins.particl-core; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -16910,7 +16910,7 @@ in espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = espeak-ng; + espeak = res.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -17209,7 +17209,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-beta-bin = wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; name = "firefox-beta-bin-" + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; @@ -17224,7 +17224,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-devedition-bin = wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; name = "firefox-devedition-bin-" + @@ -21122,7 +21122,7 @@ in ut2004Packages = callPackage ../games/ut2004 { }; - ut2004demo = ut2004Packages.ut2004 [ ut2004Packages.ut2004-demo ]; + ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -21259,8 +21259,8 @@ in # Included for backwards compatibility libsoup libwnck gtk-doc gnome-doc-utils; - gtk = gtk2; - gtkmm = gtkmm2; + gtk = res.gtk2; + gtkmm = res.gtkmm2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -22314,7 +22314,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = faust2; + faust = res.faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -22814,7 +22814,7 @@ in samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; From 5b8a861c446078f4564efd6b5af0e5a0f900c6e6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 14:54:09 +0100 Subject: [PATCH 185/467] signing-party: Update meta.homepage The current repository (debian/signing-party) was actually the old one (last activity 4 months ago) and signing-party-team/signing-party is the new upstream repository. --- pkgs/tools/security/signing-party/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 287ed1edcdae..7202f2aa28a1 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -190,7 +190,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/debian/signing-party; + homepage = https://salsa.debian.org/signing-party-team/signing-party; description = "A collection of several projects relating to OpenPGP"; longDescription = '' This is a collection of several projects relating to OpenPGP. From 614b29a93b51e3438f6dc4c121229fcf2dcc2fbd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 15:09:24 +0100 Subject: [PATCH 186/467] python37Packages.mysql-connector: 8.0.14 -> 8.0.15 --- pkgs/development/python-modules/mysql-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 2c0a83c62e3e..56c1ab227c8d 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.14"; + version = "8.0.15"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1cf0ic2mx339j62579xjlaw5q5sz61dac379c7lsy3ln3krsw3y9"; + sha256 = "1w4j2sf07aid3453529z8kg1ziycbayxi3g2r4wqn0nb3y1caqz6"; }; propagatedBuildInputs = [ protobuf ]; From d8a8de45d08bf79da44f83be162894901e750690 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Jan 2019 22:51:47 +0000 Subject: [PATCH 187/467] ocamlPackages.lwt_camlp4: init at 20180325 --- pkgs/development/ocaml-modules/lwt/camlp4.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lwt/camlp4.nix diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix new file mode 100644 index 000000000000..53f0435f462f --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildDunePackage, camlp4 }: + +buildDunePackage rec { + pname = "lwt_camlp4"; + version = "git-20180325"; + + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = "45f25a081e01071ab566924b48ba5f7553bb33ac"; + sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; + }; + + minimumOCamlVersion = "4.02"; + + propagatedBuildInputs = [ camlp4 ]; + + meta = { + description = "Camlp4 syntax extension for Lwt (deprecated)"; + license = lib.licenses.lgpl21; + inherit (src.meta) homepage; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8df57e8d710a..d357a59f6123 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -412,6 +412,8 @@ let ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2; + lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { lwt = lwt4; }; From 05350c00477b4b485a73e002d4bb56a6f4928a75 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Jan 2019 22:51:56 +0000 Subject: [PATCH 188/467] ocamlPackages.ocsigen_server: 2.9 -> 2.11 --- .../ocaml-modules/ocsigen-server/default.nix | 57 +++++++++---------- pkgs/top-level/ocaml-packages.nix | 5 +- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 474f69ba918e..147b4200cf69 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,42 +1,37 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl -, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, -libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl +{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl +, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr +, pgocaml, camlzip, ocaml_sqlite3 +, makeWrapper }: +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "ocsigenserver is not available for OCaml ${ocaml.version}" +else + let mkpath = p: n: - let v = stdenv.lib.getVersion ocaml; in - "${p}/lib/ocaml/${v}/site-lib/${n}"; + "${p}/lib/ocaml/${ocaml.version}/site-lib/${n}"; in -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { - version = "2.9"; - sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; - buildInputs = [ lwt_react lwt_ssl ]; - ldpath = ""; - } else { - version = "2.8"; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; - buildInputs = [ lwt2 ]; - ldpath = "${mkpath lwt2 "lwt"}"; - } -; in +stdenv.mkDerivation rec { + version = "2.11.0"; + name = "ocsigenserver-${version}"; -stdenv.mkDerivation { - name = "ocsigenserver-${param.version}"; - - src = fetchurl { - url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "ocsigenserver"; + rev = version; + sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2"; }; - buildInputs = [ocaml which findlib react ssl - ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] - ++ (param.buildInputs or []); + buildInputs = [ which makeWrapper ocaml findlib + lwt_react pgocaml camlzip ocaml_sqlite3 + ]; - configureFlags = [ "--root $(out) --prefix /" ]; + propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet + ocaml_pcre tyxml xml-light + ]; + + configureFlags = [ "--root $(out)" "--prefix /" ]; dontAddPrefix = true; @@ -46,7 +41,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d357a59f6123..bec2d64d4fbb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -543,10 +543,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { - lwt_react = lwt_react.override { lwt = lwt3; }; - lwt_ssl = lwt_ssl.override { lwt = lwt3; }; - }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; From 686f8a4710a4e3c0800a7ba131d92033c964a20c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Jan 2019 22:52:07 +0000 Subject: [PATCH 189/467] ocamlPackages.eliom: 6.3.0 -> 6.4.0 --- .../ocaml-modules/eliom/default.nix | 18 +++++++----------- pkgs/top-level/ocaml-packages.nix | 11 +---------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index f82cf33e3079..ec63e58fbb65 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, lwt_react, cryptokit, - ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + ipaddr, ocamlnet, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml +, lwt_ppx }: -assert stdenv.lib.versionAtLeast ocaml.version "4.03"; - stdenv.mkDerivation rec { pname = "eliom"; - version = "6.3.0"; + version = "6.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; + sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh"; }; patches = [ ./camlp4.patch ]; @@ -27,15 +26,12 @@ stdenv.mkDerivation rec ]; propagatedBuildInputs = [ - camlp4 - cryptokit - ipaddr js_of_ocaml-lwt js_of_ocaml-ppx js_of_ocaml-tyxml + lwt_camlp4 + lwt_ppx lwt_react - lwt_ssl - ocamlnet ocaml_pcre ocsigen_server ppx_deriving ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bec2d64d4fbb..1adf66d5eb78 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -231,16 +231,7 @@ let elina = callPackage ../development/ocaml-modules/elina { }; - eliom = callPackage ../development/ocaml-modules/eliom { - js_of_ocaml-lwt = js_of_ocaml-lwt.override { - ocaml_lwt = lwt3; - lwt_log = lib.overrideDerivation - (lwt_log.override { lwt = lwt3; }) - (_: { inherit (lwt3) src; }); - }; - lwt_react = lwt_react.override { lwt = lwt3; }; - lwt_ssl = lwt_ssl.override { lwt = lwt3; }; - }; + eliom = callPackage ../development/ocaml-modules/eliom { }; elpi = callPackage ../development/ocaml-modules/elpi { }; From 5a2f6b08bf79e5e271bb8bd6ac42f940cf0b11f6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Jan 2019 22:52:14 +0000 Subject: [PATCH 190/467] ocamlPackages.ocsigen-toolkit: 1.1.0 -> 2.0.0 --- .../ocaml-modules/ocsigen-toolkit/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 37c8c8f76c95..4e46c1534d80 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, opaline +{ stdenv, fetchFromGitHub, ocaml, findlib, opaline , calendar, eliom, js_of_ocaml-ppx_deriving_json }: -buildOcaml rec -{ - name = "ocsigen-toolkit"; - version = "1.1.0"; +stdenv.mkDerivation rec { + pname = "ocsigen-toolkit"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "2.0.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; - buildInputs = [ opaline ]; + buildInputs = [ ocaml findlib opaline ]; installPhase = '' @@ -17,16 +17,21 @@ buildOcaml rec opaline -prefix $out ''; - src = fetchurl { - sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = version; + sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; }; + createFindlibDestdir = true; + meta = { homepage = http://ocsigen.org/ocsigen-toolkit/; description = " User interface widgets for Ocsigen applications"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + inherit (ocaml.meta) platforms; }; From c3ddb39adea004d02104b537e28ae98941b4bdf8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Jan 2019 22:52:20 +0000 Subject: [PATCH 191/467] ocamlPackages.ocsigen-start: 1.1.0 -> 1.2.0 --- .../ocaml-modules/ocsigen-start/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index ba7e3e93c989..3efd4b61b8bd 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 +, resource-pooling }: buildOcaml rec { name = "ocsigen-start"; - version = "1.1.0"; + version = "1.2.0"; buildInputs = [ eliom js_of_ocaml-camlp4 ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,13 +17,13 @@ buildOcaml rec substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; - src = fetchurl { - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; - sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = name; + rev = version; + sha256 = "11sn673vhs08z8dq7ajnaz923kg82vvz9z5v6zq171y4zgg901zj"; }; - createFindlibDestdir = true; - meta = { homepage = http://ocsigen.org/ocsigen-start; description = "Eliom application skeleton"; From 65ba19a9c594a1e82b64acd5008c96e0a346bf10 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Jan 2019 07:34:22 +0000 Subject: [PATCH 192/467] ocamlPackages.ocsigen-start: 1.2.0 -> 1.4.0 --- pkgs/development/ocaml-modules/ocsigen-start/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 3efd4b61b8bd..60bb2dba0372 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -6,7 +6,7 @@ buildOcaml rec { name = "ocsigen-start"; - version = "1.2.0"; + version = "1.4.0"; buildInputs = [ eliom js_of_ocaml-camlp4 ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; @@ -21,7 +21,7 @@ buildOcaml rec owner = "ocsigen"; repo = name; rev = version; - sha256 = "11sn673vhs08z8dq7ajnaz923kg82vvz9z5v6zq171y4zgg901zj"; + sha256 = "1kicbw5cjb9gkfmfbqf6fiwbi0rzpqgk2lzd4v6nxaiyinxm73ff"; }; meta = { From 570dd83ae4a27b871f07ef6ec60911ddeb4315ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 18 Jan 2019 01:57:11 +0000 Subject: [PATCH 193/467] ocamlPackages.ocsigen-start: 1.4.0 -> 1.5.0 --- pkgs/development/ocaml-modules/ocsigen-start/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 60bb2dba0372..4bc9b7f8629e 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -6,7 +6,7 @@ buildOcaml rec { name = "ocsigen-start"; - version = "1.4.0"; + version = "1.5.0"; buildInputs = [ eliom js_of_ocaml-camlp4 ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; @@ -21,7 +21,7 @@ buildOcaml rec owner = "ocsigen"; repo = name; rev = version; - sha256 = "1kicbw5cjb9gkfmfbqf6fiwbi0rzpqgk2lzd4v6nxaiyinxm73ff"; + sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; }; meta = { From 038b89819b94e509d5ba32707406e6b8df6802ee Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 11:46:46 +0100 Subject: [PATCH 194/467] wlroots: 0.2 -> 0.3 --- pkgs/development/libraries/wlroots/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 92e8bded8755..d25f1d0b4c8d 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,7 +6,7 @@ let pname = "wlroots"; - version = "0.2"; + version = "0.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,14 +14,9 @@ in stdenv.mkDerivation rec { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv"; + sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '0.1.0'" "version: '${version}.0'" - ''; - # $out for the library, $bin for rootston, and $examples for the example # programs (in examples) AND rootston outputs = [ "out" "bin" "examples" ]; @@ -39,6 +34,11 @@ in stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; + postPatch = '' + # It happens from time to time that the version wasn't updated: + sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build + ''; + postInstall = '' # Install rootston (the reference compositor) to $bin and $examples for output in "$bin" "$examples"; do From f73a8b22fbed2193edcc97884f6ddbc167ebe7c4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 11:57:19 +0100 Subject: [PATCH 195/467] sway-beta: 1.0-beta.2 -> 1.0-rc1 --- pkgs/applications/window-managers/sway/beta.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix index fd3e2275b442..8b2acc94ea08 100644 --- a/pkgs/applications/window-managers/sway/beta.nix +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , meson, ninja , pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk_pixbuf , wlroots, wayland-protocols , buildDocs ? true @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-beta.2"; + version = "1.0-rc1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw"; + sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz"; }; nativeBuildInputs = [ @@ -24,14 +24,17 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ - wayland libxkbcommon pcre json_c dbus + wayland libxkbcommon pcre json_c dbus libevdev pango cairo libinput libcap pam gdk_pixbuf wlroots wayland-protocols ]; enableParallelBuilding = true; - mesonFlags = "-Dsway-version=${version}"; + mesonFlags = [ + "-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" "-Dtray=enabled" + ]; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; From ebe36008d610c5e26c65d8281489a9c2e5ef8991 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 12:01:42 +0100 Subject: [PATCH 196/467] nixos/sway-beta: Install swaylock and swayidle by default --- nixos/modules/programs/sway-beta.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix index 7fc5979a38aa..3c235de0ce63 100644 --- a/nixos/modules/programs/sway-beta.nix +++ b/nixos/modules/programs/sway-beta.nix @@ -60,10 +60,11 @@ in { extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ + swaylock swayidle xwayland rxvt_unicode dmenu ]; defaultText = literalExample '' - with pkgs; [ xwayland rxvt_unicode dmenu ]; + with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ]; ''; example = literalExample '' with pkgs; [ From f7a16402b4dfbe2b702542a0705a1bd604ff3ec7 Mon Sep 17 00:00:00 2001 From: Duarte David Date: Sun, 3 Feb 2019 16:31:30 +0100 Subject: [PATCH 197/467] coredns: Add deltaevo as maintainer --- pkgs/servers/dns/coredns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 76452ae9d8d0..214c3e91f0ef 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { homepage = https://coredns.io; description = "A DNS server that runs middleware"; license = licenses.asl20; - maintainers = [ maintainers.rushmorem maintainers.rtreffer ]; + maintainers = [ maintainers.rushmorem maintainers.rtreffer maintainers.deltaevo ]; }; } From abac6afe93a60c6078c7d86b93fbbace4da3b363 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 3 Feb 2019 15:35:55 +0000 Subject: [PATCH 198/467] pkgconfig: rename to pkg-config (#55094) Package attrs should map to the pname. It's confusing otherwise. pkg-config is also the name used by most distributions: Debian, Homebrew, Guix, OpenSuse other distributions like FreeBSD ports, Fedora and Arch Linux call it "pkgconf" Waiting a few releases to make a tree-wide change to make it easier to back-port things. --- .../misc/{pkgconfig => pkg-config}/2.36.3-not-win32.patch | 0 .../tools/misc/{pkgconfig => pkg-config}/default.nix | 0 .../misc/{pkgconfig => pkg-config}/requires-private.patch | 0 .../tools/misc/{pkgconfig => pkg-config}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 6 ++++-- 5 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/2.36.3-not-win32.patch (100%) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/default.nix (100%) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/requires-private.patch (100%) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/setup-hook.sh (100%) diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch rename to pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/default.nix rename to pkgs/development/tools/misc/pkg-config/default.nix diff --git a/pkgs/development/tools/misc/pkgconfig/requires-private.patch b/pkgs/development/tools/misc/pkg-config/requires-private.patch similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/requires-private.patch rename to pkgs/development/tools/misc/pkg-config/requires-private.patch diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkg-config/setup-hook.sh similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/setup-hook.sh rename to pkgs/development/tools/misc/pkg-config/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c6e774d3e7..1dc927f42b0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8945,11 +8945,13 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkgconfig = callPackage ../development/tools/misc/pkgconfig { + pkg-config = callPackage ../development/tools/misc/pkg-config { fetchurl = fetchurlBoot; }; + pkgconfig = pkg-config; # added 2018-02-02 - pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); + pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); + pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 postiats-utilities = callPackage ../development/tools/postiats-utilities {}; From a29294cb95d0784d0380a212610f26dadf8b89c3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Feb 2019 16:47:01 +0100 Subject: [PATCH 199/467] nixos/ndppd: register test --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0c8284eb08d0..96b34755d6f5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -142,6 +142,7 @@ in nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + ndppd = handleTest ./ndppd.nix {}; neo4j = handleTest ./neo4j.nix {}; netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; From dae8dfd69f4bd8686a22fdbbf026018a87889905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Feb 2019 16:25:17 +0100 Subject: [PATCH 200/467] haxor-news: use patch to allow newer click version --- pkgs/applications/misc/haxor-news/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 1fa016627d4e..e09e65738e5d 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python }: +{ stdenv, python, fetchpatch }: with python.pkgs; @@ -11,6 +11,12 @@ buildPythonApplication rec { sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; }; + # allow newer click version + patches = fetchpatch { + url = "${meta.homepage}/commit/5b0d3ef1775756ca15b6d83fba1fb751846b5427.patch"; + sha256 = "1551knh2f7yarqzcpip16ijmbx8kzdna8cihxlxx49ww55f5sg67"; + }; + propagatedBuildInputs = [ click colorama From 769510f9b3f394b0d063f8f9e6c4e2d813c09ea2 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 3 Feb 2019 18:34:41 +0200 Subject: [PATCH 201/467] gpodder: 3.10.6 -> 3.10.7 --- pkgs/applications/audio/gpodder/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 2da60a8bfd8d..2544be383e5d 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.6"; + version = "3.10.7"; format = "other"; src = fetchFromGitHub { - owner = "gpodder"; - repo = "gpodder"; + owner = pname; + repo = pname; rev = version; - sha256 = "11nccsnlxrj8wwl8dyz9a0yrzma6ipx5gwj2lc7m308z60r8wvjs"; + sha256 = "0sx9rj6dpvd2xz7lak2yi0zlgr3lp2ng1fw23s39la9ly4g1835j"; }; postPatch = with stdenv.lib; '' From bda21694d1a8acd8ac06ec8f4ce3830051b42378 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 17:52:53 +0100 Subject: [PATCH 202/467] wlroots: Fix the ELF binaries (rootston + examples) Due to stdenv changes the binaries where broken during the fixup phase (while stripping all binaries). The current solution isn't optimal but there must not be any cyclic dependencies on $out. --- .../development/libraries/wlroots/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d25f1d0b4c8d..6e7090a9c5b7 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -40,14 +40,21 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - # Install rootston (the reference compositor) to $bin and $examples + # Copy the library to $bin and $examples + for output in "$bin" "$examples"; do + mkdir -p $output/lib + cp -P libwlroots* $output/lib/ + done + ''; + + postFixup = '' + # Install rootston (the reference compositor) to $bin and $examples (this + # has to be done after the fixup phase to prevent broken binaries): for output in "$bin" "$examples"; do mkdir -p $output/bin cp rootston/rootston $output/bin/ - mkdir $output/lib - cp libwlroots* $output/lib/ patchelf \ - --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ + --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ $output/bin/rootston mkdir $output/etc cp ../rootston/rootston.ini.example $output/etc/rootston.ini @@ -59,10 +66,10 @@ in stdenv.mkDerivation rec { mkdir -p $examples/bin cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - patchelf \ - --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ - "$binary" cp "$binary" "$examples/bin/wlroots-$binary" + patchelf \ + --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ + "$examples/bin/wlroots-$binary" done ''; From b3c994185a46872cd4737b6727ea9480e7af06d0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 3 Feb 2019 19:19:25 +0100 Subject: [PATCH 203/467] disorderfs: 0.5.5 -> 0.5.6 --- pkgs/tools/filesystems/disorderfs/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 07a9015fa28e..b8028741d57f 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "1y1i7k5mx2pxr9bpijnsjyyw8qd7ak1h48gf6a6ca3dhna9ws6i1"; + url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2"; + sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; buildInputs = [ fuse attr ]; - sourceRoot = "."; - installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { From 25c2d1cd3e6a8c78b27ff02bac89725394005bb6 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 3 Feb 2019 15:27:30 +0100 Subject: [PATCH 204/467] glowing-bear: init at 0.7.1 --- .../networking/irc/glowing-bear/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/networking/irc/glowing-bear/default.nix diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix new file mode 100644 index 000000000000..8c5d2ffa35ea --- /dev/null +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, stdenv }: + +stdenv.mkDerivation rec { + name = "glowing-bear-${version}"; + version = "0.7.1"; + + src = fetchFromGitHub { + rev = version; + owner = "glowing-bear"; + repo = "glowing-bear"; + sha256 = "0gwrf67l3i3nl7zy1miljz6f3vv6zzc3g9as06by548f21cizzjb"; + }; + + installPhase = '' + mkdir $out + cp index.html min.js serviceworker.js webapp.manifest.json $out + cp -R 3rdparty assets css directives js $out + ''; + + meta = with stdenv.lib; { + description = "A web client for Weechat"; + homepage = https://github.com/glowing-bear/glowing-bear; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a1aa3d30f79..48a6f85395e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17398,6 +17398,8 @@ in inherit (darwin) IOKit; }; + glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; + gmtk = callPackage ../development/libraries/gmtk { }; gmu = callPackage ../applications/audio/gmu { }; From 13e6180fba4db21906cb17af17416897dc8c9263 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 20:01:03 +0000 Subject: [PATCH 205/467] libcardiacarrest: 12.1-7 -> 12.2.8 --- pkgs/misc/libcardiacarrest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 1a07878b3302..7f355bc81560 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libcardiacarrest-${version}"; - version = "12.1-7"; # - + version = "12.2.8"; # . src = fetchFromGitHub { owner = "oxij"; repo = "libcardiacarrest"; - rev = "d44288d9a24d6b7793fb36a4c9a548b6b55375ec"; - sha256 = "0j3l5s6r9hgpy5y7q7kx0rkh05rk0bgfdvzbmadqps720lqjs4xm"; + rev = "d89639f5b2d298cf74af26880f5ebf50e645166d"; + sha256 = "0vrigwcw3g8zknqyznv6y3437ahn1w00gv3d303smmygr0p8bd94"; }; outputs = [ "out" "dev" ]; From c77728de7b8b0d42c3f1f961cc55999e82eb52e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 3 Feb 2019 19:31:25 -0500 Subject: [PATCH 206/467] linux: 5.0-rc4 -> 5.0-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 22e31f2aec1c..b1e74da256b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.0-rc4"; - modDirVersion = "5.0.0-rc4"; + version = "5.0-rc5"; + modDirVersion = "5.0.0-rc5"; extraMeta.branch = "5.0"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "061afxv1d29w5kkb1rxrz3ax7pc5x8yhx5yjf9p1dbh7lw64rglh"; + sha256 = "0a60svgiz06cq4hq5z1rmwyjq1748fm7wi87arl659aidp0r0qky"; }; # Should the testing kernels ever be built on Hydra? From 70fc5edacb59b0d8d2eeed0f89248cb16f69910b Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 29 Dec 2018 23:12:08 -0500 Subject: [PATCH 207/467] mupdf: Fix changed library name --- pkgs/applications/misc/mupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index c91b9f6fb061..38f5075d10f2 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { Name: mupdf Description: Library for rendering PDF documents Version: ${version} - Libs: -L$out/lib -lmupdf -lmupdfthird + Libs: -L$out/lib -lmupdf -lmupdf-third Cflags: -I$dev/include EOF From bcea7dd394abb03b69c32e8c7719d5111efca958 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Feb 2019 18:56:09 -0600 Subject: [PATCH 208/467] zsh: 5.7 -> 5.7.1 --- pkgs/shells/zsh/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 86f499b4b564..3e4b756044bc 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, fetchpatch }: let - version = "5.7"; + version = "5.7.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "0pgisyi82pg5mycx1k7vfx9hwzl6zq00r5s9v91lg4gqisvlvagh"; + sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; }; in @@ -15,18 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "04ynid3ggvy6i5c26bk52mq6x5vyrdwgryid9hggmnb1nf8b41vq"; + sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j"; }; - patches = [ - (fetchpatch { - name = "vcs_info.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vcs_info.patch?h=packages/zsh&id=1b7537ff5343819b3110a76bbdd2a1bf9ef80c4a"; - sha256 = "0rc63cdc0qzhmj2dp5jnmxgyl5c47w857s8379fq36z8g0bi3rwq"; - excludes = [ "ChangeLog" ]; - }) - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ From e27eaf6111842f5e7765d05fa2e7f4c0cdd76e1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 17:20:27 -0800 Subject: [PATCH 209/467] star: 2.6.1d -> 2.7.0a Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/star/versions --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index cbe38649503b..4d1d60469f0e 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.6.1d"; + version = "2.7.0a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1h0j8qj95a0brv7p3gxmg3z7z6f4670jzjg56kzyc33k8dmzxvli"; + sha256 = "1yx28gra6gqdx1ps5y8mpdinsn8r0dhsc2m3gcvjfrk71i9yhd6l"; }; sourceRoot = "source/source"; From 7de900515c385c848f354bdd25099798ff2396a3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 19 Dec 2018 13:41:36 -0500 Subject: [PATCH 210/467] buildbot: 1.4.0 -> 1.8.1 --- .../python-modules/buildbot/default.nix | 20 +++++++++++-------- .../python-modules/buildbot/pkg.nix | 4 ++-- .../python-modules/buildbot/plugins.nix | 10 +++++----- .../python-modules/buildbot/worker.nix | 4 ++-- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 011cd879b1f3..cd98a8da710a 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, - sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests, - txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, - flake8, buildbot-worker, buildbot-pkg, glibcLocales }: + sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, + txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, + isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }: let withPlugins = plugins: buildPythonPackage { @@ -24,11 +24,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "1.5.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52"; + sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7"; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ let txaio autobahn pyjwt + pyyaml # tls twisted.extras.tls @@ -71,13 +72,16 @@ let ./skip_test_linux_distro.patch ]; - LC_ALL = "en_US.UTF-8"; + postPatch = '' + substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + ''; # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.isAarch64; - postPatch = '' - substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + preCheck = '' + export LC_ALL="en_US.UTF-8" + export PATH="$out/bin:$PATH" ''; passthru = { diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index b9358b1c420b..480bed2805ee 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "1.4.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "06f4jvczbg9km0gfmcd1ljplf5w8za27i9ap9jnyqgh3j77smd7a"; + sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index bdc67d178d44..4bcaa965d2f3 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -10,7 +10,7 @@ src = fetchPypi { inherit pname version format; - sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v"; + sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl"; }; meta = with lib; { @@ -27,7 +27,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r"; + sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -47,7 +47,7 @@ src = fetchPypi { inherit pname version; - sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7"; + sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -67,7 +67,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd"; + sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -87,7 +87,7 @@ src = fetchPypi { inherit pname version; - sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz"; + sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 4e54276f8aed..8e49d085fbd1 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -2,11 +2,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "1.4.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy"; + sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39"; }; propagatedBuildInputs = [ twisted future ]; From a8da72b01213af6eb40cbea94290ae1c3b0f1600 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 4 Feb 2019 03:56:43 +0100 Subject: [PATCH 211/467] nixos/tests/postgresql: fix regression from #55106 --- nixos/tests/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index cf1de2f6acbf..ae5d6d095ea2 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -68,6 +68,6 @@ let }; in (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // { - postgresql_11-backup-all = make-postgresql-test name postgresql-versions.postgresql_11 true; + postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true; } From f8f14c9a63ff37636ca92cbb133e3acb5cdf5c63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 20:02:35 -0800 Subject: [PATCH 212/467] recoll: 1.24.4 -> 1.24.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/recoll/versions --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 15c78fd81bb5..b0ac580d1622 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -8,12 +8,12 @@ assert stdenv.hostPlatform.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.24.4"; + ver = "1.24.5"; name = "recoll-${ver}"; src = fetchurl { url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "0b1rz679gbv2qy5b5jgr25h1dk8560iac16lq0h2021nrv6ix74q"; + sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv"; }; configureFlags = [ "--enable-recollq" ] From f81c0c1d8efe3b03a982b9d5ceef58d6f6313005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Mon, 4 Feb 2019 06:52:59 +0100 Subject: [PATCH 213/467] racket, racket-minimal: 7.1 -> 7.2 (#54994) The old src/configure has been split into src/lt/configure for classical Racket and src/cs/c/configure for Racket CS (Racket on Chez Scheme). --- pkgs/development/interpreters/racket/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8ba08b23c259..2d4008d69b98 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { preConfigure = '' unset AR - for f in src/configure src/racket/src/string.c; do + for f in src/lt/configure src/cs/c/configure src/racket/src/string.c; do substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname done mkdir src/build From 63c9b399c625a5fc916bd7b2c5aa5d6d556139cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 00:14:14 -0800 Subject: [PATCH 214/467] qpdf: 8.3.0 -> 8.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qpdf/versions --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 4053afe4beca..30383dda50cf 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.3.0"; +let version = "8.4.0"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1xwiqf6xkl9glpardak97ycy5f2bwjf8x0hwvf0acsxqj03a3hj6"; + sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; }; nativeBuildInputs = [ perl ]; From 76c0ebc710de75ec0aa9687678404a5851b228bf Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Mon, 4 Feb 2019 10:19:14 +0200 Subject: [PATCH 215/467] lxd: fix sh not in path (#55073) lxd: add bash to PATH --- pkgs/tools/admin/lxd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 9eb249bc5879..e48b525caba6 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -3,6 +3,7 @@ , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication , writeShellScriptBin, apparmor-profiles, apparmor-parser +, bash }: buildGoPackage rec { @@ -30,8 +31,8 @@ buildGoPackage rec { # binaries from test/ rm $bin/bin/{deps,macaroon-identity} - wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables + wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') From 787a73639e1dd09d9734db62e91f8a9301e24179 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 4 Feb 2019 00:04:02 -0200 Subject: [PATCH 216/467] Office Code Pro: init at 1.004 --- pkgs/data/fonts/office-code-pro/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/data/fonts/office-code-pro/default.nix diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix new file mode 100644 index 000000000000..564b950784be --- /dev/null +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "office-code-pro"; + version = "1.004"; + + src = fetchFromGitHub { + owner = "nathco"; + repo = "Office-Code-Pro"; + rev = version; + sha256 = "0znmjjyn5q83chiafy252bhsmw49r2nx2ls2cmhjp4ihidfr6cmb"; + }; + + installPhase = '' + fontDir=$out/share/fonts/opentype + docDir=$out/share/doc/${pname}-${version} + mkdir -p $fontDir $docDir + install -Dm644 README.md $docDir + install -t $fontDir -m644 'Fonts/Office Code Pro/OTF/'*.otf + install -t $fontDir -m644 'Fonts/Office Code Pro D/OTF/'*.otf + ''; + + meta = with stdenv.lib; { + description = "A customized version of Source Code Pro"; + longDescription = '' + Office Code Pro is a customized version of Source Code Pro, the monospaced + sans serif originally created by Paul D. Hunt for Adobe Systems + Incorporated. The customizations were made specifically for text editors + and coding environments, but are still very usable in other applications. + ''; + homepage = https://github.com/nathco/Office-Code-Pro; + license = licenses.ofl; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2ead70e50d7..5e1208d6b0cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15716,6 +15716,8 @@ in numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { }; + office-code-pro = callPackage ../data/fonts/office-code-pro { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; From 3bfab849294daeb5b23fcfe7e13bf8e45e1f9b1a Mon Sep 17 00:00:00 2001 From: David Smith Date: Mon, 4 Feb 2019 09:54:25 +0000 Subject: [PATCH 217/467] maintainers: add shmish111 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bed5a9aa002b..69cdb0b47ccd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5166,4 +5166,9 @@ github = "mredaelli"; name = "Massimo Redaelli"; }; + shmish111 = { + email = "shmish111@gmail.com"; + github = "shmish111"; + name = "David Smith"; + }; } From cd682b7c10479d391bf543c684e4f8ca8016eecc Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 Feb 2019 11:11:31 +0100 Subject: [PATCH 218/467] prosody: update communityModules After the latest automatic updates of the prosody package the community modules were partially incompatible. The worst effect I suffered was a very high timeout (hours) on reconnects due to the stanza module throwing a runtime error on the server. We should probably try harder to keep them in sync. --- pkgs/servers/xmpp/prosody/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 3138cf8dcb06..28be53b4e6cb 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { - version = "0.11.2"; + version = "0.11.2"; # also update communityModules name = "prosody-${version}"; src = fetchurl { @@ -33,10 +33,13 @@ stdenv.mkDerivation rec { sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9"; }; + # A note to all those merging automated updates: Please also update this + # attribute as some modules might not be compatible with a newer prosody + # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "150a7bd59043"; - sha256 = "0nfx3lngcy88nd81gb7v4kh3nz1bzsm67bxgpd2lprk54diqcrz1"; + rev = "b54e98d5c4a1"; + sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg"; }; buildInputs = [ lua5 makeWrapper libidn openssl ] From 93b6beeb03bbebc4dbc5797db61bd9f8ee974591 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 02:44:51 -0800 Subject: [PATCH 219/467] python37Packages.libtmux: 0.8.0 -> 0.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-libtmux/versions --- pkgs/development/python-modules/libtmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 43b75b30f5a4..9d30033c58d5 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2b969b507c26d9db08b85be4808d75774b6418ecf5a0f61956f7a1da44519585"; + sha256 = "0al5qcvzcl4v70vngbv39jg422jsy0m1b5q9pp54cc7m9b666jax"; }; checkInputs = [ pytest ]; From 2ba891788bacfb2c52f25a7a119b88c6cc298e35 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 4 Feb 2019 20:30:58 +0900 Subject: [PATCH 220/467] Lua generate nix packages from luarocks (#54978) * lua: generate packages from luarocks * luarocks-nix: update * removed packages already available in nixpkgs * adressing reviews update script can now accept another csv file as input with -c * Remove obsolete comment --- maintainers/scripts/luarocks-packages.csv | 21 + maintainers/scripts/update-luarocks-packages | 112 ++++ .../interpreters/lua-5/build-lua-package.nix | 182 +++++++ .../interpreters/lua-5/setup-hook.sh | 6 +- .../interpreters/lua-5/wrap-lua.nix | 19 + pkgs/development/interpreters/lua-5/wrap.sh | 99 ++++ .../interpreters/lua-5/wrapper.nix | 2 +- pkgs/development/lua-modules/default.nix | 17 +- .../lua-modules/generated-packages.nix | 482 ++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 33 ++ .../tools/misc/luarocks/luarocks-nix.nix | 4 +- pkgs/top-level/lua-packages.nix | 12 + 12 files changed, 981 insertions(+), 8 deletions(-) create mode 100644 maintainers/scripts/luarocks-packages.csv create mode 100755 maintainers/scripts/update-luarocks-packages create mode 100644 pkgs/development/interpreters/lua-5/build-lua-package.nix create mode 100644 pkgs/development/interpreters/lua-5/wrap-lua.nix create mode 100644 pkgs/development/interpreters/lua-5/wrap.sh create mode 100644 pkgs/development/lua-modules/generated-packages.nix create mode 100644 pkgs/development/lua-modules/overrides.nix diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv new file mode 100644 index 000000000000..e7c42925c5b2 --- /dev/null +++ b/maintainers/scripts/luarocks-packages.csv @@ -0,0 +1,21 @@ +ansicolors, +argparse, +dkjson +lrexlib-gnu, +lrexlib-posix, +ltermbox, +lua-cmsgpack, +lua_cliargs, +lua-term, +luaffi,http://luarocks.org/dev, +luuid, +penlight, +say, +luv, +luasystem, +mediator_lua,http://luarocks.org/manifests/teto +mpack,http://luarocks.org/manifests/teto +nvim-client,http://luarocks.org/manifests/teto +busted,http://luarocks.org/manifests/teto +luassert,http://luarocks.org/manifests/teto +coxpcall,https://luarocks.org/manifests/hisham,1.17.0-1 diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages new file mode 100755 index 000000000000..aa922c19860f --- /dev/null +++ b/maintainers/scripts/update-luarocks-packages @@ -0,0 +1,112 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-prefetch-scripts luarocks-nix -i bash + +# You'll likely want to use +# `` +# nixpkgs $ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +# `` +# to update all libraries in that folder. +# to debug, redirect stderr to stdout with 2>&1 + + +# stop the script upon C-C +set -eu -o pipefail + +if [ $# -lt 1 ]; then + print_help + exit 1 +fi + +CSV_FILE="maintainers/scripts/luarocks-packages.csv" +TMP_FILE="$(mktemp)" + +exit_trap() +{ + local lc="$BASH_COMMAND" rc=$? + test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2 +} +trap exit_trap EXIT + +print_help() { + echo "Usage: $0 " + echo "(most likely pkgs/development/lua-modules/generated-packages.nix)" + echo "" + echo " -c to set the list of luarocks package to generate" + exit 1 +} + + +while getopts ":hc:" opt; do + case $opt in + h) + print_help + ;; + c) + echo "Loading package list from $OPTARG !" >&2 + CSV_FILE="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + ;; + esac + shift $((OPTIND-1)) +done + +GENERATED_NIXFILE="$1" + +HEADER=" +/* ${GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! +Regenerate it with: +nixpkgs$ ${0} ${GENERATED_NIXFILE} + +These packages are manually refined in lua-overrides.nix +*/ +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +self: super: +with self; +{ +" + +FOOTER=" +} +/* GENERATED */ +" + + +function convert_pkg () { + pkg="$1" + server="" + if [ ! -z "$2" ]; then + server=" --server=$2" + fi + + version="${3:-}" + + echo "looking at $pkg (version $version) from server [$server]" >&2 + cmd="luarocks nix $server $pkg $version" + drv="$($cmd)" + if [ $? -ne 0 ]; then + echo "Failed to convert $pkg" >&2 + echo "$drv" >&2 + else + echo "$drv" | tee -a "$TMP_FILE" + fi +} + +# params needed when called via callPackage +echo "$HEADER" | tee "$TMP_FILE" + +# list of packages with format +# name,server,version +while IFS=, read -r pkg_name server version +do + if [ -z "$pkg_name" ]; then + echo "Skipping empty package name" >&2 + fi + convert_pkg "$pkg_name" "$server" "$version" +done < "$CSV_FILE" + +# close the set +echo "$FOOTER" | tee -a "$TMP_FILE" + +cp "$TMP_FILE" "$GENERATED_NIXFILE" diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix new file mode 100644 index 000000000000..0bed5efe4f79 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -0,0 +1,182 @@ +# Generic builder for lua packages +{ lib +, lua +, stdenv +, wrapLua +, unzip +, writeText +# Whether the derivation provides a lua module or not. +, toLuaModule +}: + +{ +name ? "${attrs.pname}-${attrs.version}" + +, version + +# by default prefix `name` e.g. "lua5.2-${name}" +, namePrefix ? "lua" + lua.luaversion + "-" + +# Dependencies for building the package +, buildInputs ? [] + +# Dependencies needed for running the checkPhase. +# These are added to buildInputs when doCheck = true. +, checkInputs ? [] + +# propagate build dependencies so in case we have A -> B -> C, +# C can import package A propagated by B +, propagatedBuildInputs ? [] +, propagatedNativeBuildInputs ? [] + +# used to disable derivation, useful for specific lua versions +, disabled ? false + +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] +, external_deps ? propagatedBuildInputs ++ buildInputs + +# Skip wrapping of lua programs altogether +, dontWrapLuaPrograms ? false + +, meta ? {} + +, passthru ? {} +, doCheck ? false + +# appended to the luarocks generated config +# in peculiar variables like { EVENT_INCDIR } can be useful to work around +# luarocks limitations, ie, luarocks consider include/lib folders to be subfolders of the same package in external_deps_dirs +# as explained in https://github.com/luarocks/luarocks/issues/766 +, extraConfig ? "" + +# relative to srcRoot, path to the rockspec to use when using rocks +, rockspecFilename ? "../*.rockspec" + +# must be set for packages that don't have a rock +, knownRockspec ? null + +, ... } @ attrs: + + +# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. +if disabled +then throw "${name} not supported for interpreter ${lua}" +else + +let + + deps_dirs= lib.concatStringsSep ", " ( + map (x: "\"${builtins.toString x}\"") external_deps + ); + + # TODO + # - add rocktrees (look at torch-distro.nix/https://github.com/luarocks/luarocks/wiki/Config-file-format) + # - silence warnings + luarocks_config = "luarocksConfig"; + luarocks_content = '' + local_cache = "" + -- array of strings + external_deps_dirs = { + ${deps_dirs} + } + rocks_trees = { + } + ${extraConfig} + ''; +in +toLuaModule ( lua.stdenv.mkDerivation ( +builtins.removeAttrs attrs ["disabled" "checkInputs"] // { + + name = namePrefix + name; + + buildInputs = [ wrapLua lua.pkgs.luarocks ] + ++ buildInputs + ++ lib.optionals doCheck checkInputs + ; + + # propagate lua to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ lua ]; + doCheck = false; + + # enabled only for src.rock + setSourceRoot= let + name_only=(builtins.parseDrvName name).name; + in + lib.optionalString (knownRockspec == null) '' + # format is rockspec_basename/source_basename + # rockspec can set it via spec.source.dir + folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1) + sourceRoot="$folder" + ''; + + configurePhase = '' + runHook preConfigure + + cat > ${luarocks_config} <= 1 )); then + LUAROCKS="$LUAROCKS --verbose" + fi + + patchShebangs . + + runHook postBuild + ''; + + postFixup = lib.optionalString (!dontWrapLuaPrograms) '' + wrapLuaPrograms + '' + attrs.postFixup or ''''; + + installPhase = attrs.installPhase or '' + runHook preInstall + + # luarocks make assumes sources are available in cwd + # After the build is complete, it also installs the rock. + # If no argument is given, it looks for a rockspec in the current directory + # but some packages have several rockspecs in their source directory so + # we force the use of the upper level since it is + # the sole rockspec in that folder + # maybe we could reestablish dependency checking via passing --rock-trees + + nix_debug "ROCKSPEC $rockspecFilename" + nix_debug "cwd: $PWD" + $LUAROCKS make --deps-mode=none --tree $out ''${rockspecFilename} + + # to prevent collisions when creating environments + # also added -f as it doesn't always exist + # don't remove the whole directory as + rm -rf $out/lib/luarocks/rocks/manifest + + runHook postInstall + ''; + + passthru = { + inherit lua; # The lua interpreter + } // passthru; + + meta = with lib.maintainers; { + platforms = lua.meta.platforms; + # add extra maintainer(s) to every package + maintainers = (meta.maintainers or []) ++ [ ]; + } // meta; +})) diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh index 5e37bd27f617..3989bedffdb1 100644 --- a/pkgs/development/interpreters/lua-5/setup-hook.sh +++ b/pkgs/development/interpreters/lua-5/setup-hook.sh @@ -1,7 +1,7 @@ # set -e nix_print() { - if (( "${NIX_DEBUG:-0}" >= $1 )); then + if [ ${NIX_DEBUG:-0} -ge $1 ]; then echo "$2" fi } @@ -32,13 +32,13 @@ addToLuaPath() { cd "$dir" for pattern in @luapathsearchpaths@; do - addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern" done # LUA_CPATH for pattern in @luacpathsearchpaths@; do - addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern" done cd - >/dev/null } diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix new file mode 100644 index 000000000000..f00e0d5ac336 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -0,0 +1,19 @@ +{ lib +, lua +, makeSetupHook +, makeWrapper +}: + +with lib; + +# defined in trivial-builders.nix +# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput +makeSetupHook { + deps = makeWrapper; + substitutions.executable = lua.interpreter; + substitutions.lua = lua; + substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + +} ./wrap.sh + diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh new file mode 100644 index 000000000000..545a0ae271c4 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -0,0 +1,99 @@ +# Inspired by python/wrapper.nix +# Wrapper around wrapLuaProgramsIn, below. The $luaPath +# variable is passed in from the buildLuarocksPackage function. +set -e + +wrapLuaPrograms() { + wrapLuaProgramsIn "$out/bin" "$out $luaPath" +} + +# Builds environment variables like LUA_PATH and PATH walking through closure +# of dependencies. +buildLuaPath() { + local luaPath="$1" + local path + + # Create an empty table of paths (see doc on loadFromPropagatedInputs + # for how this is used). Build up the program_PATH and program_LUA_PATH + # variables. + declare -A luaPathsSeen=() + program_PATH= + luaPathsSeen["@lua@"]=1 + addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + addToLuaPath "$path" + done +} + + +# with an executable shell script which will set some environment variables +# and then call into the original binary (which has been given a .wrapped suffix). +# luaPath is a list of directories +wrapLuaProgramsIn() { + local dir="$1" + local luaPath="$2" + local f + + buildLuaPath "$luaPath" + + if [ ! -d "$dir" ]; then + nix_debug "$dir not a directory" + return + fi + + nix_debug "wrapping programs in [$dir]" + + # Find all regular files in the output directory that are executable. + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Lua to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" + fi + + # wrapProgram creates the executable shell script described + # above. The script will set LUA_(C)PATH and PATH variables! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH" + --prefix LUA_PATH ';' "$NIX_LUA_PATH" + --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + ) + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildLuaPackage. + # makeWrapperArgs + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + + # see setup-hooks/make-wrapper.sh + wrapProgram "${wrapProgramArgs[@]}" + + done +} + +# Adds the lib and bin directories to the LUA_PATH and PATH variables, +# respectively. Recurses on any paths declared in +# `propagated-native-build-inputs`, while avoiding duplicating paths by +# flagging the directories it has visited in `luaPathsSeen`. +loadFromPropagatedInputs() { + local dir="$1" + # Stop if we've already visited here. + if [ -n "${luaPathsSeen[$dir]}" ]; then + return; + fi + luaPathsSeen[$dir]=1 + + addToLuaPath "$dir" + addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-native-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + loadFromPropagatedInputs "$new_path" + done + fi +} diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 9abbd77d575e..7f584c0f0aff 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -44,7 +44,7 @@ let rm -f "$out/bin/$prg" if [ -x "$prg" ]; then nix_debug "Making wrapper $prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index c20d4d02c65f..372d609792c2 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -6,12 +6,25 @@ let - inherit (lib) extends makeExtensible; + inherit (lib) extends; initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix { inherit lua; }); - extensible-self = makeExtensible initialPackages; + overridenPackages = import ./overrides.nix { inherit pkgs; }; + + generatedPackages = if (builtins.pathExists ./generated-packages.nix) then + pkgs.callPackage ./generated-packages.nix { } else (self: super: {}); + + extensible-self = lib.makeExtensible + (extends overrides + (extends overridenPackages + (extends generatedPackages + initialPackages + ) + ) + ) + ; in extensible-self diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix new file mode 100644 index 000000000000..353eaa6e9601 --- /dev/null +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -0,0 +1,482 @@ + +/* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! +Regenerate it with: +nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix + +These packages are manually refined in lua-overrides.nix +*/ +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +self: super: +with self; +{ + +ansicolors = buildLuarocksPackage { + pname = "ansicolors"; + version = "1.0.2-3"; + + src = fetchurl { + url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/kikito/ansicolors.lua"; + description="Library for color Manipulation."; + license = { + fullName = "MIT "; + }; + }; +}; +argparse = buildLuarocksPackage { + pname = "argparse"; + version = "0.6.0-1"; + + src = fetchurl { + url = https://luarocks.org/argparse-0.6.0-1.src.rock; + sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/mpeterv/argparse"; + description="A feature-rich command-line argument parser"; + license = { + fullName = "MIT"; + }; + }; +}; +dkjson = buildLuarocksPackage { + pname = "dkjson"; + version = "2.5-2"; + + src = fetchurl { + url = https://luarocks.org/dkjson-2.5-2.src.rock; + sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; + description="David Kolf's JSON module for Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lrexlib-gnu = buildLuarocksPackage { + pname = "lrexlib-gnu"; + version = "2.9.0-1"; + + src = fetchurl { + url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; + sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/rrthomas/lrexlib"; + description="Regular expression library binding (GNU flavour)."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lrexlib-posix = buildLuarocksPackage { + pname = "lrexlib-posix"; + version = "2.9.0-1"; + + src = fetchurl { + url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; + sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/rrthomas/lrexlib"; + description="Regular expression library binding (POSIX flavour)."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +ltermbox = buildLuarocksPackage { + pname = "ltermbox"; + version = "0.2-1"; + + src = fetchurl { + url = https://luarocks.org/ltermbox-0.2-1.src.rock; + sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://code.google.com/p/termbox"; + description="A termbox library package"; + license = { + fullName = "New BSD License"; + }; + }; +}; +lua-cmsgpack = buildLuarocksPackage { + pname = "lua-cmsgpack"; + version = "0.4.0-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/antirez/lua-cmsgpack"; + description="MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; + license = { + fullName = "Two-clause BSD"; + }; + }; +}; +lua_cliargs = buildLuarocksPackage { + pname = "lua_cliargs"; + version = "3.0-2"; + + src = fetchurl { + url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; + sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/amireh/lua_cliargs"; + description="A command-line argument parser."; + license = { + fullName = "MIT "; + }; + }; +}; +lua-term = buildLuarocksPackage { + pname = "lua-term"; + version = "0.7-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/lua-term-0.7-1.rockspec; + sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; + }).outPath; + + src = fetchurl { + url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; + }; + + + + buildType="builtin"; + + meta = { + homepage = "https://github.com/hoelzro/lua-term"; + description="Terminal functions for Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +luaffi = buildLuarocksPackage { + pname = "luaffi"; + version = "scm-1"; + + src = fetchurl { + url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/facebook/luaffifb"; + description="FFI library for calling C functions from lua"; + license = { + fullName = "BSD"; + }; + }; +}; +luuid = buildLuarocksPackage { + pname = "luuid"; + version = "20120509-2"; + + src = fetchurl { + url = https://luarocks.org/luuid-20120509-2.src.rock; + sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; + }; + disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; + description="A library for UUID generation"; + license = { + fullName = "Public domain"; + }; + }; +}; +penlight = buildLuarocksPackage { + pname = "penlight"; + version = "1.5.4-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/penlight-1.5.4-1.rockspec; + sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; + }).outPath; + + src = fetchurl { + url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; + }; + + + propagatedBuildInputs = [luafilesystem ]; + buildType="builtin"; + + meta = { + homepage = "http://stevedonovan.github.com/Penlight"; + description="Lua utility libraries loosely based on the Python standard libraries"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +say = buildLuarocksPackage { + pname = "say"; + version = "1.3-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/say-1.3-1.rockspec; + sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Lua String Hashing/Indexing Library"; + license = { + fullName = "MIT "; + }; + }; +}; +luv = buildLuarocksPackage { + pname = "luv"; + version = "1.22.0-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luv-1.22.0-1.rockspec; + sha256 = "0yxjy9wj4aqbv1my8fkciy2xar5si6bcsszipgyls24rl6lnmga3"; + }).outPath; + + src = fetchurl { + url = https://github.com/luvit/luv/releases/download/1.22.0-1/luv-1.22.0-1.tar.gz; + sha256 = "1xvz4a0r6kd1xqxwm55g9n6imprxb79600x7dhyillrz7p5nm217"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="cmake"; + + meta = { + homepage = "https://github.com/luvit/luv"; + description="Bare libuv bindings for lua"; + license = { + fullName = "Apache 2.0"; + }; + }; +}; +luasystem = buildLuarocksPackage { + pname = "luasystem"; + version = "0.2.1-0"; + + src = fetchurl { + url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/luasystem/"; + description="Platform independent system calls for Lua."; + license = { + fullName = "MIT "; + }; + }; +}; +mediator_lua = buildLuarocksPackage { + pname = "mediator_lua"; + version = "1.1.2-0"; + + src = fetchurl { + url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; + sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/mediator_lua/"; + description="Event handling through channels"; + license = { + fullName = "MIT "; + }; + }; +}; +mpack = buildLuarocksPackage { + pname = "mpack"; + version = "1.0.7-0"; + + src = fetchurl { + url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; + sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + }; + + + buildType="builtin"; + + meta = { + homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; + description="Lua binding to libmpack"; + license = { + fullName = "MIT"; + }; + }; +}; +nvim-client = buildLuarocksPackage { + pname = "nvim-client"; + version = "0.1.0-1"; + + src = fetchurl { + url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; + sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua mpack luv coxpcall ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; + description="Lua client to Nvim"; + license = { + fullName = "Apache"; + }; + }; +}; +busted = buildLuarocksPackage { + pname = "busted"; + version = "2.0.rc13-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Elegant Lua unit testing."; + license = { + fullName = "MIT "; + }; + }; +}; +luassert = buildLuarocksPackage { + pname = "luassert"; + version = "1.7.11-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luassert-1.7.11-0.rockspec; + sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua say ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Lua Assertions Extension"; + license = { + fullName = "MIT "; + }; + }; +}; +coxpcall = buildLuarocksPackage { + pname = "coxpcall"; + version = "1.17.0-1"; + + src = fetchurl { + url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; + sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; + }; + + + buildType="builtin"; + + meta = { + homepage = "http://keplerproject.github.io/coxpcall"; + description="Coroutine safe xpcall and pcall"; + license = { + fullName = "MIT/X11"; + }; + }; +}; + +} +/* GENERATED */ + diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix new file mode 100644 index 000000000000..20a24681b6ae --- /dev/null +++ b/pkgs/development/lua-modules/overrides.nix @@ -0,0 +1,33 @@ +{ pkgs, ... }@args: +self: super: +with super; +{ + ##########################################3 + #### manual fixes for generated packages + ##########################################3 + + ltermbox = super.ltermbox.override( { + disabled = !isLua51 || isLuaJIT; + }); + + lua-cmsgpack = super.lua-cmsgpack.override({ + # TODO this should work with luajit once we fix luajit headers ? + disabled = (!isLua51) || isLuaJIT; + }); + + lrexlib-posix = super.lrexlib-posix.override({ + buildInputs = [ pkgs.glibc.dev ]; + }); + lrexlib-gnu = super.lrexlib-gnu.override({ + buildInputs = [ pkgs.gnulib ]; + }); + luv = super.luv.overrideAttrs(oa: { + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; + }); + + busted = super.busted.overrideAttrs(oa: { + postInstall = '' + install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted + ''; + }); + } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 3728caf193ae..a918cb0c6475 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -3,7 +3,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "d669e8e118e6ca8bff05f32dbc9e5589e6ac45d2"; - sha256 = "1lay3905a5sx2a4y68lbys0913qs210hcj9kn2lbqinw86c1vyc3"; + rev = "f9dc7892214bff6bce822d94aca3331048e61df0"; + sha256 = "117qqbiv87p2qw0zwapl7b0p4wgnn9f8k0qpppkj3653a1bwli05"; }; }) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 50dd4d1fcd9a..11e05b504b43 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -56,6 +56,12 @@ let else if stdenv.isSunOS then "solaris" else throw "unsupported platform"; + buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args ); + + buildLuarocksPackage = with pkgs.lib; makeOverridable( callPackage ../development/interpreters/lua-5/build-lua-package.nix { + inherit toLuaModule; + inherit lua writeText; + }); in with self; { @@ -79,9 +85,15 @@ with self; { inherit toLuaModule lua-setup-hook; + inherit buildLuarocksPackage buildLuaApplication; inherit requiredLuaModules luaOlder luaAtLeast isLua51 isLua52 isLuaJIT lua callPackage; + # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH + wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { + inherit lua; inherit (pkgs) makeSetupHook makeWrapper; + }; + luarocks = callPackage ../development/tools/misc/luarocks { inherit lua; }; From 9f0ee6c60640e8da18dda4db547ea867b76b18a0 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 4 Feb 2019 13:03:50 +0100 Subject: [PATCH 221/467] primesieve: init at 7.3 --- .../science/math/primesieve/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/science/math/primesieve/default.nix diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix new file mode 100644 index 000000000000..65569b9f3bdb --- /dev/null +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "primesieve-${version}"; + version = "7.3"; + + nativeBuildInputs = [cmake]; + + src = fetchurl { + url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; + sha256 = "0l7h5r4c7hijh0c0nsdxvjqzc9dbhlx535b87fglf2i2p9la1x5v"; + }; + + meta = with stdenv.lib; { + description = "Fast C/C++ prime number generator"; + homepage = "https://primesieve.org/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2ead70e50d7..6808df9f0c10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12014,6 +12014,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + primesieve = callPackage ../development/libraries/science/math/primesieve { }; + prison = callPackage ../development/libraries/prison { }; proj = callPackage ../development/libraries/proj { }; From 3652cfec28a7694b3608614e0b8773bad463fa52 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 4 Feb 2019 13:04:06 +0100 Subject: [PATCH 222/467] haskellPackages.primesieve: fix build Temporaries changes in `configuration-common.nix` to fix the cabal file which does not specify that the haskell library depends on the C++ shared library. Pull request had been sent upstream. --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b54ec5685bf..c5ddd18ff49b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1196,4 +1196,11 @@ self: super: { beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; + + # https://github.com/sighingnow/computations/pull/1 + primesieve = appendPatch super.primesieve (pkgs.fetchpatch { + url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch"; + sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; + stripLen = 1; + }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From c6f8f8d98de092f6e6540822849dee994f41dde5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 4 Feb 2019 09:15:03 -0500 Subject: [PATCH 223/467] make-derivation: only modify name when name is given MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This preserves Nix’s native error handling of missing name: error: derivation name missing --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 8f0f12ea1a20..fdb3a2ce35a2 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -177,9 +177,9 @@ rec { "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) - // (lib.optionalAttrs (!(attrs ? name))) { + // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { name = "${attrs.pname}-${attrs.version}"; - } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) { + } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix && (attrs ? name || (attrs ? pname && attrs ? version)))) { # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the From 16b573049c2ad4ec7bed2c0499e31177e40f42f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 06:51:24 -0800 Subject: [PATCH 224/467] python37Packages.braintree: 3.50.0 -> 3.51.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-braintree/versions --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 5bd545db51cc..5e24a880e759 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.50.0"; + version = "3.51.0"; src = fetchPypi { inherit pname version; - sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030"; + sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc"; }; propagatedBuildInputs = [ requests ]; From 8107b31f86c52b483336e949a7de211a3ee4b92f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 08:05:10 -0800 Subject: [PATCH 225/467] python37Packages.distributed: 1.25.2 -> 1.25.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-distributed/versions --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0ea3a9d8ab4d..d2c8c0325ed9 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.25.2"; + version = "1.25.3"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "0rv5831xv5byx0f8ly3mlji207nb3bzq6qmdf7ishrgy9kpphc68"; + sha256 = "0bvjlw74n0l4rgzhm876f66f7y6j09744i5h3iwlng2jwzyw97gs"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; From c7369800d11519d229f376c729957fb0c0a21782 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2019 14:34:51 +0100 Subject: [PATCH 226/467] LTS Haskell 13.6 --- .../configuration-hackage2nix.yaml | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e4848f0283eb..64262b12d65c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.5 + # LTS Haskell 13.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -515,7 +515,7 @@ default-package-overrides: - cublas ==0.5.0.0 - cuckoo-filter ==0.2.0.2 - cuda ==0.10.0.0 - - cue-sheet ==2.0.0 + - cue-sheet ==2.0.1 - cufft ==0.9.0.1 - curl ==1.3.8 - currencies ==0.2.0.0 @@ -725,7 +725,7 @@ default-package-overrides: - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - flac ==0.1.2 - - flac-picture ==0.1.1 + - flac-picture ==0.1.2 - flat-mcmc ==1.5.0 - flay ==0.4 - flexible-defaults ==0.0.2 @@ -834,7 +834,7 @@ default-package-overrides: - githash ==0.1.3.1 - github-release ==1.2.4 - github-types ==0.2.1 - - github-webhooks ==0.10.0 + - github-webhooks ==0.10.1 - gitrev ==1.3.1 - gi-vte ==2.91.19 - gl ==0.8.0 @@ -1030,7 +1030,7 @@ default-package-overrides: - http-client ==0.5.14 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.4 + - http-conduit ==2.3.5 - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 @@ -1124,8 +1124,8 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.0.1 - - io-streams-haproxy ==1.0.0.2 + - io-streams ==1.5.1.0 + - io-streams-haproxy ==1.0.1.0 - ip ==1.4.1 - ip6addr ==1.0.0 - iproute ==1.7.7 @@ -1319,7 +1319,7 @@ default-package-overrides: - mixpanel-client ==0.1.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.6.0 + - mmark ==0.0.6.1 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.1 - mmorph ==1.1.2 @@ -1357,7 +1357,7 @@ default-package-overrides: - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - - mono-traversable ==1.0.10.0 + - mono-traversable ==1.0.11.0 - mono-traversable-instances ==0.1.0.0 - mountpoints ==1.0.2 - mtl ==2.2.2 @@ -1458,7 +1458,7 @@ default-package-overrides: - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 - - openssl-streams ==1.2.1.3 + - openssl-streams ==1.2.2.0 - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 @@ -1467,7 +1467,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 - optparse-generic ==1.3.0 - - optparse-simple ==0.1.1 + - optparse-simple ==0.1.1.1 - optparse-text ==0.1.1.0 - overhang ==1.0.0 - packcheck ==0.4.1 @@ -1518,7 +1518,7 @@ default-package-overrides: - persistent ==2.9.1 - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - - persistent-mysql-haskell ==0.5.1 + - persistent-mysql-haskell ==0.5.2 - persistent-postgresql ==2.9.0 - persistent-sqlite ==2.9.2 - persistent-template ==2.5.4 @@ -1651,7 +1651,7 @@ default-package-overrides: - range ==0.2.1.1 - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - - rank2classes ==1.2 + - rank2classes ==1.2.1 - Rasterific ==0.7.4.2 - rasterific-svg ==0.3.3.2 - ratel ==1.0.8 @@ -1668,7 +1668,7 @@ default-package-overrides: - rebase ==1.3 - record-dot-preprocessor ==0.1.4 - records-sop ==0.1.0.2 - - recursion-schemes ==5.1 + - recursion-schemes ==5.1.1 - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 @@ -1688,7 +1688,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.2.3 + - registry ==0.1.2.6 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1768,7 +1768,7 @@ default-package-overrides: - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - - sendfile ==0.7.9 + - sendfile ==0.7.10 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - serialise ==0.2.1.0 @@ -1851,7 +1851,7 @@ default-package-overrides: - smoothie ==0.4.2.9 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.3.2 + - snap-core ==1.0.4.0 - snap-server ==1.1.0.0 - snowflake ==0.1.1.1 - soap ==0.2.3.6 @@ -1934,10 +1934,10 @@ default-package-overrides: - sv-cassava ==0.3 - sv-core ==0.3.1 - svg-builder ==0.1.1 - - SVGFonts ==1.7 + - SVGFonts ==1.7.0.1 - svg-tree ==0.6.2.3 - swagger ==0.3.0 - - swagger2 ==2.3.1 + - swagger2 ==2.3.1.1 - swish ==0.10.0.1 - syb ==0.7 - symbol ==0.2.4 @@ -1998,10 +1998,10 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.11.1.2 + - texmath ==0.11.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.4 + - text-builder ==0.6.5 - text-conversions ==0.3.0 - text-format ==0.3.2 - text-icu ==0.7.0.1 @@ -2020,7 +2020,7 @@ default-package-overrides: - th-abstraction ==0.2.10.0 - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - - these ==0.7.5 + - these ==0.7.6 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - th-lift ==0.7.11 @@ -2217,10 +2217,10 @@ default-package-overrides: - web-routes-hsp ==0.24.6.1 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.5.2 + - websockets ==0.12.5.3 - websockets-snap ==0.10.3.0 - weigh ==0.0.13 - - wide-word ==0.1.0.7 + - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.9 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 @@ -2298,7 +2298,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.10.1 + - yesod-core ==1.6.11 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 From 0f68f393bfdc8177fade06493b6607180992163f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Feb 2019 02:30:57 +0100 Subject: [PATCH 227/467] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/6098061825a432f3f458481497b2a1b8859286e8. --- .../haskell-modules/hackage-packages.nix | 1002 ++++++----------- 1 file changed, 356 insertions(+), 646 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c8ba2138d928..f82f49dd8912 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15563,6 +15563,8 @@ self: { pname = "Ranged-sets"; version = "0.3.0"; sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; + revision = "1"; + editedCabalFile = "0xv8ph5vfwfcvk5hbkcxbsf9vwhpikxzkz7zsr7c5ky2bw707gfv"; libraryHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -16288,28 +16290,6 @@ self: { }) {}; "SVGFonts" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , bytestring, cereal, cereal-vector, containers, data-default-class - , diagrams-core, diagrams-lib, directory, parsec, split, text - , vector, xml - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.7"; - sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s"; - revision = "1"; - editedCabalFile = "1w687f4lk4l07wqgldhpg7ycid0fs099x8vrylcxqdgfrzmm04dg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg bytestring cereal - cereal-vector containers data-default-class diagrams-core - diagrams-lib directory parsec split text vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "SVGFonts_1_7_0_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class , diagrams-core, diagrams-lib, directory, parsec, split, text @@ -16327,7 +16307,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -27775,6 +27754,8 @@ self: { pname = "apecs"; version = "0.7.1"; sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7"; + revision = "1"; + editedCabalFile = "14v5704fhysxpip0s7bfsg073kfbal3b0335s9nb14nwwak7bsyn"; libraryHaskellDepends = [ base containers mtl template-haskell vector ]; @@ -27828,6 +27809,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-stm" = callPackage + ({ mkDerivation, apecs, base, containers, list-t, stm + , stm-containers, template-haskell, vector + }: + mkDerivation { + pname = "apecs-stm"; + version = "0.1.1"; + sha256 = "0d0l48fynsk84y2ifb004dpr39s2hdcwrgfp1ds3qff6784sh66b"; + libraryHaskellDepends = [ + apecs base containers list-t stm stm-containers template-haskell + vector + ]; + description = "STM stores for apecs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apelsin" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, filepath, glib, gtk, HTTP, mtl, network, process @@ -30058,6 +30055,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) assimp;}; + "assoc" = callPackage + ({ mkDerivation, base, bifunctors }: + mkDerivation { + pname = "assoc"; + version = "1"; + sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2"; + libraryHaskellDepends = [ base bifunctors ]; + description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "assoc-list" = callPackage ({ mkDerivation, base, contravariant, doctest, hedgehog }: mkDerivation { @@ -30602,8 +30610,8 @@ self: { }: mkDerivation { pname = "atom-conduit"; - version = "0.5.0.2"; - sha256 = "14gf11z7zmgczrdshmywrkpzrsy68wgaxx5jsn2m0q6797m9yzzd"; + version = "0.5.0.3"; + sha256 = "0hj9r6akwaxdhlaqnapfpa00d61vk4b7di67vn1h5jlscvzgrrc2"; libraryHaskellDepends = [ base blaze-builder conduit lens-simple mono-traversable parsers safe-exceptions text time timerep uri-bytestring xml-conduit @@ -33790,6 +33798,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basement_0_0_9" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.9"; + sha256 = "0fx9zw20id9lmv5likmsy1xs9cy286zd284wcd721xwvl74bg040"; + revision = "1"; + editedCabalFile = "0f5syvnp7g108adssmsqz7v8pgaasknvbi88g1lnm1ygn65kwpv1"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basen-bytestring" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -40247,6 +40269,8 @@ self: { pname = "bson"; version = "0.3.2.7"; sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7"; + revision = "1"; + editedCabalFile = "1y6gy4rq2wb123p1qc35p0hnk8dqh2hnlys2c97znwcjjsd5p203"; libraryHaskellDepends = [ base binary bytestring cryptohash data-binary-ieee754 mtl network text time @@ -40444,6 +40468,8 @@ self: { pname = "buffer"; version = "0.5.3"; sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; + revision = "1"; + editedCabalFile = "19v3zis3fqirsacacqnn7ypgvddgi6i8dj8bkbap2ln2mmqkvlh0"; libraryHaskellDepends = [ base base-prelude bug bytestring ]; testHaskellDepends = [ bug quickcheck-instances rerebase tasty tasty-hunit @@ -41989,6 +42015,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-bundle-clib" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, temporary, text, time + }: + mkDerivation { + pname = "cabal-bundle-clib"; + version = "0.1.0"; + sha256 = "02fwpasnvpc2np7aibwmgpmy0yz638iya8w6sy6szxzfzmn2kscm"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath process temporary text + time + ]; + description = "Bundling C/C++ projects in Cabal package made easy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-cargs" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs , directory, filepath, lens, system-fileio, system-filepath, tasty @@ -43234,8 +43276,8 @@ self: { }: mkDerivation { pname = "cairo-core"; - version = "1.16.3"; - sha256 = "1dap6697r6izvags7k43b88z7m9i9yy0znrf1lgkrwv23mg6qxmj"; + version = "1.16.4"; + sha256 = "1f4ps76mxgnk2y0gqk28kgs6qrslwccbisl6wrk2qwxd13cfwk86"; setupHaskellDepends = [ base bytestring Cabal directory filepath haskell-src-exts http-client http-client-tls hxt hxt-xpath @@ -50830,6 +50872,8 @@ self: { pname = "compact-string-fix"; version = "0.3.2"; sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; + revision = "1"; + editedCabalFile = "1akx1kzpirl1fc3lfcrsa88jvrk023f9qyj2b2fbpz4p11d07qfc"; libraryHaskellDepends = [ base bytestring ]; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = stdenv.lib.licenses.bsd3; @@ -57373,31 +57417,6 @@ self: { }) {cudd = null;}; "cue-sheet" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec - , mtl, QuickCheck, text - }: - mkDerivation { - pname = "cue-sheet"; - version = "2.0.0"; - sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql"; - revision = "1"; - editedCabalFile = "0cnlyy7psk8qcwahiqfdpaybvrw899bv106p0i53lrdjxfdsmf4g"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text - ]; - testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec megaparsec - QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - description = "Support for construction, rendering, and parsing of CUE sheets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cue-sheet_2_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hspec , hspec-discover, hspec-megaparsec, megaparsec, mtl, QuickCheck , text @@ -57418,7 +57437,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cufft" = callPackage @@ -63739,8 +63757,8 @@ self: { pname = "diagrams-postscript"; version = "1.4.1"; sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57"; - revision = "1"; - editedCabalFile = "0z0rh7lwyr3vx6llq6q9s5f1vzqk4zxpcg5ibfn5jdp274kfd7r1"; + revision = "2"; + editedCabalFile = "0s6z3kaj1dm5kifaydnd2nx97g5qbc6jjqy3wn4dwa9rm7w49753"; libraryHaskellDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist hashable lens monoid-extras mtl semigroups split statestack @@ -73184,20 +73202,21 @@ self: { }) {}; "ewe" = callPackage - ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty - , transformers + ({ mkDerivation, alex, array, base, Cabal, containers, happy, mtl + , pretty, transformers, uuagc, uuagc-cabal, uulib }: mkDerivation { pname = "ewe"; - version = "0.1.0.46"; - sha256 = "06pz56a4r4j601p100lnvih7pi1hfpvd6hr23mz5wk5dbkm9ng6f"; + version = "0.3.1.1"; + sha256 = "1kxjsxl0idy82xynjbafw7695m9aylgs9bpkr2gvcmzs5lpyni8p"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal uuagc uuagc-cabal uulib ]; executableHaskellDepends = [ - array base containers mtl pretty transformers + array base containers mtl pretty transformers uuagc-cabal ]; - executableToolDepends = [ alex happy ]; - description = "A language for teaching simple programming languages"; + executableToolDepends = [ alex happy uuagc ]; + description = "An interpreter for EWE programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -77780,27 +77799,6 @@ self: { }) {FLAC = null;}; "flac-picture" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , flac, hspec, JuicyPixels, temporary - }: - mkDerivation { - pname = "flac-picture"; - version = "0.1.1"; - sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; - revision = "1"; - editedCabalFile = "02vdh61nzig0yrv6ja6fjlgfcznj5k4iqh3i5f9g5p078ycqb17w"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; - testHaskellDepends = [ - base bytestring data-default-class directory flac hspec JuicyPixels - temporary - ]; - description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "flac-picture_0_1_2" = callPackage ({ mkDerivation, base, bytestring, directory, flac, hspec , hspec-discover, JuicyPixels, temporary }: @@ -78401,7 +78399,7 @@ self: { description = "FLTK bindings"; license = stdenv.lib.licenses.mit; }) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined; - inherit (pkgs) pkgconfig;}; + pkgconfig = null;}; "fltkhs-demos" = callPackage ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm @@ -79717,6 +79715,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_22" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.22"; + sha256 = "1a66abjm0qy90i1kc0zik373gy83p14vxw0q7qx2yd8yqf2kf28j"; + revision = "1"; + editedCabalFile = "18kk8h7d0gr57p95b6y9ax6ngbj76gd68rc3br85sk90nl89zxjz"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -79776,6 +79790,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fpe" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, integer-logarithms + , vector + }: + mkDerivation { + pname = "fpe"; + version = "0.1.1"; + sha256 = "1rzd1g6zk98l5bz5d7pr66i10gd2kx6vrv9py06wcnz3b5svkx2l"; + libraryHaskellDepends = [ + base bytestring integer-logarithms vector + ]; + testHaskellDepends = [ + base bytestring cryptonite integer-logarithms vector + ]; + description = "Format-preserving encryption"; + license = stdenv.lib.licenses.mit; + }) {}; + "fpipe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -81476,8 +81508,8 @@ self: { ({ mkDerivation, base, tagged }: mkDerivation { pname = "function-builder"; - version = "0.1.0.4"; - sha256 = "1iiz1fx8m152wg55k6vgv8sf3zf9wvc9zmx2wca8yc38bki43h61"; + version = "0.1.1.0"; + sha256 = "1qj78l8j6f9wnvapmkijhgby45g23r0w2wwwwlnkbnrvy869fr4p"; libraryHaskellDepends = [ base tagged ]; description = "Create poly variadic functions for monoidal results"; license = stdenv.lib.licenses.bsd3; @@ -82204,16 +82236,21 @@ self: { }) {}; "gamma" = callPackage - ({ mkDerivation, base, continued-fractions, converge - , template-haskell, vector + ({ mkDerivation, base, continued-fractions, converge, erf, numbers + , QuickCheck, template-haskell, test-framework + , test-framework-quickcheck2, vector }: mkDerivation { pname = "gamma"; - version = "0.9.0.2"; - sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; + version = "0.10.0.0"; + sha256 = "17pdnff340hgmq0dyxf5jrnkrhrgzp96pisc2fppvjbhdw8ndm65"; libraryHaskellDepends = [ base continued-fractions converge template-haskell vector ]; + testHaskellDepends = [ + base erf numbers QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Gamma function and related functions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -87541,24 +87578,6 @@ self: { }) {}; "github-webhooks" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time - , vector - }: - mkDerivation { - pname = "github-webhooks"; - version = "0.10.0"; - sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite deepseq - deepseq-generics memory text time vector - ]; - testHaskellDepends = [ aeson base bytestring hspec text vector ]; - description = "Aeson instances for GitHub Webhook payloads"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-webhooks_0_10_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time , vector @@ -87574,7 +87593,6 @@ self: { testHaskellDepends = [ aeson base bytestring hspec text vector ]; description = "Aeson instances for GitHub Webhook payloads"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "githud" = callPackage @@ -92877,8 +92895,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.1.0.0"; - sha256 = "17ki6wvrjvxl77zjpkxjq8yr4ljdrwlszrzwdv3arlq2c0mgl7yy"; + version = "0.2.1.0"; + sha256 = "0a4hhcggfbgxraq2jj40gvrg64nw37h7y6jj7pgswa623m85040j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95847,8 +95865,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.12.5.0"; - sha256 = "097i49pg3wcy2407ysakhrlm67jj68wl9bm5f807gq9pi5qisa06"; + version = "4.12.5.1"; + sha256 = "0zxl99qrzzngc6z08hpl4rxssb7djqdbccjay76sgq8akw40x720"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98256,6 +98274,8 @@ self: { pname = "hashable-orphans"; version = "0"; sha256 = "0mpvfhf07swhj7vb9mrrrbq4a4il0i49nlzh2157kf66a891ih47"; + revision = "1"; + editedCabalFile = "00ngp3hqp3i0xbx00vdgv92pq0n1q5dffjfjni5bnb3rzlafsvvl"; libraryHaskellDepends = [ base hashable sorted-list time ]; description = "Provides instances missing from Hashable"; license = stdenv.lib.licenses.bsd3; @@ -101968,21 +101988,23 @@ self: { }) {}; "haskus-binary" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils - , haskus-utils-data, haskus-utils-types, mtl, QuickCheck, tasty - , tasty-quickcheck + ({ mkDerivation, base, bytestring, cereal, criterion, directory + , doctest, ghc-prim, haskus-utils, haskus-utils-data + , haskus-utils-types, megaparsec, mtl, primitive, QuickCheck, tasty + , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "haskus-binary"; - version = "1.2"; - sha256 = "0wk9hh7snj6spadivikx5w1val076ngkca908z64z5yqqfiq0pcg"; + version = "1.3"; + sha256 = "06smbrvkpiz3rwmlsrxv6a5zh5952ivpl7wg85li6bc90dnz04rm"; libraryHaskellDepends = [ - base bytestring cereal haskus-utils haskus-utils-data - haskus-utils-types mtl + base bytestring cereal directory ghc-prim haskus-utils + haskus-utils-data haskus-utils-types megaparsec mtl primitive + template-haskell transformers ]; testHaskellDepends = [ - base bytestring haskus-utils haskus-utils-data QuickCheck tasty - tasty-quickcheck + base bytestring doctest haskus-utils haskus-utils-data QuickCheck + tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; @@ -102031,6 +102053,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-utils-compat" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , haskus-binary, haskus-utils-data, template-haskell + }: + mkDerivation { + pname = "haskus-utils-compat"; + version = "1.0"; + sha256 = "0mgklzs26xhq06gij4cn9iz69z028apmrhafd8cqar3kg75lisyx"; + libraryHaskellDepends = [ + base bytestring directory filepath haskus-binary haskus-utils-data + template-haskell + ]; + description = "Compatibility modules with other external packages (ByteString, etc.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-utils-data" = callPackage ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl , recursion-schemes, transformers @@ -102079,6 +102117,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-web" = callPackage + ({ mkDerivation, base, bytestring, clay, happstack-server + , happstack-server-tls, haskus-utils-compat, lucid, text + }: + mkDerivation { + pname = "haskus-web"; + version = "1.1"; + sha256 = "15d2718d7iqfxkdl6ggdyl81lp98s3djsgd37wmyx1xx9v03lg3g"; + libraryHaskellDepends = [ + base bytestring clay happstack-server happstack-server-tls + haskus-utils-compat lucid text + ]; + description = "Haskus web"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskyapi" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , directory, http-conduit, markdown, mtl, network, parsec @@ -108037,7 +108091,7 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, criterion, data-default, Decimal - , Diff, directory, easytest, filepath, hashable, haskeline, here + , Diff, directory, easytest, filepath, hashable, haskeline , hledger-lib, html, lucid, math-functions, megaparsec, mtl , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa , safe, shakespeare, split, tabular, temporary, terminfo @@ -108047,22 +108101,22 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.13"; - sha256 = "1dhyc439r0ff3jdnbfcb06wb7xlxwvczn9p2spn5316wdza8lk53"; + version = "1.13.2"; + sha256 = "0dxw5zhynhdhangib5awcciz7qlgmnx9km4dph7nrw2ikj6ffmwv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal Diff directory easytest filepath - hashable haskeline here hledger-lib lucid math-functions megaparsec - mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + hashable haskeline hledger-lib lucid math-functions megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory easytest filepath - haskeline here hledger-lib math-functions megaparsec mtl mtl-compat + haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards @@ -108070,7 +108124,7 @@ self: { testHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory easytest filepath - haskeline here hledger-lib math-functions megaparsec mtl mtl-compat + haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time transformers unordered-containers @@ -108079,8 +108133,8 @@ self: { benchmarkHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers criterion data-default Decimal directory easytest - filepath haskeline here hledger-lib html math-functions megaparsec - mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + filepath haskeline hledger-lib html math-functions megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards ]; @@ -108153,8 +108207,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.7"; - sha256 = "1x80f427mvgak1jz8mc7zmx4fz801dwxvij9zy93jw2h4yf7a16b"; + version = "1.3.8"; + sha256 = "02dfi6drhipj1an2smalhgjp52scmcy6ndixakjk5y0zpvkxzzbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108217,27 +108271,27 @@ self: { , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec , cmdargs, containers, data-default, Decimal, deepseq, directory , doctest, easytest, extra, file-embed, filepath, Glob, hashtables - , here, megaparsec, mtl, mtl-compat, old-time, parsec - , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular - , template-haskell, text, time, transformers, uglymemo, utf8-string + , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators + , pretty-show, regex-tdfa, safe, split, tabular, template-haskell + , text, time, transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.13"; - sha256 = "1pfqfc7kfy3sni5i8h73i6gj0yf3fsbn1lf1g1zx2jfpgxm36wgg"; + version = "1.13.1"; + sha256 = "1g98gikpvx002zjc1smj21lz4x9ghfa2965rb0vlnqmwcz5pqak7"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory easytest extra file-embed - filepath Glob hashtables here megaparsec mtl mtl-compat old-time - parsec parser-combinators pretty-show regex-tdfa safe split tabular + filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec + parser-combinators pretty-show regex-tdfa safe split tabular template-haskell text time transformers uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory doctest easytest extra - file-embed filepath Glob hashtables here megaparsec mtl mtl-compat + file-embed filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec parser-combinators pretty-show regex-tdfa safe split tabular template-haskell text time transformers uglymemo utf8-string @@ -108255,8 +108309,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.13"; - sha256 = "1dmziyffx3bjam40j1jxbbg0wm15fkci9zpsdpdbzx39264c0n40"; + version = "1.13.1"; + sha256 = "0jafgvnc88r24zab8kijj1v0jj8y2481ybsya3gnf3bfcb7p7xyp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117055,36 +117109,6 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, hspec, http-client, http-client-tls - , http-types, HUnit, mtl, network, resourcet, streaming-commons - , temporary, text, time, transformers, unliftio, unliftio-core - , utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.3.4"; - sha256 = "03si9ymgnv1252q3wyj8cblbzx56shcvmi1hx51p90a2aiqbhj15"; - revision = "1"; - editedCabalFile = "1c0cz9qxq3a0avcccqx07knnnxjjxgq81fp5wlxb6z5q6r3cpxag"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra http-client - http-client-tls http-types mtl resourcet transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit network resourcet streaming-commons - temporary text time transformers unliftio utf8-string wai - wai-conduit warp warp-tls - ]; - doCheck = false; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_5" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, hspec, http-client, http-client-tls @@ -117112,7 +117136,6 @@ self: { doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -121960,19 +121983,18 @@ self: { , blaze-markup, bytestring, case-insensitive, conduit, connection , containers, directory, dyre, fast-logger, filepath, hashable , HaskellNet, HaskellNet-SSL, http-client, http-client-tls - , http-types, lifted-base, microlens, mime-mail, monad-time - , mono-traversable, monoid-subclasses, mtl, network, opml-conduit - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rss-conduit, safe-exceptions, stm, streaming-bytestring - , streaming-with, streamly, text, time, timerep, tls, transformers - , transformers-base, uri-bytestring, xml, xml-conduit, xml-types + , http-types, lifted-base, microlens, mime-mail, monad-control + , monad-time, mono-traversable, monoid-subclasses, mtl, network + , opml-conduit, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, rss-conduit, safe-exceptions, stm + , streaming-bytestring, streaming-with, streamly, text, time + , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit + , xml-types }: mkDerivation { pname = "imm"; - version = "1.3.0.0"; - sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; - revision = "1"; - editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; + version = "1.4.0.0"; + sha256 = "0dz7zss373gc80xlng11agsr2yx51l0pdab72605w9rpn0znplrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121980,12 +122002,11 @@ self: { case-insensitive conduit connection containers directory dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL http-client http-client-tls http-types lifted-base microlens mime-mail - monad-time mono-traversable monoid-subclasses mtl network - opml-conduit optparse-applicative prettyprinter + monad-control monad-time mono-traversable monoid-subclasses mtl + network opml-conduit optparse-applicative prettyprinter prettyprinter-ansi-terminal rss-conduit safe-exceptions stm streaming-bytestring streaming-with streamly text time timerep tls - transformers transformers-base uri-bytestring xml xml-conduit - xml-types + transformers-base uri-bytestring xml xml-conduit xml-types ]; executableHaskellDepends = [ base ]; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; @@ -124356,34 +124377,6 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , deepseq, directory, filepath, HUnit, mtl, network, primitive - , process, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; - version = "1.5.0.1"; - sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; - revision = "2"; - editedCabalFile = "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14"; - configureFlags = [ "-fNoInteractiveTests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder network primitive - process text time transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder deepseq directory - filepath HUnit mtl network primitive process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -124407,31 +124400,9 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams - , network, test-framework, test-framework-hunit, transformers - }: - mkDerivation { - pname = "io-streams-haproxy"; - version = "1.0.0.2"; - sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "4"; - editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"; - libraryHaskellDepends = [ - attoparsec base bytestring io-streams network transformers - ]; - testHaskellDepends = [ - attoparsec base bytestring HUnit io-streams network test-framework - test-framework-hunit transformers - ]; - description = "HAProxy protocol 1.5 support for io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams-haproxy_1_0_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers }: @@ -124448,7 +124419,6 @@ self: { ]; description = "HAProxy protocol 1.5 support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-http" = callPackage @@ -133586,6 +133556,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leanpub-concepts" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "leanpub-concepts"; + version = "1.0.0.1"; + sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Leanpub API"; + license = stdenv.lib.licenses.mit; + }) {}; + + "leanpub-wreq" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions + , leanpub-concepts, lens, rando, text, time, transformers + , unordered-containers, wreq + }: + mkDerivation { + pname = "leanpub-wreq"; + version = "1.0.0.0"; + sha256 = "060ilipz2aj7rci6yiy2r6j8c10hlv8q8qv5wm7ic9rjl2gvx4ra"; + libraryHaskellDepends = [ + aeson base bytestring exceptions leanpub-concepts lens rando text + time transformers unordered-containers wreq + ]; + description = "Use the Leanpub API via Wreq"; + license = stdenv.lib.licenses.mit; + }) {}; + "leapseconds" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, time }: mkDerivation { @@ -134741,6 +134739,8 @@ self: { pname = "libgraph"; version = "1.14"; sha256 = "0grzimgy946mnwggmlc3sja567v2s21ymcwzlwf110k11pjqp5xp"; + revision = "1"; + editedCabalFile = "12xyrvvyh73b93k74lj55zwaygsvd93p4bm51kcd54m0pv0lclbq"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -135356,6 +135356,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; + "libtelnet" = callPackage + ({ mkDerivation, base, bytestring, libtelnet }: + mkDerivation { + pname = "libtelnet"; + version = "0.1.0.0"; + sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libtelnet ]; + description = "Bindings to libtelnet"; + license = stdenv.lib.licenses.gpl3Plus; + }) {inherit (pkgs) libtelnet;}; + "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, libvirt, syb, unix }: mkDerivation { @@ -145685,37 +145699,6 @@ self: { }) {}; "mmark" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, data-default-class, deepseq, dlist, email-validate - , foldl, hashable, hspec, hspec-discover, hspec-megaparsec - , html-entity-map, lucid, megaparsec, microlens, microlens-th - , modern-uri, mtl, parser-combinators, QuickCheck, text - , text-metrics, unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; - version = "0.0.6.0"; - sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv"; - revision = "2"; - editedCabalFile = "1nxw8vfqji8x63qkrcjnjc2rq1japrylz2wi1s76dm86pcs6hfw1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers data-default-class deepseq - dlist email-validate foldl hashable html-entity-map lucid - megaparsec microlens microlens-th modern-uri mtl parser-combinators - text text-metrics unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark_0_0_6_1" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec , hspec-discover, hspec-megaparsec, html-entity-map, lucid @@ -145742,7 +145725,6 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmark-cli" = callPackage @@ -147787,10 +147769,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.10.0"; - sha256 = "04c8gcksxkrfdll2lm3aaj1dgz7snvfa8avsccs3h6v5ygvdp5h0"; - revision = "1"; - editedCabalFile = "1hgwrmq7r8d1nq9283wis67lg0wlid2sgqnr9vpsv2wpnd4n1rdl"; + version = "1.0.11.0"; + sha256 = "1lipj4ld99cb3sc9i8va9w7cfki89h436dysyr5ifcb1l0kxg861"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -157935,27 +157915,6 @@ self: { }) {}; "openssl-streams" = callPackage - ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams - , network, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "openssl-streams"; - version = "1.2.1.3"; - sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw"; - revision = "2"; - editedCabalFile = "1004kgdryflpkp19dv4ikilhcn0xbfc5dsp6v3ib34580pcfj7wy"; - libraryHaskellDepends = [ - base bytestring HsOpenSSL io-streams network - ]; - testHaskellDepends = [ - base bytestring HsOpenSSL HUnit io-streams network test-framework - test-framework-hunit - ]; - description = "OpenSSL network support for io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "openssl-streams_1_2_2_0" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams , network, test-framework, test-framework-hunit }: @@ -157972,7 +157931,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory" = callPackage @@ -158594,24 +158552,6 @@ self: { }) {}; "optparse-simple" = callPackage - ({ mkDerivation, base, bytestring, directory, githash - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; - version = "0.1.1"; - sha256 = "192mw3dn43vcckjbhmmrbs3r6vaaa74xqsp6c5bvmv2wafm1plq3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base githash optparse-applicative template-haskell transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_1_1" = callPackage ({ mkDerivation, base, bytestring, directory, githash , optparse-applicative, template-haskell, transformers }: @@ -158627,7 +158567,6 @@ self: { testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -161965,8 +161904,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.2.0"; - sha256 = "04cvvff88ga3s22rcsjiyifdggjqpymfkbbcay7ibjhmiqwhisfq"; + version = "0.8.2.2"; + sha256 = "03k4njhn7sasr02446qj8x69hh8af7l35900lrvxr7qv741rc006"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163827,30 +163766,6 @@ self: { }) {}; "persistent-mysql-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , io-streams, monad-logger, mysql-haskell, network, persistent - , persistent-template, resource-pool, resourcet, text, time, tls - , transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql-haskell"; - version = "0.5.1"; - sha256 = "1hl0igjcq9clwhn1dl6nix9gy8ka1mb2alb80cixz8gm8q6bx1dc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers io-streams monad-logger - mysql-haskell network persistent resource-pool resourcet text time - tls transformers unliftio-core - ]; - executableHaskellDepends = [ - base monad-logger persistent persistent-template transformers - ]; - description = "A pure haskell backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql-haskell_0_5_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-logger, mysql-haskell, network, persistent , persistent-template, resource-pool, resourcet, text, time, tls @@ -163872,7 +163787,6 @@ self: { ]; description = "A pure haskell backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-odbc" = callPackage @@ -164720,8 +164634,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.27.0"; - sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn"; + version = "0.0.28.0"; + sha256 = "106y0j3a3xnz76pdv1vdag1wqn21ybypxzygs66jm1qv6vlragcn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169206,8 +169120,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "5.1.0"; - sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6"; + version = "5.2.0"; + sha256 = "0h4167jr0k398paf2sgnxkm4iziqf3a9i61cbh7d0ix86z2v8a53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169222,14 +169136,14 @@ self: { ]; executableHaskellDepends = [ auto-update base base64-bytestring bytestring hasql hasql-pool - protolude retry text time unix warp + hasql-transaction protolude retry text time unix warp ]; testHaskellDepends = [ aeson aeson-qq async auto-update base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool - heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens - lens-aeson monad-control process protolude regex-tdfa time - transformers-base wai wai-extra + hasql-transaction heredoc hjsonschema hspec hspec-wai + hspec-wai-json http-types lens lens-aeson monad-control process + protolude regex-tdfa time transformers-base wai wai-extra ]; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -170732,7 +170646,7 @@ self: { description = "FFI bindings for the primesieve library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {primesieve = null;}; + }) {inherit (pkgs) primesieve;}; "primitive_0_5_1_0" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -176699,25 +176613,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.2"; - sha256 = "1qaqsg4xfvhdvffr42y1r95lkvm2spj27pwxz4vrhkxq56fkbj2p"; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rank2classes_1_2_1" = callPackage ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit , template-haskell, transformers }: @@ -178376,14 +178271,14 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.1"; - sha256 = "1lpk8mkh3vd2j56f0fmaj64indgf5m1db9355fgimcb4xfw13nq1"; + version = "5.1.1"; + sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers ]; testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Generalized bananas, lenses and barbed wire"; + description = "Representing common recursion patterns as higher-order functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180024,31 +179919,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, hashable - , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , protolude, random, resourcet, semigroupoids, semigroups, tasty - , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base - }: - mkDerivation { - pname = "registry"; - version = "0.1.2.3"; - sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions hashable hedgehog hedgehog-corpus - io-memoize MonadRandom mtl protolude random resourcet semigroupoids - semigroups tasty tasty-discover tasty-hedgehog tasty-th text - transformers-base - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - }) {}; - - "registry_0_1_2_6" = callPackage ({ mkDerivation, async, base, containers, exceptions, hashable , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl , protolude, random, resourcet, semigroupoids, semigroups, tasty @@ -180071,7 +179941,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regress" = callPackage @@ -181300,8 +181169,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "4"; - editedCabalFile = "13chmpfq1m1fgmgf7nxgs4dgfkpsv2khp4ma3cqqki76j1s8rq3p"; + revision = "5"; + editedCabalFile = "1vbki857d5xj54s83r7kqirrg9a738xr55d40xqcaxxm7ki4s63i"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -188330,26 +188199,16 @@ self: { }) {}; "sendfile" = callPackage - ({ mkDerivation, base, bytestring, network }: - mkDerivation { - pname = "sendfile"; - version = "0.7.9"; - sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh"; - libraryHaskellDepends = [ base bytestring network ]; - description = "A portable sendfile library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sendfile_0_7_10" = callPackage ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; version = "0.7.10"; sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab"; + revision = "1"; + editedCabalFile = "08k4clhyfa4h5ja9bz1mzg2wdx5337cg8bxd6lz25781f65llq7d"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sendgrid-haskell" = callPackage @@ -190872,8 +190731,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "1"; - editedCabalFile = "0dd97qvi5w1y90ln58pk0y2vb5f1bhwsix9ym3cnnq8h0snfda4p"; + revision = "2"; + editedCabalFile = "02yxnvd54wcykhswivhg5sr67njz0p3raxmp5nqmijwwxh0iqdvc"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -195338,6 +195197,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slack-web_0_2_0_10" = callPackage + ({ mkDerivation, aeson, base, containers, errors, hspec + , http-api-data, http-client, http-client-tls, megaparsec, mtl + , servant, servant-client, servant-client-core, text, time + , transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.2.0.10"; + sha256 = "0dcvy6x08xm3kgxh65p7kvp7r4f1n819g933vna37sjwy94mmqh1"; + libraryHaskellDepends = [ + aeson base containers errors http-api-data http-client + http-client-tls megaparsec mtl servant servant-client + servant-client-core text time transformers + ]; + testHaskellDepends = [ + aeson base containers errors hspec http-api-data megaparsec text + time + ]; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "slate" = callPackage ({ mkDerivation, base, directory, filepath, htoml , optparse-applicative, process, string-conversions @@ -196219,42 +196102,6 @@ self: { }) {}; "snap-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , case-insensitive, containers, deepseq, directory, filepath - , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , network, network-uri, old-locale, parallel, QuickCheck, random - , readable, regex-posix, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector - , zlib - }: - mkDerivation { - pname = "snap-core"; - version = "1.0.3.2"; - sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; - revision = "3"; - editedCabalFile = "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath hashable HUnit io-streams lifted-base - monad-control mtl network network-uri old-locale random readable - regex-posix text time transformers transformers-base unix-compat - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl network network-uri old-locale - parallel QuickCheck random readable regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers transformers-base unix-compat unordered-containers - vector zlib - ]; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-core_1_0_4_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath , hashable, HUnit, io-streams, lifted-base, monad-control, mtl @@ -196286,7 +196133,6 @@ self: { ]; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-cors" = callPackage @@ -196511,6 +196357,8 @@ self: { pname = "snap-server"; version = "1.1.1.0"; sha256 = "0kjdsdgpxxsp5r4gpx8wdq5qn1b1y80mgkl9ahjbhlahjf5xyf6k"; + revision = "2"; + editedCabalFile = "1p39ngr6ynmhwgln2cappkgmb5mfxn23i6qwwid6gak62wipldk4"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -205647,39 +205495,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, base, base-compat-batteries, bytestring - , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop - , Glob, hashable, hspec, hspec-discover, http-media, HUnit - , insert-ordered-containers, lens, mtl, network, QuickCheck - , quickcheck-instances, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.3.1"; - sha256 = "0717i4bv97sywbdf94bszh2g858wznvl8q7ngv0zirnlvx8a27y6"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat-batteries bytestring containers cookie - generics-sop hashable http-media insert-ordered-containers lens mtl - network QuickCheck scientific template-haskell text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "swagger2_2_3_1_1" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries, bytestring , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop , Glob, hashable, hspec, hspec-discover, http-media, HUnit @@ -207985,6 +207800,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tapioca" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, cassava + , errors, hspec, lens, unordered-containers, vector + }: + mkDerivation { + pname = "tapioca"; + version = "0.1.1.0"; + sha256 = "12rx22dixl4i48jmicvax0ix5h2savcmdni4bxh5c3pm2ic1330m"; + libraryHaskellDepends = [ + attoparsec base binary bytestring cassava errors lens + unordered-containers vector + ]; + testHaskellDepends = [ base hspec vector ]; + description = "A tasty enhancement to cassava for easy csv exporting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tar_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-time }: mkDerivation { @@ -210837,28 +210669,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.11.1.2"; - sha256 = "1wac48qlcwrfm5j1yng27929iqnj2x0zkj7ffrwkj3rchf0i4grp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_11_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -210878,7 +210688,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -210982,29 +210791,6 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , deferred-folds, QuickCheck, quickcheck-instances, rerebase - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "text-builder"; - version = "0.6.4"; - sha256 = "0s3rphrp9d3pbagmlzz3xdm4fym38j8vg55wlqw1j1pkbdvm2cgg"; - libraryHaskellDepends = [ - base base-prelude bytestring deferred-folds semigroups text - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "text-builder_0_6_5" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -211025,7 +210811,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -212562,32 +212347,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, containers - , data-default-class, deepseq, hashable, keys, mtl, profunctors - , QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "these"; - version = "0.7.5"; - sha256 = "1yrmxkpka0b6hzb7h2j603rjvyzhldrsq8h7336jr7b0ml929b6v"; - libraryHaskellDepends = [ - aeson base bifunctors binary containers data-default-class deepseq - hashable keys mtl profunctors QuickCheck semigroupoids transformers - transformers-compat unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - aeson base bifunctors binary containers hashable QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "these_0_7_6" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, data-default-class, deepseq, hashable, keys, lens , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty @@ -214030,6 +213789,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timer-wheel_0_2_0" = callPackage + ({ mkDerivation, atomic-primops, base, ghc-prim, primitive + , psqueues, random + }: + mkDerivation { + pname = "timer-wheel"; + version = "0.2.0"; + sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp"; + libraryHaskellDepends = [ + atomic-primops base ghc-prim primitive psqueues + ]; + testHaskellDepends = [ base random ]; + description = "A timer wheel"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -224087,6 +223863,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vector-builder_0_3_7" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.7"; + sha256 = "06n33dzszqx2yzf9q9n0ap0avb0ljfyx8b6mp7k80vmakxfxdxds"; + libraryHaskellDepends = [ base base-prelude semigroups vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -225578,8 +225373,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.5.2.1"; - sha256 = "0siyqgw634sw9zz3zb7akl691g3yznvm0851avn44nfrj6xp1nq1"; + version = "0.5.2.2"; + sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors bytestring containers contravariant digit @@ -228712,40 +228507,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, bytestring-builder, case-insensitive, containers - , criterion, entropy, HUnit, network, QuickCheck, random, SHA - , streaming-commons, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.12.5.2"; - sha256 = "0wacifjbskkfv6xq1sbmc8p60wn767xcjhz8hn8hyijxrrmjabci"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy network - random SHA streaming-commons text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy HUnit - network QuickCheck random SHA streaming-commons test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers criterion entropy - network random SHA text - ]; - doCheck = false; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_5_3" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , bytestring, bytestring-builder, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -228777,7 +228538,6 @@ self: { doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -229182,18 +228942,6 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog }: - mkDerivation { - pname = "wide-word"; - version = "0.1.0.7"; - sha256 = "0qqam1sxssxq43r8i586lrs2zslm2qnw5yhjdqj5zxksk2jrcxrd"; - libraryHaskellDepends = [ base deepseq ghc-prim ]; - testHaskellDepends = [ base bytestring ghc-prim hedgehog ]; - description = "Data types for large but fixed width signed and unsigned integers"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "wide-word_0_1_0_8" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog , primitive, QuickCheck, quickcheck-classes, semirings }: @@ -229208,7 +228956,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -235135,42 +234882,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.10.1"; - sha256 = "0xkfzdy1r07w7xqai4r5b96rrk51gr5ndwrf20nhdnjjms4928li"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_11" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -235204,7 +234915,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage From aa4af45d3963d4bd19071fc7c530291efe17345b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2019 18:12:11 +0100 Subject: [PATCH 228/467] all-cabal-hashes: update to Hackage at 2019-02-04T16:43:55Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e6c8b1a388a3..c50c511e7363 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c400563a55894c34ae0d7dec415ac8994aa74aa0.tar.gz"; - sha256 = "0mqgfw8sc0h4p031gcs4m3n6rbd31zrqx2lh1xgplhxldhw5gg8p"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz"; + sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx"; } From 30c40858bd7fb2bd59636c94472c9466705f320b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 4 Feb 2019 18:30:25 +0100 Subject: [PATCH 229/467] gitlab-runner: 11.6.0 -> 11.7.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 93f389e6879a..ae9fa6b3690c 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.6.0"; + version = "11.7.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "16xwj962biny18ci8lvfc6r6jq9vcdlc8vs6w7d5yzvd9x55rvwd"; + sha256 = "1q8m2hi85kh01lz6agp76ppny3ik5m61v5l3ipha4jf6k90140k8"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "05wb7imly0c5zqmxrgdpls8izsq1g409nh31yf6j0sr76m8qkvf9"; + sha256 = "1325jh984hv7yhc977d271866i5gq78lmw4h16sj5i8zny4wzgz5"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1g9wyi9n9xvynvn7c8kjzm5pznyw7w4ziklxjniaa69idzgvbl5g"; + sha256 = "119azvkbx6gmmh7y166jxaja0a6n8lghmslsyar95dxw8akxrfzz"; }; patches = [ ./fix-shell-path.patch ]; From b015c68deffba99822620b5f3ba091c2d9d03d27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 15:15:37 -0800 Subject: [PATCH 230/467] verilator: 4.008 -> 4.010 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/verilator/versions --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index fdee3e013ded..d2246f656db0 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.008"; + version = "4.010"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "1b0cj7bb2a3hrfaziix7p9idcpbygapdl0nrfr3pbdxxsgnzdknm"; + sha256 = "0wfmazhxb6bf6qznh7v756fv7jayjgkzar33gazkwdwfwa7p8lan"; }; enableParallelBuilding = true; From a7d9dcab7e2f759a7ff1ff7fb99f92fba75631f0 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 5 Feb 2019 02:59:42 +0900 Subject: [PATCH 231/467] nixos/nextcloud: use matching nginx package when configuring nginx NixOS currently defaults services.nginx.package to nginxStable. Including configuration files from nginxMainline could potentially cause incompatible configuration. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index ecb1c5615d58..ee1354d6a997 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -426,7 +426,7 @@ in { "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = { priority = 500; extraConfig = '' - include ${pkgs.nginxMainline}/conf/fastcgi.conf; + include ${config.services.nginx.package}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; From 7264d801a67cc26ce5547baec2d60fdbaea45cfd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 10:16:42 -0800 Subject: [PATCH 232/467] pirate-get: 0.3.2 -> 0.3.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pirate-get/versions --- pkgs/tools/networking/pirate-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 3acf625fd00b..5d410685c0d0 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.3.2"; + version = "0.3.3"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1iirip12zrxm2nqsib5wfqqnlfmhh432y3kkyih9crk4q2p914df"; + sha256 = "1zwfgfiszkca44wlx5p2243hmf8594n7bnfva5if1f69dic6w7mi"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; From 8dda7e9215b2a4f40e32e17492bf3ae3c2da0160 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 00:06:46 -0800 Subject: [PATCH 233/467] python37Packages.rasterio: 1.0.13 -> 1.0.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rasterio/versions --- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 02848856eb1f..6b9ed24488fd 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.13"; + version = "1.0.15"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1l1ppclmcq4cmbqvplrpx9sscxfpjlba6w0114y1ma675w30bgfb"; + sha256 = "0waxkqdkaxxmqnkpj397niq193l2bg8s9isal4c7q12jbm6mf7f7"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; From 4a3f06a6526c0e0e0da21c8fca678fb29a19a27d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Feb 2019 10:49:29 -0600 Subject: [PATCH 234/467] swift: 4.2.1 -> 4.2.2 --- pkgs/development/compilers/swift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 02b100fe6130..468c04b5c96c 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -34,7 +34,7 @@ }: let - v_base = "4.2.1"; + v_base = "4.2.2"; version = "${v_base}-RELEASE"; version_friendly = "${v_base}"; @@ -84,7 +84,7 @@ let }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "1bfnkj8s3v327cy0czkngz0ryzmz7amjzkkxbsg2zyrhf9a9f0f7"; + sha256 = "1ki9vc723r13zgm6bcmif43aypavb2hz299gbhp93qkndz8hqkx5"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; @@ -93,7 +93,7 @@ let }; swift = fetch { repo = "swift"; - sha256 = "0y277wi0m6zp1yph9s14mmc65m21q5fm6lgzkn2rkrbaz25fdzak"; + sha256 = "1hwi6hi9ss1kj1s65v5q8v8d872c0914qfy1018xijd029lwq694"; }; }; From 23319c67465235651dd887e224bb424547fa6150 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 4 Feb 2019 20:09:06 +0100 Subject: [PATCH 235/467] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 220 ++++++++++++++-------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b4a0081910df..3ea855bfae6a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-01-27"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "067601e9db7e0c2ab6c8394c9be74769463c6da9"; - sha256 = "18pgwcsryd2p6gw37iw4q0km1d174wgl1nb0ibb55xpzxgpcs1nf"; + rev = "4d426bf2873c6e1cd2c71e478c756903307628d3"; + sha256 = "044nzg672rmbamvzmc41i6klgs7qwdv1a3gl2l18cbli8jr4q8c2"; }; }; @@ -83,12 +83,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2019-01-09"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "e5b9acf212536b9be77a5460a757aee50420c9fa"; - sha256 = "086i8dcz8sxad0k4dzpnp7sjfkys7j3j2sjn8k0b9jaq360ygmk7"; + rev = "dec377ddffd6616aa156029a5f065496582f697b"; + sha256 = "1rmji65skhnf1658f67kaxbhfiwcc7yf91n96ni74djsp26mqfzm"; }; }; @@ -105,12 +105,12 @@ let auto-pairs = buildVimPluginFrom2Nix { pname = "auto-pairs"; - version = "2019-01-28"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "jiangmiao"; repo = "auto-pairs"; - rev = "1c3f4c8171ee30fcdbfd474c8e6bc6842a22be4d"; - sha256 = "0zsw6zvd4x2hnx1p99qkhkqxgv06j79vzi50drgn5ipfpk1ipp4x"; + rev = "40ba005829450406e92ec6277d4308ab532dd256"; + sha256 = "0pxrsmrcnci2k3crmj6ldb0faiai5f9ic1ywx513v148cl4vh8h1"; }; }; @@ -326,12 +326,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-01-11"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "502f03ddb1b519d7581d9119b2cdaef59c0bf32a"; - sha256 = "022nz1aii4vpyfg27bq415368dpnc3dlhh11gbqqncy99an40nvk"; + rev = "ea2685eb1c522dc7ea51ca0a1f215d4107d9978d"; + sha256 = "1kzavi4ja0ivw4jiqm2cyhb018x0npshr912jdkjwihklcrz26vb"; }; }; @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-01-28"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "613e33123b8aa2abd8e020867c26a5e6d9ea47d4"; - sha256 = "1apy2jm2837qvyy6fygkgspp4k64wv5yhc3mh4n93ips02fyygva"; + rev = "334fce21f798a3c4c7b33a37b107df28069e2bd7"; + sha256 = "01nbbsp62jqff7pm85lbi3kmwgq83cpm87p3bn8nbb7iw8ivkiva"; }; }; @@ -494,12 +494,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-01-28"; + version = "2019-02-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "067ed5acdc77d200fb6c2bb28caee63f5781bba3"; - sha256 = "10b4z3r93ivdadvf235syh44zqrkq7ggsl6lnixcpjwki0ry5j5d"; + rev = "1d577d43feae8eae88176c7909e7891297acc8de"; + sha256 = "1hbwz2mkxzq213bpgvrnpf784f193s9bk479nhysrv6704dpqb4v"; }; }; @@ -606,12 +606,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-01-15"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "db3358f25d2dea3cf65ef28f5cf7b0d5fa2bd857"; - sha256 = "1lnd3sa3cw0sdkkc4784rvn9iq17qbzvrq1rmsr75c3r0p086jww"; + rev = "023b441f7aab72166ab5436ff5b6d1500be472b1"; + sha256 = "1a10l1fkgwpi8dm1wfsbllpcb3dnj1p6lg3xp2l5qg10bsjng1lk"; }; }; @@ -872,12 +872,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2019-01-21"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "a7402031c6f6eefc77c16e570cbd0e411923679a"; - sha256 = "07ys787kkwy7dy9kwbjrqf2srfbc39ivmccb5yfdhxaxdrjr90bp"; + rev = "84104d0d55db347be045927e71cf9b0a88e72c2f"; + sha256 = "1bbpi9ndapp14qvbk7qr2xzih0sg6i7rx4sadf3zryasjaxxbfv4"; }; }; @@ -1103,12 +1103,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2018-12-30"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "e83470ab925a76c9f1bde4904c682c49ae4f939e"; - sha256 = "0mxfg2pcrcy4198klvib188zipb38bxg2pf3nypsngcsbmxql0yv"; + rev = "e57ec7889bfb4371c5a4241183204d0bd1f8aea8"; + sha256 = "0ynln0wn0kg5s6n3v31bijwkr0cghv5jzlkawaj4ihxnx44lf839"; }; }; @@ -1125,12 +1125,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-01-25"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "856b272bc09850835e3cd6c47ab5b91b995bd993"; - sha256 = "063v107d738ggbf85iswiz0j9c7nb6vazghbdkr2sq2c55zsh8l0"; + rev = "5fc1f982a5172705038e0a65adf587d9e43c160e"; + sha256 = "1r8mfn95s9kmswbkqsk03n2y2zzi8msqfkl9nzy2l9af9hvf9gwr"; }; }; @@ -1158,23 +1158,23 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-01-28"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "a3c618221999a64997d32563fc6bdabdb63e898d"; - sha256 = "0ck05cvz7n9brzrnmpyqr0hq0ik0papny61pbqs8ccdvxcwm1yqg"; + rev = "c9b41fe9b8cca4b6a11cc0cbe71eecb94fa8a30f"; + sha256 = "1dn09s5jyi0k521llbi4qg5kpmza55i6bxxfvaizkdzdcimnmwxq"; }; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-01-22"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "b4156bd3208c1b96efe53b5407ecda0cf5b5d0f8"; - sha256 = "1jc8r5367yfa8zkb9wra8mc400hkr56s98q009iyns6zcp84kmji"; + rev = "372401281a45eb1389de523440ed38df2c059515"; + sha256 = "1487fbz7hbslr7n7kj3v49476rzzmc3l294gkhgf90ymyv1s8phn"; }; }; @@ -1202,23 +1202,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2018-12-26"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "371e4d0e099abb86a3016fefd1efae28a4e13856"; - sha256 = "0rdfjkd85w1d22mnfxy4ly35d7vi7q09i32hypxnhk7120hjmzdg"; + rev = "3427b2f4ef5f28c9886b7fed54eb9b1cd417fbdf"; + sha256 = "1mfb34z37bl5rqs5q0jmgjqmiqkjl7fw7plik8qfnwgbaspxhfv3"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2018-12-12"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "72c3656799289d4635520c28e17f737066ce19d6"; - sha256 = "1dy77vjj2prn0cl2k3cf7bd240nvh95m6h6lpv0zshjzjap7m1fx"; + rev = "8cc154d4b0cf28f73815050b9782e6ac5a4d733d"; + sha256 = "0cfasf1g4xns1pasriy14k16w6v2j7cb2zbxh62d6cra0jra70i0"; }; }; @@ -1290,12 +1290,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2019-01-28"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "d8790c28aa6e574e5e00307acf8c2f5286dfd6de"; - sha256 = "1b3cvrljsswalhlvxph7qh8ffcjwzmqk014cn0nivwargfck0ai8"; + rev = "5d489606484decb862d4c943d845595be3fe7a0f"; + sha256 = "1qsr470h772xvfxs8bfimb58g77015n0h0ggqjsr3hmm43qj8mal"; }; }; @@ -1455,12 +1455,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2018-10-22"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "28195f7d1047515438c43a3ae8ac39648376412b"; - sha256 = "03jd3jzq0b1djym448vyg0bvrkfrhk86djkbkyzajrsfj46ygs8q"; + rev = "493d80ef7a4f16926d10b8c3923cf69c5209fe34"; + sha256 = "0nqs98g6lq45yrrlwgxckkgq90n73s7nibih2906s0zvsr1x95s8"; }; }; @@ -1642,12 +1642,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-01-28"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "1cbf03ac9bbb3817e6ab3cf9ba9cea41d0d2b06e"; - sha256 = "123agkbwvvjnci9c3vdy7zwz5gcv5ybrjq1779q8is3m8jycjvyy"; + rev = "7274363a7267bf168ec21a50375102d602fd1232"; + sha256 = "0x6jn1hqxjlhhsykqqrlx910x53xcrwd3qa1jx0a9yighws9b01i"; }; }; @@ -1752,12 +1752,12 @@ let tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2018-04-08"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; - sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + rev = "857858deae98c31c766446bd54f73e636691eecb"; + sha256 = "04b8m6hzh8rgdy5h3n39mi9fqm38x8r7zn76h3inm2mw85h86jla"; }; }; @@ -1818,23 +1818,23 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2019-01-22"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "63734df2a33eb809a985657662e3a7c671480177"; - sha256 = "0rrrsxs8bxzg3a2lqsrq9s4n2qy2h6fmj61pgy7ckly1gn0kk691"; + rev = "db0223fc6857c160b2394489094355feb20318f2"; + sha256 = "0ncqwn0gdz23gp9avdqkd8l0z6zc87m0xmi63b0axarp1lfazr56"; }; }; unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2018-12-14"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "f08df66abda88a83f0436e0bd1ffa05009a9645a"; - sha256 = "15mrmawxa1gwhirb11w10lw1prl3sjr6xy7xgsfjja2fzz5wm1jy"; + rev = "b55994a18b19499f8de19cf7ea48670113a45e4f"; + sha256 = "1mcspmnd7qvscf1zxn0i7gzb4yxa5xcpg7piyvssx9nbb8w57jr1"; }; }; @@ -2082,12 +2082,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-01-28"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "98bc6abde3860600e599c7ad17fdfb80809c04af"; - sha256 = "029f63gxppgnwx1ymwra1bn0xvqfdp4rm0dxbiafdyh5h7c3zb14"; + rev = "40786883051429053d22ad0da4e04b52e900aaba"; + sha256 = "09igzw2wg2m55bq9l343wgxdgjmhjg62sz3fr2wjgmr5ji4kpkn4"; }; }; @@ -2148,12 +2148,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2018-01-11"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; - sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939"; + sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f"; }; }; @@ -2313,12 +2313,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2018-06-21"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; - sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; + rev = "7cbdd2b68ff9bc6d4da74e9872b12adf32b1bc2f"; + sha256 = "00g6cy2ly26fmzjdjga987k2apkkhpy1jkndj6d1hg35kwv7bihv"; }; }; @@ -2511,12 +2511,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-01-27"; + version = "2019-02-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "d27dbc40d4264525b1c812482bf0efecfed53f28"; - sha256 = "12r1s10z74sy7a76bs5mwazb4yy29ym2mfzm6xdz3nadngxlbb8v"; + rev = "ed07f9a503e53ec3ca4d5e255acb078675f2ff0e"; + sha256 = "0ykzawd9axa68109mwl3c7177si8sxy6b5x0xwf4z80c1xnc8czx"; }; }; @@ -2555,12 +2555,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-01-25"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "afa4f2ddf0fecb37914ec37357636abb18013422"; - sha256 = "1bf2bxn967sw1x4mxfy43p0k4cgi719pg3gsk7yqih8imb22ihdl"; + rev = "fd834e48eed21cc3c3ab66779a2296a16f41cbca"; + sha256 = "1q8263cxa7ic3bijl0zlz14pxa8mqww1isb6a9gpwmlmxrfwhl7x"; }; }; @@ -2775,12 +2775,12 @@ let vim-jade = buildVimPluginFrom2Nix { pname = "vim-jade"; - version = "2019-01-13"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "digitaltoad"; repo = "vim-jade"; - rev = "2eb75dc5c31e4f84e9c7a0d7d02c6cdd905bf79e"; - sha256 = "1vgw9fs6j0fzv4y9kj2njnw2izymbmv3wgz004alb1h0khhzgaw2"; + rev = "0b4f42ac1ae491adac2b99b81eddd2bfd79337ee"; + sha256 = "0xr54p19fr8z6ywaw2mlmw0c92dlc7xjsnif19bafjxrlz3l0aq9"; }; }; @@ -3341,8 +3341,8 @@ let src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "2a332fed835c3286139756a1377c3aa05f4e935f"; - sha256 = "1rvqc25834yr16b300lwadgn5p7ksba6x4nxilxmaiksbhj3j8gn"; + rev = "4f640daecbb1d0b4f6c02675bfc0fa958102f5be"; + sha256 = "1rja2kc3i364d7bfq8d1z5yck6sjzyjxrciv5cb4ww1v6njp4ay5"; }; }; @@ -3414,12 +3414,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-01-25"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "a1ddf6d524a244bbccdded1a6c03771972422b29"; - sha256 = "11sldd2vv3b71qrdc2jhag4k3amg8s9n5jhyj8lhhh86ky6wp47z"; + rev = "768f52319212b6e2964e4f11d1baf7092066d504"; + sha256 = "14b9s7plj9h55n1ddqvjy13mfciviq2ngmjs3x22vrpwgsga2zik"; }; }; @@ -3436,12 +3436,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-01-22"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "06525ceee2457bed7c7718fef0b4fe715651c392"; - sha256 = "09ldx1d12cwpdxfyfzl7hxi2ds3jysfpy57yxvv073bldkhv6c7q"; + rev = "8717c21b270cfd7396de54a256c7be3a30e70cc1"; + sha256 = "01yl8pl59yksdz9z6ry70m441w847cjwx92z0qf3ipv5038dsngs"; }; }; @@ -3469,12 +3469,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-01-27"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "54e76dd36c8341197cd7284c37e21b61561f081a"; - sha256 = "1i7swgd8izzihkni6hq6cg1q7bkgi3kl2sqnm1q7a9v30k9lrcav"; + rev = "075e97b6b6c1f981a15f7a887d7c006141fccbfc"; + sha256 = "19hifbhdg2hp7b719vjrpkk0zndmswp1px2r94blvyd82gn21y42"; }; }; @@ -3513,12 +3513,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-01-13"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "06f2f59d4fc6d56b034f98cecd8702168b674020"; - sha256 = "12y4sbjay3xpckhcik4nc7ahishg5firclrl08sgbsrx3rly2sm6"; + rev = "69e835d1f779140f7c0a27f6fd30ae4d1f9dac77"; + sha256 = "0s4938xrmn6ivm4dvkhpqc5gdx42hk2m206fkhayxagvwnxsfiwb"; }; }; @@ -3612,12 +3612,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-01-20"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "7e5e118720be538fd560dee8bf34c3f139f2b037"; - sha256 = "11k0dvbs4kc448ff2a61q7rgprhiv28rxbbs1g20ljhafzfz52q3"; + rev = "ae44000a0e556a6b4c95d75b6ad39ffc1dd5f066"; + sha256 = "02h1y59wzb7kxyqr2405y72sq0bf6yn16vw2qxfnbp7shdhxr2sa"; }; }; @@ -3645,12 +3645,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2018-11-03"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "9f7d1588b04644d8a1671d2325fefbb4f772e466"; - sha256 = "08nxa5v56zmsjbx0zld1i9nwydxmb3r6qmxb9hgnvzg4aylmbxlc"; + rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; + sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; }; }; @@ -3821,12 +3821,12 @@ let vimpreviewpandoc = buildVimPluginFrom2Nix { pname = "vimpreviewpandoc"; - version = "2018-11-05"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "tex"; repo = "vimpreviewpandoc"; - rev = "61d34f27b6d47da6523b682e32a155f65867d46e"; - sha256 = "08hszn4mjp64b1qcfc868cyrrylil2257sjzs19w61p10l6j6skm"; + rev = "90e39ff676c78bc6f3dde2a76b56fe86aa38d39c"; + sha256 = "0xaaq565wfd2bx64wm1cy0k18jrm6l9snwkvmgbp7p10zjxnqfhs"; }; }; @@ -3854,12 +3854,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-01-24"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "48c2927ffad12d487129da718f1d4a7386a02cdf"; - sha256 = "0jq1pkrj2d1ajd9bh6288f0d0pz5zyhl01icx0xpvjk8dilplk14"; + rev = "97b02bb024b23501302f50c068e89b058faace6b"; + sha256 = "1yd6xl7a2gbazgr6fs9n00b9msz1w7szl42h0pn80nmgp0pmjmcp"; }; }; @@ -3876,12 +3876,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-01-20"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "4e6db92d2c5a3ff24e64f6ba88220e7000f6c2b3"; - sha256 = "0wd6kvryx95knx3k5z2f2ii0sckhb7k5w11z4swig3s11pv62cfs"; + rev = "417490f30b3aaec600c19cfa59018cf2368dd87b"; + sha256 = "12mkk48kgjd7ijz81drmd4fimd9881r4nhhffckqqkv0r0mvg8x8"; }; }; @@ -4043,12 +4043,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-01-02"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "6e8b24f97152952e89979eb2638dd0963b3a1567"; - sha256 = "0y5f6lbkizspab35dym3f634b24vjfda8zi09ayvy9bi8g0zmmx3"; + rev = "09e0bceb7be1488318df9441a5499f1dde644e72"; + sha256 = "1g1s0176s3cz0ynyrx5a3r0jnbmqgln318v7hw5qvgalf3k99c5c"; }; }; From 722af384ea4979c3245161f25abf8463d405f507 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Feb 2019 21:47:13 +0100 Subject: [PATCH 236/467] nixos/ndppd: add short changelog entry --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 6c45301b91e1..eca280afdf18 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -476,6 +476,14 @@ + + + The ndppd module + now supports all config options provided by the current + upstream version as service options. Additionally the ndppd package doesn't contain + the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + + From ff06495bfed8a687bc86281f73a08818932a77ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 12:48:12 -0800 Subject: [PATCH 237/467] papirus-icon-theme: 20190106 -> 20190203 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/papirus-icon-theme/versions --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 89ec5ec54de1..3b1c9a1131ed 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20190106"; + version = "20190203"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0i5dmpqq65nipps800iijxd6krnvrdbnd6zrf7f145dg7r6hfk8p"; + sha256 = "02vx8sqpd3rpcypjd99rqkci0fj1bcjznn46p660vpdddpadxya4"; }; nativeBuildInputs = [ gtk3 ]; From 9f056c9a7d19b3524430a150b218ba1fe895afc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 13:27:02 -0800 Subject: [PATCH 238/467] osrm-backend: 5.21.0 -> 5.22.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osrm-backend/versions --- pkgs/servers/osrm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 47c1bf3d77ae..8eca1fb7790b 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.21.0"; + version = "5.22.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "18v2lwx5iyn73b5bfh2r898cwps7m9pwym197dl8lg0jy88m129m"; + sha256 = "1m4hf26mgfvvx9z37qww8v8w4mhzyfl554ymdnzl99pr5ild093s"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 9edc2d4dbb4a87ecb8c608cb49a72cbe30872421 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2019 22:43:48 +0100 Subject: [PATCH 239/467] xcodeenv: enable Xcode 10.1 support --- .../development/mobile/xcodeenv/build-app.nix | 20 +++++++++++++------ .../mobile/xcodeenv/compose-xcodewrapper.nix | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 90fa307fbf23..b88f806d5866 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, composeXcodeWrapper}: { name , src -, sdkVersion ? "11.3" +, sdkVersion ? "12.1" , target ? null , configuration ? null , scheme ? null @@ -11,6 +11,7 @@ , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null +, codeSignIdentity ? null , signMethod ? null , generateIPA ? false , generateXCArchive ? false @@ -21,7 +22,7 @@ , ... }@args: -assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; +assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null && codeSignIdentity != null; assert enableWirelessDistribution -> installURL != null && bundleId != null && appVersion != null; let @@ -53,8 +54,11 @@ let in stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed - buildInputs = [ xcodewrapper ]; buildPhase = '' + # Be sure that the Xcode wrapper has priority over everything else. + # When using buildInputs this does not seem to be the case. + export PATH=${xcodewrapper}/bin:$PATH + ${stdenv.lib.optionalString release '' export HOME=/Users/$(whoami) keychainName="$(basename $out)" @@ -85,9 +89,9 @@ stdenv.mkDerivation ({ ''} # Do the building - export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works + export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' @@ -97,11 +101,15 @@ stdenv.mkDerivation ({ + signingCertificate + ${codeSignIdentity} provisioningProfiles - ${bundleId} + ${stdenv.lib.toLower bundleId} $PROVISIONING_PROFILE + signingStyle + manual method ${signMethod} ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index d0093ffac91b..dea1b77211bd 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -1,5 +1,5 @@ {stdenv}: -{version ? "9.3", xcodeBaseDir ? "/Applications/Xcode.app"}: +{version ? "10.1", xcodeBaseDir ? "/Applications/Xcode.app"}: assert stdenv.isDarwin; @@ -13,6 +13,7 @@ stdenv.mkDerivation { ln -s /usr/bin/codesign ln -s /usr/bin/xcrun ln -s /usr/bin/plutil + ln -s /usr/bin/clang ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" From 8cec070f8c43905473435709aa04c9aeada53851 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2019 22:50:36 +0100 Subject: [PATCH 240/467] titaniumenv: add Xcode 10.1 and Titanium 7.5.1 support --- .../mobile/titaniumenv/build-app.nix | 12 ++- .../mobile/titaniumenv/default.nix | 11 +- .../mobile/titaniumenv/titaniumsdk-7.5.nix | 102 ++++++++++++++++++ 3 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 472f85fbc453..aac94fe6130b 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: { name, src, preBuild ? "", target, tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.3", iosBuildStore ? false +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false , enableWirelessDistribution ? false, installURL ? null , xcodeBaseDir ? "/Applications/Xcode.app" , androidsdkArgs ? {} @@ -15,7 +15,7 @@ assert enableWirelessDistribution -> installURL != null; let realAndroidsdkArgs = { - platformVersions = [ "26" ]; + platformVersions = [ "28" ]; } // androidsdkArgs; androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk; @@ -46,6 +46,14 @@ stdenv.mkDerivation ({ buildPhase = '' ${preBuild} + ${stdenv.lib.optionalString stdenv.isDarwin '' + # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. + alloy=$(dirname $(type -p alloy))/.. + cp -rv $alloy/* alloy + chmod -R u+w alloy + export PATH=$(pwd)/alloy/bin:$PATH + ''} + export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"} ${stdenv.lib.optionalString (tiVersion != null) '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index e9f6344680b7..1d5df87f6eec 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,8 +1,17 @@ -{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: +{pkgs, pkgs_i686, tiVersion ? "7.1.0.GA"}: rec { + androidenv = import ../../nix-androidenvtests/androidenv { + inherit pkgs pkgs_i686; + }; + + xcodeenv = import ../../nix-xcodeenvtests/xcodeenv { + inherit (pkgs) stdenv; + }; + titaniumsdk = let titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix + else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix new file mode 100644 index 000000000000..cff1d73d3024 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -0,0 +1,102 @@ +{stdenv, fetchurl, unzip, makeWrapper}: + +let + # Gradle is a build system that bootstraps itself. This is what it actually + # downloads in the bootstrap phase. + gradleAllZip = fetchurl { + url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; + }; + + # A Titanium-Android build requires proguard plugins. We create a fake + # repository so that Gradle does not attempt to download them in the builder. + # Since there are only 3 plugins required, this is still (sort of) manageable + # without a generator. + proguardVersion = "5.3.3"; + + proguardGradlePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom"; + sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj"; + }; + proguardGradleJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar"; + sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk"; + }; + proguardParentPOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom"; + sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202"; + }; + proguardBasePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom"; + sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5"; + }; + proguardBaseJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar"; + sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; + }; + + # Put the downloaded plugins in a fake Maven repository + fakeMavenRepo = stdenv.mkDerivation { + name = "fake-maven-repo"; + buildCommand = '' + mkdir -p $out + cd $out + mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion} + cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom + cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar + mkdir -p net/sf/proguard/proguard-parent/${proguardVersion} + cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom + mkdir -p net/sf/proguard/proguard-base/${proguardVersion} + cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom + cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar + ''; + }; +in +stdenv.mkDerivation { + name = "mobilesdk-7.5.1.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip; + sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip; + sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 7.5.1.GA + cd * + + # Patch bundled gradle build infrastructure to make shebangs work + patchShebangs android/templates/gradle + + # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app + sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip + echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + + # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts + sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} From 7a8b65d216d069f8f594151fc47162b179227a86 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2019 23:07:04 +0100 Subject: [PATCH 241/467] titaniumenv: fix broken function header --- pkgs/development/mobile/titaniumenv/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 1d5df87f6eec..336194cf0a81 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,14 +1,6 @@ -{pkgs, pkgs_i686, tiVersion ? "7.1.0.GA"}: +{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: rec { - androidenv = import ../../nix-androidenvtests/androidenv { - inherit pkgs pkgs_i686; - }; - - xcodeenv = import ../../nix-xcodeenvtests/xcodeenv { - inherit (pkgs) stdenv; - }; - titaniumsdk = let titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix From b93477087fcf6eab780c629c3d62d1916d6f7c5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 14:15:49 -0800 Subject: [PATCH 242/467] notejot: 1.5.3 -> 1.5.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notejot/versions --- pkgs/applications/misc/notejot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 9e2f4bf7f2e4..fa5477697db0 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.3"; + version = "1.5.4"; name = "${pname}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1n41sg9a38p9qp8pz3lx9rnb8kc069vkbwf963zzpzs2745h6s9v"; + sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf"; }; nativeBuildInputs = [ From 091de08e7908dab94f88149fa6b1e4dbc509c3ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 12:28:00 -0800 Subject: [PATCH 243/467] gnome3.orca: 3.30.1 -> 3.30.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/orca/versions --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index f52215fa4a26..5533bf6eeded 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -9,7 +9,7 @@ let pname = "orca"; - version = "3.30.1"; + version = "3.30.2"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -17,7 +17,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b9s69frjmghjm1p9a4rrvknl9m0qlwr7mr4lsxkvjnblhsnw0g7"; + sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53"; }; patches = [ From acfc1c15352a88af7077af8581898a85f5935827 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Feb 2019 23:56:39 +0100 Subject: [PATCH 244/467] hydra: don't support Nix 1.x The component `hydra-evaluator` requires `pool.hh` from Nix which isn't provided by Nix 1.x and thus fails with the following error in this case: ``` hydra-evaluator.cc:3:10: fatal error: pool.hh: No such file or directory #include "pool.hh" ^~~~~~~~~ compilation terminated. make[3]: *** [Makefile:443: hydra_evaluator-hydra-evaluator.o] Error 1 ``` As the commit is from 2016 and fairly hard to revert for Nix 1.x support, it's easier to drop that. This has been tested with fixed perl-bindings for Nix1 as done in #55146. --- pkgs/development/tools/misc/hydra/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 395ab5349c2f..00f679cfdac8 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -8,6 +8,10 @@ with stdenv; +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + let isGreaterNix20 = with lib.versions; let From 904e9ab04859f976dbf3b84e1274a9e41a9cfc50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 07:55:21 -0800 Subject: [PATCH 245/467] pythia: 8.235 -> 8.240 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pythia/versions --- pkgs/development/libraries/physics/pythia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 3f9f3f8498bd..e84aaf373255 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.235"; + version = "8.240"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8"; + sha256 = "13cd86030j1f00n4xw30g26cgir3a5lsn9n0z13dh1vprbc9ax6j"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; From c02564e37c6159408d09ef762ad2dde854bef50c Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:08:56 -0500 Subject: [PATCH 246/467] nixos/munin: fix documentation links Since this module was written, Munin has moved their documentation from munin-monitoring.org/wiki to guide.munin-monitoring.org. Most of the links were broken, and the ones that weren't went to "please use the new site" pages. --- nixos/modules/services/monitoring/munin.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 2b265d5b5a90..fb1a11a44f92 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -4,7 +4,7 @@ # TODO: LWP/Pg perl libs aren't recognized # TODO: support fastcgi -# http://munin-monitoring.org/wiki/CgiHowto2 +# http://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html # spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph # spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum @@ -86,7 +86,7 @@ in Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See . + See . ''; }; @@ -95,7 +95,7 @@ in type = types.lines; description = '' munin-node.conf extra configuration. See - + ''; }; @@ -121,9 +121,9 @@ in default = ""; description = '' munin.conf extra global configuration. - See . + See . Useful to setup notifications, see - + ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -137,8 +137,8 @@ in ''; description = '' Definitions of hosts of nodes to collect data from. Needs at least one - hosts for cron to succeed. See - + host for cron to succeed. See + ''; }; @@ -173,7 +173,7 @@ in environment.MUNIN_PLUGSTATE = "/run/munin"; environment.MUNIN_LOGDIR = "/var/log/munin"; preStart = '' - echo "updating munin plugins..." + echo "Updating munin plugins..." mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* From c74abf763af37fd453a2dd5aa8390da8256e4f8e Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:14:21 -0500 Subject: [PATCH 247/467] nixos/munin: add extraPluginConfig option This lets you specify additional plugin-specific configuration to go in plugin-conf.d, and complements the extraConfig and extraGlobalConfig options. --- nixos/modules/services/monitoring/munin.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index fb1a11a44f92..47ccf9b0a343 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -63,6 +63,8 @@ let [ipmi*] user root group root + + ${nodeCfg.extraPluginConfig} ''; pluginConfDir = pkgs.stdenv.mkDerivation { @@ -100,6 +102,18 @@ in }; # TODO: add option to add additional plugins + extraPluginConfig = mkOption { + default = ""; + type = types.lines; + description = '' + plugin-conf.d extra plugin configuration. See + + ''; + example = '' + [fail2ban_*] + user root + ''; + }; }; From 0c3208a8e462c95a1deeb5bd7ab3c467ff2eec49 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:16:07 -0500 Subject: [PATCH 248/467] nixos/munin: add disabledPlugins option This is just a set of globs to remove from the active plugins directory after autoconfiguration is complete. I also removed the hard-coded disabling of "diskstats", since it seems to work just fine now. --- nixos/modules/services/monitoring/munin.nix | 21 +++++++++++++++++++-- nixos/tests/munin.nix | 4 +--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 47ccf9b0a343..dcdad6fac1ba 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -115,6 +115,17 @@ in ''; }; + disabledPlugins = mkOption { + default = []; + type = with types; listOf string; + description = '' + Munin plugins to disable, even if + munin-node-configure --suggest tries to enable + them. To disable a wildcard plugin, use an actual wildcard, as in + the example. + ''; + example = [ "diskstats" "zfs_usage_*" ]; + }; }; services.munin-cron = { @@ -191,10 +202,16 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* + + # Autoconfigure builtin plugins ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${pkgs.munin}/lib/plugins --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash - # NOTE: we disable disktstats because plugin seems to fail and it hangs html generation (100% CPU + memory leak) - rm /etc/munin/plugins/diskstats || true + + ${lib.optionalString (nodeCfg.disabledPlugins != []) '' + # Disable plugins + cd /etc/munin/plugins + rm -f ${toString nodeCfg.disabledPlugins} + ''} ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/ --sconfdir=${pluginConfDir}"; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 9f66005292ab..95cecf17b8cc 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -15,9 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { munin-node = { enable = true; # disable a failing plugin to prevent irrelevant error message, see #23049 - extraConfig = '' - ignore_file ^apc_nis$ - ''; + disabledPlugins = [ "apc_nis" ]; }; munin-cron = { enable = true; From b5b82b2caee7bb2c0ea80353397fc7fadf470025 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:17:21 -0500 Subject: [PATCH 249/467] nixos/munin: require DejaVu fonts if enabled munin-graph is hardcoded to use DejaVu Mono for the graph legends; if it can't find it, there's no guarantee it finds a monospaced font at all, and if it can't find a monospaced font the legends come out badly misformatted. --- nixos/modules/services/monitoring/munin.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index dcdad6fac1ba..431d03975460 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -223,6 +223,10 @@ in }) (mkIf cronCfg.enable { + # Munin is hardcoded to use DejaVu Mono and the graphs come out wrong if + # it's not available. + fonts.fonts = [ pkgs.dejavu_fonts ]; + systemd.timers.munin-cron = { description = "batch Munin master programs"; wantedBy = [ "timers.target" ]; From 6c907851f4fbb1252b7d667b46389989e3207cac Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 19:58:12 -0500 Subject: [PATCH 250/467] nixos/munin: add extraPlugins and extraAutoPlugins options [#17895] extraAutoPlugins lets you list plugins and plugin directories to be autoconfigured, and extraPlugins lets you enable plugins on a one-by-one basis. This can be used to enable plugins from contrib (although you'll need to download and check out contrib yourself, then point these options at it), or plugins you've written yourself. --- nixos/modules/services/monitoring/munin.nix | 108 +++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 431d03975460..af3562befde1 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -74,6 +74,46 @@ let ln -s ${pluginConf} $out/nixos-config ''; }; + + # Copy one Munin plugin into the Nix store with a specific name. + # This is suitable for use with plugins going directly into /etc/munin/plugins, + # i.e. munin.extraPlugins. + internOnePlugin = name: path: + "cp -a '${path}' '${name}'"; + + # Copy an entire tree of Munin plugins into a single directory in the Nix + # store, with no renaming. + # This is suitable for use with munin-node-configure --suggest, i.e. + # munin.extraAutoPlugins. + internManyPlugins = name: path: + "find '${path}' -type f -perm /a+x -exec cp -a -t . '{}' '+'"; + + # Use the appropriate intern-fn to copy the plugins into the store and patch + # them afterwards in an attempt to get them to run on NixOS. + internAndFixPlugins = name: intern-fn: paths: + pkgs.runCommand name {} '' + mkdir -p "$out" + cd "$out" + ${lib.concatStringsSep "\n" + (lib.attrsets.mapAttrsToList intern-fn paths)} + chmod -R u+w . + find . -type f -exec sed -E -i ' + s,(/usr)?/s?bin/,/run/current-system/sw/bin/,g + ' '{}' '+' + ''; + + # TODO: write a derivation for munin-contrib, so that for contrib plugins + # you can just refer to them by name rather than needing to include a copy + # of munin-contrib in your nixos configuration. + extraPluginDir = internAndFixPlugins "munin-extra-plugins.d" + internOnePlugin nodeCfg.extraPlugins; + + extraAutoPluginDir = internAndFixPlugins "munin-extra-auto-plugins.d" + internManyPlugins + (builtins.listToAttrs + (map + (path: { name = baseNameOf path; value = path; }) + nodeCfg.extraAutoPlugins)); in { @@ -101,7 +141,6 @@ in ''; }; - # TODO: add option to add additional plugins extraPluginConfig = mkOption { default = ""; type = types.lines; @@ -115,6 +154,66 @@ in ''; }; + extraPlugins = mkOption { + default = {}; + type = with types; attrsOf path; + description = '' + Additional Munin plugins to activate. Keys are the name of the plugin + symlink, values are the path to the underlying plugin script. You + can use the same plugin script multiple times (e.g. for wildcard + plugins). + + Note that these plugins do not participate in autoconfiguration. If + you want to autoconfigure additional plugins, use + . + + Plugins enabled in this manner take precedence over autoconfigured + plugins. + + Plugins will be copied into the Nix store, and it will attempt to + modify them to run properly by fixing hardcoded references to + /bin, /usr/bin, + /sbin, and /usr/sbin. + ''; + example = literalExample '' + { + zfs_usage_bigpool = /src/munin-contrib/plugins/zfs/zfs_usage_; + zfs_usage_smallpool = /src/munin-contrib/plugins/zfs/zfs_usage_; + zfs_list = /src/munin-contrib/plugins/zfs/zfs_list; + }; + ''; + }; + + extraAutoPlugins = mkOption { + default = []; + type = with types; listOf path; + description = '' + Additional Munin plugins to autoconfigure, using + munin-node-configure --suggest. These should be + the actual paths to the plugin files (or directories containing them), + not just their names. + + If you want to manually enable individual plugins instead, use + . + + Note that only plugins that have the 'autoconfig' capability will do + anything if listed here, since plugins that cannot autoconfigure + won't be automatically enabled by + munin-node-configure. + + Plugins will be copied into the Nix store, and it will attempt to + modify them to run properly by fixing hardcoded references to + /bin, /usr/bin, + /sbin, and /usr/sbin. + ''; + example = literalExample '' + [ + /src/munin-contrib/plugins/zfs + /src/munin-contrib/plugins/ssh + ]; + ''; + }; + disabledPlugins = mkOption { default = []; type = with types; listOf string; @@ -206,6 +305,13 @@ in # Autoconfigure builtin plugins ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${pkgs.munin}/lib/plugins --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash + # Autoconfigure extra plugins + ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${extraAutoPluginDir} --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash + + ${lib.optionalString (nodeCfg.extraPlugins != {}) '' + # Link in manually enabled plugins + ln -f -s -t /etc/munin/plugins ${extraPluginDir}/* + ''} ${lib.optionalString (nodeCfg.disabledPlugins != []) '' # Disable plugins From c4437fee7e41d54d58ef680546cc8814b0da3575 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 21:55:41 -0500 Subject: [PATCH 251/467] nixos/munin: add extraCSS option This permits custom styling of the generated HTML without needing to build your own Munin package from source. Also comes with an example that works as a passable dark theme for Munin. --- nixos/modules/services/monitoring/munin.nix | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index af3562befde1..c65432b4bbf0 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -24,6 +24,8 @@ let logdir /var/log/munin rundir /run/munin + ${lib.optionalString (cronCfg.extraCSS != "") "staticdir ${customStaticDir}"} + ${cronCfg.extraGlobalConfig} ${cronCfg.hosts} @@ -114,6 +116,14 @@ let (map (path: { name = baseNameOf path; value = path; }) nodeCfg.extraAutoPlugins)); + + customStaticDir = pkgs.runCommand "munin-custom-static-data" {} '' + cp -a "${pkgs.munin}/etc/opt/munin/static" "$out" + cd "$out" + chmod -R u+w . + echo "${cronCfg.extraCSS}" >> style.css + echo "${cronCfg.extraCSS}" >> style-new.css + ''; in { @@ -266,6 +276,24 @@ in ''; }; + extraCSS = mkOption { + default = ""; + type = types.lines; + description = '' + Custom styling for the HTML that munin-cron generates. This will be + appended to the CSS files used by munin-cron and will thus take + precedence over the builtin styles. + ''; + example = '' + /* A simple dark theme. */ + html, body { background: #222222; } + #header, #footer { background: #333333; } + img.i, img.iwarn, img.icrit, img.iunkn { + filter: invert(100%) hue-rotate(-30deg); + } + ''; + }; + }; }; From e7c1449ae92646723296bf3da12dcc53af8aa272 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Fri, 14 Dec 2018 19:24:00 -0500 Subject: [PATCH 252/467] nixos/munin: add types to Munin options Some options were missing their types. --- nixos/modules/services/monitoring/munin.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index c65432b4bbf0..bf1be56ee9e1 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -134,6 +134,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. @@ -241,6 +242,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Enable munin-cron. Takes care of all heavy lifting to collect data from nodes and draws graphs to html. Runs munin-update, munin-limits, @@ -253,6 +255,7 @@ in extraGlobalConfig = mkOption { default = ""; + type = types.lines; description = '' munin.conf extra global configuration. See . @@ -265,15 +268,17 @@ in }; hosts = mkOption { - example = '' - [''${config.networking.hostName}] - address localhost - ''; + default = ""; + type = types.lines; description = '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See ''; + example = '' + [''${config.networking.hostName}] + address localhost + ''; }; extraCSS = mkOption { From ace4855cf6998d43c2d347aec03a65d0089201ed Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Fri, 14 Dec 2018 19:26:02 -0500 Subject: [PATCH 253/467] nixos/munin: enable munin_update and disable munin_stats munin_update relies on a stats file that exists, but isn't found in the default location on NixOS; the appropriate plugin configuration is added. munin_stats relies on munin-cron writing a logfile, which the NixOS build of munin does not. (This is probably fixable in the munin package, but I don't have time to dig into that right now.) --- nixos/modules/services/monitoring/munin.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index bf1be56ee9e1..f67986327245 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -66,6 +66,9 @@ let user root group root + [munin*] + env.UPDATE_STATSFILE /var/lib/munin/munin-update.stats + ${nodeCfg.extraPluginConfig} ''; @@ -226,13 +229,20 @@ in }; disabledPlugins = mkOption { - default = []; + # TODO: figure out why Munin isn't writing the log file and fix it. + # In the meantime this at least suppresses a useless graph full of + # NaNs in the output. + default = [ "munin_stats" ]; type = with types; listOf string; description = '' Munin plugins to disable, even if munin-node-configure --suggest tries to enable them. To disable a wildcard plugin, use an actual wildcard, as in the example. + + munin_stats is disabled by default as it tries to read + /var/log/munin/munin-update.log for timing + information, and the NixOS build of Munin does not write this file. ''; example = [ "diskstats" "zfs_usage_*" ]; }; @@ -312,6 +322,7 @@ in description = "Munin monitoring user"; group = "munin"; uid = config.ids.uids.munin; + home = "/var/lib/munin"; }]; users.groups = [{ From 85cdd06e0c079369a46351a126ef67f9a7142a80 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Sat, 15 Dec 2018 15:02:54 -0500 Subject: [PATCH 254/467] munin: 2.0.37 -> 2.0.43 Also creates the RELEASE file in preBuild so that munin knows its own version number at runtime. --- pkgs/servers/monitoring/munin/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 032789ef05d0..5153fcc5ef61 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.37"; + version = "2.0.43"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; + sha256 = "1ydhf9hcb3n5h0ss5f1zf9yz4r4njqxazlz931ixvx5gyhj9gq5l"; }; buildInputs = [ @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' + echo "${version}" > RELEASE substituteInPlace "Makefile" \ --replace "/bin/pwd" "pwd" \ --replace "HTMLOld.3pm" "HTMLOld.3" From 770e014574245b8892208629785cee6c8632732b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 4 Feb 2019 21:47:15 -0800 Subject: [PATCH 255/467] amass: 2.8.5 -> 2.9.1 --- pkgs/tools/networking/amass/default.nix | 4 +- pkgs/tools/networking/amass/deps.nix | 284 ++++++++++++++++++++++-- 2 files changed, 265 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 16e87d2a5c97..f031cf09884c 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { name = "amass-${version}"; - version = "2.8.5"; + version = "2.9.1"; goPackagePath = "github.com/OWASP/Amass"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; + sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29"; }; outputs = [ "bin" "out" "wordlists" ]; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index e9b5acf618e2..c81a603e39ce 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -1,101 +1,343 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { goPackagePath = "github.com/PuerkitoBio/fetchbot"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/fetchbot"; - rev = "1f502d610659b899a007858812b601e715f531eb"; - sha256 = "0yzv0xh3cwq87jv9whs5rmhaj8b2nqdm76vwppzn8mm34fg41n8s"; + rev = "v1.1.2"; + sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq"; }; } + { goPackagePath = "github.com/PuerkitoBio/goquery"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; + rev = "v1.4.1"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; }; } + { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; - sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; + rev = "v1.0.0"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; }; } + { goPackagePath = "github.com/asaskevich/EventBus"; fetch = { type = "git"; url = "https://github.com/asaskevich/EventBus"; - rev = "d46933a94f05c6657d7b923fcf5ac563ee37ec79"; + rev = "d46933a94f05"; sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha"; }; } + + { + goPackagePath = "github.com/caffix/cloudflare-roundtripper"; + fetch = { + type = "git"; + url = "https://github.com/caffix/cloudflare-roundtripper"; + rev = "4c29d231c9cb"; + sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.1.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + }; + } + + { + goPackagePath = "github.com/dghubble/go-twitter"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/go-twitter"; + rev = "7fd79e2bcc65"; + sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7"; + }; + } + + { + goPackagePath = "github.com/dghubble/sling"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/sling"; + rev = "v1.2.0"; + sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6"; + }; + } + { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; }; } + + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.41.0"; + sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { goPackagePath = "github.com/irfansharif/cfilter"; fetch = { type = "git"; url = "https://github.com/irfansharif/cfilter"; - rev = "d07d951ff29d52840ca5e798a17e80db4de8c820"; - sha256 = "11gicb8jbpnsc7wylv7qs9dgc91qc3rld6ahsylb491knxr78yb2"; + rev = "v0.1.1"; + sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz"; }; } + { goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver"; fetch = { type = "git"; url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver"; - rev = "6b24c0085aaeaf3b2844acd18066864e24b57387"; - sha256 = "0dmfgy0ci0k0s4hxp9v5j4j0mab5x1nsc83icgq9ldb2446mn0fk"; + rev = "c68f22031e42"; + sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c"; }; } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.0"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "1c9c9bf4c93ee029810272d3e5b8a126aee5bf1f"; - sha256 = "002z8l5crsipdn2zkavjkjzxrj6c4132yqgbg1zk7w7gkv40q7wr"; + rev = "v1.0.8"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; }; } + + { + goPackagePath = "github.com/qasaur/gremgo"; + fetch = { + type = "git"; + url = "https://github.com/qasaur/gremgo"; + rev = "fa23ada7c5da"; + sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4"; + }; + } + + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "15f95af6e78d"; + sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "v1.2.0"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "github.com/temoto/robotstxt"; + fetch = { + type = "git"; + url = "https://github.com/temoto/robotstxt"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; + }; + } + { goPackagePath = "github.com/temoto/robotstxt-go"; fetch = { type = "git"; url = "https://github.com/temoto/robotstxt-go"; - rev = "97ee4a9ee6ea01ed0bbf0325dd789f74cac6cb94"; - sha256 = "1nfnwz5lm9dgicsjh99gs4gh4gbrxdl16srz505f04mab51kd51r"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; }; } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c126467f60eb"; + sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; + }; + } + { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "adae6a3d119ae4890b46832a2e88a95adc62b8e7"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + rev = "1e06a53dbb7e"; + sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j"; }; } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "99b60b757ec1"; + sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; + rev = "e072cadbbdc8"; + sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "4d8a0ac9f66c"; + sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; }; } ] From aae923a255e913c439bfc13eb9616fc405bbdad0 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 4 Feb 2019 21:54:03 -0800 Subject: [PATCH 256/467] Revert "amass: 2.8.5 -> 2.9.1" I did not intend to push directly to master, I'm going to revert this and go through a pull request instead! This reverts commit 770e014574245b8892208629785cee6c8632732b. --- pkgs/tools/networking/amass/default.nix | 4 +- pkgs/tools/networking/amass/deps.nix | 284 ++---------------------- 2 files changed, 23 insertions(+), 265 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index f031cf09884c..16e87d2a5c97 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { name = "amass-${version}"; - version = "2.9.1"; + version = "2.8.5"; goPackagePath = "github.com/OWASP/Amass"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29"; + sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; }; outputs = [ "bin" "out" "wordlists" ]; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index c81a603e39ce..e9b5acf618e2 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -1,343 +1,101 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.34.0"; - sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; - }; - } - { goPackagePath = "github.com/PuerkitoBio/fetchbot"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/fetchbot"; - rev = "v1.1.2"; - sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq"; + rev = "1f502d610659b899a007858812b601e715f531eb"; + sha256 = "0yzv0xh3cwq87jv9whs5rmhaj8b2nqdm76vwppzn8mm34fg41n8s"; }; } - { goPackagePath = "github.com/PuerkitoBio/goquery"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.4.1"; - sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; + sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; }; } - { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "v1.0.0"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; + sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; }; } - { goPackagePath = "github.com/asaskevich/EventBus"; fetch = { type = "git"; url = "https://github.com/asaskevich/EventBus"; - rev = "d46933a94f05"; + rev = "d46933a94f05c6657d7b923fcf5ac563ee37ec79"; sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha"; }; } - - { - goPackagePath = "github.com/caffix/cloudflare-roundtripper"; - fetch = { - type = "git"; - url = "https://github.com/caffix/cloudflare-roundtripper"; - rev = "4c29d231c9cb"; - sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra"; - }; - } - - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - - { - goPackagePath = "github.com/dghubble/go-twitter"; - fetch = { - type = "git"; - url = "https://github.com/dghubble/go-twitter"; - rev = "7fd79e2bcc65"; - sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7"; - }; - } - - { - goPackagePath = "github.com/dghubble/sling"; - fetch = { - type = "git"; - url = "https://github.com/dghubble/sling"; - rev = "v1.2.0"; - sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6"; - }; - } - { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; + sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; }; } - - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.41.0"; - sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.0"; - sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; - }; - } - - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { goPackagePath = "github.com/irfansharif/cfilter"; fetch = { type = "git"; url = "https://github.com/irfansharif/cfilter"; - rev = "v0.1.1"; - sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz"; + rev = "d07d951ff29d52840ca5e798a17e80db4de8c820"; + sha256 = "11gicb8jbpnsc7wylv7qs9dgc91qc3rld6ahsylb491knxr78yb2"; }; } - { goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver"; fetch = { type = "git"; url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver"; - rev = "c68f22031e42"; - sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c"; + rev = "6b24c0085aaeaf3b2844acd18066864e24b57387"; + sha256 = "0dmfgy0ci0k0s4hxp9v5j4j0mab5x1nsc83icgq9ldb2446mn0fk"; }; } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.0"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "v1.0.8"; - sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + rev = "1c9c9bf4c93ee029810272d3e5b8a126aee5bf1f"; + sha256 = "002z8l5crsipdn2zkavjkjzxrj6c4132yqgbg1zk7w7gkv40q7wr"; }; } - - { - goPackagePath = "github.com/qasaur/gremgo"; - fetch = { - type = "git"; - url = "https://github.com/qasaur/gremgo"; - rev = "fa23ada7c5da"; - sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4"; - }; - } - - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "15f95af6e78d"; - sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; - }; - } - - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.2.0"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - - { - goPackagePath = "github.com/temoto/robotstxt"; - fetch = { - type = "git"; - url = "https://github.com/temoto/robotstxt"; - rev = "9e4646fa7053"; - sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; - }; - } - { goPackagePath = "github.com/temoto/robotstxt-go"; fetch = { type = "git"; url = "https://github.com/temoto/robotstxt-go"; - rev = "9e4646fa7053"; - sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; + rev = "97ee4a9ee6ea01ed0bbf0325dd789f74cac6cb94"; + sha256 = "1nfnwz5lm9dgicsjh99gs4gh4gbrxdl16srz505f04mab51kd51r"; }; } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c126467f60eb"; - sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; - }; - } - { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "1e06a53dbb7e"; - sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j"; + rev = "adae6a3d119ae4890b46832a2e88a95adc62b8e7"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; }; } - - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "99b60b757ec1"; - sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "e072cadbbdc8"; - sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "4d8a0ac9f66c"; - sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym"; - }; - } - - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.4.0"; - sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; - }; - } - - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; + sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; }; } ] From 23c0d79673e7016c737fa295ef7a1940ca536f6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 22:38:25 -0800 Subject: [PATCH 257/467] kubectx: 0.6.2 -> 0.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kubectx/versions --- pkgs/development/tools/kubectx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index c2eaa28a2d9a..0f9fb36a3f4e 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubectx"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "0kmzj8nmjzjfl5jgdnlizn3wmgp980xs6m9pvpplafjshx9k159c"; + sha256 = "0nb867llpvjmkxv5bbqnyjrc4z74kibqg1d3dw7m47d5a5hn8525"; }; buildInputs = [ makeWrapper ]; From 60e4f936e2d95a65b644d3ef0de2e9d36d9f27bc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Feb 2019 11:50:27 +0000 Subject: [PATCH 258/467] pulseaudio-modules-bt: Use pulseaudioFull as pulseaudio This is more likely to give binary cache hits for users --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a7d5185c14..5578106651f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14245,7 +14245,10 @@ in bluez5 = callPackage ../os-specific/linux/bluez { }; - pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { + # pulseaudio-modules-bt is most likely to be used with pulseaudioFull + pulseaudio = pulseaudioFull; + }; bluez = bluez5; From 013173be9625295908bd73e920b46cc9e7dacde7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 23:33:51 -0800 Subject: [PATCH 259/467] libtommath: 1.0.1 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libtommath/versions --- pkgs/development/libraries/libtommath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 8c88dd97ec41..15c392fa7923 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtommath-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - sha256 = "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7"; + sha256 = "1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh"; }; nativeBuildInputs = [ libtool ]; From c7df612e2a566679250fe0e044b26ad2ffac28f2 Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 5 Feb 2019 09:39:57 +0200 Subject: [PATCH 260/467] ncdu: 1.13 -> 1.14 --- pkgs/tools/misc/ncdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index b167d0f2c475..bb7924515647 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; + sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; }; buildInputs = [ ncurses ]; meta = with stdenv.lib; { - description = "Ncurses disk usage analyzer"; + description = "Disk usage analyzer with an ncurses interface"; homepage = https://dev.yorhel.nl/ncdu; license = licenses.mit; platforms = platforms.all; From 1c2ceb724b73281e5feaad34862f71501e51205b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 00:44:10 -0800 Subject: [PATCH 261/467] kubernetes: 1.13.2 -> 1.13.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kubernetes/versions --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index d39585ce8b42..597c2c183092 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1j5yyzn3c481ba6bbyx6gsa41zhg3x35sdbajlnxmbnid0g21g8g"; + sha256 = "1fcp27c501ql4v7fl7rl5qyjlw1awk139rwwm0jqdpgh3sd22l2z"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 56dba36eb5bc783c314d0fa627585cab42cebe7a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2019 13:42:21 +0100 Subject: [PATCH 262/467] rustc: 1.31.0 -> 1.32.0 --- pkgs/development/compilers/rust/bootstrap.nix | 16 ++++++++-------- pkgs/development/compilers/rust/cargo.nix | 8 ++++---- pkgs/development/compilers/rust/default.nix | 11 +++-------- .../rust/patches/disable-test-inherit-env.patch | 10 ---------- pkgs/development/compilers/rust/rustc.nix | 8 ++------ 5 files changed, 17 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 9528d798618f..03b77c90fe9a 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.30.1"; + version = "1.31.0"; - # fetch hashes by running `print-hashes.sh 1.30.0` + # fetch hashes by running `print-hashes.sh 1.31.0` hashes = { - i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf"; - x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e"; - armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b"; - aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874"; - i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083"; - x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94"; + i686-unknown-linux-gnu = "46333e8feec55bc1f99fd03028370f6163ef1e33e483da0389a9c424ec9634ed"; + x86_64-unknown-linux-gnu = "c8a2016109ffdc12a488660edc5f30c1643729efc15abe311ebb187437e506bf"; + armv7-unknown-linux-gnueabihf = "60bb75649b457ad971e94dd14c666b59deeee2176b14ae0f98e2fa435c172c1e"; + aarch64-unknown-linux-gnu = "4e68c70aba58004d9e86c2b4463e88466affee51242349a038b456cf6f4be5c9"; + i686-apple-darwin = "ec8d08eeea97d78d37430e9b32511e87854aad502f4e3e77e806788246b36e6f"; + x86_64-apple-darwin = "5d4035e3cecb7df13e728bcff125b52b43b126e91f8311c66b143f353362606f"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 02ea7ebbbfbf..65aa4ea9292f 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { inherit version src patches; # the rust source tarball already has all the dependencies vendored, no need to fetch them again - cargoVendorDir = "src/vendor"; - preBuild = "cd src; pushd tools/cargo"; + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/cargo"; postBuild = "popd"; passthru.rustc = rustc; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; - LIBGIT2_SYS_USE_PKG_CONFIG=1; + LIBGIT2_SYS_USE_PKG_CONFIG = 1; # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel - RUSTC_BOOTSTRAP=1; + RUSTC_BOOTSTRAP = 1; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 1f24157eea42..9640cd9b577e 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.31.0"; - cargoVersion = "1.31.0"; + version = "1.32.0"; + cargoVersion = "1.32.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs"; + sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; }; in rec { rustc = callPackage ./rustc.nix { @@ -22,11 +22,6 @@ in rec { # Re-evaluate if this we need to disable this one #./patches/stdsimd-disable-doctest.patch - - # Fails on hydra - not locally; the exact reason is unknown. - # Comments in the test suggest that some non-reproducible environment - # variables such $RANDOM can make it fail. - ./patches/disable-test-inherit-env.patch ]; withBundledLLVM = false; diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch deleted file mode 100644 index fcb75ed098ec..000000000000 --- a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100 -+++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100 -@@ -1745,6 +1745,7 @@ - } - - #[test] -+ #[ignore] - fn test_inherit_env() { - use env; - diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index c6350e42bc23..19d5156e02fb 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, targetPackages, removeReferencesTo , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version , withBundledLLVM ? false @@ -20,8 +20,6 @@ let llvmShared = llvm.override { enableSharedLibraries = true; }; - prefixedJemalloc = jemalloc.override { stripPrefix = false; }; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); in @@ -62,7 +60,6 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" "--enable-vendor" - "--jemalloc-root=${prefixedJemalloc}/lib" "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] ++ optional (targets != []) "--target=${target}"; @@ -85,7 +82,6 @@ stdenv.mkDerivation { patchShebangs src/etc ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} - rm -rf src/jemalloc # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -97,7 +93,7 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/39522 echo removing gdb-version-sensitive tests... find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete - rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs} + rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,generic-enum-with-different-disr-sizes.rs} # Useful debugging parameter # export VERBOSE=1 From 7fff567ee99c1f343ecdd82fef2e35fb6f50e423 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2019 13:42:54 +0100 Subject: [PATCH 263/467] rustfmt: 1.0.0 -> 1.0.1 --- pkgs/development/tools/rust/rustfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 4684841cf478..dac00aa4c969 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; rev = "${version}"; - sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy"; + sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; }; - cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8"; + cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From 6833eabe59bfca7e7d0ab3c841709dbdfea1c80a Mon Sep 17 00:00:00 2001 From: christoph Date: Tue, 5 Feb 2019 12:20:17 +0100 Subject: [PATCH 264/467] run update_runtimes.py --- pkgs/games/steam/runtime-generated.nix | 360 +++++++++++++++---------- 1 file changed, 216 insertions(+), 144 deletions(-) diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index f5b79db19158..d5532c051d42 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,9 +4,9 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64"; - sha256 = "074vbkdxaylb36ljkxz586jfcn7ghxzfivyiz703li1dw54jaq87"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64"; + sha256 = "0qbr4jfqyda0fi3giwizfv3ainsvld9fl4vd7sylpi490yw7yymh"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; @@ -22,18 +22,18 @@ }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; - sha256 = "1iknyb54mn8l1gcm9pg47hlra7y5x9awrgd431hzvig44c34vv9m"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; + sha256 = "16dlf5zdy9njyaj9c9gdqcq73hd49lfm3ivwizs6i4jgfi44a2q0"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "0lgab6qkkx7xzrl349c3xqcajgby6v6l6xq0cn5bzbs2dhn3ggpb"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "1vpdmgq0vbh7x4r6n1b5cxlz6yl2lfy5bwp89xph640kip1j1xax"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; @@ -67,9 +67,9 @@ }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_amd64"; - sha256 = "0pzm4hpi2rynds21764qhpz8mjbd504as6350qgz5i8rbd3h9gbw"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64"; + sha256 = "0anp6yvp59ian96pkzp899sjxl7l86gp0q5lfmwdiv74asixj52j"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; @@ -211,27 +211,27 @@ }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64"; - sha256 = "1x36zmsb7wcmgli75sfqamw5gmsv47if56f1vljjgak3jn2vlmm2"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; + sha256 = "10mfqks3zw2cqn2kbcc0abswnx886bnrgaf51q5r919vwrm11vi6"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64"; - sha256 = "0g68j9w3xn0vnjgznq2avmzk8rykas0a6749ldq99yq9afccjfcp"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; + sha256 = "1im7a6z47dwlwcvcafg3bmh055fjzrar6zl207hj9h8hkw3gdnxq"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64"; - sha256 = "0qzyjrr5nmc72pfbalh9s22s51c5c10f0h23viyjrk77kk0ysc3f"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; + sha256 = "1blld717yb6npjswczs06khm3b6vp4r0yzlwfxjp76gvmazgc3iq"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; @@ -265,27 +265,27 @@ }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_amd64"; - sha256 = "162s3pdgxhjfpg3jdxp4dp4qmn81da21g9hn5fb7karzkgw59mns"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64"; + sha256 = "012fv3d528iz1xdrqlk1xckaslda6kq1sm64kwb5zzm9bzzgnl29"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+srt1_amd64"; - sha256 = "1nzbxzrkqnnzhml2fyjzpaifsm3whq78bxjqnhs9ljs3jwhl59p5"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; + sha256 = "1zjy6vqay9ssaxvq11gnf9kr8y94idbx7abcrr4nbx7xkdijz0zi"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64"; - sha256 = "0mgxy0vninsv7yi3wiqjkdz8ap52y4zlkzxwyijcvbwkxp33rq68"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; + sha256 = "1599nmpk68cn9awqfq0picwclap7fwfsm8gagz95y5a5nsmldii8"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; @@ -373,9 +373,9 @@ }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64"; - sha256 = "047sq7342mqvc84qx8dayf282yh84zdj4azqp1c0h4hczc73jwv9"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64"; + sha256 = "1q3sk9ad8y1x6nbd86i417zp0j624m7b7yj6xp4gm96g8l443asj"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; @@ -391,18 +391,18 @@ }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "1300z3mjxxcl718mjdfppv53s42ba88gm0izbfn6wqvrj7wrz5wq"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "1r6nviva9jnkwyg28lxjcr142lda88f3r2312wgdfhry69szw2ld"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64"; - sha256 = "163jbgkz66crkkjdqc0axj4sjfmd6kfkglwlk3d52rf3bc7mvimb"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64"; + sha256 = "1psyh5bcf3k28ziw0b2sxjyy2va6xahb0696rz0r6y9m924n0dn7"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; @@ -463,9 +463,9 @@ }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64"; - sha256 = "0vmx8ybnbf4rilylk1kxhq6c1z5wbxh77garwf79jm0jx3xamzrh"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt1_amd64"; + sha256 = "1q0qgpldz25pzbnmhw1vxqd0azp9qai9arydmw66f6kwflx6s7as"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; @@ -481,9 +481,18 @@ }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "06x5j6rvv5g8brsmgpxikjb9fs6gjpd31g2iw3b313k9c6fl7z9x"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64"; + sha256 = "1a1m1h7x0acympf7lsdn9k30crff4gkg31n82fxsf5mwbg5rzsy4"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libgnutls30.deb"; + }; + } + rec { + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "1pcc8jj73bgs2ks0pkxhn3hc43yk0h97jsss6ckhmp3j5mg9szq7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; @@ -588,6 +597,15 @@ name = "libheimntlm0-heimdal.deb"; }; } + rec { + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64"; + sha256 = "1d9746bfwajafd28292q0fl6mwj51in9qg7mbd583y459jyb0ffd"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libhogweed4.deb"; + }; + } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9"; @@ -607,9 +625,9 @@ }; } rec { - name = "libidn11_1.23-2+steamrt1+srt5_amd64"; - sha256 = "19s5pm1w8idc52hcj07fd52hw4fxl8hda9rm5gdbgginrl1naibp"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_amd64.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64"; + sha256 = "1qlpfhwvx4m72541rlk934h72hczb0gwiyiav8sd4kcwwkcacqml"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; @@ -715,9 +733,9 @@ }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_amd64"; - sha256 = "1nsjgna1m6nk9j23gfgmdmy90vkb0xk06p8z9gkbkjv5h1jn36hl"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64"; + sha256 = "02w5h7hbapwwsya468v6wcizm9nra5c9nbbf86666mlkgb6y6z20"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; @@ -768,6 +786,15 @@ name = "libncursesw5.deb"; }; } + rec { + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64"; + sha256 = "18f9ymqkmnnx2hxfms2ph7hajl0ghk8ywav5vaihaii47wfzkdww"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libnettle6.deb"; + }; + } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3"; @@ -841,9 +868,9 @@ }; } rec { - name = "libopusfile0_0.11-0+steamrt1.1+srt2_amd64"; - sha256 = "1iv8w2g440l760gdi17mcq6hvk093f6v9m0v0svjzjc7l6147bmp"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.1+srt2_amd64.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt1_amd64"; + sha256 = "1q5n474br6k0l5xhr1b7bclrmdqpcd98dq4yd92rsybjnf9xiqgq"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; @@ -859,9 +886,9 @@ }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt5_amd64"; - sha256 = "00x01l29gh4zl0nfsyh90ixgvln6kcs2963vmmjaql4h1cgvi27g"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_amd64.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64"; + sha256 = "1hm1lqphdp0vk1zyyyxz78k15lqw7w6vmv64pp27cwm8zkqmvj4q"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; @@ -940,9 +967,9 @@ }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64"; - sha256 = "0g07a8vxxglsh7sswqznsi7lmq5ibchhkhrmfywcdinxniwcr7ha"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64"; + sha256 = "05wm9ddpy2axf0a7vsrfc7prhaqf7npbcfrsy57f66aachpj778r"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; @@ -1102,27 +1129,27 @@ }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64"; - sha256 = "149wrr5k7hx5lbgkyi4rh2sgr15m9k8x075gilab60mj1b6cv439"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64"; + sha256 = "1s82s5ylmsbbx567bdjv9dh53nzzwqskfpry3a61naw8nsbxg5kb"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "0fnqw21m8byigf4303z7qvficral6ar3lsxrsx4ai9r8d6bmmgdn"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "09gn89qdjpwhh4yzydrpjbpwgbfhc0xmy56113an0rk9hs43ym1i"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; - sha256 = "0km4v33pzknjq0ah7w03s8xny21qggx6pc2q1ah9dlra5dwv4nsm"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; + sha256 = "175qkx9blsjidsbg7dkp6anyhfdpv1njqs2hzhjnfnsdz0hsy5pp"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; @@ -1146,6 +1173,15 @@ name = "libtasn1-3.deb"; }; } + rec { + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64"; + sha256 = "0s6rljgvgcawws574ka2kn944w64fwjan1lri1anszg0m274n5na"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libtasn1-6.deb"; + }; + } rec { name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v"; @@ -1210,9 +1246,9 @@ }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64"; - sha256 = "03d2jj9l3k31wb2wrvcjpa79cp7yjsqqms58vqh9pksbnmyrddr2"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64"; + sha256 = "17f8cqf20fm9yak1i3d25x4a7pznhsc6xj3949zk2pbn4jiz1q3h"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; @@ -1779,9 +1815,9 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386"; - sha256 = "1899b2x8kfallda1i0m1hph7v088q7px0rpxm8w6qwp5mwqy4rip"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386"; + sha256 = "134fv1d73hnlfn14asgmi36pwbs3mlri290jbl0621mih1iq8b7i"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; @@ -1797,18 +1833,18 @@ }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; - sha256 = "0zsb0kn2kn64hvf33xnp94k5i9c1269qyla8p5q8vzwplcl0qrx9"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; + sha256 = "0lq2bm237vwjkclxjqldw4cy1mirbw6lx6ryqmjwzwq1ya5490sr"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "0zp452nqq29d57fl98n7x2vfwjxp1ngjsyfw9nnnwjlpldv41sg6"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "1jlyq99j7rgw6m4rvrxcrpk5l386sps36isld18bg7hb67qm5gzy"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; @@ -1842,9 +1878,9 @@ }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_i386"; - sha256 = "1m39sq2zv88922z3h8q8ccwk9fspslzs2rk6g67j4vc30lln6x45"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386"; + sha256 = "01cmbrlgzx7djy0xgf4950936s596rp8cn51qadbfz0sad5w7sd9"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; @@ -1986,27 +2022,27 @@ }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386"; - sha256 = "10bw3fha2nc8lb3md5l8yj8c40rx7gm7vg9lk76359p06z3ypvvf"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386"; + sha256 = "1lg98x7cr66nq48k3klah9apskvk2cqdpj3g52z5yffkrrd1sqci"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386"; - sha256 = "1yg1hllxp2m5rv6hlgh714yhcb9l5ggg4lfwv33yaw4fnzz387km"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; + sha256 = "0jnqzfshd1f16f3gcq3fw955i6w9pfizli0l0zxl6fl58ad6g9as"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386"; - sha256 = "03b6rk9gkxx4d75cjr27w229nsc1jjp2fy8ln5gxp2bbhywgxl4a"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; + sha256 = "0kfw2ghb47ysww9wrp9gjq449j82a22f5w5xn1vk17bq0kk2vg8c"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; @@ -2040,27 +2076,27 @@ }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_i386"; - sha256 = "0swb4ykw5yh35vdj0s64jhpii7srlkkiawr110zn7y4p8ymcf82w"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386"; + sha256 = "02p2svhf5zr2q5pga2qbnk5v6v6isjymli8arfarqcawgw8x8abg"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+srt1_i386"; - sha256 = "14yb0a5cglgqvwa75kb6lbhfpmpj4xjgxz6dm27q27pcxv9xx5km"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; + sha256 = "18kysm6nj8jfankkarphpzk03cab126pnili4p3kfglw2z7dxci0"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386"; - sha256 = "027dgd9ik9zxy2ixi1272mskbax10cg0k7flljhcx5zmnwvrhxhx"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; + sha256 = "166mcqrwh86qx2dpsi5qx9nczzwyyih51d0ssrbnxzabshkyzmsx"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; @@ -2148,9 +2184,9 @@ }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386"; - sha256 = "1ls25q28jk9znmi0fhm30cqilx9bmm463zfq1jmj5apw96wk64n4"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386"; + sha256 = "19mqzn0p0x282wvh4njykiar10rc5zd43cl7pji9hkrq4xlv0s3j"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; @@ -2166,18 +2202,18 @@ }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "0bsm95m17f9lxrknl11jmaz9mqrbkd40p29z44497fw8miw736r2"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "0x9sssiqkdpbya6v5slw6lv3ad0w7k4j25bxh0zqxgjfpf3np8m7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_i386"; - sha256 = "07b1w4ww3xb5r13px85f8rv4nsc08rz8w3741zdk0vacq8scw4pb"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386"; + sha256 = "1rf64kxpbjp0dvd0l5ip8qlrla69zj4h4wsx5hjhbrx2qhf9h31z"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; @@ -2238,9 +2274,9 @@ }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386"; - sha256 = "0y6qrw7n41szpi8p2fpilx20wmqk3arw0m7kr35isy0y3icpryka"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt1_i386"; + sha256 = "0x0ipagi7z9s4cf5wsp1h5vbgx1czsnv3z9rvcz289fb88b7vn2f"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; @@ -2256,9 +2292,18 @@ }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "0p6gj53jdk3d4nmhkiiqvh8sk3pm2g99iqfmlc7br1gxvmpjjj3s"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386"; + sha256 = "12xzkh2fzlnqdpyf18a13dc92pk9fmakcsm89zs1lfq68ad7zlb6"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libgnutls30.deb"; + }; + } + rec { + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "0z73ay26wi49hg74lwn13gyraqvdim7q79rpckvk7p7cimb65ina"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; @@ -2363,6 +2408,15 @@ name = "libheimntlm0-heimdal.deb"; }; } + rec { + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386"; + sha256 = "1d3p11al48d1ig6kn74wkx298kizvw9i0s25rs1433k9cx5aissp"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libhogweed4.deb"; + }; + } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp"; @@ -2382,9 +2436,9 @@ }; } rec { - name = "libidn11_1.23-2+steamrt1+srt5_i386"; - sha256 = "1wv5rfk5a9y6w5wylvbxj8kbmav61y5w3j413kvf373xnhp79gaf"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_i386.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386"; + sha256 = "0zx078d5ycbmy56lcl3j71r9ygfj1b18msrik36ya5qkqm9335rj"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; @@ -2490,9 +2544,9 @@ }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_i386"; - sha256 = "194vaq6g03m32cfar7s7kzk5qxqlfzy0l49hgwg8igx40r7nscqw"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386"; + sha256 = "072vkbk177xxr0g50vban143m1r67ana3abkv4ha0wk4z8wvvw13"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; @@ -2543,6 +2597,15 @@ name = "libncursesw5.deb"; }; } + rec { + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386"; + sha256 = "0rpw9fg2xfccdvbq0ji66a52rb401r05cs16z9py9r6b0brrxvsf"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libnettle6.deb"; + }; + } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d"; @@ -2616,9 +2679,9 @@ }; } rec { - name = "libopusfile0_0.11-0+steamrt1.1+srt2_i386"; - sha256 = "0dbhzwgjr33xbqaq9015v9h7l6lga002vzrfcyna19ff92d2xg8m"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.1+srt2_i386.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt1_i386"; + sha256 = "19hsl0h0pgx6qc4sizpgj4mcipq2wk6w316mahv05iskkshwb2il"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; @@ -2634,9 +2697,9 @@ }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt5_i386"; - sha256 = "1nfcccnsn7x44wqwgkz0h9b3hzy3a0cknc51syniabsqds5w2i8p"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_i386.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386"; + sha256 = "0bvp8xslxfag2kpfyhhgsldb7687q11bj365z2m5xmwlk5ihf0bk"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; @@ -2715,9 +2778,9 @@ }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386"; - sha256 = "04wg1b9i77hv87ra7xbhqzcx6m9xdpx72b6d7pxnkrxxxc8sp35d"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386"; + sha256 = "0c9y8m7ynnchs7mj9nmp7y681mkphqy4p7vca7i5vw2cacd7bbv7"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; @@ -2877,27 +2940,27 @@ }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386"; - sha256 = "06gc6qpm51jx0x1imf5nccc3r9x2d41xvfi0wl3p9wvrx6nsna7d"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386"; + sha256 = "1kwi96xyjf2gz021zg2hkd6ks9l2087r9ghh8iqgwqivbvcizvr7"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "13kvxng82xz171y3q0i12bvy8z77cqk6s088bjil4b5fq81aaxns"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "0l60yc1i7p20gaih1mzjk8c62zq9ba4zvmfmrk5w8xr05dpyq9a6"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; - sha256 = "1xh0hvgw6rrg6k1fbpblxvfdaslwkjlqbgaqjkavkkvl0xmk5k4b"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; + sha256 = "1a5hyz5185fhh64hw8kf6mav7jz07l9c9v3m9wwd92xj39sp0vzw"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; @@ -2921,6 +2984,15 @@ name = "libtasn1-3.deb"; }; } + rec { + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386"; + sha256 = "11bdwhyzzy5xa4p0rrirh7wqg3q1iwbw460nh4ya5aafysiw71il"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libtasn1-6.deb"; + }; + } rec { name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz"; @@ -2985,9 +3057,9 @@ }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386"; - sha256 = "1hi8gq8jws689pacx8m0pzjfhrswh8jng39m7vnx2clj7xzfsk5b"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386"; + sha256 = "1xs58z4431ybrmnks0camc4svqpnd4zd814czchi0cs4h1vfvvb8"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; From b8a9c3fbfddca622326c5f072c8f5a35a071f2cf Mon Sep 17 00:00:00 2001 From: aanderse Date: Tue, 5 Feb 2019 06:51:33 -0500 Subject: [PATCH 265/467] redmine: 3.4.8 -> 4.0.1 (#55234) * redmine: 3.4.8 -> 4.0.1 * nixos/redmine: update nixos test to run against both redmine 3.x and 4.x series * nixos/redmine: default new installs from 19.03 onward to redmine 4.x series, while keeping existing installs on redmine 3.x series * nixos/redmine: add comment about default redmine package to 19.03 release notes * redmine: add aandersea as a maintainer --- nixos/doc/manual/release-notes/rl-1903.xml | 7 + nixos/modules/services/misc/redmine.nix | 14 +- nixos/tests/redmine.nix | 94 +-- .../version-management/redmine/4.x/Gemfile | 71 ++ .../redmine/4.x/Gemfile.lock | 204 ++++++ .../redmine/4.x/default.nix | 43 ++ .../version-management/redmine/4.x/gemset.nix | 622 ++++++++++++++++++ .../version-management/redmine/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 + 9 files changed, 1017 insertions(+), 42 deletions(-) create mode 100644 pkgs/applications/version-management/redmine/4.x/Gemfile create mode 100644 pkgs/applications/version-management/redmine/4.x/Gemfile.lock create mode 100644 pkgs/applications/version-management/redmine/4.x/default.nix create mode 100644 pkgs/applications/version-management/redmine/4.x/gemset.nix diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index eca280afdf18..943b9d2a6081 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -484,6 +484,13 @@ the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + + + New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in + services.redmine.package while existing installs of NixOS will default to + the Redmine 3.x series. + + diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index d7250c5f35af..98e9c8953c84 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -61,12 +61,20 @@ in description = "Enable the Redmine service."; }; + # default to the 4.x series not forcing major version upgrade of those on the 3.x series package = mkOption { type = types.package; - default = pkgs.redmine; + default = if versionAtLeast config.system.stateVersion "19.03" + then pkgs.redmine_4 + else pkgs.redmine + ; defaultText = "pkgs.redmine"; - description = "Which Redmine package to use."; - example = "pkgs.redmine.override { ruby = pkgs.ruby_2_3; }"; + description = '' + Which Redmine package to use. This defaults to version 3.x if + system.stateVersion < 19.03 and version 4.x + otherwise. + ''; + example = "pkgs.redmine_4.override { ruby = pkgs.ruby_2_4; }"; }; user = mkOption { diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 330f72854cac..ea72a0121d11 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -1,40 +1,58 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing.nix { inherit system pkgs; }; +with pkgs.lib; + +let + redmineTest = package: makeTest { + machine = + { config, pkgs, ... }: + { services.mysql.enable = true; + services.mysql.package = pkgs.mariadb; + services.mysql.ensureDatabases = [ "redmine" ]; + services.mysql.ensureUsers = [ + { name = "redmine"; + ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; }; + } + ]; + + services.redmine.enable = true; + services.redmine.package = package; + services.redmine.database.socket = "/run/mysqld/mysqld.sock"; + services.redmine.plugins = { + redmine_env_auth = pkgs.fetchurl { + url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; + sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; + }; + }; + services.redmine.themes = { + dkuk-redmine_alex_skin = pkgs.fetchurl { + url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; + }; + }; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('redmine.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; +in { - name = "redmine"; - meta.maintainers = [ lib.maintainers.aanderse ]; + redmine_3 = redmineTest pkgs.redmine // { + name = "redmine_3"; + meta.maintainers = [ maintainers.aanderse ]; + }; - machine = - { config, pkgs, ... }: - { services.mysql.enable = true; - services.mysql.package = pkgs.mariadb; - services.mysql.ensureDatabases = [ "redmine" ]; - services.mysql.ensureUsers = [ - { name = "redmine"; - ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; }; - } - ]; - - services.redmine.enable = true; - services.redmine.database.socket = "/run/mysqld/mysqld.sock"; - services.redmine.plugins = { - redmine_env_auth = pkgs.fetchurl { - url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip; - sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak"; - }; - }; - services.redmine.themes = { - dkuk-redmine_alex_skin = pkgs.fetchurl { - url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; - sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; - }; - }; - }; - - testScript = '' - startAll; - - $machine->waitForUnit('redmine.service'); - $machine->waitForOpenPort('3000'); - $machine->succeed("curl --fail http://localhost:3000/"); - ''; -}) + redmine_4 = redmineTest pkgs.redmine_4 // { + name = "redmine_4"; + meta.maintainers = [ maintainers.aanderse ]; + }; +} diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile new file mode 100644 index 000000000000..3fd176007abf --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile @@ -0,0 +1,71 @@ +source 'https://rubygems.org' + +gem "bundler", ">= 1.5.0" + +gem "rails", "5.2.2" +gem "rouge", "~> 3.3.0" +gem "request_store", "1.0.5" +gem "mini_mime", "~> 1.0.1" +gem "actionpack-xml_parser" +gem "roadie-rails", "~> 1.3.0" +gem "mimemagic" +gem "mail", "~> 2.7.1" +gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" + +gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") +gem "i18n", "~> 0.7.0" + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] +gem "rbpdf", "~> 1.19.6" + +# Optional gem for LDAP authentication +group :ldap do + gem "net-ldap", "~> 0.16.0" +end + +# Optional gem for OpenID authentication +group :openid do + gem "ruby-openid", "~> 2.3.0", :require => "openid" + gem "rack-openid" +end + +platforms :mri, :mingw, :x64_mingw do + # Optional gem for exporting the gantt to a PNG file, not supported with jruby + group :rmagick do + gem "rmagick", ">= 2.14.0" + end + + # Optional Markdown support, not for JRuby + group :markdown do + gem "redcarpet", "~> 3.4.0" + end +end + +# Include database gems for the database adapters NixOS supports +gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] +gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] + +group :development do + gem "yard" +end + +group :test do + gem "rails-dom-testing" + gem "mocha" + gem "simplecov", "~> 0.14.1", :require => false + # For running system tests + gem 'puma', '~> 3.7' + gem "capybara", '~> 2.13' + gem "selenium-webdriver" +end + +local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") +if File.exists?(local_gemfile) + eval_gemfile local_gemfile +end + +# Load plugins' Gemfiles +Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| + eval_gemfile file +end diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock new file mode 100644 index 000000000000..8c569ddb3227 --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock @@ -0,0 +1,204 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.2) + actionpack (= 5.2.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionpack-xml_parser (2.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + actionview (5.2.2) + activesupport (= 5.2.2) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) + marcel (~> 0.3.1) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + arel (9.0.0) + builder (3.2.3) + capybara (2.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (>= 2.0, < 4.0) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + concurrent-ruby (1.1.4) + crass (1.0.4) + css_parser (1.6.0) + addressable + csv (3.0.4) + docile (1.1.5) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + htmlentities (4.3.4) + i18n (0.7.0) + json (2.1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + metaclass (0.0.4) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + mysql2 (0.5.2) + net-ldap (0.16.1) + nio4r (2.3.1) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) + rack-openid (1.4.2) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) + bundler (>= 1.3.0) + railties (= 5.2.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rbpdf (1.19.8) + htmlentities + rbpdf-font (~> 1.19.0) + rbpdf-font (1.19.1) + redcarpet (3.4.0) + request_store (1.0.5) + rmagick (2.16.0) + roadie (3.4.0) + css_parser (~> 1.4) + nokogiri (~> 1.5) + roadie-rails (1.3.0) + railties (>= 3.0, < 5.3) + roadie (~> 3.1) + rouge (3.3.0) + ruby-openid (2.3.0) + rubyzip (1.2.2) + selenium-webdriver (3.141.0) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + simplecov (0.14.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + yard (0.9.18) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack-xml_parser + bundler (>= 1.5.0) + capybara (~> 2.13) + csv (~> 3.0.1) + i18n (~> 0.7.0) + mail (~> 2.7.1) + mimemagic + mini_mime (~> 1.0.1) + mocha + mysql2 (~> 0.5.0) + net-ldap (~> 0.16.0) + nokogiri (~> 1.10.0) + pg (~> 1.1.4) + puma (~> 3.7) + rack-openid + rails (= 5.2.2) + rails-dom-testing + rbpdf (~> 1.19.6) + redcarpet (~> 3.4.0) + request_store (= 1.0.5) + rmagick (>= 2.14.0) + roadie-rails (~> 1.3.0) + rouge (~> 3.3.0) + ruby-openid (~> 2.3.0) + selenium-webdriver + simplecov (~> 0.14.1) + tzinfo-data + yard + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix new file mode 100644 index 000000000000..ba9f96f5a30c --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, bundlerEnv, ruby }: + +let + version = "4.0.1"; + rubyEnv = bundlerEnv { + name = "redmine-env-${version}"; + + inherit ruby; + gemdir = ./.; + groups = [ "ldap" "openid" ]; + }; +in + stdenv.mkDerivation rec { + name = "redmine-${version}"; + + src = fetchurl { + url = "https://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1"; + }; + + buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; + + buildPhase = '' + mv config config.dist + mv public/themes public/themes.dist + ''; + + installPhase = '' + mkdir -p $out/share + cp -r . $out/share/redmine + for i in config files log plugins public/plugin_assets public/themes tmp; do + rm -rf $out/share/redmine/$i + ln -fs /run/redmine/$i $out/share/redmine/$i + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.redmine.org/; + platforms = platforms.linux; + maintainers = [ maintainers.garbas maintainers.aanderse ]; + license = licenses.gpl2; + }; + } diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix new file mode 100644 index 000000000000..ce21a58b5564 --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix @@ -0,0 +1,622 @@ +{ + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x"; + type = "gem"; + }; + version = "5.2.2"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n"; + type = "gem"; + }; + version = "5.2.2"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws"; + type = "gem"; + }; + version = "5.2.2"; + }; + actionpack-xml_parser = { + dependencies = ["actionpack" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; + type = "gem"; + }; + version = "2.0.1"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z"; + type = "gem"; + }; + version = "5.2.2"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir"; + type = "gem"; + }; + version = "5.2.2"; + }; + activemodel = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi"; + type = "gem"; + }; + version = "5.2.2"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y"; + type = "gem"; + }; + version = "5.2.2"; + }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31"; + type = "gem"; + }; + version = "5.2.2"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + type = "gem"; + }; + version = "5.2.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + type = "gem"; + }; + version = "2.6.0"; + }; + arel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; + type = "gem"; + }; + version = "9.0.0"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8"; + type = "gem"; + }; + version = "2.18.0"; + }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + type = "gem"; + }; + version = "0.9.0"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + type = "gem"; + }; + version = "1.1.4"; + }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + type = "gem"; + }; + version = "1.0.4"; + }; + css_parser = { + dependencies = ["addressable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + type = "gem"; + }; + version = "1.6.0"; + }; + csv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33"; + type = "gem"; + }; + version = "3.0.4"; + }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; + erubi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; + type = "gem"; + }; + version = "1.8.0"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; + globalid = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + type = "gem"; + }; + version = "0.4.2"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + type = "gem"; + }; + version = "0.7.0"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + type = "gem"; + }; + version = "2.2.3"; + }; + mail = { + dependencies = ["mini_mime"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + marcel = { + dependencies = ["mimemagic"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + metaclass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + type = "gem"; + }; + version = "0.0.4"; + }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; + mimemagic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + type = "gem"; + }; + version = "0.3.3"; + }; + mini_mime = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + type = "gem"; + }; + version = "1.0.1"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + mocha = { + dependencies = ["metaclass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al"; + type = "gem"; + }; + version = "1.8.0"; + }; + mysql2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4"; + type = "gem"; + }; + version = "0.5.2"; + }; + net-ldap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "016igqz81a8zcwqzp5bbhryqmb2skmyf57ij3nb5z8sxwhw22jgh"; + type = "gem"; + }; + version = "0.16.1"; + }; + nio4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; + type = "gem"; + }; + version = "2.3.1"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + type = "gem"; + }; + version = "1.10.1"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; + type = "gem"; + }; + version = "1.1.4"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; + type = "gem"; + }; + version = "3.12.0"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + type = "gem"; + }; + version = "2.0.6"; + }; + rack-openid = { + dependencies = ["rack" "ruby-openid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; + type = "gem"; + }; + version = "1.4.2"; + }; + rack-test = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails = { + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr"; + type = "gem"; + }; + version = "5.2.2"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + type = "gem"; + }; + version = "1.0.4"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l"; + type = "gem"; + }; + version = "5.2.2"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + type = "gem"; + }; + version = "12.3.2"; + }; + rbpdf = { + dependencies = ["htmlentities" "rbpdf-font"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; + type = "gem"; + }; + version = "1.19.8"; + }; + rbpdf-font = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; + type = "gem"; + }; + version = "1.19.1"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + request_store = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh"; + type = "gem"; + }; + version = "1.0.5"; + }; + rmagick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6"; + type = "gem"; + }; + version = "2.16.0"; + }; + roadie = { + dependencies = ["css_parser" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx"; + type = "gem"; + }; + version = "3.4.0"; + }; + roadie-rails = { + dependencies = ["railties" "roadie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02km0ama85mkw7kkn6qif86b781pglfdmqrwx5s6hwjlzk16qih3"; + type = "gem"; + }; + version = "1.3.0"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + type = "gem"; + }; + version = "3.3.0"; + }; + ruby-openid = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn"; + type = "gem"; + }; + version = "2.3.0"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + type = "gem"; + }; + version = "1.2.2"; + }; + selenium-webdriver = { + dependencies = ["childprocess" "rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; + type = "gem"; + }; + version = "3.141.0"; + }; + simplecov = { + dependencies = ["docile" "json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + type = "gem"; + }; + version = "0.14.1"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; + type = "gem"; + }; + version = "0.10.2"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + type = "gem"; + }; + version = "3.2.1"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; + type = "gem"; + }; + version = "0.7.0"; + }; + websocket-extensions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; + type = "gem"; + }; + version = "0.1.3"; + }; + xpath = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; + yard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f"; + type = "gem"; + }; + version = "0.9.18"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 6e5a2dbbdf70..02ae5da0f3f0 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -37,7 +37,7 @@ in meta = with stdenv.lib; { homepage = http://www.redmine.org/; platforms = platforms.linux; - maintainers = [ maintainers.garbas ]; + maintainers = [ maintainers.garbas maintainers.aanderse ]; license = licenses.gpl2; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5578106651f8..5c2ed177d328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5086,6 +5086,8 @@ in redir = callPackage ../tools/networking/redir { }; redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_4; }; + # failed to build websocket-driver gem with ruby 2.6, so sticking to 2.5 for now + redmine_4 = callPackage ../applications/version-management/redmine/4.x { ruby = pkgs.ruby_2_5; }; redsocks = callPackage ../tools/networking/redsocks { }; From 99bb42651af97109acdaa8b0bdb0079c1b580afd Mon Sep 17 00:00:00 2001 From: Vonfry <3413119+Vonfry@users.noreply.github.com> Date: Tue, 5 Feb 2019 21:07:27 +0800 Subject: [PATCH 266/467] fortune: 1.99.1 -> 2.6.2 (#55171) fortune: 1.99.1 -> 2.6.2 --- pkgs/tools/misc/fortune/default.nix | 33 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 8e9557335982..45d27e7b7c82 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, recode }: +{ stdenv, fetchurl, cmake, recode, perl }: +let srcs = { + fortune = fetchurl { + url = "https://github.com/shlomif/fortune-mod/archive/fortune-mod-${version}.tar.gz"; + sha256 = "89223bb649ea62b030527f181539182d6a17a1a43b0cc499a52732b839f7b691"; + }; + shlomifCommon = fetchurl { + url = https://bitbucket.org/shlomif/shlomif-cmake-modules/raw/default/shlomif-cmake-modules/Shlomif_Common.cmake; + sha256 = "62f188a9f1b7ab0e757eb0bc6540d9c0026d75edc7acc1c3cdf7438871d0a94f"; + }; + }; + version = "2.6.2"; +in stdenv.mkDerivation { - name = "fortune-mod-1.99.1"; + name = "fortune-mod-${version}"; - src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz; - sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw"; - }; + src = srcs.fortune; + + sourceRoot = "fortune-mod-fortune-mod-${version}/fortune-mod"; + + nativeBuildInputs = [ cmake perl ]; buildInputs = [ recode ]; preConfigure = '' - sed -i "s|/usr/|$out/|" Makefile - ''; - - preBuild = '' - makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=") + cp ${srcs.shlomifCommon} cmake/Shlomif_Common.cmake ''; postInstall = '' mv $out/games/fortune $out/bin/fortune - rmdir $out/games + rm -r $out/games ''; meta = with stdenv.lib; { From a0a203eb5c1bc8a380d0270e3fe8dff502aecd64 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 3 Feb 2019 16:50:04 +0100 Subject: [PATCH 267/467] sdnotify-wrapper: init at unversioned --- .../linux/sdnotify-wrapper/default.nix | 37 ++++ .../linux/sdnotify-wrapper/sdnotify-wrapper.c | 172 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/sdnotify-wrapper/default.nix create mode 100644 pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix new file mode 100644 index 000000000000..28e1f0257897 --- /dev/null +++ b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchurl, runCommandCC, skawarePackages }: + +with skawarePackages; + +let + # From https://skarnet.org/software/misc/sdnotify-wrapper.c, + # which is unversioned. + src = ./sdnotify-wrapper.c; + +in runCommandCC "sdnotify-wrapper" { + + outputs = [ "bin" "doc" "out" ]; + + meta = { + homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c"; + description = "Use systemd sd_notify without having to link against libsystemd"; + platforms = lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ Profpatsch ]; + }; + +} '' + mkdir -p $bin/bin + mkdir $out + + # just dynamic for now + $CC \ + -o $bin/bin/sdnotify-wrapper \ + -I${skalibs.dev}/include \ + -L${skalibs.lib}/lib \ + -lskarnet \ + ${src} + + mkdir -p $doc/share/doc/sdnotify-wrapper + # copy the documentation comment + sed -ne '/Usage:/,/*\//p' ${src} > $doc/share/doc/sdnotify-wrapper/README +'' diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c new file mode 100644 index 000000000000..0d1ae96068a4 --- /dev/null +++ b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c @@ -0,0 +1,172 @@ +/* + Copyright: (C)2015-2017 Laurent Bercot. http://skarnet.org/ + ISC license. See http://opensource.org/licenses/ISC + + Build-time requirements: skalibs. http://skarnet.org/software/skalibs/ + Run-time requirements: none, if you link skalibs statically. + + Compilation: + gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet + Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically. + Adapt gcc's -I and -L options to your skalibs installation paths. + + Usage: if a daemon would be launched by systemd as "foobard args...", + launch it as "sdnotify-wrapper foobard args..." instead, and you can now + tell systemd that this daemon supports readiness notification. + + Instead of using sd_notify() and having to link against the systemd + library, the daemon notifies readiness by writing whatever it wants + to a file descriptor (by default: stdout), then a newline. (Then it + should close that file descriptor.) The simplest way is something like + int notify_readiness() { write(1, "\n", 1) ; close(1) ; } + This mechanism is understandable by any notification readiness framework. + + Readiness notification occurs when the newline is written, not when + the descriptor is closed; but since sdnotify-wrapper stops reading + after the first newline and will exit, any subsequent writes will + fail and it's best to simply close the descriptor right away. + + sdnotify-wrapper sees the notification when it occurs and sends it + to systemd using the sd_notify format. + + Options: + -d fd: the daemon will write its notification on descriptor fd. + Default is 1. + -f: do not doublefork. Use if the daemon waits for children it does + not know it has (for instance, superservers do this). When in doubt, + do not use that option, or you may have a zombie hanging around. + -t timeout: if the daemon has not sent a notification after timeout + milliseconds, give up and exit; systemd will not be notified. + -k: keep the NOTIFY_SOCKET environment variable when execing into the + daemon. By default, the variable is unset: the daemon should not need it. + + Notes: + sdnotify-wrapper does not change the daemon's pid. It runs as a + (grand)child of the daemon. + If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper + does nothing - it only execs into the daemon. + sdnotify-wrapper is more liberal than sd_notify(). It will accept + a relative path in NOTIFY_SOCKET. +*/ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..." +#define dieusage() strerr_dieusage(100, USAGE) + +#define VAR "NOTIFY_SOCKET" + +static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path) +{ + struct sockaddr_un sa ; + size_t l = strlen(path) ; + if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ; + memset(&sa, 0, sizeof sa) ; + sa.sun_family = AF_UNIX ; + memcpy(sa.sun_path, path, l+1) ; + if (path[0] == '@') sa.sun_path[0] = 0 ; + return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ; +} + +static inline void notify_systemd (pid_t pid, char const *socketpath) +{ + size_t n = 16 ; + char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ; + int fd = ipc_datagram_b() ; + if (fd < 0) strerr_diefu1sys(111, "create socket") ; + n += pid_fmt(fmt + n, pid) ; + fmt[n++] = '\n' ; + if (!ipc_sendto(fd, fmt, n, socketpath)) + strerr_diefu2sys(111, "send notification message to ", socketpath) ; + close(fd) ; +} + +static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s) +{ + char dummy[4096] ; + iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ; + tain_t deadline ; + tain_now_g() ; + if (timeout) tain_from_millisecs(&deadline, timeout) ; + else deadline = tain_infinite_relative ; + tain_add_g(&deadline, &deadline) ; + for (;;) + { + int r = iopause_g(&x, 1, &deadline) ; + if (r < 0) strerr_diefu1sys(111, "iopause") ; + if (!r) return 99 ; + r = sanitize_read(fd_read(fd, dummy, 4096)) ; + if (r < 0) + if (errno == EPIPE) return 1 ; + else strerr_diefu1sys(111, "read from parent") ; + else if (r && memchr(dummy, '\n', r)) break ; + } + close(fd) ; + notify_systemd(pid, s) ; + return 0 ; +} + +int main (int argc, char const *const *argv, char const *const *envp) +{ + char const *s = env_get2(envp, VAR) ; + unsigned int fd = 1 ; + unsigned int timeout = 0 ; + int df = 1, keep = 0 ; + PROG = "sdnotify-wrapper" ; + { + subgetopt_t l = SUBGETOPT_ZERO ; + for (;;) + { + register int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ; + case 'f' : df = 0 ; break ; + case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ; + case 'k' : keep = 1 ; break ; + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + } + if (!argc) dieusage() ; + + if (!s) xpathexec_run(argv[0], argv, envp) ; + else + { + pid_t parent = getpid() ; + pid_t child ; + int p[2] ; + if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ; + child = df ? doublefork() : fork() ; + if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ; + else if (!child) + { + PROG = "sdnotify-wrapper (child)" ; + close(p[1]) ; + return run_child(p[0], timeout, parent, s) ; + } + close(p[0]) ; + if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ; + if (keep) xpathexec_run(argv[0], argv, envp) ; + else xpathexec_r(argv, envp, env_len(envp), VAR, sizeof(VAR)) ; + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c2ed177d328..5bfb7c71b545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12451,6 +12451,8 @@ in SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + sdnotify-wrapper = skawarePackages.sdnotify-wrapper; + sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; @@ -12509,7 +12511,7 @@ in nsss = callPackage ../development/libraries/nsss { }; utmps = callPackage ../development/libraries/utmps { }; - + sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; skydive = callPackage ../tools/networking/skydive { }; From 3aca219535514ee1ed34eb1bfe48dc0e55a81ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 5 Feb 2019 14:58:09 +0100 Subject: [PATCH 268/467] ranger: add pillow dependency Pillow is required to display images with kitty terminal To test it, add these 2 lines to your rc.conf: set preview_images true set preview_images_method kitty --- pkgs/applications/misc/ranger/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7527fe963abb..7045228d6a2f 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -19,7 +19,8 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = [ file ]; + propagatedBuildInputs = [ file ] + ++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ]; checkPhase = '' py.test tests From 0058ce53693fbdbb516e72804a4f49ad168aac72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 06:37:22 -0800 Subject: [PATCH 269/467] python37Packages.cysignals: 1.8.1 -> 1.9.0 (#55216) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-cysignals/versions --- pkgs/development/python-modules/cysignals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index f9d7ba8a8513..c1f85ce75ac4 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -9,11 +9,11 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1hnkcrrxgh6g8a197v2yw61xz43iyv81jbl6jpy19ql3k66w81zx"; + sha256 = "15ix8crpad26cfl1skyg7qajqqfdrm8q5ahhmlfmqi1aw0jqj2g2"; }; # explicit check: From aaeaa6d1c6052938c302c07407e441e5b5794e48 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:00:19 +0900 Subject: [PATCH 270/467] Add checkPhase for neovim (disabled by default) (#55266) * neovim-unwrapped: now use lua environments * mpv: use lua environments * luaPackages.inspect: init at 3.1.1-0 * luaPackages.lgi: mark as a lua module * luaPackages.vicious: mark as a lua module --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/applications/editors/neovim/default.nix | 49 +++++++++++++------ pkgs/applications/video/mpv/default.nix | 19 +++---- .../lua-modules/generated-packages.nix | 20 ++++++++ pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/lua-packages.nix | 8 +-- 6 files changed, 68 insertions(+), 33 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e7c42925c5b2..e6817a060560 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,6 +1,7 @@ ansicolors, argparse, dkjson +inspect lrexlib-gnu, lrexlib-posix, ltermbox, diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index d7932dc4dcfc..ee7a79517850 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv -, libuv, luaPackages, ncurses, pkgconfig +, libuv, lua, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim , withJemalloc ? true, jemalloc +, glibcLocales ? null, procps ? null + +# now defaults to false because some tests can be flaky (clipboard etc) +, doCheck ? false }: with stdenv.lib; let - - neovim = stdenv.mkDerivation rec { + neovimLuaEnv = lua.withPackages(ps: + (with ps; [ mpack lpeg luabitop ] + ++ optionals doCheck [ + nvim-client luv coxpcall busted luafilesystem penlight inspect + ] + )); +in + stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; version = "0.3.4"; @@ -36,11 +46,20 @@ let ncurses libvterm-neovim unibilium - luaPackages.lua gperf + neovimLuaEnv ] ++ optional withJemalloc jemalloc ++ optional stdenv.isDarwin libiconv - ++ lualibs; + ++ optionals doCheck [ glibcLocales procps ] + ; + + inherit doCheck; + + # to be exhaustive, one could run + # make oldtests too + checkPhase = '' + make functionaltest + ''; nativeBuildInputs = [ cmake @@ -48,10 +67,6 @@ let pkgconfig ]; - LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs); - LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath lualibs); - - lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ]; # nvim --version output retains compilation flags and references to build tools postPatch = '' @@ -61,9 +76,11 @@ let disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${luaPackages.lua}/bin/lua" + "-DLUA_PRG=${neovimLuaEnv}/bin/lua" "-DGPERF_PRG=${gperf}/bin/gperf" - ]; + ] + ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" + ; # triggers on buffer overflow bug while running tests hardeningDisable = [ "fortify" ]; @@ -81,6 +98,11 @@ let $out/bin/nvim ''; + # export PATH=$PWD/build/bin:${PATH} + shellHook='' + export VIMRUNTIME=$PWD/runtime + ''; + meta = { description = "Vim text editor fork focused on extensibility and agility"; longDescription = '' @@ -104,7 +126,4 @@ let # https://nix-cache.s3.amazonaws.com/log/9ahcb52905d9d417zsskjpc331iailpq-neovim-unwrapped-0.2.2.drv broken = stdenv.isAarch64; }; - }; - -in - neovim + } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4e4c623ca607..ffbaa9fffdf7 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs -, lua, luasocket, libuchardet, libiconv ? null, darwin +, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? false , wayland ? null @@ -92,6 +92,8 @@ let "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia"; }; + luaEnv = lua.withPackages(ps: with ps; [ luasocket]); + in stdenv.mkDerivation rec { name = "mpv-${version}"; version = "0.29.1"; @@ -139,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - lua luasocket libuchardet mujs + luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray @@ -183,16 +185,9 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for mpv wrapperFlags = - let - getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + - "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; - luaPath = getPath "lua"; - luaCPath = getPath "so"; - in - '' - --prefix LUA_PATH : "${luaPath}" \ - --prefix LUA_CPATH : "${luaCPath}" \ - '' + optionalString youtubeSupport '' + + ''--prefix PATH : "${luaEnv}/bin" \'' + + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 353eaa6e9601..dc15a7a9ad67 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -70,6 +70,26 @@ dkjson = buildLuarocksPackage { }; }; }; +inspect = buildLuarocksPackage { + pname = "inspect"; + version = "3.1.1-0"; + + src = fetchurl { + url = https://luarocks.org/inspect-3.1.1-0.src.rock; + sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/kikito/inspect.lua"; + description="Lua table visualizer, ideal for debugging"; + license = { + fullName = "MIT "; + }; + }; +}; lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.0-1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdd54e2ea9c2..a1adb32cded1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18354,7 +18354,7 @@ in }; mpv = callPackage ../applications/video/mpv rec { - inherit (luaPackages) luasocket; + inherit lua; waylandSupport = stdenv.isLinux; alsaSupport = !stdenv.isDarwin; pulseSupport = !stdenv.isDarwin; @@ -19816,7 +19816,7 @@ in wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; neovim-unwrapped = callPackage ../applications/editors/neovim { - luaPackages = luajitPackages; + lua = luajit; }; neovim = wrapNeovim neovim-unwrapped { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 11e05b504b43..de68c139dc28 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -972,7 +972,7 @@ with self; { }; }; - lgi = stdenv.mkDerivation rec { + lgi = toLuaModule(stdenv.mkDerivation rec { name = "lgi-${version}"; version = "0.9.2"; @@ -1007,7 +1007,7 @@ with self; { maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.unix; }; - }; + }); mpack = buildLuaPackage rec { name = "mpack-${version}"; @@ -1105,7 +1105,7 @@ with self; { }; }; - vicious = stdenv.mkDerivation rec { + vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; version = "2.3.1"; @@ -1131,7 +1131,7 @@ with self; { maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; - }; + }); }); in (lib.extends overrides packages) From 16994118ba0666c22c45f20f50775741dc6f1caa Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 Feb 2019 17:38:02 +0100 Subject: [PATCH 271/467] minio: 2019-01-23T23-18-58Z -> 2019-01-31T00-31-19Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1f8b750c125c..1dcac1f9a822 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2019-01-23T23-18-58Z"; + version = "2019-01-31T00-31-19Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "07clcsxm4xgp7df5y6zkkgflp2f5mnzrl8fkzr6b08ij3cpmi2ws"; + sha256 = "0rvvjgnbk9khi443bahrg6iqa5lhmv8gydg96vgkrby13r1yy84k"; }; goPackagePath = "github.com/minio/minio"; From d60c38ad9bc441336d51d08e49f5e302d14e1fb6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 Feb 2019 17:38:18 +0100 Subject: [PATCH 272/467] minio-client: 2018-12-27T00-37-49Z -> 2019-01-30T19-57-22Z --- pkgs/tools/networking/minio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 7234d73e1144..3a3ca03f18ae 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-client-${version}"; - version = "2018-12-27T00-37-49Z"; + version = "2019-01-30T19-57-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1hbw3yam5lc9414f3f8yh32ycj0wz2xc934ksvjnrhkk4xzyal6h"; + sha256 = "1w0ig0daf0zxpkz449xq2hm7ajhzn8hlnnmpac6ip82qy53xnbm4"; }; goPackagePath = "github.com/minio/mc"; From 400aa7b86a17a5685913caf3432983964da9aef5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 Feb 2019 17:38:34 +0100 Subject: [PATCH 273/467] minio: add test to nixos/tests/all-tests.nix --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 96b34755d6f5..4450cafd2800 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -129,6 +129,7 @@ in matrix-synapse = handleTest ./matrix-synapse.nix {}; memcached = handleTest ./memcached.nix {}; mesos = handleTest ./mesos.nix {}; + minio = handleTest ./minio.nix {}; misc = handleTest ./misc.nix {}; mongodb = handleTest ./mongodb.nix {}; morty = handleTest ./morty.nix {}; From 50087e01c43a8a5d97352a30fbcdfe8531b6c9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TG=20=E2=8A=97=20=CE=98?= <*@tg-x.net> Date: Tue, 5 Feb 2019 18:25:25 +0100 Subject: [PATCH 274/467] idrisPackages.tparsec: 2018-11-09 -> 2018-12-21 --- pkgs/development/idris-modules/tparsec.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index fcf25f0fb93e..8aa413b51c31 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,15 +4,15 @@ }: build-idris-package { name = "tparsec"; - version = "2018-11-09"; + version = "2018-12-21"; ipkgName = "TParsec"; src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "fc5bc1e0bf21a53ec854990ed799c4c73e304b06"; - sha256 = "0ladks6x1qhs884w4rsxnzpq8dpijyqfqbvhk55kq10xh6w1smrz"; + rev = "6fafcaa894def6f2af86bc799e507013b56e7741"; + sha256 = "0alnw0hqjs200gvb5f58lb16rna48j1v6wnvq4q7zbw99dcxsxwn"; }; meta = { From f392a07e61c13fce1f1401616c634a3e30c1dcd7 Mon Sep 17 00:00:00 2001 From: scalavision Date: Tue, 5 Feb 2019 14:29:54 +0100 Subject: [PATCH 275/467] singularity: 2.6.0 -> 2.6.1 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index cc543d2e94a1..f56c15d0b99c 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.6.0"; + version = "2.6.1"; enableParallelBuilding = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "0bi7acgppbkfbra8r29s1ldq02lazdww0z2h1rfvv8spr8dzzi94"; + sha256 = "0q8qq9l3s6mv74km9h8gsn5mpd0m98dhmx8vph1jp6wnrr4xyfqf"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From bea326e8de42ecf1162532e9b24982f062224795 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 13:13:22 -0800 Subject: [PATCH 276/467] latte-dock: 0.8.4 -> 0.8.5 (#55254) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/latte-dock/versions --- pkgs/applications/misc/latte-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 773030bcd60a..ec571c0284b6 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.4"; + version = "0.8.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "0zm2xckyaymd53a38mf1bh9in4bh2bshbr3z8z9gn6mp7c60jay3"; + sha256 = "1yhnmppp65xy8skainn438q3hwlpsz8qcj4ksvl8xdz5jzn7gs7k"; name = "${name}.tar.xz"; }; From f08b99c42f02a99ac3fa580d4bd38781bcf7b309 Mon Sep 17 00:00:00 2001 From: scalavision Date: Tue, 5 Feb 2019 20:12:28 +0000 Subject: [PATCH 277/467] singularity: rewrite path to cp in bootstrap script --- pkgs/applications/virtualization/singularity/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index f56c15d0b99c..985f46ed9607 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's/-static//g' src/Makefile.am patchShebangs . + substituteInPlace libexec/bootstrap-scripts/deffile-sections.sh \ + --replace /bin/cp ${coreutils}/bin/cp ''; configureFlags = [ "--localstatedir=/var" ]; From 970376555617db75e3d22c151495afb8d0006e7e Mon Sep 17 00:00:00 2001 From: markuskowa Date: Tue, 5 Feb 2019 22:57:29 +0100 Subject: [PATCH 278/467] molden: 5.8.2 -> 5.9.3 (#55044) --- pkgs/applications/science/chemistry/molden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 76a19d410ef8..99a8c777cd0e 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.8.2"; + version = "5.9.3"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4"; + sha256 = "18fz44g7zkm0xcx3w9hm049jv13af67ww7mb5b3kdhmza333a16q"; }; nativeBuildInputs = [ which ]; From 46503d069af84cab9373ee3e72dedfcc22545897 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Feb 2019 23:29:36 +0100 Subject: [PATCH 279/467] swaylock: 1.2 -> 1.3 --- pkgs/applications/window-managers/sway/lock.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index b99721ba19e3..a275e411c6e3 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc -, wayland, wayland-protocols, wlroots, libxkbcommon, cairo, pango, gdk_pixbuf, pam +, wayland, wayland-protocols, libxkbcommon, cairo, gdk_pixbuf, pam }: stdenv.mkDerivation rec { name = "swaylock-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "1nqirrkkdhb6b2hc78ghi2yzblcx9jcgc9qwm1jvnk2iqwqbzclg"; + sha256 = "093nv1y9wyg48rfxhd36qdljjry57v1vkzrlc38mkf6zvsq8j7wb"; }; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; - buildInputs = [ wayland wayland-protocols wlroots libxkbcommon cairo pango - gdk_pixbuf pam - ]; + buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk_pixbuf pam ]; - mesonFlags = "-Dsway-version=${version}"; # TODO: Should probably be swaylock-version + mesonFlags = [ "-Dswaylock-version=${version}" + "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + ]; meta = with stdenv.lib; { description = "Screen locker for Wayland"; From d2aa09f26d1f32defdfce8fa896963561864579a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Feb 2019 23:32:50 +0100 Subject: [PATCH 280/467] swayidle: 1.1 -> 1.2 --- pkgs/applications/window-managers/sway/idle.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 8227f4a8fa7e..86af7fc629a0 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -5,18 +5,20 @@ stdenv.mkDerivation rec { name = "swayidle-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "1xmcd5wajyrxc8171pl7vhxqg4da482k5n1h0x1j9n07wz50wjqm"; + sha256 = "0b65flajwn2i6k2kdxxgw25w7ikzzmm595f4j5x1wac1rb0yah9w"; }; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; + mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; + meta = with stdenv.lib; { description = "Idle management daemon for Wayland"; longDescription = '' From 8c043d3c7bc136864d2de5eed05184d9653670c3 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Tue, 5 Feb 2019 11:40:41 -0800 Subject: [PATCH 281/467] gitlab: 11.6.3 -> 11.7.4 --- .../version-management/gitlab/data.json | 32 ++-- .../gitlab/gitaly/Gemfile.lock | 2 +- .../gitlab/gitaly/default.nix | 4 +- .../gitlab/gitaly/gemset.nix | 4 +- .../gitlab/gitlab-shell/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 6 +- .../remove-hardcoded-paths.patch | 12 -- .../gitlab/rubyEnv-ce/Gemfile | 62 +++----- .../gitlab/rubyEnv-ce/Gemfile.lock | 147 ++++++++--------- .../gitlab/rubyEnv-ce/gemset.nix | 114 +++++++------- .../gitlab/rubyEnv-ee/Gemfile | 65 +++----- .../gitlab/rubyEnv-ee/Gemfile.lock | 149 +++++++++--------- .../gitlab/rubyEnv-ee/gemset.nix | 122 +++++++------- 13 files changed, 346 insertions(+), 377 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 7504adcbf4f1..b5a5a9feb76b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.6.3", - "repo_hash": "0bvmccfybgzbd85bdvwikmxh4asj5ly8yhxazhaqkwmnymnxa4k2", - "deb_hash": "11blasjkdi85sivfjb0s6cssh1p13fyxhqimcx1dsvb5q5v0m6as", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.6.3-ce.0_amd64.deb/download.deb", + "version": "11.7.4", + "repo_hash": "0qq9snykdlpkpbznwpkv0n7bz1rsgz4z7lcjl4xkjxkf2gkf8pxp", + "deb_hash": "1j76jya0ydyg7v3vcdfjmcr5ir23yzdwmg9fxlirvgh74py7q85c", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.4-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.6.3", + "rev": "v11.7.4", "passthru": { - "GITALY_SERVER_VERSION": "1.7.1", + "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.3", - "GITLAB_WORKHORSE_VERSION": "7.6.0" + "GITLAB_SHELL_VERSION": "8.4.4", + "GITLAB_WORKHORSE_VERSION": "8.0.1" } }, "ee": { - "version": "11.6.3", - "repo_hash": "0j31h5i74j94f7qlcxk6pvwaxqqcjbm02lnqslnfs3zs8k2bmd35", - "deb_hash": "1ivap84d5xphxfmzff8i663pf6kw5rh2zxv1bcwn62p8dccr7hcc", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.6.3-ee.0_amd64.deb/download.deb", + "version": "11.7.4", + "repo_hash": "0riqww094ylbbwb9mhjpsqhrdpxlcf6rc5p796p7x7f46p31mcjb", + "deb_hash": "02hnhhyrm4a3lgwnl399byka2dr5q3pjirki447373270ca93h5i", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.4-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.6.3-ee", + "rev": "v11.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.7.1", + "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.3", - "GITLAB_WORKHORSE_VERSION": "7.6.0" + "GITLAB_SHELL_VERSION": "8.4.4", + "GITLAB_WORKHORSE_VERSION": "8.0.1" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 73dab9a33928..59f8ad69f223 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -82,7 +82,7 @@ GEM nokogumbo (1.5.0) nokogiri parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) posix-spawn (0.3.13) powerpack (0.1.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 19b1d3cab948..349b75f19347 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.7.1"; + version = "1.12.2"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1ravy308b5h9gsbb3ka159f68ghyjkb4bj1ngj7ighb9dd84vlf4"; + sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 34c2e5ed036a..c06be7891ffb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -352,10 +352,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; + sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; type = "gem"; }; - version = "2.5.1.2"; + version = "2.5.3.0"; }; posix-spawn = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index dca9630b04c7..895e1e13bec8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.4.3"; + version = "8.4.4"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0ah039xpff1gmj36rm1ns8lb1k3di49lmnphl54bc45wnj72lw57"; + sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq"; }; buildInputs = [ ruby bundler go ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ea864d700d4c..96ea361a2548 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,19 +3,17 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "7.6.0"; + version = "8.0.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "13wr2az3bp6qnb05505sb5qn0fl2syaclc40dwjcdwwmhaalj2m4"; + sha256 = "1aslcadag1q2rdirf9m0dl5vfaz8v3yy1232mvyjyvy1wb51pf4q"; }; buildInputs = [ git go ]; - patches = [ ./remove-hardcoded-paths.patch ]; - makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch deleted file mode 100644 index d8313ecb433a..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/internal/git/command.go b/internal/git/command.go -index 0e5496c..5778294 100644 ---- a/internal/git/command.go -+++ b/internal/git/command.go -@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd { - cmd.Env = []string{ - fmt.Sprintf("HOME=%s", os.Getenv("HOME")), - fmt.Sprintf("PATH=%s", os.Getenv("PATH")), -+ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")), - fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")), - fmt.Sprintf("GL_PROTOCOL=http"), - } diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index a7f5deadb866..f59e61208ac3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -1,22 +1,6 @@ -# --- Special code for migrating to Rails 5.0 --- -def rails5? - !%w[0 false].include?(ENV["RAILS5"]) -end - -gem_versions = {} -gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' -gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' -gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' - -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem_versions['rack'] = rails5? ? '2.0.6' : '1.6.11' -# --- The end of special code for migrating to Rails 5.0 --- - source 'https://rubygems.org' -gem 'rails', gem_versions['rails'] +gem 'rails', '5.0.7.1' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Improves copy-on-write performance for MRI @@ -28,11 +12,7 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -if rails5? - gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' -else - gem 'default_value_for', '~> 3.0.0' -end +gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql @@ -54,7 +34,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.3' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.3' +gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' @@ -63,7 +43,7 @@ gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt', '~> 1.5.6' +gem 'jwt', '~> 2.1.0' # Spam and anti-bot protection gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' @@ -77,6 +57,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' +gem 'rubyzip', '~> 1.2.2', require: 'zip' # Browser detection gem 'browser', '~> 2.5' @@ -109,9 +90,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. -# config/initializers/carrierwave_patch.rb can be removed once that change is released. -gem 'carrierwave', '= 1.2.3' +gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups @@ -149,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.2' +gem 'nokogiri', '~> 1.8.5' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -159,7 +138,10 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -gem 'rack', gem_versions['rack'] +# The 2.0.6 version of rack requires monkeypatch to be present in +# `config.ru`. This can be removed once a new update for Rack +# is available that contains https://github.com/rack/rack/pull/1201. +gem 'rack', '2.0.6' group :unicorn do gem 'unicorn', '~> 5.1.0' @@ -278,6 +260,7 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' +gem 'sass', '~> 3.5' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' @@ -297,7 +280,7 @@ gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', gem_versions['rails-i18n'] +gem 'rails-i18n', '~> 5.1' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development @@ -307,7 +290,7 @@ gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '~> 1.2.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' @@ -340,13 +323,13 @@ end group :development, :test do gem 'bootsnap', '~> 1.3' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.4.1', platform: :mri + gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' - gem 'database_cleaner', '~> 1.5.0' + gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.7.0' gem 'rspec-retry', '~> 0.4.5' @@ -355,13 +338,13 @@ group :development, :test do gem 'rspec-parameterized', require: false # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' + gem 'minitest', '~> 5.11.0' # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' + gem 'capybara', '~> 2.16.1' + gem 'capybara-screenshot', '~> 1.0.18' gem 'selenium-webdriver', '~> 3.12' gem 'spring', '~> 2.0.0' @@ -382,7 +365,7 @@ group :development, :test do gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' - gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] + gem 'activerecord_sane_schema_dumper', '1.0' gem 'stackprof', '~> 0.2.10', require: false @@ -396,8 +379,7 @@ group :test do gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'rails-controller-testing' if rails5? # Rails5 only gem. - gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. + gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.2.5' @@ -435,7 +417,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 96bbfa7d4e1d..77b4360cf413 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -4,41 +4,41 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actioncable (5.0.7) - actionpack (= 5.0.7) + actioncable (5.0.7.1) + actionpack (= 5.0.7.1) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.7.1) + actionview (= 5.0.7.1) + activesupport (= 5.0.7.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.7.1) + activesupport (= 5.0.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.0.7.1) + activesupport (= 5.0.7.1) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.7.1) + activesupport (= 5.0.7.1) + activerecord (5.0.7.1) + activemodel (= 5.0.7.1) + activesupport (= 5.0.7.1) arel (~> 7.0) activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.0.7) + activesupport (5.0.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -97,18 +97,18 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.6) - capybara (2.15.1) + byebug (9.1.0) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.14) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.3) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -140,7 +140,7 @@ GEM css_parser (1.5.0) addressable daemons (1.2.6) - database_cleaner (1.5.3) + database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) @@ -274,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.3.0) + gitaly-proto (1.5.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -381,7 +381,7 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.1.1) + i18n (1.2.0) concurrent-ruby (~> 1.0) icalendar (2.4.1) ice_nine (0.11.2) @@ -403,7 +403,7 @@ GEM bindata json-schema (2.8.0) addressable (>= 2.4) - jwt (1.5.6) + jwt (2.1.0) kaminari (1.0.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.0.1) @@ -449,7 +449,7 @@ GEM loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) memoist (0.16.0) @@ -463,7 +463,7 @@ GEM mini_magick (4.8.0) mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.7.0) + minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -483,24 +483,24 @@ GEM nokogiri numerizer (0.1.1) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-oauth2 (0.0.9) - jwt (~> 1.0) + omniauth-azure-oauth2 (0.0.10) + jwt (>= 1.0, < 3.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) @@ -515,8 +515,8 @@ GEM omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.3) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) omniauth-kerberos (0.3.0) @@ -527,9 +527,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) @@ -558,8 +558,9 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-mysql2 (1.1.0) - atomic (>= 1.0.0) + peek-mysql2 (1.2.0) + concurrent-ruby + concurrent-ruby-ext mysql2 peek peek-pg (1.3.0) @@ -594,8 +595,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.4.3) - byebug (>= 9.0, < 9.1) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) @@ -623,17 +624,17 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.7.1) + actioncable (= 5.0.7.1) + actionmailer (= 5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) + activemodel (= 5.0.7.1) + activerecord (= 5.0.7.1) + activesupport (= 5.0.7.1) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -649,15 +650,15 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.0.7.1) + actionpack (= 5.0.7.1) + activesupport (= 5.0.7.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) raindrops (0.18.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -962,9 +963,9 @@ DEPENDENCIES browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.15) - capybara-screenshot (~> 1.0.0) - carrierwave (= 1.2.3) + capybara (~> 2.16.1) + capybara-screenshot (~> 1.0.18) + carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -972,7 +973,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.0) creole (~> 0.5.0) - database_cleaner (~> 1.5.0) + database_cleaner (~> 1.7.0) deckar01-task_list (= 2.0.0) device_detector devise (~> 4.4) @@ -1007,7 +1008,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.5.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) @@ -1040,7 +1041,7 @@ DEPENDENCIES jquery-atwho-rails (~> 1.3.2) js_regex (~> 2.2.1) json-schema (~> 2.8.0) - jwt (~> 1.5.6) + jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) kubeclient (~> 4.0.0) @@ -1053,12 +1054,12 @@ DEPENDENCIES method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick - minitest (~> 5.7.0) + minitest (~> 5.11.0) mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.8.2) + nokogiri (~> 1.8.5) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1069,7 +1070,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.3) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.3) + omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) @@ -1079,14 +1080,14 @@ DEPENDENCIES org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.1.0) + peek-mysql2 (~> 1.2.0) peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) - pry-byebug (~> 3.4.1) + pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer @@ -1095,7 +1096,7 @@ DEPENDENCIES rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 5.0.7) + rails (= 5.0.7.1) rails-controller-testing rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) @@ -1126,9 +1127,11 @@ DEPENDENCIES ruby-prof (~> 0.17.0) ruby-progressbar ruby_parser (~> 3.8) + rubyzip (~> 1.2.2) rufus-scheduler (~> 3.4) rugged (~> 0.27) sanitize (~> 4.6) + sass (~> 3.5) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) @@ -1169,4 +1172,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index abaecb432245..10b8c3f25ead 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -19,64 +19,64 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2znw81zf11f7kqyks80ha4sb4aiqrs1mia0jnf3xfn5zgx28y0"; + sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d9f3kwk1z3p6sa9d8vl7yqa689ihm24cy7lp4h6v478dbr156sz"; + sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nin3f817dpkjlw94sh4rsvayqy4z6ij7fak82wqdqv5mcd9q08"; + sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vvq439jjj4byhkvckrk7ap4krrfsbpw54n5xxfwh7fr5y0087b"; + sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdqdgwmcx28jznc5mfmqzz42y03mx6i6fs6m4nka0ic61rmp8g8"; + sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ycnzi32cd92ylxhqwqfchqk3m7y9z7sfiyf8b7830lzfxv2dgy"; + sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ri32lhmmd4waphpynwj53ysy9xlhx743lnlsnp8l499kvarqd66"; + sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -91,10 +91,10 @@ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; + sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -367,37 +367,37 @@ byebug = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; + sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; type = "gem"; }; - version = "9.0.6"; + version = "9.1.0"; }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92"; + sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.1"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xy79lf3rwn3602r4hqm9s8a03bhlf6hzwdi6345dzrkmhwwj2ij"; + sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q"; type = "gem"; }; - version = "1.0.14"; + version = "1.0.22"; }; carrierwave = { dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs"; + sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; cause = { source = { @@ -562,10 +562,10 @@ database_cleaner = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x"; type = "gem"; }; - version = "1.5.3"; + version = "1.7.0"; }; debug_inspector = { source = { @@ -1085,10 +1085,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; github-markup = { source = { @@ -1427,10 +1427,10 @@ dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; + sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; icalendar = { source = { @@ -1520,10 +1520,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1661,10 +1661,10 @@ dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; mail_room = { source = { @@ -1751,10 +1751,10 @@ minitest = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8"; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; type = "gem"; }; - version = "5.7.0"; + version = "5.11.3"; }; msgpack = { source = { @@ -1891,10 +1891,10 @@ dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "094hmmfms8vpm6nwglpl7jmlv85nlfzl0kik4fizgx1rg70a6mr5"; + sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; octokit = { dependencies = ["sawyer"]; @@ -1909,10 +1909,10 @@ dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; + sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -1936,10 +1936,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx"; + sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4"; type = "gem"; }; - version = "0.0.9"; + version = "0.0.10"; }; omniauth-cas3 = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -1981,10 +1981,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; + sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.0"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2017,10 +2017,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; + sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2136,13 +2136,13 @@ version = "0.0.2"; }; peek-mysql2 = { - dependencies = ["atomic" "mysql2" "peek"]; + dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fzx3dwj7k6sc87jwhjk8vzp8dskv49j141xx15vvkg603j8k"; + sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2252,10 +2252,10 @@ dependencies = ["byebug" "pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n"; + sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; type = "gem"; }; - version = "3.4.3"; + version = "3.5.1"; }; pry-rails = { dependencies = ["pry"]; @@ -2373,10 +2373,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "117z277m78cw6bm43dyzxhjmx8awpidmqcjjx99kpj4rgqm5m0bn"; + sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2427,10 +2427,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j6v5ylwgqmxs4pllgip5yxdsivdqs1w00cs8jfqyw5v7pn9b2z0"; + sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rainbow = { source = { @@ -2451,10 +2451,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; type = "gem"; }; - version = "12.3.1"; + version = "12.3.2"; }; rb-fsevent = { source = { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 8258596ed6bd..f01944a0e877 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -1,22 +1,6 @@ -# --- Special code for migrating to Rails 5.0 --- -def rails5? - !%w[0 false].include?(ENV["RAILS5"]) -end - -gem_versions = {} -gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' -gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' -gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' - -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem_versions['rack'] = rails5? ? '2.0.6' : '1.6.11' -# --- The end of special code for migrating to Rails 5.0 --- - source 'https://rubygems.org' -gem 'rails', gem_versions['rails'] +gem 'rails', '5.0.7.1' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Improves copy-on-write performance for MRI @@ -28,11 +12,7 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -if rails5? - gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' -else - gem 'default_value_for', '~> 3.0.0' -end +gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql @@ -54,7 +34,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.3' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.3' +gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' @@ -63,7 +43,7 @@ gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt', '~> 1.5.6' +gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos @@ -80,6 +60,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' +gem 'rubyzip', '~> 1.2.2', require: 'zip' # Browser detection gem 'browser', '~> 2.5' @@ -112,9 +93,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. -# config/initializers/carrierwave_patch.rb can be removed once that change is released. -gem 'carrierwave', '= 1.2.3' +gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups @@ -159,7 +138,7 @@ gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.2' +gem 'nokogiri', '~> 1.8.5' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -169,7 +148,10 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -gem 'rack', gem_versions['rack'] +# The 2.0.6 version of rack requires monkeypatch to be present in +# `config.ru`. This can be removed once a new update for Rack +# is available that contains https://github.com/rack/rack/pull/1201. +gem 'rack', '2.0.6' group :unicorn do gem 'unicorn', '~> 5.1.0' @@ -288,6 +270,7 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' +gem 'sass', '~> 3.5' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' @@ -309,7 +292,7 @@ gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', gem_versions['rails-i18n'] +gem 'rails-i18n', '~> 5.1' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development @@ -319,7 +302,7 @@ gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '~> 1.2.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' @@ -352,13 +335,13 @@ end group :development, :test do gem 'bootsnap', '~> 1.3' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.4.1', platform: :mri + gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' - gem 'database_cleaner', '~> 1.5.0' + gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.7.0' gem 'rspec-retry', '~> 0.4.5' @@ -367,13 +350,13 @@ group :development, :test do gem 'rspec-parameterized', require: false # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' + gem 'minitest', '~> 5.11.0' # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' + gem 'capybara', '~> 2.16.1' + gem 'capybara-screenshot', '~> 1.0.18' gem 'selenium-webdriver', '~> 3.12' gem 'spring', '~> 2.0.0' @@ -394,7 +377,7 @@ group :development, :test do gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' - gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] + gem 'activerecord_sane_schema_dumper', '1.0' gem 'stackprof', '~> 0.2.10', require: false @@ -408,8 +391,7 @@ group :test do gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'rails-controller-testing' if rails5? # Rails5 only gem. - gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. + gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.2.5' @@ -450,7 +432,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' @@ -465,3 +447,6 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' + +# DNS Lookup +gem 'net-dns', '~> 0.9.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index d7c27460c604..8d07afb59bf1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -4,41 +4,41 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actioncable (5.0.7) - actionpack (= 5.0.7) + actioncable (5.0.7.1) + actionpack (= 5.0.7.1) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.7.1) + actionview (= 5.0.7.1) + activesupport (= 5.0.7.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.7.1) + activesupport (= 5.0.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.0.7.1) + activesupport (= 5.0.7.1) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.7.1) + activesupport (= 5.0.7.1) + activerecord (5.0.7.1) + activemodel (= 5.0.7.1) + activesupport (= 5.0.7.1) arel (~> 7.0) activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.0.7) + activesupport (5.0.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -105,18 +105,18 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.6) - capybara (2.15.1) + byebug (9.1.0) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.14) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.3) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -148,7 +148,7 @@ GEM css_parser (1.5.0) addressable daemons (1.2.6) - database_cleaner (1.5.3) + database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) @@ -298,7 +298,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.3.0) + gitaly-proto (1.5.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -408,7 +408,7 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.1.1) + i18n (1.2.0) concurrent-ruby (~> 1.0) icalendar (2.4.1) ice_nine (0.11.2) @@ -431,7 +431,7 @@ GEM bindata json-schema (2.8.0) addressable (>= 2.4) - jwt (1.5.6) + jwt (2.1.0) kaminari (1.0.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.0.1) @@ -477,7 +477,7 @@ GEM loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) memoist (0.16.0) @@ -491,7 +491,7 @@ GEM mini_magick (4.8.0) mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.7.0) + minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -501,6 +501,7 @@ GEM mustermann (~> 1.0.0) mysql2 (0.4.10) nakayoshi_fork (0.0.4) + net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.0.1) @@ -512,24 +513,24 @@ GEM nokogiri numerizer (0.1.1) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-oauth2 (0.0.9) - jwt (~> 1.0) + omniauth-azure-oauth2 (0.0.10) + jwt (>= 1.0, < 3.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) @@ -544,8 +545,8 @@ GEM omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.3) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) omniauth-kerberos (0.3.0) @@ -556,9 +557,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) @@ -587,8 +588,9 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-mysql2 (1.1.0) - atomic (>= 1.0.0) + peek-mysql2 (1.2.0) + concurrent-ruby + concurrent-ruby-ext mysql2 peek peek-pg (1.3.0) @@ -623,8 +625,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.4.3) - byebug (>= 9.0, < 9.1) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) @@ -652,17 +654,17 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.7.1) + actioncable (= 5.0.7.1) + actionmailer (= 5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) + activemodel (= 5.0.7.1) + activerecord (= 5.0.7.1) + activesupport (= 5.0.7.1) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -678,15 +680,15 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.0.7.1) + actionpack (= 5.0.7.1) + activesupport (= 5.0.7.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) raindrops (0.18.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -992,9 +994,9 @@ DEPENDENCIES browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.15) - capybara-screenshot (~> 1.0.0) - carrierwave (= 1.2.3) + capybara (~> 2.16.1) + capybara-screenshot (~> 1.0.18) + carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -1002,7 +1004,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.0) creole (~> 0.5.0) - database_cleaner (~> 1.5.0) + database_cleaner (~> 1.7.0) deckar01-task_list (= 2.0.0) device_detector devise (~> 4.4) @@ -1041,7 +1043,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.5.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) @@ -1076,7 +1078,7 @@ DEPENDENCIES jquery-atwho-rails (~> 1.3.2) js_regex (~> 2.2.1) json-schema (~> 2.8.0) - jwt (~> 1.5.6) + jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) kubeclient (~> 4.0.0) @@ -1089,13 +1091,14 @@ DEPENDENCIES method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick - minitest (~> 5.7.0) + minitest (~> 5.11.0) mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) + net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.0) - nokogiri (~> 1.8.2) + nokogiri (~> 1.8.5) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1106,7 +1109,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.3) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.3) + omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) @@ -1116,14 +1119,14 @@ DEPENDENCIES org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.1.0) + peek-mysql2 (~> 1.2.0) peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) - pry-byebug (~> 3.4.1) + pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer @@ -1132,7 +1135,7 @@ DEPENDENCIES rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 5.0.7) + rails (= 5.0.7.1) rails-controller-testing rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) @@ -1163,9 +1166,11 @@ DEPENDENCIES ruby-prof (~> 0.17.0) ruby-progressbar ruby_parser (~> 3.8) + rubyzip (~> 1.2.2) rufus-scheduler (~> 3.4) rugged (~> 0.27) sanitize (~> 4.6) + sass (~> 3.5) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) @@ -1206,4 +1211,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index bd6c9d29a0aa..03f885f2f9e5 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -19,64 +19,64 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2znw81zf11f7kqyks80ha4sb4aiqrs1mia0jnf3xfn5zgx28y0"; + sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d9f3kwk1z3p6sa9d8vl7yqa689ihm24cy7lp4h6v478dbr156sz"; + sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nin3f817dpkjlw94sh4rsvayqy4z6ij7fak82wqdqv5mcd9q08"; + sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vvq439jjj4byhkvckrk7ap4krrfsbpw54n5xxfwh7fr5y0087b"; + sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdqdgwmcx28jznc5mfmqzz42y03mx6i6fs6m4nka0ic61rmp8g8"; + sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ycnzi32cd92ylxhqwqfchqk3m7y9z7sfiyf8b7830lzfxv2dgy"; + sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ri32lhmmd4waphpynwj53ysy9xlhx743lnlsnp8l499kvarqd66"; + sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -91,10 +91,10 @@ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; + sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -402,37 +402,37 @@ byebug = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; + sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; type = "gem"; }; - version = "9.0.6"; + version = "9.1.0"; }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92"; + sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.1"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xy79lf3rwn3602r4hqm9s8a03bhlf6hzwdi6345dzrkmhwwj2ij"; + sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q"; type = "gem"; }; - version = "1.0.14"; + version = "1.0.22"; }; carrierwave = { dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs"; + sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; cause = { source = { @@ -597,10 +597,10 @@ database_cleaner = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x"; type = "gem"; }; - version = "1.5.3"; + version = "1.7.0"; }; debug_inspector = { source = { @@ -1173,10 +1173,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; github-markup = { source = { @@ -1532,10 +1532,10 @@ dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; + sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; icalendar = { source = { @@ -1633,10 +1633,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1774,10 +1774,10 @@ dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; mail_room = { source = { @@ -1864,10 +1864,10 @@ minitest = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8"; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; type = "gem"; }; - version = "5.7.0"; + version = "5.11.3"; }; msgpack = { source = { @@ -1934,6 +1934,14 @@ }; version = "0.0.4"; }; + net-dns = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d"; + type = "gem"; + }; + version = "0.9.0"; + }; net-ldap = { source = { remotes = ["https://rubygems.org"]; @@ -2012,10 +2020,10 @@ dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "094hmmfms8vpm6nwglpl7jmlv85nlfzl0kik4fizgx1rg70a6mr5"; + sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; octokit = { dependencies = ["sawyer"]; @@ -2030,10 +2038,10 @@ dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; + sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -2057,10 +2065,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx"; + sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4"; type = "gem"; }; - version = "0.0.9"; + version = "0.0.10"; }; omniauth-cas3 = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -2102,10 +2110,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; + sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.0"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2138,10 +2146,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; + sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2257,13 +2265,13 @@ version = "0.0.2"; }; peek-mysql2 = { - dependencies = ["atomic" "mysql2" "peek"]; + dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fzx3dwj7k6sc87jwhjk8vzp8dskv49j141xx15vvkg603j8k"; + sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2373,10 +2381,10 @@ dependencies = ["byebug" "pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n"; + sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; type = "gem"; }; - version = "3.4.3"; + version = "3.5.1"; }; pry-rails = { dependencies = ["pry"]; @@ -2494,10 +2502,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "117z277m78cw6bm43dyzxhjmx8awpidmqcjjx99kpj4rgqm5m0bn"; + sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2548,10 +2556,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j6v5ylwgqmxs4pllgip5yxdsivdqs1w00cs8jfqyw5v7pn9b2z0"; + sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rainbow = { source = { @@ -2572,10 +2580,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; type = "gem"; }; - version = "12.3.1"; + version = "12.3.2"; }; rb-fsevent = { source = { From 0028bad962d0184f190474244b9e51d4b840443d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Feb 2019 00:54:07 +0000 Subject: [PATCH 282/467] dino: 2018-11-29 -> 2019-02-06 --- .../networking/instant-messengers/dino/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 457fdd2544f0..0ee051a87fbd 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -11,16 +11,17 @@ , gpgme , pcre , qrencode +, icu }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-11-29"; + name = "dino-unstable-2019-02-06"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "680d28360c781ff29e810821801cfaba0493c526"; - sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln"; + rev = "864196d2acef3db047160b9da5803805067276c3"; + sha256 = "10nyq9marclzbkxisackp402gimgs7gb0llgjm922c593c5h39cq"; fetchSubmodules = true; }; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { ninja pkgconfig wrapGAppsHook + gettext ]; buildInputs = [ @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { epoxy at-spi2-core dbus - gettext + icu ]; enableParallelBuilding = true; From 81531046e84d1159be0eebfd5fb18e7ea174495f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 5 Feb 2019 20:45:10 -0500 Subject: [PATCH 283/467] qt511: add patch for macOS sdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately we don’t have access to NSWindowStyleMask. These patches should go away once we switch to a newer SDK. --- .../libraries/qt-5/5.11/default.nix | 1 + .../5.11/qtbase-darwin-revert-69221.patch | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index c6cc393624e6..59dab2beabd0 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -56,6 +56,7 @@ let ./qtbase-fixguicmake.patch ] ++ optionals stdenv.isDarwin [ ./qtbase-darwin-nseventtype.patch + ./qtbase-darwin-revert-69221.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch new file mode 100644 index 000000000000..73eea435f847 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch @@ -0,0 +1,73 @@ +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 00c3f7c22c..94d35f59d6 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1355,15 +1355,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + { + QMacAutoReleasePool pool; + +- Qt::WindowType type = window()->type(); +- Qt::WindowFlags flags = window()->flags(); +- +- // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow +- // a window to be created within the area of the screen that has a Y coordinate (I quadrant) +- // higher than the height of the screen in its non-rotated state, unless the window is +- // created with the NSWindowStyleMaskBorderless style mask. +- NSWindowStyleMask styleMask = windowStyleMask(flags); +- + QRect rect = geometry(); + + QScreen *targetScreen = nullptr; +@@ -1375,22 +1366,26 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + } + + if (!targetScreen) { +- qCWarning(lcQpaCocoaWindow) << "Window position" << rect << "outside any known screen, using primary screen"; ++ qCWarning(lcQpaCocoaWindow) << "Window position outside any known screen, using primary screen"; + targetScreen = QGuiApplication::primaryScreen(); +- // AppKit will only reposition a window that's outside the target screen area if +- // the window has a title bar. If left out, the window ends up with no screen. +- // The style mask will be corrected to the original style mask in setWindowFlags. +- styleMask |= NSWindowStyleMaskTitled; + } + + rect.translate(-targetScreen->geometry().topLeft()); + QCocoaScreen *cocoaScreen = static_cast(targetScreen->handle()); + NSRect frame = QCocoaScreen::mapToNative(rect, cocoaScreen); + ++ // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow ++ // a window to be created within the area of the screen that has a Y coordinate (I quadrant) ++ // higher than the height of the screen in its non-rotated state, unless the window is ++ // created with the NSWindowStyleMaskBorderless style mask. ++ ++ Qt::WindowType type = window()->type(); ++ Qt::WindowFlags flags = window()->flags(); ++ + // Create NSWindow + Class windowClass = shouldBePanel ? [QNSPanel class] : [QNSWindow class]; + QCocoaNSWindow *nsWindow = [[windowClass alloc] initWithContentRect:frame +- styleMask:styleMask ++ styleMask:windowStyleMask(flags) + // Deferring window creation breaks OpenGL (the GL context is + // set up before the window is shown and needs a proper window) + backing:NSBackingStoreBuffered defer:NO +@@ -1399,9 +1394,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + Q_ASSERT_X(nsWindow.screen == cocoaScreen->nativeScreen(), "QCocoaWindow", + "Resulting NSScreen should match the requested NSScreen"); + +- if (targetScreen != window()->screen()) +- QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen); +- + nsWindow.delegate = [[QNSWindowDelegate alloc] initWithQCocoaWindow:this]; + + // Prevent Cocoa from releasing the window on close. Qt +@@ -1421,6 +1413,9 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + }); + } + ++ if (targetScreen != window()->screen()) ++ QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen); ++ + nsWindow.restorable = NO; + nsWindow.level = windowLevel(flags); + From 013c7fa4ba46882427e0973aa17d63ea2c918ec6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 5 Feb 2019 21:33:37 -0500 Subject: [PATCH 284/467] efi-image_eltorito: make reproducible './*' produces arguments ordered by inode. efiDir produces, reliably, ./EFI, so just make all the directories known explicitly. --- nixos/modules/installer/cd-dvd/iso-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 9475da23b1ff..e78e290e7438 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -339,11 +339,11 @@ let # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' mkdir ./contents && cd ./contents - cp -rp "${efiDir}"/* . + cp -rp "${efiDir}"/EFI . mkdir ./boot cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/ - touch --date=@0 ./* + touch --date=@0 ./EFI ./boot usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') # Make the image 110% as big as the files need to make up for FAT overhead @@ -355,7 +355,7 @@ let echo "Image size: $image_size" truncate --size=$image_size "$out" ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out" - mcopy -psvm -i "$out" ./* :: + mcopy -psvm -i "$out" ./EFI ./boot :: # Verify the FAT partition. ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out" ''; # */ From 89c2bf50694c330b3d2727e7afeca0068172d391 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Tue, 5 Feb 2019 18:45:07 -0800 Subject: [PATCH 285/467] amass: 2.8.5 -> 2.9.1 (#55252) --- pkgs/tools/networking/amass/default.nix | 4 +- pkgs/tools/networking/amass/deps.nix | 284 ++++++++++++++++++++++-- 2 files changed, 265 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 16e87d2a5c97..f031cf09884c 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { name = "amass-${version}"; - version = "2.8.5"; + version = "2.9.1"; goPackagePath = "github.com/OWASP/Amass"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; + sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29"; }; outputs = [ "bin" "out" "wordlists" ]; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index e9b5acf618e2..c81a603e39ce 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -1,101 +1,343 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { goPackagePath = "github.com/PuerkitoBio/fetchbot"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/fetchbot"; - rev = "1f502d610659b899a007858812b601e715f531eb"; - sha256 = "0yzv0xh3cwq87jv9whs5rmhaj8b2nqdm76vwppzn8mm34fg41n8s"; + rev = "v1.1.2"; + sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq"; }; } + { goPackagePath = "github.com/PuerkitoBio/goquery"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; + rev = "v1.4.1"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; }; } + { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; - sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; + rev = "v1.0.0"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; }; } + { goPackagePath = "github.com/asaskevich/EventBus"; fetch = { type = "git"; url = "https://github.com/asaskevich/EventBus"; - rev = "d46933a94f05c6657d7b923fcf5ac563ee37ec79"; + rev = "d46933a94f05"; sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha"; }; } + + { + goPackagePath = "github.com/caffix/cloudflare-roundtripper"; + fetch = { + type = "git"; + url = "https://github.com/caffix/cloudflare-roundtripper"; + rev = "4c29d231c9cb"; + sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.1.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + }; + } + + { + goPackagePath = "github.com/dghubble/go-twitter"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/go-twitter"; + rev = "7fd79e2bcc65"; + sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7"; + }; + } + + { + goPackagePath = "github.com/dghubble/sling"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/sling"; + rev = "v1.2.0"; + sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6"; + }; + } + { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; }; } + + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.41.0"; + sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { goPackagePath = "github.com/irfansharif/cfilter"; fetch = { type = "git"; url = "https://github.com/irfansharif/cfilter"; - rev = "d07d951ff29d52840ca5e798a17e80db4de8c820"; - sha256 = "11gicb8jbpnsc7wylv7qs9dgc91qc3rld6ahsylb491knxr78yb2"; + rev = "v0.1.1"; + sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz"; }; } + { goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver"; fetch = { type = "git"; url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver"; - rev = "6b24c0085aaeaf3b2844acd18066864e24b57387"; - sha256 = "0dmfgy0ci0k0s4hxp9v5j4j0mab5x1nsc83icgq9ldb2446mn0fk"; + rev = "c68f22031e42"; + sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c"; }; } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.0"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "1c9c9bf4c93ee029810272d3e5b8a126aee5bf1f"; - sha256 = "002z8l5crsipdn2zkavjkjzxrj6c4132yqgbg1zk7w7gkv40q7wr"; + rev = "v1.0.8"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; }; } + + { + goPackagePath = "github.com/qasaur/gremgo"; + fetch = { + type = "git"; + url = "https://github.com/qasaur/gremgo"; + rev = "fa23ada7c5da"; + sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4"; + }; + } + + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "15f95af6e78d"; + sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "v1.2.0"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "github.com/temoto/robotstxt"; + fetch = { + type = "git"; + url = "https://github.com/temoto/robotstxt"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; + }; + } + { goPackagePath = "github.com/temoto/robotstxt-go"; fetch = { type = "git"; url = "https://github.com/temoto/robotstxt-go"; - rev = "97ee4a9ee6ea01ed0bbf0325dd789f74cac6cb94"; - sha256 = "1nfnwz5lm9dgicsjh99gs4gh4gbrxdl16srz505f04mab51kd51r"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; }; } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c126467f60eb"; + sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; + }; + } + { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "adae6a3d119ae4890b46832a2e88a95adc62b8e7"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + rev = "1e06a53dbb7e"; + sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j"; }; } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "99b60b757ec1"; + sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; + rev = "e072cadbbdc8"; + sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "4d8a0ac9f66c"; + sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; }; } ] From da628f0cbda0d6115648411aff07236293363177 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 20:06:55 -0800 Subject: [PATCH 286/467] igv: 2.4.16 -> 2.4.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/igv/versions --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 1804f854c48c..19ba508d758e 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.16"; + version = "2.4.17"; src = fetchurl { url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "0bsl20zw7sgw16xadh1hmlg6d6ijyb1dhpnyvf4kxk3nk0abrmn1"; + sha256 = "02zl0r1yhyllh000cad6pjk0ic0xm6l05jzkglsf8wdz17nh15nr"; }; buildInputs = [ unzip jre ]; From a1360faba7f3add8b4ca16cb331ffdd2c509c233 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 20:33:46 -0800 Subject: [PATCH 287/467] jmol: 14.29.29 -> 14.29.31 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jmol/versions --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b748d26bb2a1..a57b2357d27a 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.29"; + version = "14.29.31"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { 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 = "0j3075lwagfvwzyh0mas9pj2fm8zdqn5ak0w0byz8s57azsrc3w4"; + sha256 = "15mxifm1h145bhyrm9rvmipvg048q8rgwg1sn6jmfgrimy0cjraj"; }; patchPhase = '' From e422db21bed4b1b1db27fd7c55c7d20b4a8d226e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 21:56:28 -0800 Subject: [PATCH 288/467] libgnurl: 7.62.0 -> 7.63.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgnurl/versions --- pkgs/development/libraries/libgnurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index c7cf4a37b98f..1a00822f66d3 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -2,13 +2,13 @@ libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.62.0"; + version = "7.63.0"; name = "libgnurl-${version}"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "15b5fn4na9vzmzp4i0jf7al9v3q0abx51g1sgkrdsvdxhypwji1v"; + sha256 = "15y4yjy67n3c57kp0yszklcrz2nickrvjvd6laizs6kdbpixjdfl"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; From ce8878fdeb600c408cc6a75273ec0c38f074f8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 18:03:33 -0200 Subject: [PATCH 289/467] materia-theme: 20181125 -> 20190201 --- pkgs/data/themes/materia-theme/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f081078d3afd..efafdb5d3bb7 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }: stdenv.mkDerivation rec { - name = "materia-theme-${version}"; - version = "20181125"; + pname = "materia-theme"; + version = "20190201"; src = fetchFromGitHub { owner = "nana-4"; - repo = "materia-theme"; + repo = pname; rev = "v${version}"; - sha256 = "17gsgll2m534lwvpffqisdmhhmn0da419wnpq39wv5cjnmk0q3by"; + sha256 = "0al6d1ijrdzhia1nflyy178r1jszh82splv81cjpj8cyrq579r32"; }; nativeBuildInputs = [ gnome3.glib libxml2 bc ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Material Design theme for GNOME/GTK+ based desktop environments"; + description = "Material Design theme for GNOME/GTK+ based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; From a33b64c83582485824ce278830ea75c5bd803b52 Mon Sep 17 00:00:00 2001 From: Edward Amsden Date: Wed, 2 Jan 2019 21:45:04 -0500 Subject: [PATCH 290/467] maintainers: add eamsden (Edward Amsden) --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 69cdb0b47ccd..b005a1b9c127 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1275,6 +1275,11 @@ github = "eadwu"; name = "Edmund Wu"; }; + eamsden = { + email = "edward@blackriversoft.com"; + github = "eamsden"; + name = "Edward Amsden"; + }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; From 42bdc36a84c6a6cadd70c963d172d322e48c1db0 Mon Sep 17 00:00:00 2001 From: Edward Amsden Date: Wed, 2 Jan 2019 21:45:51 -0500 Subject: [PATCH 291/467] ledger-autosync: init at 1.0.0 --- .../office/ledger-autosync/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/office/ledger-autosync/default.nix diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix new file mode 100644 index 000000000000..4c126fc2f919 --- /dev/null +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -0,0 +1,51 @@ +{ stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: + +python3Packages.buildPythonApplication rec { + pname = "ledger-autosync"; + version = "1.0.0"; + +# no tests included in PyPI tarball + src = fetchFromGitHub { + owner = "egh"; + repo = "ledger-autosync"; + rev = "v${version}"; + sha256 = "1fn32c02idccdmf9906pxn248qc9basjy2kr2g600806k3qvw84a"; + }; + + propagatedBuildInputs = with python3Packages; [ + asn1crypto + beautifulsoup4 + cffi + cryptography + entrypoints + fuzzywuzzy + idna + jeepney + keyring + lxml + mock + nose + ofxclient + ofxhome + ofxparse + pbr + pycparser + secretstorage + six + ] ++ stdenv.lib.optional useLedger ledger + ++ stdenv.lib.optional useHledger hledger; + + # Checks require ledger as a python package, + # ledger does not support python3 while ledger-autosync requires it. + checkInputs = with python3Packages; [ ledger hledger nose mock ]; + checkPhase = '' + nosetests -a generic -a ledger -a hledger + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/egh/ledger-autosync; + description = "OFX/CSV autosync for ledger and hledger"; + license = licenses.gpl3; + maintainers = with maintainers; [ eamsden ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1adb32cded1..7b61ad101db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18044,6 +18044,9 @@ in boost = boost15x; }; ledger = ledger3; + + ledger-autosync = callPackage ../applications/office/ledger-autosync { }; + ledger-web = callPackage ../applications/office/ledger-web { }; lighthouse = callPackage ../applications/misc/lighthouse { }; From 08a54aac01c677fee66df0c625ad3fbacc6d840c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 23:52:43 -0800 Subject: [PATCH 292/467] guvcview: 2.0.5 -> 2.0.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guvcview/versions --- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 4b9c37686c1c..1afd1078c03e 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,12 +5,12 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.6"; name = "guvcview-${version}"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; - sha256 = "a86beb5993a8449ed3cbcc6ec2a238ef0b90138b6cbe2afab4456d37f44c41a0"; + sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m"; }; buildInputs = From a382c2969a3176b1a3f2cda0381da47b2eb5c7f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 00:27:19 -0800 Subject: [PATCH 293/467] flacon: 5.0.0 -> 5.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flacon/versions --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index cec20743abdd..1c5eaba78b27 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0pglqm2z7mp5igqmfnmvrgjhfbfrj8q5jvd0a0g2dzv3rqwfw4vc"; + sha256 = "18m077z1hqjg10chy5rgajd9q1wnrcxhiidivgjcdchc9q5d4b08"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; From 4f621ca1d4ebf7d596119de11c1010e87aafece1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 01:01:03 -0800 Subject: [PATCH 294/467] folly: 2018.10.29.00 -> 2019.01.28.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1598dafaad05..7381c240c8c8 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.10.29.00"; + version = "2019.01.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab"; + sha256 = "0ll7ivf59s4xpc6wkyxnl1hami3s2a0kq8njr57lxiqy938clh4g"; }; nativeBuildInputs = [ cmake ]; From ac098c2e6292eabf1d0375856d71e8328e347c0b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 6 Feb 2019 17:28:30 +0800 Subject: [PATCH 295/467] home-assistant: missing dependencies (#55294) --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 73595c1d67bc..7e5eb47953ec 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -592,7 +592,7 @@ "light.lifx" = ps: with ps; [ ]; "light.lifx_legacy" = ps: with ps; [ ]; "light.lightwave" = ps: with ps; [ ]; - "light.limitlessled" = ps: with ps; [ ]; + "light.limitlessled" = ps: with ps; [ limitlessled ]; "light.litejet" = ps: with ps; [ ]; "light.lutron" = ps: with ps; [ ]; "light.lutron_caseta" = ps: with ps; [ ]; @@ -799,7 +799,7 @@ "notify.clicksend_tts" = ps: with ps; [ ]; "notify.command_line" = ps: with ps; [ ]; "notify.demo" = ps: with ps; [ ]; - "notify.discord" = ps: with ps; [ ]; + "notify.discord" = ps: with ps; [ discordpy ]; "notify.ecobee" = ps: with ps; [ ]; "notify.facebook" = ps: with ps; [ ]; "notify.file" = ps: with ps; [ ]; From f7b2656d1ec5e2d79106acf5e7121e5bdf9435a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 01:35:50 -0800 Subject: [PATCH 296/467] fasm-bin: 1.73.06 -> 1.73.08 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fasm-bin/versions --- pkgs/development/compilers/fasm/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 9039553e3d1e..0c4a48656b72 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.06"; + version = "1.73.08"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6"; + sha256 = "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997"; }; installPhase = '' From 95f434366b26021051fad7a177c1dc5cec3580d9 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 6 Feb 2019 10:43:10 +0100 Subject: [PATCH 297/467] pythonPackages.pymacaroons: init at 0.13.0 --- .../python-modules/pymacaroons/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pymacaroons/default.nix diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix new file mode 100644 index 000000000000..96023c01e1e5 --- /dev/null +++ b/pkgs/development/python-modules/pymacaroons/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pynacl }: + +buildPythonPackage rec { + pname = "pymacaroons"; + version = "0.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8"; + }; + + propagatedBuildInputs = [ + six + pynacl + ]; + + # Tests require an old version of hypothesis + doCheck = false; + + meta = with lib; { + description = "Macaroon library for Python"; + homepage = https://github.com/ecordell/pymacaroons; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63d3e962b236..cd1d4d6a4af1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4738,6 +4738,8 @@ in { pymacaroons-pynacl = callPackage ../development/python-modules/pymacaroons-pynacl { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; + pynacl = callPackage ../development/python-modules/pynacl { }; service-identity = callPackage ../development/python-modules/service_identity { }; From d667c33cb2c4563191c3666be8c2e16a376d6df0 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 6 Feb 2019 10:44:24 +0100 Subject: [PATCH 298/467] matrix-synapse: 0.34.1.1 -> 0.99.0 Also cleanup of old dependencies and irrelevant patch --- pkgs/servers/matrix-synapse/default.nix | 14 ++++--------- .../matrix-synapse/matrix-synapse.patch | 20 ------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 pkgs/servers/matrix-synapse/matrix-synapse.patch diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index ee52b838aea9..e2ee3e55afb7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,29 +23,24 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.34.1.1"; + version = "0.99.0"; src = fetchPypi { inherit pname version; - sha256 = "13jmbcabll3gk0b6yqwfwpc7aymqhpv6iririzskhm4pgbjcp3yk"; + sha256 = "1xsp60172zvgyjgpjmzz90rj1din8d65ffg73nzid4nd875p45kh"; }; - patches = [ - ./matrix-synapse.patch - ]; - propagatedBuildInputs = [ bcrypt bleach canonicaljson daemonize - dateutil frozendict jinja2 jsonschema lxml matrix-synapse-ldap3 - msgpack-python + msgpack netaddr phonenumbers pillow @@ -59,8 +54,7 @@ in buildPythonApplication rec { psutil psycopg2 pyasn1 - pydenticon - pymacaroons-pynacl + pymacaroons pynacl pyopenssl pysaml2 diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch deleted file mode 100644 index 288e6ff16245..000000000000 --- a/pkgs/servers/matrix-synapse/matrix-synapse.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/homeserver b/homeserver -new file mode 120000 -index 0000000..2f1d413 ---- /dev/null -+++ b/homeserver -@@ -0,0 +1,1 @@ -+synapse/app/homeserver.py -\ No newline at end of file -diff --git a/setup.py b/setup.py -index b00c2af..c7f6e0a 100755 ---- a/setup.py -+++ b/setup.py -@@ -92,6 +92,6 @@ setup( - include_package_data=True, - zip_safe=False, - long_description=long_description, -- scripts=["synctl"] + glob.glob("scripts/*"), -+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), - cmdclass={'test': TestCommand}, - ) From 863e49e3ee86517730c6600797f2dbbc2b746d5a Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 6 Feb 2019 10:46:34 +0100 Subject: [PATCH 299/467] pythonPackages.pymacaroons-pynacl: remove unmaintained fork --- .../pymacaroons-pynacl/default.nix | 24 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/python-modules/pymacaroons-pynacl/default.nix diff --git a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix deleted file mode 100644 index 8bc644252c0f..000000000000 --- a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }: - -buildPythonPackage rec { - pname = "pymacaroons-pynacl"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "pymacaroons"; - rev = "v${version}"; - sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii"; - }; - - propagatedBuildInputs = [ pynacl six ]; - - # Tests require an old version of hypothesis - doCheck = false; - - meta = with lib; { - description = "Macaroon library for Python"; - homepage = https://github.com/matrix-org/pymacaroons; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd1d4d6a4af1..145ac72211b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4736,8 +4736,6 @@ in { pygccxml = callPackage ../development/python-modules/pygccxml {}; - pymacaroons-pynacl = callPackage ../development/python-modules/pymacaroons-pynacl { }; - pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pynacl = callPackage ../development/python-modules/pynacl { }; From 61a20d6d64d49ec68ee4d62e44013afc9f5b24ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 6 Feb 2019 11:07:31 +0100 Subject: [PATCH 300/467] crawl: Update repo url --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index b2015a28947a..c8b940a8820e 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { version = "0.22.1"; src = fetchFromGitHub { - owner = "crawl-ref"; - repo = "crawl-ref"; + owner = "crawl"; + repo = "crawl"; rev = version; sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; }; From 4010639d5e06d09d15695dadd26c2c169ea8a879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Feb 2019 08:27:05 +0000 Subject: [PATCH 301/467] flameshot: fix executable path in dbus service also some minor tweaks that makes the package more robust. --- pkgs/tools/misc/flameshot/default.nix | 37 +++++++++++++++------------ 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 3be418af823c..16a46ac1432b 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,25 +1,14 @@ { stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }: +# To use `flameshot gui`, you will also need to put flameshot in `services.dbus.packages` +# in configuration.nix so that the daemon gets launched properly: +# +# services.dbus.packages = [ pkgs.flameshot ]; +# environment.systemPackages = [ pkgs.flameshot ]; stdenv.mkDerivation rec { name = "flameshot-${version}"; version = "0.6.0"; - nativeBuildInputs = [ qmake qttools qtsvg ]; - buildInputs = [ qtbase ]; - - qmakeFlags = [ - # flameshot.pro assumes qmake is being run in a git checkout and uses it - # to determine the version being built. Let's replace that. - "VERSION=${version}" - "PREFIX=/" - ]; - patchPhase = '' - sed -i 's/VERSION =/#VERSION =/g' flameshot.pro - sed -i 's,USRPATH = /usr/local,USRPATH = /,g' flameshot.pro - ''; - - installFlags = [ "INSTALL_ROOT=$(out)" ]; - src = fetchFromGitHub { owner = "lupoDharkael"; repo = "flameshot"; @@ -27,6 +16,22 @@ stdenv.mkDerivation rec { sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm"; }; + nativeBuildInputs = [ qmake qttools qtsvg ]; + buildInputs = [ qtbase ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + preConfigure = '' + # flameshot.pro assumes qmake is being run in a git checkout. + git() { echo ${version}; } + export -f git + ''; + + postFixup = '' + substituteInPlace $out/share/dbus-1/services/org.dharkael.Flameshot.service \ + --replace "/usr/local" "$out" + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { From e06eb19de58bc75aee5f58eb7833f7536da7b145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 6 Feb 2019 11:13:41 +0100 Subject: [PATCH 302/467] crawl: Add full game name to description I didn't find the game when searching for it and invested quite some time to package it myself. Having the game title in the description makes the package easier to discover. --- pkgs/games/crawl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index c8b940a8820e..392af49c38dc 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -45,9 +45,10 @@ stdenv.mkDerivation rec { description = "Open-source, single-player, role-playing roguelike game"; homepage = http://crawl.develz.org/; longDescription = '' - Open-source, single-player, role-playing roguelike game of exploration and - treasure-hunting in dungeons filled with dangerous and unfriendly monsters - in a quest to rescue the mystifyingly fabulous Orb of Zot. + Dungeon Crawl: Stone Soup, an open-source, single-player, role-playing + roguelike game of exploration and treasure-hunting in dungeons filled + with dangerous and unfriendly monsters in a quest to rescue the + mystifyingly fabulous Orb of Zot. ''; platforms = platforms.linux; license = with licenses; [ gpl2Plus bsd2 bsd3 mit licenses.zlib cc0 ]; From d7be766a050163f8fc4002866f0b3052df1d0dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 6 Feb 2019 11:17:30 +0100 Subject: [PATCH 303/467] crawl: Add option for sound support and enable it in tileMode by default --- pkgs/games/crawl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 392af49c38dc..8966623e2b82 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, libGLU_combined, freetype, pngcrush, advancecomp -, tileMode ? false +, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp +, tileMode ? false, enableSound ? tileMode }: stdenv.mkDerivation rec { @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] - ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]; + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ] + ++ lib.optional enableSound SDL2_mixer; preBuild = '' cd crawl-ref/source @@ -35,7 +36,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" - ] ++ lib.optional tileMode "TILES=y"; + ] ++ lib.optional tileMode "TILES=y" + ++ lib.optional enableSound "SOUND=y"; postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"; From 56c7ac2fba5bf3d68860fd70d45ed4ffc300f7e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 20:55:33 -0800 Subject: [PATCH 304/467] rabbitmq-server: 3.7.10 -> 3.7.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rabbitmq-server/versions --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index b13c2cbee85d..5f8358a45d64 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.10"; + version = "3.7.11"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "03g9912640xxwwm078idrxqg8jwn3xc45lkyq5ixjqs0vhc7aw4v"; + sha256 = "04m9ikm7ywx63y68lf3rxds97nr9czdzg82c1m1f823m89kmpgi0"; }; buildInputs = From 4cd3944a1bd05e141b111dae6d21fa41a3061302 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 03:02:31 -0800 Subject: [PATCH 305/467] google-compute-engine: 20181206 -> 20190124 (#55312) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/google-compute-engine/versions --- pkgs/tools/virtualization/google-compute-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 8f50b1d38a2c..0db43ccfcfdd 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -12,14 +12,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20181206"; + version = "20190124"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "090gbkfk3jh403jzs133isxk8263i16vnj5021l7pxbjgj1zzzwf"; + sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp"; }; postPatch = '' From 64e9f2ad654d5c13d24f5618baf4cbe71923f00c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 6 Feb 2019 12:25:25 +0100 Subject: [PATCH 306/467] jmol: remove redundant name attribute version and pname are alrady present --- pkgs/applications/science/chemistry/jmol/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a57b2357d27a..7f5eb7b76e8c 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -19,9 +19,8 @@ in stdenv.mkDerivation rec { version = "14.29.31"; pname = "jmol"; - name = "${pname}-${version}"; - src = let + 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"; From 168be7c506d2f038c9702fc35fe2bbe07d881a0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 03:28:23 -0800 Subject: [PATCH 307/467] coturn: 4.5.0.8 -> 4.5.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/coturn/versions --- pkgs/servers/coturn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 9bf461938cdb..c7a1a8be1021 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.0.8"; + version = "4.5.1.0"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "1l2q76lzv2gff832wrqd9dcilyaqx91pixyz335822ypra89mdp8"; + sha256 = "16fp9vppdz825949vpqi82iwscc2k4gajw1kl2p9pf3d3mv1flsk"; }; buildInputs = [ openssl libevent ]; From 37236026c305e35f9cb1a9c1fea1ad76c91160d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 03:45:50 -0800 Subject: [PATCH 308/467] cmus: 2.7.1 -> 2.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cmus/versions --- pkgs/applications/audio/cmus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index f8c5a4e5acff..e36d01b8d2e7 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -100,13 +100,13 @@ in stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; rev = "v${version}"; - sha256 = "0xd96py21bl869qlv1353zw7xsgq6v5s8szr0ldr63zj5fgc2ps5"; + sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar"; }; patches = [ ./option-debugging.patch ]; From 092eab7228573086879c4cf86689fe79d8388238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandar=20Topuzovi=C4=87?= Date: Sun, 13 Jan 2019 11:54:19 +0100 Subject: [PATCH 309/467] nixos/grafana: implement dashboard & datasource provisioning Adds the ability to automatically provision datasources and dashboards. --- nixos/modules/services/monitoring/grafana.nix | 184 +++++++++++++++++- 1 file changed, 180 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 5fb3e3771221..85879cfe0b33 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -50,6 +50,158 @@ let SMTP_FROM_ADDRESS = cfg.smtp.fromAddress; } // cfg.extraOptions; + datasourceConfiguration = { + apiVersion = 1; + datasources = cfg.provision.datasources; + }; + + datasourceFile = pkgs.writeText "datasource.yaml" (builtins.toJSON datasourceConfiguration); + + dashboardConfiguration = { + apiVersion = 1; + providers = cfg.provision.dashboards; + }; + + dashboardFile = pkgs.writeText "dashboard.yaml" (builtins.toJSON dashboardConfiguration); + + provisionConfDir = pkgs.runCommand "grafana-provisioning" { } '' + mkdir -p $out/{datasources,dashboards} + ln -sf ${datasourceFile} $out/datasources/datasource.yaml + ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml + ''; + + # Get a submodule without any embedded metadata: + _filter = x: filterAttrs (k: v: k != "_module") x; + + # http://docs.grafana.org/administration/provisioning/#datasources + grafanaTypes.datasourceConfig = types.submodule { + options = { + name = mkOption { + type = types.str; + description = "Name of the datasource. Required"; + }; + type = mkOption { + type = types.enum ["graphite" "prometheus" "cloudwatch" "elasticsearch" "influxdb" "opentsdb" "mysql" "mssql" "postgres" "loki"]; + description = "Datasource type. Required"; + }; + access = mkOption { + type = types.enum ["proxy" "direct"]; + default = "proxy"; + description = "Access mode. proxy or direct (Server or Browser in the UI). Required"; + }; + orgId = mkOption { + type = types.int; + default = 1; + description = "Org id. will default to orgId 1 if not specified"; + }; + url = mkOption { + type = types.str; + description = "Url of the datasource"; + }; + password = mkOption { + type = types.nullOr types.str; + default = null; + description = "Database password, if used"; + }; + user = mkOption { + type = types.nullOr types.str; + default = null; + description = "Database user, if used"; + }; + database = mkOption { + type = types.nullOr types.str; + default = null; + description = "Database name, if used"; + }; + basicAuth = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Enable/disable basic auth"; + }; + basicAuthUser = mkOption { + type = types.nullOr types.str; + default = null; + description = "Basic auth username"; + }; + basicAuthPassword = mkOption { + type = types.nullOr types.str; + default = null; + description = "Basic auth password"; + }; + withCredentials = mkOption { + type = types.bool; + default = false; + description = "Enable/disable with credentials headers"; + }; + isDefault = mkOption { + type = types.bool; + default = false; + description = "Mark as default datasource. Max one per org"; + }; + jsonData = mkOption { + type = types.nullOr types.attrs; + default = null; + description = "Datasource specific configuration"; + }; + secureJsonData = mkOption { + type = types.nullOr types.attrs; + default = null; + description = "Datasource specific secure configuration"; + }; + version = mkOption { + type = types.int; + default = 1; + description = "Version"; + }; + editable = mkOption { + type = types.bool; + default = false; + description = "Allow users to edit datasources from the UI."; + }; + }; + }; + + # http://docs.grafana.org/administration/provisioning/#dashboards + grafanaTypes.dashboardConfig = types.submodule { + options = { + name = mkOption { + type = types.str; + default = "default"; + description = "Provider name"; + }; + orgId = mkOption { + type = types.int; + default = 1; + description = "Organization ID"; + }; + folder = mkOption { + type = types.str; + default = ""; + description = "Add dashboards to the speciied folder"; + }; + type = mkOption { + type = types.str; + default = "file"; + description = "Dashboard provider type"; + }; + disableDeletion = mkOption { + type = types.bool; + default = false; + description = "Disable deletion when JSON file is removed"; + }; + updateIntervalSeconds = mkOption { + type = types.int; + default = 10; + description = "How often Grafana will scan for changed dashboards"; + }; + options = { + path = mkOption { + type = types.path; + description = "Path grafana will watch for dashboards"; + }; + }; + }; + }; in { options.services.grafana = { enable = mkEnableOption "grafana"; @@ -175,6 +327,22 @@ in { }; }; + provision = { + enable = mkEnableOption "provision"; + datasources = mkOption { + description = "Grafana datasources configuration"; + default = []; + type = types.listOf grafanaTypes.datasourceConfig; + apply = x: map _filter x; + }; + dashboards = mkOption { + description = "Grafana dashboard configuration"; + default = []; + type = types.listOf grafanaTypes.dashboardConfig; + apply = x: map _filter x; + }; + }; + security = { adminUser = mkOption { description = "Default admin username."; @@ -313,10 +481,15 @@ in { }; config = mkIf cfg.enable { - warnings = optional ( - cfg.database.password != opt.database.password.default || - cfg.security.adminPassword != opt.security.adminPassword.default - ) "Grafana passwords will be stored as plaintext in the Nix store!"; + warnings = flatten [ + (optional ( + cfg.database.password != opt.database.password.default || + cfg.security.adminPassword != opt.security.adminPassword.default + ) "Grafana passwords will be stored as plaintext in the Nix store!") + (optional ( + any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) cfg.provision.datasources + ) "Datasource passwords will be stored as plaintext in the Nix store!") + ]; environment.systemPackages = [ cfg.package ]; @@ -359,6 +532,9 @@ in { ${optionalString (cfg.smtp.passwordFile != null) '' export GF_SMTP_PASSWORD="$(cat ${escapeShellArg cfg.smtp.passwordFile})" ''} + ${optionalString cfg.provision.enable '' + export GF_PATHS_PROVISIONING=${provisionConfDir}; + ''} exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir} ''; serviceConfig = { From d9e455a0261c8bda1e6ad79816f01e51be9de88c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Feb 2019 12:55:01 +0100 Subject: [PATCH 310/467] nixos/grafana: add changelog entry for dashboard and datasource provisioning --- nixos/doc/manual/release-notes/rl-1903.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 943b9d2a6081..d84e57333e98 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -491,6 +491,13 @@ the Redmine 3.x series. + + + The Grafana module now supports declarative + datasource and dashboard + provisioning. + + From 38eb73784527587f3fc6df724629b87da66188d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 5 Feb 2019 20:59:11 +0100 Subject: [PATCH 311/467] kitty: install completions --- pkgs/applications/misc/kitty/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 9427ac426fb7..845de8b0388a 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -45,6 +45,12 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} $out wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}" runHook postInstall + + # ZSH completions need to be invoked with `source`: + # https://github.com/kovidgoyal/kitty/blob/8ceb941051b89b7c50850778634f0b6137aa5e6e/docs/index.rst#zsh + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" + "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" ''; postInstall = '' From 874e0585e0415e086487bf8beabd6707731c30cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 05:11:40 -0800 Subject: [PATCH 312/467] copyq: 3.7.2 -> 3.7.3 (#55333) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/copyq/versions --- pkgs/applications/misc/copyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index ebc0a8297746..5609b6a8bebe 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1f2q9lzs5z31rl689ai2hig4nrj8cg9g25hhsrj6r85q9vkwkqjs"; + sha256 = "1nxxxq0lfs4r673i70dh2xwdn3chcjl913bkz14kyna29i6n1nwm"; }; nativeBuildInputs = [ cmake ]; From c479113212c6a0b55fd3e3a3d8db9a9c773751a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 05:17:27 -0800 Subject: [PATCH 313/467] cfr: 0.138 -> 0.139 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cfr/versions --- pkgs/development/tools/java/cfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 6371e2499036..e29dfa354bb0 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.138"; + version = "0.139"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "1v0agc3d26jvgxmskh2pl0sq0nr2czl7g0dckya4l6af4lxp9x7q"; + sha256 = "0wiag1m0hqk697qhrm4c7srzy18ixkcj5dn911lxhf0nfq5q63nk"; }; buildInputs = [ makeWrapper ]; From 78c73f7ec036b01830dec84abf3c71725c069faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Feb 2019 14:42:59 +0100 Subject: [PATCH 314/467] home-assistant-cli: install shell completions --- pkgs/servers/home-assistant/cli.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index fff804d53a10..90e4b0c736d5 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -15,16 +15,28 @@ python36.pkgs.buildPythonApplication rec { sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py ''; + nativeBuildInputs = [ + glibcLocales + ]; + propagatedBuildInputs = with python36.pkgs; [ requests pyyaml netdisco click click-log tabulate idna jsonpath_rw jinja2 dateparser ]; + LC_ALL = "en_US.UTF-8"; + + postInstall = '' + mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" + $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli" + $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" + ''; + checkInputs = with python36.pkgs; [ - pytest requests-mock glibcLocales + pytest requests-mock ]; checkPhase = '' - LC_ALL=en_US.UTF-8 pytest + pytest ''; meta = with lib; { From c7fda39fc2a622d7bbc9fde45c83dd7f37f35fc2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Feb 2019 08:53:41 -0500 Subject: [PATCH 315/467] sbt-extras: 2018-12-04 -> 2019-01-30 --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index deea53c9d38b..74e30aa0e6dd 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "33b1a535656222810572d36d10afc5711515958e"; - version = "2018-12-04"; + rev = "a9f2e2592d069313329971930d1740943d19ef91"; + version = "2019-01-30"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0195b47a6agzs750il1lirm2rhlz55f59sb8mdi6573fnj6f23d3"; + sha256 = "1kkpsd3fb8lm631bwjj41x4i9a5m88y2f3flzs918y12bjkli8ji"; }; dontBuild = true; From d49ffaac8a23f3605d75a210ce90521f0c097999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Feb 2019 15:53:42 +0100 Subject: [PATCH 316/467] dovecot: 2.3.4 -> 2.3.4.1 fixes CVE-2019-3814: https://dovecot.org/list/dovecot-news/2019-February/000394.html --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6007d15a3a15..2d9d2fe0f154 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.4"; + name = "dovecot-2.3.4.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "01ggzf7b3jpl89mjiqr7xbpbs181g2gjf6wzg70qaqfzz3ppc6yr"; + sha256 = "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq"; }; enableParallelBuilding = true; From eb753318b3716921d3ab3b1887385a5ee92b1884 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 6 Feb 2019 15:55:06 +0100 Subject: [PATCH 317/467] nixos/matrix-synapse: use python to launch synapse launch synapse with the python executable because the startup script is no longer available --- nixos/modules/services/misc/matrix-synapse.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 18e13f6ac030..216898d50886 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -651,12 +651,16 @@ in { services.postgresql.enable = mkIf usePostgresql (mkDefault true); - systemd.services.matrix-synapse = { + systemd.services.matrix-synapse = + let + python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ])); + in + { description = "Synapse Matrix homeserver"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - ${cfg.package}/bin/homeserver \ + ${python.interpreter} -m synapse.app.homeserver \ --config-path ${configFile} \ --keys-directory ${cfg.dataDir} \ --generate-keys @@ -687,7 +691,7 @@ in { WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; ExecStart = '' - ${cfg.package}/bin/homeserver \ + ${python.interpreter} -m synapse.app.homeserver \ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } --keys-directory ${cfg.dataDir} ''; From 4a5f1bb9bc7ae9a77b144bcc8b0570ea838d6ebb Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 6 Feb 2019 15:46:00 +0100 Subject: [PATCH 318/467] nixos/tests/matrix-synapse: generate ca and certificates --- nixos/tests/matrix-synapse.nix | 50 +++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 8504a7c0d057..882e4b75814b 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -1,4 +1,32 @@ -import ./make-test.nix ({ pkgs, ... } : { +import ./make-test.nix ({ pkgs, ... } : let + + + runWithOpenSSL = file: cmd: pkgs.runCommand file { + buildInputs = [ pkgs.openssl ]; + } cmd; + + + ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048"; + ca_pem = runWithOpenSSL "ca.pem" '' + openssl req \ + -x509 -new -nodes -key ${ca_key} \ + -days 10000 -out $out -subj "/CN=snakeoil-ca" + ''; + key = runWithOpenSSL "matrix_key.pem" "openssl genrsa -out $out 2048"; + csr = runWithOpenSSL "matrix.csr" '' + openssl req \ + -new -key ${key} \ + -out $out -subj "/CN=localhost" \ + ''; + cert = runWithOpenSSL "matrix_cert.pem" '' + openssl x509 \ + -req -in ${csr} \ + -CA ${ca_pem} -CAkey ${ca_key} \ + -CAcreateserial -out $out \ + -days 365 + ''; + +in { name = "matrix-synapse"; meta = with pkgs.stdenv.lib.maintainers; { @@ -8,23 +36,31 @@ import ./make-test.nix ({ pkgs, ... } : { nodes = { # Since 0.33.0, matrix-synapse doesn't allow underscores in server names serverpostgres = args: { - services.matrix-synapse.enable = true; - services.matrix-synapse.database_type = "psycopg2"; + services.matrix-synapse = { + enable = true; + database_type = "psycopg2"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; serversqlite = args: { - services.matrix-synapse.enable = true; - services.matrix-synapse.database_type = "sqlite3"; + services.matrix-synapse = { + enable = true; + database_type = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; testScript = '' startAll; $serverpostgres->waitForUnit("matrix-synapse.service"); - $serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serverpostgres->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/"); $serverpostgres->requireActiveUnit("postgresql.service"); $serversqlite->waitForUnit("matrix-synapse.service"); - $serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serversqlite->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/"); $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); ''; From 524e26c69a21459aefb17b395f22d6fca6ef2cb1 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 6 Feb 2019 16:20:43 +0100 Subject: [PATCH 319/467] nixos/matrix-synapse: reload service with SIGHUP This is used to load new certificates without restarting the service --- nixos/modules/services/misc/matrix-synapse.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 216898d50886..a01e34d73629 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -695,6 +695,7 @@ in { ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } --keys-directory ${cfg.dataDir} ''; + ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; }; }; From 52b4b07df9bfee7a7b5c23bc3eb88fec6134d389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Feb 2019 16:56:43 +0100 Subject: [PATCH 320/467] python.pkgs.filetype: 1.0.2 -> 1.0.3 --- .../python-modules/filetype/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index e47c007b9678..1cf8c6f9de0d 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -1,20 +1,16 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , python }: buildPythonPackage rec { pname = "filetype"; - version = "1.0.2"; + version = "1.0.3"; - # No tests in PyPI tarball - # See https://github.com/h2non/filetype.py/pull/33 - src = fetchFromGitHub { - owner = "h2non"; - repo = "filetype.py"; - rev = "v${version}"; - sha256 = "000gl3q2cadfnmqnbxg31ppc3ak8blzb4nfn75faxbp7b6r5qgr2"; + src = fetchPypi { + inherit pname version; + sha256 = "74ccbd9ca5c95aad5665eee2f173fb1930226a12f05b0bc7380b1d456a86fcdf"; }; checkPhase = '' From fabb1c4344a477cec24f678c0e0ad6a5db5e2056 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 08:00:38 -0800 Subject: [PATCH 321/467] acme-sh: 2.7.9 -> 2.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acme.sh/versions --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 4bdc9f096cf6..fc4f5e8843e4 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }: stdenv.mkDerivation rec { name = "acme.sh-${version}"; - version = "2.7.9"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "1fp1sifhm4in0cqmc8i0zms7fqxw0rgfi1rkkm496d3068a4a51x"; + sha256 = "1h22bmx065v0lhwkr4zykybfl6ppjr2wibgwy2wnihy30g28zq7v"; }; nativeBuildInputs = [ makeWrapper ]; From 83c627b8b0e40d14aed0b02ecb3c303444152a8b Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:23:59 +0100 Subject: [PATCH 322/467] jetbrains.clion: 2018.3.3 -> 2018.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b8aa411523b3..af87412f18ec 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,15 +250,15 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1pffxq69ihdc55lsy2q56vlanpgyks0g82n40b29j4m66flmxbkl"; /* updated by script */ + sha256 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */ }; wmClass = "jetbrains-clion"; - update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml + update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { From 6d21c1a3a11b1a8296998a6f15e5dc04135fe345 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:25:00 +0100 Subject: [PATCH 323/467] jetbrains.datagrip: 2018.2.5 -> 2018.3.2 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index af87412f18ec..024cd8b007e7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -263,15 +263,15 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2.5"; /* updated by script */ + version = "2018.3.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0ls3qas8z0d1ynn6hh42qipa5br2g2497wf3pgcw3q0m3kp6wida"; /* updated by script */ + sha256 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "DataGrip 2018.2"; + update-channel = "DataGrip RELEASE"; }; goland = buildGoland rec { From 575c88d765b721bdc08df0a2aafe7342ecb98492 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:25:42 +0100 Subject: [PATCH 324/467] jetbrains.goland: 2018.3.2 -> 2018.3.3 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 024cd8b007e7..68ac339943e6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -276,15 +276,15 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.3.2"; /* updated by script */ + version = "2018.3.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0vnw6zc23dibpk1z7yg1lrgjznqc7508g1azybml878h6yykm5a4"; /* updated by script */ + sha256 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */ }; wmClass = "jetbrains-goland"; - update-channel = "GoLand Release"; + update-channel = "GoLand RELEASE"; }; idea-community = buildIdea rec { From 5cbaff3b43569d28c3e3094c2e9e5737714a6639 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:31:35 +0100 Subject: [PATCH 325/467] jetbrains.idea-community: 2018.3.3 -> 2018.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 68ac339943e6..60e60fd16804 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,15 +289,15 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1c9x3m7dknqr6yxqnn2ch3akwm6yskpmy32hcbjg7s87g1n6gy8m"; /* updated by script */ + sha256 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; - update-channel = "IntelliJ IDEA Release"; + update-channel = "IntelliJ IDEA RELEASE"; }; idea-ultimate = buildIdea rec { From 4a137f5435ef7e4d0841c9ba25aa3909dd66211b Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:32:22 +0100 Subject: [PATCH 326/467] jetbrains.idea-ultimate: 2018.3.3 -> 2018.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 60e60fd16804..db8061c63c0b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -302,15 +302,15 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1dj39hs63xba2jfk3sd2yiq7vk7758axrc5549krfd1aaawl4sl8"; /* updated by script */ + sha256 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */ }; wmClass = "jetbrains-idea"; - update-channel = "IntelliJ IDEA Release"; + update-channel = "IntelliJ IDEA RELEASE"; }; phpstorm = buildPhpStorm rec { From 1341f5523de5b1ee6385dd4bfb688e465065b030 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:33:13 +0100 Subject: [PATCH 327/467] jetbrains.phpstorm: 2018.2.6 -> 2018.3.3 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db8061c63c0b..c802a6bd3581 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -315,15 +315,15 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2.6"; /* updated by script */ + version = "2018.3.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0z627q9mcxlz8a92dndnaz2qa9dkaapimsfqkvc0i8ab88yw75v1"; /* updated by script */ + sha256 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PhpStorm 2018.2"; + update-channel = "PhpStorm RELEASE"; }; pycharm-community = buildPycharm rec { From 175c0134eafb255e3fb4db3a452170cd2e85da8e Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:35:13 +0100 Subject: [PATCH 328/467] jetbrains.pycharm-community: 2018.3.3 -> 2018.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c802a6bd3581..c8d00b0167e1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -328,15 +328,15 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0dnjkq1qbxc05cxafi5hw6pw9wya0w44ni32b34sclq26xr6blvj"; /* updated by script */ + sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; - update-channel = "PyCharm Release"; + update-channel = "PyCharm RELEASE"; }; pycharm-professional = buildPycharm rec { From 47152bcc338677cf6dd4083be97395c2eb588f1b Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:36:32 +0100 Subject: [PATCH 329/467] jetbrains.pycharm-professional: 2018.3.3 -> 2018.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c8d00b0167e1..a00f0357ea37 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -341,15 +341,15 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0z6qjc3qh58ds338rlfzi9446y3sghpnccaachkja2q59f97dfma"; /* updated by script */ + sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; - update-channel = "PyCharm Release"; + update-channel = "PyCharm RELEASE"; }; rider = buildRider rec { From f81339cadde37e9fcc0e0cbcf6ead078059cf46e Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:39:08 +0100 Subject: [PATCH 330/467] jetbrains.rider: 2018.3.1 -> 2018.3.2 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a00f0357ea37..455b56b6a968 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -354,15 +354,15 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.3.1"; /* updated by script */ + version = "2018.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0ghk819ik28y9b61vb2h463zbvvq1n2wl778czkakc4qjba2qnks"; /* updated by script */ + sha256 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "Rider 2018.3"; + update-channel = "Rider RELEASE"; }; ruby-mine = buildRubyMine rec { From 80778d3c0a2dc1850eab6c7f14dab30182f2e532 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:39:52 +0100 Subject: [PATCH 331/467] jetbrains.ruby-mine: 2018.2.6 -> 2018.3.3 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 455b56b6a968..e0ddaec2a109 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -367,15 +367,15 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2.6"; /* updated by script */ + version = "2018.3.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xbmj7d1ccq2qf1jsvch1zxdrypkvzxdfkr431c8fnabh993yxx1"; /* updated by script */ + sha256 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "RubyMine 2018.2"; + update-channel = "RubyMine RELEASE"; }; webstorm = buildWebStorm rec { From 27af2b4dca5be5c047ebfd8bbc8a73c1b57e6a30 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 Feb 2019 17:40:34 +0100 Subject: [PATCH 332/467] jetbrains.webstorm: 2018.3.3 -> 2018.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e0ddaec2a109..08a8b28117e7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -380,15 +380,15 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0q8njbrll7qgijnxqic2mpca2jb2plpd677xdj5v72mm66mvxmss"; /* updated by script */ + sha256 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; - update-channel = "WebStorm Release"; + update-channel = "WebStorm RELEASE"; }; } From 27c6ca929797989e3c68183ec32affc718f276f4 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Mon, 4 Feb 2019 20:57:03 -0700 Subject: [PATCH 333/467] fff: 2.0 -> 2.1 --- pkgs/applications/misc/fff/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 9589c341f8ae..e87c86f1b4b3 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchFromGitHub, makeWrapper, xdg_utils, file, coreutils }: +{ stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: stdenv.mkDerivation rec { pname = "fff"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "dylanaraps"; repo = pname; rev = version; - sha256 = "0pqxqg1gnl3kgqma5vb0wcy4n9xbm0dp7g7dxl60cwcyqvd4vm3i"; + sha256 = "0s5gi5ghwax5gc886pvbpcmsbmzhxzywajwzjsdxwjyd1v1iynwh"; }; - pathAdd = stdenv.lib.makeSearchPath "bin" [ xdg_utils file coreutils ]; - buildInputs = [ makeWrapper ]; + pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); - installPhase = '' - install -D fff "$out/bin/fff" - install -D README.md "$out/share/doc/fff/README.md" - install -D fff.1 "$out/share/man/man1/fff.1" - wrapProgram $out/bin/fff --prefix PATH : ${pathAdd} + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bashInteractive ]; + dontBuild = true; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram "$out/bin/fff" --prefix PATH : $pathAdd ''; meta = with stdenv.lib; { From c02cfc6f64f1a19e2eefd31c55842d1bdd4d5fac Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Wed, 6 Feb 2019 14:38:14 +0100 Subject: [PATCH 334/467] nixopsUnstable: 1.6.1pre2706_d5ad09c -> 1.6.1pre2728_8ed39f9 This fixes evaluation with the latest master. See also [0] and [1] for this. [0] https://github.com/NixOS/nixops/issues/1086 [1] https://github.com/NixOS/nixops/pull/1088 --- pkgs/tools/package-management/nixops/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index b5487f5b11d2..dc71914f087b 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -5,9 +5,9 @@ # Then copy the URL to the tarball. callPackage ./generic.nix (rec { - version = "1.6.1pre2706_d5ad09c"; + version = "1.6.1pre2728_8ed39f9"; src = fetchurl { - url = "https://hydra.nixos.org/build/84098258/download/2/nixops-${version}.tar.bz2"; - sha256 = "0lr963a0bjrblv0d1nfl4d0p76jkq6l9xj3vxgzg38q0ld5qw345"; + url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2"; + sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc"; }; }) From 851cfedb53286f426ba42326cda2a501d58f520e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 07:04:20 -0800 Subject: [PATCH 335/467] appstream: 0.12.4 -> 0.12.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/appstream/versions --- pkgs/development/libraries/appstream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index aded6945cb16..5b9b4beed7ab 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1ag00w13fqvv584svcml7cykvgy0mi709qsm5mgy2ygy9d8r2vfw"; + sha256 = "1h68raflp04r79c58vyy3mmcixs5bqffm2d1js7mxfypmi4mvv6r"; }; nativeBuildInputs = [ From 9c931c48801c0ce3776004f68e6a003b5102e3ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 06:06:28 -0800 Subject: [PATCH 336/467] brave: 0.58.21 -> 0.59.34 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brave/versions --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 45fc67e9d0c1..f74e64d3798d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.58.21"; + version = "0.59.34"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0mml8zjpm8gjw3krppr57y4p10ky975v0s4wyyx7ixr1lzk2qp11"; + sha256 = "1i14y01387q0h12w6h780v9d98qygmx0w0vbygy4w9x9aj5nnask"; }; dontConfigure = true; From 7924ba052650a4be3c6d45dce103a3c2a441daf7 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 6 Feb 2019 15:26:36 +0100 Subject: [PATCH 337/467] albert: 0.15.0 -> 0.16.1 --- pkgs/applications/misc/albert/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 39dae0db1250..2dda615081c0 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "albert"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "063z9yq6bsxcsqsw1n93ks5dzhzv6i252mjz1d5mxhxvgmqlfk0v"; + sha256 = "04sr35fqz66i24lv7r2p9qfqxs55i8xpj7aam0v9yakcr33lf55a"; fetchSubmodules = true; }; @@ -25,7 +25,7 @@ mkDerivation rec { postPatch = '' sed -i "/QStringList dirs = {/a \"$out/libs\"," \ - lib/albertcore/src/core/albert.cpp + src/app/main.cpp ''; preBuild = '' From 2aed6b2cc8161f07fce035f9c8dd286855f7f356 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 6 Feb 2019 17:52:50 +0000 Subject: [PATCH 338/467] pulseaudio-modules-bt: unstable-2018-11-01 -> unstable-2019-01-05 --- pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index cb267d8bbb66..950b32a82013 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "unstable-2018-11-01"; + version = "unstable-2019-01-05"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; - rev = "a2f62fcaa702bb883c07d074ebca8d7135520ab8"; - sha256 = "1fhg7q9064zikhy0xxldn4fvh49pc47mgikcbd9yhsk66gcn6zj3"; + rev = "4b0cde160c96f40d860fef267a6ded49ae045be0"; + sha256 = "15jw5nf2dhqqdwzyh2x5kdkrq7f3qn140gw6gmspcai9kplhk24w"; fetchSubmodules = true; }; From 9abf5e35e30b03a471472e8ffc6ee8755cbcfa4c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 6 Feb 2019 17:56:46 +0000 Subject: [PATCH 339/467] firefox-devedition-bin: 66.0b3 -> 66.0b5 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index e3a845db95d4..da72ef4b1d93 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0b3"; + version = "66.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ach/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ach/firefox-66.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "70472ebc7ae494ea9908efc18042ecbd72809d76c36c4f171513ac5a7a5e98f8b7b7e4b2a0204284b9a042a7b6735928413c30193dbfd221b718c503c7d0c568"; + sha512 = "516a4c4090673c2d2eedc87336bcae870a9a310829148bd9e5fee7e0af93077d2eef27382e0a51b3c3b01e7e874c707ad900c6b201e7bbbc4bbf1797000547aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/af/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/af/firefox-66.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7a8f9fe78a8bb22470a9ab985352610ca15c01e933722fe697314c9c75ba326ec1153d7e9c42e41f92f47041477e14cce6c25012a4f346211e0d15e5a5a8c29a"; + sha512 = "bdac4f6a63ffdddc7c3d529d79f8d7f91cd2f58723a32a365b39ba9d8e9281f9ab6a6c0b3d903272dcccbe9312dc85b058169e1f2176080260bba311bf0d2f1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/an/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/an/firefox-66.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4ff71c000028f107856df5d65eb54257b44968d0922d55ac6d691947bf448d30b6e38b5e889305f24e5bd10d73610a5f7c24ca2bd0c1aa91140c11dd5bf167b5"; + sha512 = "407dd9688fc2de8bbe6e45d70138921a78bc38c052544e4c2e800866969428de4b6e0b8e5372265c623719323cda9c6c701b343e41ebb6d7baedf53c851a2226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ar/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ar/firefox-66.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "df2375b4010b9ebe1f01173e1ad4163c25f0e80879aeeccc2145d9e089e7a238beaed8243c7609070a206ab6064649335fc41eecf7f1543312fc52307efd3d2f"; + sha512 = "ebb76ffa239ac43f0c7ccd3d4fffa244f5c58970992d43d977cfd8e4a7091e981af0db7798cc07fd8aaff19337e11030b9d0512079c5807db8c67b13b761cd14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/as/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/as/firefox-66.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "7b8dd7b6b90a13ebbe2a96113d92f2bf524112d7e5332cc60ec19015edf9f99d66efd4380239eb70112914c02a4b93365822640d5b19c2ddf8f310d6a8576fd0"; + sha512 = "8527b264d57d664d4d3edda9e3c9ca75838678ca8c687191e72c205e23feb7cc44ad284f6bc120011bcf4080e3a62309ae195d71816f14bd3f711560c4bdfb82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ast/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ast/firefox-66.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "16e29a5839418e7248e4b726ac7893e2f2e8feb7e0e97310505aadfac15038a349dd5ae2ecac10fb517d6253b4d1d8efa76c07b397713ef6009d83daa7efac6c"; + sha512 = "7ffb9d461a06ea6c46d2ad6ceeb97660d68fb9a83c14cb7b626511dc113623d929c59aef730b9b966e44ab7a0b7197354519fdee33e4f624b3c5b94e0d65fedd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/az/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/az/firefox-66.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "20e387bf9339bd3c7c58cefa2d18a486f5eedf6a4f50fb15bbe4b9a9098e4f3839f24d8dddbc4bb5543216404de3aa7aeb8663c9a341e7dc7b03b4317c6cb33e"; + sha512 = "d367aa07099d6735503d64497f601ac868ea2a8d4300ea8e17ca5c4c51e8c8ee08dbb84e637d17e2a25568f51aecac79349383f02825a36899d25430a61add58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/be/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/be/firefox-66.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b17a32e7d1986c368990a43c789ad464562cda37a925e3feb96e40dceb5e727f9a960f4d9c4a2fea7cb9a68b65ea975f1411740368f628fabc583d8c9585296c"; + sha512 = "1d8959c6edb57c16f69e23ac08d878ed92b3f75e9d86fd2f6768e1b840dc7880e2c1d606afaaee33811e679a660344808382e750d61d8f6b155dd5f6be9e3dc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/bg/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/bg/firefox-66.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e6026611d56225e519a5b6c4a00430008899395683ec9ae336e60883880d2f792d67f30c1f319873996ad1469abb1af48ee3bf2116c9ac5c0b8927b2e4b0b931"; + sha512 = "8937b1f2de4f2faf7b4d3a620d6514b22a853f3fb420d6b2458b5ddd97234230305ded35cb82833b0028beb0b997df73cc701ebd33037708074ed96056c27178"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/bn-BD/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/bn-BD/firefox-66.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "aefd86dde591f5ed62c827d4c3ed68e02c5099602aed89cdd8675d3e83c5d0373d1e3506f7f67a45972b30189eac4e4994c8783b55e28dfacb2697a96fcae779"; + sha512 = "faebd853bf9f9093067104f3247f36ebdd0c3e903844cda4091e9128118a6da7b0542fe03cc17402bb046ac2e50bb3de6d23fa77630f23af9b5d38b5cc9fbba8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/bn-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/bn-IN/firefox-66.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "7d8dba9ca0b6987cc56e5f665bb22067995cd404b1d53365dd8d75da8c29e3c749044a8fe1d1ed6e8cc326e7327fe79a0a02a96ddeaa2a2cc5a5e9db58ba59f4"; + sha512 = "3d0c12e6c43f63bfd1c7f189492ba21041dba4ed9f33928087b8e6cbace0749d7a80bed0aa89a462c76f360c8a3a87796491be5b8df1d2647c1bc30cb4161876"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/br/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/br/firefox-66.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7ba28a5ae59fd72fb7a6a4b4699e831325f261dbec52e8f40a5f97aec19f7521d0fc7d3f85fa4c73b660ae5c4cdc87586d53d15ed63f7799677aa7fd2996c3f7"; + sha512 = "0415d61ddcaf9945e752e1ec976e6a5f36b22c5a1c3f862852def912ca2fd2e6978b3bab8f53868a7fdfb050ac8e61adcc59fa19f3759ae513e2ec0d37a58a87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/bs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/bs/firefox-66.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "4dafd4c1c541879020643f9c37fb2e990994b734fca464e22e2e401ec6a6fb99bccca55ecd42aa94f93d6fc7dc9a31a550c2f06c58d95797376c95634f0322dc"; + sha512 = "94699ba52ce93b54e9381d353af922c30b8bb95a387128e8aa76f47067cc73b779c1bff8255c974a8db7c91950376772a5307f1642007e193cc09beaf4309a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ca/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ca/firefox-66.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3e230cbedae0753c756fe77d0b04a1ae06eb81bedbddd612347d2a8b2cc14599ca593fd328afb3afba719e6622f19a06e0ea4a5c63a0f8517f7cfb158ad40a6f"; + sha512 = "24d612b5e0651634d7dca4575ad231288b79ecb6bc9f5c6389b794a9a468b95c6579f56b82f21843a18c6cd38cc238967d5f88c5a8bd7c602837df79c75f307b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/cak/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/cak/firefox-66.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "905229bce02e9b8239b9aeb2222717b479585a7beaa0eb9375f44004862e6bafef98d704792e7da2f60dd72db4386a466489d6757a32ebca77d24707059f94a5"; + sha512 = "6f0c4ce78fb683cbe970e1b638c6c8b42e04d04a9fc0fb0688d777f4873924124895d9c073937c9e3b4d8c2d68d68e081d7c0f31bfafa7b1ec9a4c3b1e529089"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/cs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/cs/firefox-66.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "75e538c283aaf0259d41fae2af947368b59faeed0db6cc17a905e94feddfd7fa7154f5c372dd7cca04e3b09d89566e55bb8a7eeab5d611307d91c39c2dfd1e45"; + sha512 = "ac2ed1411216e9d81d92d7d2069bb3751bc9c55b13974973a822efc9fa0cdc08ab1099b0bc7dd4c01890caf13377af9e7cd1f65deba799a14ad3d789f773d620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/cy/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/cy/firefox-66.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "daa5459f149e1f8154534e02057ce1e0693f9977d586fc710cee2c8dd46ebc0f51844d05649fac4bb9d74083eea9ea059dbfb681f158ebb3741ac9e97cf0b513"; + sha512 = "cc3fc83f8395e455e76953d7e04947dd398d7c8921dc65b2871a4a5049106f6e8e76926eb414170485e3785b1ea8839f0bd43541c9893123e745a6a9dd44a06a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/da/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/da/firefox-66.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4500a65be1e62d82d94161aa0a4f440268094071ab14c0afbd1d726f4f038c2be6479fbd0ff43b593e492920a3cb5f95d0bfd42baa0c8746286b0e80fc39d336"; + sha512 = "33cb6f25e8cbcbb9ad639a4bf60f2e322ab613442ab5ecf1b36ad33e29452c248459941ece5e61bc29a01fe08a00dc7bdb9f5e3a9700c7807ce1834ecf039f92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/de/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/de/firefox-66.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2594829caa580f86c7968a09ac2c2fe9a4a8fb55781ea63c2abfd35478348d533a4c462a7f8e5b34186b0a104ece1401109776378e01ce29d10f4a800c81776e"; + sha512 = "742ab5b5dbf0fe62b1d2e9d867b310697ee77e04574d4f6e47968a218c0416cb3b92f03b1c7fbdeff59889b47b6ebf17f181cbacc29dd63990dd07bfbdee2884"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/dsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/dsb/firefox-66.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ec99c83354c9708794e81fac6f58ad416c1c94f9c8add509d22ea0639dc30abfee020ba1cc0e817010307f95f19b7d5677e7f96070c5472135e7e9b43dcf01c5"; + sha512 = "0adbb4097376d963876f9ea3d70652d288c29c2037bb496fd3aab3e85d1c35022aa70e8a9e52939def9eebbec336c7b3e2f282716cf8aae8fefbe5c388c079a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/el/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/el/firefox-66.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4ceb7cc969191bb58491e8cda4a065a13d9f2d30ab3cd9a47e8035f7f3c2fca8c096d1029b6c9852f2a1143e573ecc27bd9b85b63b6718ba3a72f95882ad8d90"; + sha512 = "78822e18e97d58159d144b5604b9c3eeda6497dd0d5505c6c20bf2cb9791b94ca3652de3fe7ed90a56dcf42339dd68801086a37000e82741830c79c6853e7740"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/en-CA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/en-CA/firefox-66.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "3438c77187498459d0b1c3895039bccb5155d9756851c816df17c10fca90686a76aea31d2e63ede45708cdd49517e8fb7634a75823202e27ac3f1b1fd938260d"; + sha512 = "49bbe1904be08e67eacfd025934eb49a5c0482582e5bee0d635415be2b8e9da829fd5181a857dba0bd16e3057a68e8643278d25a86023abeb44e85b96f410934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/en-GB/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/en-GB/firefox-66.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0076533f3e064318dfbb3c6df748cd7b7418e67b1e72c0b16287e70e72434037d1aded47f90980afc4df509bd2932b0e46ff677efc40be6815f04efd1a4ffdc5"; + sha512 = "51d647068ec901bc2507c8860508a53445bfbd55cc6b28587d9b5de9428b17e7bbccbee92ea50604e112f80a93fc31647289e1687c7e685553493ac8ce8a67ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/en-US/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/en-US/firefox-66.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "f8a92f10d5cf4a7009ea460ec070c800b8a0a27c0e4e9f8bda8d6cdc14b34fb1eb671ded695453cbfc2a78dc02b13b59c9d0c199e1c6448537bf0fc25654d9f6"; + sha512 = "e529979f6ab7751be0682722c02b3fed49905e0fd32c64cbb754134e7957339ff534160ea37219946263203bfeef12a99b4d3ab7746453fc245b6989e047d17c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/en-ZA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/en-ZA/firefox-66.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "fde1d951ddbf30b1caf71863e2cd94d0826b478e78a8d75355e6332b482c1c06a0980783cb82ff78a887c7db80c46bda8789e8d25e737fa7928fe3dda506b356"; + sha512 = "890abd958333fad7041e240ebd0f2925d718152c97369584011669b12088eaa62156044f3a3a3fdb257d5b374fb6bf76ef361b9afc31859e23eb19fa29d53f28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/eo/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/eo/firefox-66.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "16f5f8793f1bc4cbbb12ec6ce798b0290e1893f12347c2ff32ddfa50f0a65c67dd4c12c2e63d77e223e65f75df21c8106aa68db57532a6709c8562a43b18688e"; + sha512 = "1cf09679b8d63fa69ef54f77008368372e10e9dbb48612f548a5263285d9f05ffbf5958959488adaee30dfc65f8ef869e093d81f272577197bd891ce593d9c00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/es-AR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/es-AR/firefox-66.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "2a6bb9b737095676bdca3ee3fc70ed070140c35b5728739f8bf5770a4819bd46ddb35c20aec85aaebc5941d8e7e5ef5055a3222684056f44da74d59bea05c2a0"; + sha512 = "d7b9ea61d6e8bc5847a06469c002ef0a60a548549872162132170da74f4d06406b1dd2eb971a64344f72f4a4697a148c25e7f58ada371a04fa909fc1dc562194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/es-CL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/es-CL/firefox-66.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7c0397405d974ca9f865be53f14a324a7b98372aa11796476c382882c199aca22daccbfeaf5c9ead23d504afb3eb595423d23fe81c0af0c71397e50917adf858"; + sha512 = "50ede155aba7d2d51d4c473c2b61394ae9b61d53846675d5980ed3f91535305184ee6030dcd2bd6f5f8e9bffd0ff1686295bcc09128afaf2ad60842bb0f38760"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/es-ES/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/es-ES/firefox-66.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "92b9b70d4c941871528fa2893e74ccffdc04075e22e93c90ec26ab850a6a24ba46b3b4135cc00bc0da2441b3a801038cc50271b39f02825d582a07c26351c79d"; + sha512 = "f53a6369417e1de19121e79684d5c02502b5e002704f37640b9df9aed8c7208c3ba8509d9f101c7861867adcde1f1106df77166e32ba82b56766ef1d732f044a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/es-MX/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/es-MX/firefox-66.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ad30445ad5c3aa260d2e8412b7a47568c442534c565244dc923414d76c59691146f84e5b4f1fbf976a35bd826399f73241e1ee659b31d9285540f1921e99de1a"; + sha512 = "91bf2f9754f320e595944b9b043d098f5603d9b677a3b090aa65153c2bf47ceb198a0af80d96ef0deee5b887b9ec886e21c336f1d0a68d06333198032ef7d3e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/et/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/et/firefox-66.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "11ab57bd6f21d8cf56a8e79a39c11fd8ac7dcd311db2190ec7518c5faaf119483872401fbc9339c37da6a0311829830149e2d0c5c1e692da4e4588ba19b86ea9"; + sha512 = "1e808aff600da26bbfa1e99652c753ea7f89852628fc92093edc701ed3529b2c2d5dec1f1599566532226be904a580c5561a6f70bc1192090b03a8b27392f3aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/eu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/eu/firefox-66.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ceb3b3ccb50c49518bdcf47c5195d801cefb2077d6e49ede5e35fe7280f69a3a52b52ce7a55ee739d159e787c7175a585579f204bd7ed012799f1c82efedc17a"; + sha512 = "0a9c1361f1f473db8ee10e206131cf62b754ab7cd584c92738cae36fdff6dccbd9d9d2590255870f18f813812236d3c0e69c2aaa4cd7adc434958845cc90de10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/fa/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/fa/firefox-66.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d264d2ba8e8531bd2ef453ed916a1f8787bcd80b72a4813a48ac7ae65a84c5fdbb66f7fb2e85f886bd2d1a0045766522238f8af482aa51f28c182c49842a0238"; + sha512 = "78f26aeb2ea22bd422f3e3a0b6e6f2b23db7fa702eada12466612f55fa99cdb1893cfe1b39e0fc42a729397cef2eb05799d6ce0625e2507c67813b3a9d6a291e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ff/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ff/firefox-66.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9e2aa399ebe6ea5e44df53ca3951b5e911b25f68ba2f22a0dd991ee8f2188c7fe78cbcd5412d184446bb204b4e9a35a0af078f996a7b5ae6ea05c0f22c27e899"; + sha512 = "ce74a9a517b3b8d251e82934ae58247cde50226fadec200f3c49b0b01cee43c43253491179203770a600ce7ea5f4122718a408e636194ed133ea258a936ea9ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/fi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/fi/firefox-66.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "d4f97992e32de49c02aebf357e7bdee4e3eb58bbefc65396b4fcfb85b2269d5e8f0d814c22efed5d0c7ecb7620a533afd17a1f75603e7195ac49495bd840fcf6"; + sha512 = "e4a41144144a0e8763f9950fe1108338e50cd56c3b39715450d43dc0b4e90fc8f7fdefa106e1616e71c322bd33bccb68c6cc7d616d5ad466eb50db57e1273b5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/fr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/fr/firefox-66.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "dacdbe1c418aeabc9f29440dcf0058d562a80f90149820ef77728e3d7da5309e3d35d3b8b3e68af41e9a73e7919875f12f1f6835fc19c81bc1f2ec47de8e30a3"; + sha512 = "cd202618247779ddbfa157601d400dadf4351a350cc3f64c374abb3853d33daa41ec0471903ba6ed45ba42d2aa09f9bcd3e46637d9b029bc503f4a16da1e4413"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/fy-NL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/fy-NL/firefox-66.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ec386aac97cb3da783e8ac0df2b471464e5eb952795da859ae3110df17d630c4ac32ae882b19d6ee09009eeead19497117f58d9a45fb7797a48aedc37d415727"; + sha512 = "170029791535c15e4c5b25c883dbc6e466b083a3e495e055916dbe3e6561d9c675adf7a960e898640f680e1c4487926ff30284d3d9ae7626561432c9743404fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ga-IE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ga-IE/firefox-66.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d994b883ad953efb42c73183e4abe17fe155f8f14b7873aa7da3a37e130bd53ea979a29f945b094e5190693c5e6f214cf69d4b118708e73b15330713b61ca540"; + sha512 = "04573d4773f8da14957aab382da3f78fdd5892b5f8386bbed712324efdcf4941925a80411e3bc54f73ac5f8e79371b3d4e59da28d5abcb63b18be7420c2ae215"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/gd/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/gd/firefox-66.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "878d2d321f4029e5d49350f37d86c738bd12776a15fa5ee6bfd31a2158946f769c83efb68def59161517d0c8b5c051514bf90b4c5a72131c289f1dc230595744"; + sha512 = "9f055fb0983886836d84b807787124039a3b34476bd4630321063fa8302ba2e18d922d43d3008ab29c1b247b148048b62d575ee74271f7536ec83f727f194084"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/gl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/gl/firefox-66.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "7646b6859110642c8ac33fe429f1b55477b6556f3f6a49d7505b6f140c490223afbc9f17e0ca1654a895f186182966766aca437370eee56a251928cf174de516"; + sha512 = "e6c78611ba6171a87d9708030f3501f4e2faae4be81289219e1bbcdee0e84cb5922f17d2ccb07dae7ef9dcd2b5d5d2fcd57a8d03bcb4d7112ba2c9eb36c7134f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/gn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/gn/firefox-66.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a5be9b7a3a4c82965de99f05c9e12f17f5f233c1e84db0248f750e71a0c71be10db53c5a35887f68898c598272ae00786da0c639a3792d16d4095ca09a3b554c"; + sha512 = "157f75515248e44c1ac0f3941a59af418a0b20f1566d228f16e31565c5e7e4f060a95ce28eb1b603e4bb86cee900987766980b464be0ec00ad251228140ebd7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/gu-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/gu-IN/firefox-66.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "94b86a696c0df9dac19ab41a1f93f47861269cbcb61a5afee5f796f2735933ee76679ca9e009b4f602f97b12a7d56dac7a8b55ca0d3032af7c9bdb357ae0969b"; + sha512 = "b9d9e18e924b49e1dd7f0087a4f1f875426da806ad12fdb128403765178f838eb6c08c386918142a016b9b0fe95018d55762059b427c52f9d85821c5687308a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/he/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/he/firefox-66.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fabf627af2aa30fdc825125683ac0c7801c5562152dda55fa1c8b0628192048b0cb0a0d234f6b770857ce6954fe7e087920d035649313024df05dd136eacf6c2"; + sha512 = "d5fbf3b8bbf56c3e8b96e231b0c2edf4237ac42a1c2e7ffda1621372df231cdd452e1d9736b49b19ad7e88b8f5985e67c3b2436ccc6c3425e041bbd53730d97f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/hi-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/hi-IN/firefox-66.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "b88b6aa8dadfd74cb627c88e58bd0cc23d83955e154f9c8c622b4e530f507a3031b3cdf0338891cc72fd052be7ed3600844a069fbf79c41aa4457988a1062049"; + sha512 = "d7d13c301e87671b590a9d8a8892aef320ec73d88aa2a83cebeaaea97a0338f3bec291a34cb3fb5ac8b7478c5c249ddf0ea78a0b621e6ee8f5ec8172efd7d300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/hr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/hr/firefox-66.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "32abe62b18e4a12881826338700af2cb3caec49f943368a1f5e379d6b5e3f644d087dd33f33997af08a17ec0a28f7c2bed82455fb207103b311fcc3008a825f9"; + sha512 = "8a6d76943272de6480867b24d09677f6895b732ed8bf37c6d8852d30e1b215135f66b288bfa6cdd3f915b1d1daf3df142e0045a8cc97fc19bd0d51883ec60a2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/hsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/hsb/firefox-66.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8adbf0511fcd8ca4543a7a1cb790d3e95881417e1d13a75cb65f42205c97a2553f4a0f4c5e707ff9f60fc887cc37952ee8e64b6ecd540ca4443670db2c358991"; + sha512 = "7cee95093f8ee4a8d2a16bd90790d0b78f817adf4f18e55007c673d232da45b9302fb5620703afbb8a45846ad3873f9ce4ff05b07f71dbea85b4cd31b1638ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/hu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/hu/firefox-66.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a03f1af655d53ef1310ca2758511df6223d4e8c4d01ce30ba8737d6e3c6a87ee25a2ee8117850193b49fc5cf73d1327099d65f845136d3e47bfb839afb628488"; + sha512 = "2a22c43e100dd38ca84224eb692a2a296d4907f6a4d1e3d5baad09a03631f6547c8af0eaa1a5e749e180b88e25477ac1b916519007dc778b158111045cf4553b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/hy-AM/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/hy-AM/firefox-66.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e98b6183189ced69e8fc6f2bde60bf933cc4399f7ed7834b8abe5014a64650efe36b0f068e9140e88b8aaf09790d092cf2f10c506c1e5caf87dc3749533e4601"; + sha512 = "f6ba737996e00899e63f105a86c5eafc61844a598bd2552aead89f76d0a01a36116734d542acdf40d6b0e807b7fb352c99de3284cc4d39a33fc82c808ff9f05d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ia/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ia/firefox-66.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e354d76e5a97b08ce420bdbc3fb7fd9915dcd3eb35ff318828af05182913b3321dc69e95e9ada5503e10a82fffaa8a6af8b2a29f15773faeaec0d2ce150819de"; + sha512 = "b248f6dd7b59510ab2b6f415e12aae23038f2c6200f293096d6c80e22bbac629ce75a8da169cf1e8c0acd5daac31fc7b76b6985fc204f24b5b2d51ff15bf7bb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/id/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/id/firefox-66.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "14a659aeddd71882952a8591993e8e4ed5b2ed0725c9c1294fda89c607eb2a82691efc85a523cef3b8376c2af1f1b69e81445e0eacc164494457b125e6dc1f97"; + sha512 = "10f5b673b09b5ce214bc17fc3050a97ebf830fd6a07494a5c55de2ff8d75945e92abc0246ce6d10f8dd3e3a501d6006979004a7142daa61ff38deb4bc43d40ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/is/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/is/firefox-66.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "48b0a930e4344304d893f384700a696f0814d03ba74153c90af4c0d11fb78963392d492fddcb1ba335631eb3f5a07f32f1aa0210f96ec8b7798522c30ef9b1d7"; + sha512 = "39446190eac20960e63172e886d685b5fde0c241d9cde8e1f317f53e45b1345c7ab379f6d9b569c2037db81cafd0a4e1a6025e1416f23c464f0cbb4a50559c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/it/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/it/firefox-66.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "98b0230cc587f1129c54fc1df2f4c4d80a9d963f3d3ce721cffdae143fd0be6cdeb58d9164897883bd58d162e3546edc900a8a8220d407726829d5402de88ccd"; + sha512 = "4db73c3e649825e5744e3aa19ee6b45d7334fca5cd40a62dc77ea28b6c612beadb29d10108dce11bb6ce0eb25293e8c9a4e2bff92273b935e481be85bead2e41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ja/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ja/firefox-66.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "46ab1c7ba2f66d55976a9a753f84f01533003b88b290d3659f728eece09b3cc8e54837692079dd7a9e4dcdc7c4e1706700e1633fa2a3def7bc32ce4f9f0e6916"; + sha512 = "745112f57f4fba19c83069e86d5c273b196fea7f5ce2dd62b9b747f34c3454b86cb52d215a47e5f9ae3d681b13375e5dc331050e26412d3a6269a7a4011561c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ka/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ka/firefox-66.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "cd944e0953f60321a970774eb347b54356c77e301743532639a7b97ce8846e2928bb1a179190e67f36e8a721e3ff28265c4d1ddd69fb6c37a76707c3fd86db1f"; + sha512 = "189a2eebaa75b104ebdaa8648b771b8435e70a445d4bc91c70e3ed528d66d1eb04b2aff2c93e05a9d0bfce4cb41c5ba70e87eeacac9375a457d4ac6ea9d91015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/kab/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/kab/firefox-66.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "11fe53b857b669c0aab04be14e1a9f1f9a861e8170086e5efac647bdb9f0ef114a3f3c52eba669687fa7ce0a08c1c7c96b8bc8e325c409c119b536be0f56f184"; + sha512 = "ca6ba0436c40ca2f162b0768a32f1750502402467fecba3c8bf08c6c0d798ba491e97b74c8fae6321c6ed33ca28e8db20220c2b7d645b01c05a5d3a83f303d91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/kk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/kk/firefox-66.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "8798b976e1f4610467cf94ac61eb3c4e5159b2f9cec14d3ef4d71236abdc49d9db4f744a41840f56c5349352b8aef91da17e3463d5fe5c5485dfbff61744e2bd"; + sha512 = "becc22dc77ea2e16c9485b22e0ac1a17bf3dfc5142c2c9ed747c2c73a8351036df7e9a6db3e21a320c7283cf8c74a590f82fbbb3b4fe790713983a9f193d335f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/km/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/km/firefox-66.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f928fdbf708e56458ba8224d1bf8b7bf5d81d87d31c840fb8d7556fab8d0af971b7f4275102772fc59d010485902c90795a2adb4299b21d03df67550fa46b82f"; + sha512 = "803090e801aaf52fbbf27726f140e6285612255ed676c05186ca7b43f4ae90f03a8b9cf161ebf31d3ae4bf5865150d318994fb26e80771f5fd870e847eb9a235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/kn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/kn/firefox-66.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "931d21b73a31672633a6ab3ec713f15e17f508fa5b5bf1eadc9b43d6ccdf06746b2ee659440f15e9507db8782257e3236d8ca2731972e61cddd5b16258232d3a"; + sha512 = "26c42a9eeb9d43f3940850f74172ad5f36c7f0e1cc3d3e16783f052a29daae023e6c7ee18d0887e82814af00fb6048a2f502fa5bfda22d9a344f10fa44645d97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ko/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ko/firefox-66.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3f3de0d6a9a9d723eae6ed3648f0af6337f36a7348d9549e36907df89466c9f9ae8e852c6368c7af6de084b5407dbb46f3f316bf502d0bedae2dbee163790c45"; + sha512 = "f6f5a4576e1c0dc8fd676aa0da25795bf5320f38a47f90a80aebadc64696fe7dff11d4c6b5a51479a57b591a49f56bace24033a60af0c823247c8aeeac69fa75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/lij/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/lij/firefox-66.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "75ebaff62ddada5fea18cffd9be0fe2c0858b39b1b5d6b3357a3671463b193aa5e893e8270f2a3b1610f6cec21184e7481d81b09cadf5fe6e4a618038d13a0c8"; + sha512 = "798f0e2daae8533368e3367b8849d850bf0239ad63eaeabcf98b759204fc217f468dbb34c9d7cf692f970eb58204b2a27a38007d02b63215a9c553ce98d3f684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/lt/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/lt/firefox-66.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2fd1e9ad306b6bbf6ad617e67cbe91364f97accfa5b2374acd839cbebe8cc1896ab6757022bfd912c7a8cb9f1336d1069e61c51f3689e9ce3e17efb399d1a59f"; + sha512 = "da1af9fa4c8621771a41046152cb1b9dbdf6d6af763f8f2a81de025dd79f11ae3df3dc57825e4f7fd4f153f1f207451f7a4749e2c985c09e4ffd01295833b430"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/lv/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/lv/firefox-66.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d7230cc1eb9376beffac9997f3f495d56102e2d0afdd833b99ae85c326197e762a0d704d553d6a80de89db5a5eebdef151f4fb085432fc520ba80b34a30bac9e"; + sha512 = "d2a2f27dded49d965b9a4f944132e5ca32e191a523002eebd8134467e300568f5ef0f8026783db947eb8c9d43b76b0b746a0596ae66fcb4ac7e73230e64ea31b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/mai/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/mai/firefox-66.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "ed2c5806c6e5ef4f7b58cb91254ff3259f45153975c7dffd20203b53bbc6d4035b62495137a232dd2ea946d1fa99ea8ab0ab19814cd77c1aaf7d94e347d32837"; + sha512 = "519210a17a652c01cd45fc1b3d4fcc443d5897331dba649290f15908e54094b56f4860e97affaa5b0be163eff76dd7b7e12378c759624f9d76aa58c3161fc36b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/mk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/mk/firefox-66.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2ca5c2a6d1d6d76441aed5b6cce252c3747cab07740e9261dae12b5875d7e8eb1edf1acfa003bd960093292b601bb66fb564600afa8416ff8f05d8b6a3450cb6"; + sha512 = "f77494704ed265097a34b38008084b571cb0e995319967db1fd80d2da084d1193da545e2373d02240da0e5884dc5e766681f9b6c3e9c04b6ae862ed49e8fa425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ml/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ml/firefox-66.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "e63270cd99cdef104b2388fba20c553034d62d93c1b49db4995182d26a61a9944ea4483b92caf10cf9a7d8446bb4fceab04ccb0a09be21b73ba729404bb1be4d"; + sha512 = "830038d8fe96187988dd2b13e0f10c54db566389135de45d45aa7d2a89852afff0ace9b14e271a3aae14daa4202dde18d9d356a168f73e203748e8e779e634d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/mr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/mr/firefox-66.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cf0e49ccd254439556502230b03b89bfd53a6595d236f59dfba795fee79f68cd9610094c486365ef58a068009db55bfe33245ad94dcb23cc45a83aac33fa437d"; + sha512 = "81e64a3749389c6a4a6894d468054a13b661317582a89ded1efc9286d16e9364098b0718ced7dcb0777f2adf8e04d83bfb8870c2e797f382c5e3b2c8ca5a893e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ms/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ms/firefox-66.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "29d418eea2cd6ed519db1b2c81d0c1c9450b740e20a331afe09a54652517178c1bd334bbe81669d0b9898f0e19cbcb00d7e669c4c475665b4b1b53b72c66b132"; + sha512 = "656a3f8e2d3e0fa99935c6e49eb98366e0f87896ff274ebb1d6faa00aee2c565b9ca6123a578958a3b871a142cc544441aec5a2c20b855affa250ae4548a1ad3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/my/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/my/firefox-66.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "62f182ec5d67e5ebcec4d17404b74c5edcd29edcc8e53f2fb1a71f6a2afcce877ec4c75f506477e8c76bda36cbb444dda680221b0b015fc3f3a5dfa807959d8c"; + sha512 = "1718c0ae40ef03dec02403a2a056d220c5eb13116b52d935fcd54a003eb27d2a71664d5b8ca681220f82a5824f1be12e686c75a394bb42ebd27ab236c92d68d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/nb-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/nb-NO/firefox-66.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "177d7473e30c3a4d7689b0c87d66d1630d758f7f39339f7e2e879d7903e23230dcd1de7091b891a36dd9655d65e26e03491fcdc56d2792b05f96f489f1f9841d"; + sha512 = "6a9290145bb679482ba752656969f287fb84b57ab761fb209c97adea8792aa0e6cab8c2bdc889fe62cc1c359e1b83256887575647dc8c4e18a4921488a3b73cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ne-NP/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ne-NP/firefox-66.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "95dfc485e1195075d7df0639b52f1dcd18095eb9e4ecba1b08eb07ca1dc088e1967a51ae2992cf990caad888bc3060f3d14a59d4bf77e79fbb66fd051c624c29"; + sha512 = "c249305bdf0f3ac950ed4940023f6cdfea94ab9db771ee9ef21bcfe78f3be45ae1716453385020cb2680bd28a8b4e2c51a8781b0f305319b8d92a36cecb46a26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/nl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/nl/firefox-66.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ce4022d1d5671b9e6407a8030697f3e716e3eb6117a3dd0b6906d9f5d034eb29c642f9ebe29ebac259162cba594d88ea36f79f353f06eefff398e9a7e6fad5e0"; + sha512 = "01cfdbc51c76b24d69a2388eaf2f546870699bbafa9515a58bd7cc2b8ecf24fbf178bfc1a3952251daf0c4240323682a0007c228b34787c0656f7539602eafcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/nn-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/nn-NO/firefox-66.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "344bdf53d8597a035bc116997dcb0ebd7f15e43496b542a85abb606c557cf7e1e4ab5ad3da221ddc2e3640cdfe5fe1cf221fc4e8ea91b2b6fec0820253f8376f"; + sha512 = "7bccdf7bbf09c1115e5a828d78d9e7fb058727ffff81968bf9c498a080e9f6a4e5fb8345d1b8f7d710061552efff656155a34556d74f37195faa2b3035ec4eab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/oc/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/oc/firefox-66.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "fa6c97b1d5fc5428b90a7a544af4cf2078753f7ce67e55d6d3aa97f08e796676e5a78ca8d774163cc7d10f87fca915944d65562cbb7a08b3eac087ec95632c6e"; + sha512 = "b65b0250644bab551bee7ed7a62b13a3ef343811b6b4839e31a2591ca96c7c81f522a142af2e973f3db15edebb007fe80a5f9c32eef12061a9ba791870f77999"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/or/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/or/firefox-66.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f99a1d8d1fce517b9da53c93c98407b7b15be95f947f64f62cc5f9829e07c7f5ce898765fea2374f3dd64693e3cc9b919ba6f1cd7ffe961d0b631ff5fcdf3ba2"; + sha512 = "e672754b110ab3518d97fb6cca3fa6cebe58aa820b601cd0e6ca87a7183eb3abadb8dbcf71c44ae93584f69838dfe065730fd7ac343b0bcfda6c852e74ad44ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/pa-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/pa-IN/firefox-66.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8b91fa954fdefdba1599f0b4a2fa64bb901c5815a6e02698abf0e95623a830dccd6dcc23b5c5c805c1436bb42baa2bc69f9e73c07a26cedc1a0c095275e1ddde"; + sha512 = "b1de1f1a465df78dd313858d042c55577500a8a76eddf333526c78393eccb2ae25fe7fabb668b7438e66902e4b1a21785560a3efeb095ea4d71aa75e68c5ffea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/pl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/pl/firefox-66.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "0439de0dc2e293908eb02ecd849d07c5ef970e9408cbce287a245af06f5ad747142ae13d47818ceb213da992c6984706a64b4e9413dd77080089b6d855062a26"; + sha512 = "6975b403a15b2f61602a099cefdf1e6f72623971ef95618e91931770f8142ca30f3f09adc96eb85ae5bb247952b442873b40981e61dc4bdb650b59a6d0e65ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/pt-BR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/pt-BR/firefox-66.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "772f31bc4245a777bd502862fdcd9185edc330554f5e3fc54a1d017231f9572b1d60d18967bb17d0081e5459ebdac123be3ae378743e84d5076cd9753f9099e5"; + sha512 = "0531cc0c072f59fcdc7e2ec58bda1520a1b2aa31a330441731425a82f8855c26470dd7708350d7d9eddf148f36ace88d341788f814239a29ac3a8f59fe2b5372"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/pt-PT/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/pt-PT/firefox-66.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "65613305d61a3e109200e0522a88264aa66d5f91870a424b150bd76bfeba772cefa2f1676ecaf841e25866fbee7886cb7045ccee8970c3fd9cebee6aa757720d"; + sha512 = "f9e206e3785600c23bdf3b5235f6678465949f7424f2e53a32d849451af32e83c1b97cda3497b2f1fb1b6a2181b27d3b974cb88c04ba098b791ce0d01343c99a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/rm/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/rm/firefox-66.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "1d382bec8bc0cc0715b4d0a5230de2f6be31966b6ce21afc300259a2c1d6faff4f1cd9a993c7493c5c645715d2673f1f8b34802f85e748e8086476bb56d59872"; + sha512 = "65aaf24fd0c9ccb957fb4baa54f477765a7ef9f3c467e9fdf3b4d3755c0da5515a93f2876dda39e383cc9c06d3d5d624ab40eb92d72c0e9a521929e47f53a0b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ro/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ro/firefox-66.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e6b0c664dc88907d5bc0bbdf26fc0f8404627144fe323209117f616c1cab09393374a0d5b7f02913e6ff25376a32302dad1e707bf42f2b68911925b7b2577ae6"; + sha512 = "09fc3ffd2446bf20b457b7d971194eb74917fdfcf81b89dac7b98d439b466c2956f1da94649f1a8b1623a4830daf73a11d3ea9cecfb7e7d288f91720bc7dd4df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ru/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ru/firefox-66.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "e9c48e836eaae19ff75982c1296a7d21009013bd0d9fef3b3911c7f061a473bfe7b44c8e27c03a2ca141a5d4da71a765341c7aa433e9fd1da5438c7e3f96732a"; + sha512 = "8347c64569f35298a2e360b76c1a617442b0a98e5622909e709565a0610113c8735a2079fe0c78178797d8b44b2b89852dc94e78810b09d6b5daf161230b2726"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/si/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/si/firefox-66.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8d3ac930512070c21c671d76d8cf5752c6aa6cdf7f2382c1ddd98ec6f5557603fce143c88b50f5eae9cf0a1d9b22143044cc29b3e6c9d867e2d86740bbaf44c8"; + sha512 = "6551bf8d1ee0eb1d0beb26223adb3b2790a78e30e6ab2e16ba0d8b90ced5e3cc891203b14cda091d8d11b8ff7a637687a9a339b7e7876260525089638eb6d63b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/sk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/sk/firefox-66.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a325e6f5213392787df32096bf99cddbeada909b93745057209254fe9b5bf18b1ec3f5e520eacd694644dc6aa137b2c5e30bb20b24adf0769c22f94e82268cdd"; + sha512 = "921ebc300503fb88507dba1081718b166a2b56c5ce3cbd92ae80c27ecc6ad19ed5101f04cb8d7fd2c690752b86eb75bc6c6fd0d5f3862bb6b70c856faa650d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/sl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/sl/firefox-66.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "fe20b6c0c7772c3797b0f99e41459b54cf1fa2d73bb4dc4e15e20181df1d3c010278cb62567c93185e04b3e4072d4ae5d2fb3a0bd6fb9eca1a8fa2c8d9d5346d"; + sha512 = "a23af7b45f6860e53b42b05b5eb550058ce0b5f4c139f45102f212a679a9e8832ec35f066242bde67a9d02c988ace48a4f77a5c56805550108585163e6d263d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/son/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/son/firefox-66.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e340ce34c85259f375a69efcebd22d972815d91e204c52d5425b66d19a4a484df37b84449afb52d2b1e0e3f094fc73fb1e503c378a55a2d3eb164284058b625a"; + sha512 = "92fe467666f845e565d4570398205df59cb8cf377192af2c5695e640a993c824299111a712b913740451d468ad551607f890b6d87fb5d44bd11a62ffb8c89343"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/sq/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/sq/firefox-66.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ef5272e63fa9da175120f56f3d8426b8956c936289745163899116e9df359046a0ed9e076ddbc424f20f1c4954485f9a80116ec89b4f1c5ebc91706fc478f799"; + sha512 = "753fe1aa7a857bdbb1c13a7100c8230d1ef8ac0fc97402733df16d7f4b5b841ed940e1977e243192ff99bed03388abef3e3c57c0dcea70d6b21644fd3ccf06b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/sr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/sr/firefox-66.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0aeba501501860c77ff1045d03d1cd22b0618544637a19deaabef43bc34dc3055194a0d7753746700682ed14416cc66ba05d5c1a6ed3c9b354dce86ff3ac2769"; + sha512 = "a64d969923077380a6fa39544e25599b69566dc0edd90ced03d146a1672f1b0840d948ef689268a5c101f90c0cc76099648862970a7a03bfb76474aae4e0d64c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/sv-SE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/sv-SE/firefox-66.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8759ca9ae52f7eaaf4cf809edfa1a1e36b8b7ab47cbfebcbf057518cc402cf19d2aa737a45925e27c5b71f873ca71aa2969c183d605e1c0752d7cab23094883d"; + sha512 = "0f178e27f6b61af8095fdd00ebb6331cec40f8a1e479ac5e27f742b7b9e29cd256d86c7665db0cf7bd1f258f129074964e1da78acdecaf3f8e63b16e5e3ca291"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ta/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ta/firefox-66.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "0996162a354baf6de09b4f7fc1963767f3b6763ce95b226ee13150494d1551eb37fbf5cd5557b20bd80c163268e39ebf1827a19dc461f58659838d8e3b23cd46"; + sha512 = "3e8506fdebddb2542d5abcf8805693e532c0563ffadffa95b8a4d49d01d5d4ae27d5fc10c2966dbc7a6d1b57494f79c380aa2c9aad9a8271e858a8a084af469c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/te/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/te/firefox-66.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9a7a35dec0d223588b18c3a9ce73ebb50f0f04f34301a0dab98a1afd956a899bcffe13b45862f7bc08367d5d85f8305f2e5f6835667087ffa50e2cd187d1bf00"; + sha512 = "9aff964f65331ac90145c1d3418b797a02ca3c4acf33e5d387e0231936cacc3e49f533fdc1bc3dcbb45274e84c393b3bc28bb1ecc9b36330d270bdd6ee14562f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/th/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/th/firefox-66.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ca027006eaad9b56c951cb5ed461c20a05a4ef8940dc39aaee7e739a294ab3ff6dc256ebf9a663993bad3ee7564114aa854506b5b9454aaa85bdcda979a868af"; + sha512 = "7346fbf3855101536d0dc58381686633071b54bd2e098b10f528352de582c559589c3ce9c406d636bd82b90b2b2b88c27a35c25acf104ec2d268469614793b24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/tr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/tr/firefox-66.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "78264f040ebf7617117245f57e55b55dcd6ddac06f5693f0c630a83a1d3e4e70069caf910be6bfef43afc3bdddf11dcf264a34edb0459ca81ec9a21c7ec376aa"; + sha512 = "8af447a31045fa7b5d17f03afc681911e685e6af83d5ea2b71f345b5c6705f134c436e0942358d861d9723bf5b7dee2ae4502636875b7b9e396f296f351d24ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/uk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/uk/firefox-66.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "6a565b5b6a1f31032790c223236bc01e8227723f489e29d9cbf024892a0983b6f4679aa78a0ba4d2e77ab90a94c67ba9d642ec39ae9cfd8b3afd94825d887f66"; + sha512 = "7db719b536ca8a67076af6785d43febc802abfac3f0fbb60ba040e825069309f5da331d902ee8707617e0954b8d61bff6f4d7718c5e89c2c831e2412f1ae975c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/ur/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/ur/firefox-66.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "83bb216b278877070efe38305e686b35ad05ac7a928c9a46e5349916055bf0c3996f12f20dea80900f4c36a10ce52cf5b956753142f9b8151593826b683c1312"; + sha512 = "8f65002867ebcfc6b5eb9b4031a22923e6b64cac6404d66967ac28db7fe34b31278e0335e501eb9a91c1d32b370f2d8340f9205a20d0179ab203c63116962f16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/uz/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/uz/firefox-66.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "cd72c6310d36f3e92000f803b8ba2e478545cc4ca05e4caff2dd79aedaf14c1aef9ba26e6cf31dc477dead33dccc9d4c71fa3b2a48934fd69cb0a0e1a357aa78"; + sha512 = "81a3952fb80b624f4ec67c8c024a9fa1c6695a14e58424be23e01a2141fa013d0e6509a6891fd07840359d37a68ea961e1b22b5d7066dc5ca720e2cab74fc467"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/vi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/vi/firefox-66.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "9210280c89062c6be7255cdc5c33ec8def0685bdbbf9cd1384434224dfda15745d014fafb5aa5c0449e6fc8f1b414889371a2714d37233186d0005f390177af6"; + sha512 = "f6a393d3abf8cefd40a93b9f4bffe6676102f15fe39922862b6e232dace238dc3ab545f1d4ca7bcec9a146ff2fbc650c9cfdf245a856c185396447cdcb1710f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/xh/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/xh/firefox-66.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "880a777bb89f88ba8227a6d8144f0ff8c5789907c27a262a22ecdc48d2f302703f96dbd0ef12f5bc299c345a02bad430c9aaf9de7b88efd0116f573c019f2c3c"; + sha512 = "7eafbfdc7d899126f15749fb4c5fd7b5c36c76a79aaf60b190ccc60fa7c0b02c87f4cf7533da647be23e04d3f767d286f94f50dbe4fec8b536588697e236faea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/zh-CN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/zh-CN/firefox-66.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2bb744c46f3a88799bbb55af65d53c85a58dedc04847580bda97d1a6eb43069417986ff7c24c3e8175d0ce1028bee9590dafdae6e264c08a0017b06b20ff4c72"; + sha512 = "4574f018101641f846d11a66da23516e2dad1832fa1cca71db95584b49bdd8bc6b1cb1bc1f9ec67b329899fc3aaad90d0c36c99b9303ef0e1b978ea0beb08ccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-x86_64/zh-TW/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-x86_64/zh-TW/firefox-66.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b0443ad389bdb46426806df8a2fa8ceca8dfb3f0adf18b453d2a7ce728f63294bef0ea6dae4ba3f54e5c6999a17b5c06e3b08ca61e59b8c006cda7b0e23cdcc8"; + sha512 = "54218d2db216ad81f9a77098319fa986a337d7fd6c4a815f755d1b3eb0953f5159625af7570e5ebbe6a3fb2b7fc955d8635d99c8187dd4115dfa10436a67da42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ach/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ach/firefox-66.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1828c8d846e038425dd17fb439f196e4c1a9bd38de282d4029ac5c202be28765e0c902bc838cc8abcd41daf81f899f2f394c5fb5358ece4941c7026bccfbf460"; + sha512 = "a33406bf0fb7fe1c6f96e0cd12b61e1ae921ae8f105b7a2ae41121503ffe8111cd8db99fad20f02ea498e317f1191f056f51c188f8701b0959805b07d43cf784"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/af/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/af/firefox-66.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fac0c6b3a46f8b87818d3eba7ebe7113825953d112845c7f8f725278968698ab83d4106323a778c1332387d788f227dd8e01fe194744467416dd1980aea106ef"; + sha512 = "53d5dd586773bb2c229c9ca93ec7670fdb5ec06700130de35147e57cb3fdedc8ec268bb03ee86f474e04dc5c90eab3adc05ba89bc88e1ffa13e60527bdec2a12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/an/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/an/firefox-66.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d41df8939f9c2b58e0dcdfb9dc6487a8549cff9d27a1fd062a218f8a38066b07fa9232703c2e988bb6e5719fe01ec3272358ba9cca60d959640676cfd934626c"; + sha512 = "7297dc71c8732ea41583a1605efc465d8d77ccd143ebf5dbd097a1d237f1884e5e200c2787bd245bdf5987d52c38a673669c267e17e2424a4359361b85cd1473"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ar/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ar/firefox-66.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "80362936fa9dfca201aa9abcb3d89beedc7c41fc9f657884003e1ffc3f8d33dd7420709c2e921acbb5ea56fbbbc4476c74b61bd4f62a94eb2a1392388b758621"; + sha512 = "82a7503093bebbced20b8c00ad31ed507a2d8ef072e065ef1450365bafa39b07a7e51bb6e9255766eecf7d9b26f8ed299c602f8ed832b663ec278e7cef83f08d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/as/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/as/firefox-66.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b0b9bbc6bace52e99208cfe305c615bac8d67ea6f93917d9078ccf5a5d4e0ea1afa6c9e97689f015d6fc71112860b0fd361fc8435a918419a792a6fb0e212ed7"; + sha512 = "4b1b780cfc0f6bd1fcdc94ae45a948830ad1067ab87f6b66b4aae001159db4af5beca256259714da881537c41b8a26ca9c953e8a1bbfbedf51ada24da89ff0aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ast/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ast/firefox-66.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3a6876d094c880ad47c6f13ca6613de42ed83cd5006ddb1c3dddcc7b032fc32189b03cfd84e0cb30004e998fd4f8f88f12e4e940b56840e1e35e97217ba67fd2"; + sha512 = "c007cf45e1471353065614b2e907cf3453ff4a9a4961d0cdea51a8d2ecce6da435efece15802110a18071b59e0d23fb7021649115fd88caa4018976cbb71df29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/az/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/az/firefox-66.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "be7dd488583af7bbbb6151724df3eb4fc20571bac86e67ec5ef2c50e64c8012864b2079f7a5bf843ff8e6b0c26d4419b7fe5321248b27a0c439da204988d09d3"; + sha512 = "4112953c6bc0c17526f2f4e4102efc11e994a375aba7be80cbe395a7b906e944ecc76f176d8ed0ca45dda3054e61384d96b1b0f1df01cf63041395d3fd61890f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/be/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/be/firefox-66.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "3b34831a9e4ca1eef3a7cac24f64bf0256a43c83899fcc9518d2836240d988620907a843e924d07a686e12e2b07234c817376b2850bac71e9004b74fe99e33df"; + sha512 = "4ae968b84376ddb4f967384dc41ede458d94e0d49f4f2a43a10ee053a7edefb43303a471cefd4724140eb8d72ae7e275bdc4f78215df004cf236271cac831bf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/bg/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/bg/firefox-66.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "aa2b3d1a5e82aeec60c8556c2d9d98dece0df51cd29cb0e7e2048ff2b949ef8b58331cad8f797631fe93853fcb2b18280e959bac2f20694bfdc34487c942b4cf"; + sha512 = "9ddd0852d07c56702ea4d9b2b22b418acfb445949e7736b3496a0cd86e16f8473f679227f955b5091a42d955bd121dbc17bfec13551b9a06a83b601f1bbc580b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/bn-BD/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/bn-BD/firefox-66.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "cc20d6a81c9124dc8570059e3f35776d52c2e699c0847d86f77db67121b527e36e5fa1b6f01e362cd8debeffee2bd8444b3ba51a7755c2a7ddc3e56d8ef6f00d"; + sha512 = "17eb62f9ee748ea87150d765115a55cdd1ce64a0f78ac0d03435256b6394df3a4d762f23b6a1bdbd9c90219ec4f1153006766f0e09bca6e5b486a5376eb72522"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/bn-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/bn-IN/firefox-66.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "7bb824862c23541385121347c14f72451644f107ac4bdf37507e262561dee574ccac817bc25633fa54486188864e4ef20aea96cbafc01657ecdb6288edb3ca77"; + sha512 = "f36cfb6f3ac19bb4abd88c9ef73276ae1e5e7e768265da8f8bc8749253b5501095f868abfe8086150f405e19b9108fd3a3d04fa45d9ab137cfbbf421e15be62a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/br/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/br/firefox-66.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fc4c61367dbed2c22dc03e068ce71856bcaf841af66b71bfdc4b1584aba2c7c418ccc808786673f8e1dc3f8f635c03db29ae7449f9fcab41104cf54c486f8ac5"; + sha512 = "cf4f7b72b857ad6733ef4faadba19f90a9a90c75b8242caed7a1bc7a8347d2fbe2fa2727b2b65b35118dcc10119963c47b59b74e344691614f8eebff90829040"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/bs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/bs/firefox-66.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b22672ac558529b53d4b2f49d49e45b1e21e05b36775214372b29529a72105753f353348c97b27c30e58fe68271e7a2b71f05de9f0cc088bef99163470183e5a"; + sha512 = "c07ca65c98fbb6bd9dc984f3af265eb1962b1144bec57e0c170a6b9a1adfae74df1a0d362b96acbd597a857799e173fed37a1d5a97f8f44eee7eed33a650e602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ca/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ca/firefox-66.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "50ddb4a070959ec0754450267fdbd8f12287f26d445cef52b08ce69c49adb1ad0efb52b4acd565567d0c57e8bdba21c39bbaab33e95614830241c14918cf8261"; + sha512 = "89e64225f5b6d7e12f3bc8b62b7169f06d3d6665802ee1d4e694eda8d9bc79a7948ef0ee3d951ebffa9f3ed3af01cfe3a7c6b7a5adbcf3f46785fcfb5be1bcc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/cak/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/cak/firefox-66.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "991275047879d97f527172d42f7646fa8053cfcbb3a52597ea41f42f8e1aa5d796358d696012e769e255142997fe41919e2241fdf32552bfa9f1289cc7277954"; + sha512 = "540496837ab0fdd2f7777b777c1100a20e33d56a0086326247d5442651072b35f7807b29c5cd680026cbcc8136efe57d000936f2f5c1400dc8e843cf60c325e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/cs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/cs/firefox-66.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "4c66774a7f57e913f768ae08459a010877d310ced6f52ab1f6a73e91b4db4f279da7890e4e9b49b3bb13633cccc3b6cae60276f400d83e0f031ad5838ed9533c"; + sha512 = "3ce473ce84ca55a93e1b5a07c56fd2e54a5b32199fa79a19a0492d40d0da98af20871d81a400433790c261c3a72a41fb243b61a5bd838f0196c62cd866b849af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/cy/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/cy/firefox-66.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "6be89bd707af22a31d56a67debb72cb1b9f7e7c5f742eff0037e1165fbe5067bd3bcafa62f01619cd63106fb297ddb2cf738af74ca6dbdec49522ba765826c52"; + sha512 = "3310fc28eab8a6429545ecda42fd246e761776a21458e34c0a6860d7a781c41ebd0e018d4ead3487a5815f949d8784a8831dc86125d86360c521d5db6f4a8e7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/da/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/da/firefox-66.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ca8318eb051165093019bafc770f3a25c1d52aeb2c3528034463006a07220ac0ae181678321562496e1e201ca3dfe8f6e917a1c5595f16e6aac733f697d179e"; + sha512 = "f1c9a24b83dbcbc055be79adf3e874f65e0c81fa52993212ad71329244aee0abfee63e72dc6b8617da83936ad498e248698739601aa5d77c12b0c07741425c61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/de/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/de/firefox-66.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0cc73c0d60360c84b4f2b50535414b4a5712a5bb11b098cd6c55417856f54ee730b1c7d8ff27ed35db0d4c4646a8e6354104b735feff093a0e1284054a2910ec"; + sha512 = "9b3352a8549b8b6a866c766d084337c6966c9d4261070a30c2468d386810f8be0ada2eaece3268eeb59d3df996003659d7c35887c5f091b86e192c9d479bb56e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/dsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/dsb/firefox-66.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "faa61580cedc2e1ddd382f2e413571179cc137e437939006a2cbfdac096f9a24e85a3a8c1be33d28e2e78f6a73568e8b5cbe6581f69e581410c1dcfca3994aa3"; + sha512 = "9b9982d9e4b894379463b39e38f7c96cc1b02e4a1ba4e4af0f8972deefcba986f7194c67a9cdd98c2b89cc8eaa4e2809cc9d8aad56cae0245de6ef46c4fd5b13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/el/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/el/firefox-66.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "c1068941023c2901655de6fecd231e708dc346f45b39d6de8ceee899f0437566d91b401c376d714e395b628962958b466890fc08ef86b8bbe98b70c015e901b5"; + sha512 = "3310c128fe20c46e698c6cdbaee93aa6a67992f0fec4bc008766ce90de43c0661bd1319285fe9c98d94141c5fc176b79ce1f152f2581ef5f754204b7d2cd0646"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/en-CA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/en-CA/firefox-66.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6006cedc634b23e76922004f1bf0306b78ed2160022cdb77b4315d85a61ba7cc8e9e3fea710a44bcaa2e98dcd1f71e6b25ba36a1037cd0efef2bc023d2b4f8bf"; + sha512 = "fec8b7404bf062ad75d7eff109be01252ae9be8e2c1fdd302e114141453b17b396adb67e5cf25a9e87711d3383a616933c12bdcdef8e1be1efd89a39869d79ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/en-GB/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/en-GB/firefox-66.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "fef153bd3ca87da3fc31ae54775cbda64b32ebc52c1ae9e64adef44cb037b666751b4bda43ca74e146135f91adfb35a6fa8ba780a669326e1c018671e0e7f627"; + sha512 = "fc86717901349a4179451353deec7e80b165f25f0598dade76a8108d696620776cbe8a8282887f1a8756d7a64c9eb35696efe142696cddecff66e8b91b2e4755"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/en-US/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/en-US/firefox-66.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e98a03a3274d38f5088522e9164c4d6574c291056a1b4ce475c8ce101e7cd4e426f3d553fa6d804a25e72bad9a381322c2162ecee54c03b5d30538097d63d384"; + sha512 = "d291309a6178996cab17ccb9679f6a07488283a584aadffff64dfa68ace1b3befabb6360121252531c2329c3be73816a6c66be1b4b7272a85b45d9a51c86094e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/en-ZA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/en-ZA/firefox-66.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "27034e6b7e01d783cc5febb56b7e20a9a83d40fc37cbee284b75c8067d8c74a800ce4acc7ea6a99f4f3016b208852535fe259a56afab43b64b26fd2f62cafa1a"; + sha512 = "41d358e0ca7238d9c6e94de22e52a74fc249b7b49cfb816c02cec2464c5885f99985dad7af23254dfa54df747ec3286fbef5a04fa890ebd78a129e1a489606e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/eo/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/eo/firefox-66.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "76693b292084c2b8f340922968fee08d7d15c66181f85e85cff50252a289924b999cc45c936ca1f0b5497397d39f6dd7f96ee651499f63ee38125a11a6cc2f8d"; + sha512 = "f7fc277aae0b99b8dfdf8625971fb4b03dbc86c31311a764ae36393d9cccaf38aeaf61788646bf0cd286fb3ec899c6ff82e84b87e300d986a8a8505529fb9f64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/es-AR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/es-AR/firefox-66.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "f61a52f314fa0c4f7a4a5f6076d66fe02a560cd7b0e7df72297d999fc459a9bc208ba28abd648ca930ec8becb5a5e46300dd5ffef45d89a1acfd87abe9c56d55"; + sha512 = "4985c341c9cd4284a8298f1221017cfc267547fa6977f76b92894fd5a1cfd744596d429b054df24bc996f619bc6cb5e3f31c0efc7e23b9a504bfc4e33c3e32b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/es-CL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/es-CL/firefox-66.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ea97b4e38d4a98cc39fe27177f74b813ac69689fe0ab0e288993bfad1c5d83489f7b21b23e99989a4710b7a95a4197cdf7943c74c601505e188caf2e238a64a1"; + sha512 = "0a494bef279e78a00c835728d9a504dbbbd258154bab2c0f1e8969825411d7006f8cab50659b0f8fec58682f3fae36ba701b16ec469ec1125c35f1b96e098cda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/es-ES/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/es-ES/firefox-66.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0f17e30eee7bfd71de72dd4a43e20d5c34ff85021fa5303cffb4f61e7c7ee21a9d8cd6b8a65e929c02bdafffb537cc3c761ec92bdeb7cab057628d7183da82bb"; + sha512 = "a4e0e7b3e2f7f7d9a63f2f61e5aeeb6c524063abfbbd53a12eb873900072d59772677e0da4dbabbf088158f448d0e18ad60fc1bd42898a4acbb4b7d039f27619"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/es-MX/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/es-MX/firefox-66.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "86c4ef03225c189f13a480efa3fdf0fbd6760f8a3682d9686c2cb4bdb2345889acdc49093df7ecf22d286bf0368af7938a42487b44c1aca87451e59e21fd88bd"; + sha512 = "eded359a2462e4e9b4b5de421b34aecf6567c709725d0568e13f99664a9c6f77fb61b4fce28c55d2d399f34cb7164879c103666ee0e581192910a6d86fe7e6bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/et/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/et/firefox-66.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0d77d41a43c956bae09604344966ea5537f6906054021b2ec6c4b9b002acd32ebf36ce67f8df7a21e806c8b70403a50bb9282fbd099ead104757384adbb82fc4"; + sha512 = "936121aacd183f528463b89757d71728df0015911c2769962e931d0ca453f5098e840c0c41fafa5e6db4ffdd14c8dbd7fe356ce3b78bf6a16c6dd1f7b5cf3edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/eu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/eu/firefox-66.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ae3b044b2730fbb342b03caea0f2feaa72b2176ba2cf6c9eff4a67fa52c735a50e70c34251b19d46632895732b6c7f108af4319c1479190633d7d743281851bb"; + sha512 = "976679b3d1c31cd985a456daa138673fb70fdb4191a58ffc368d2fe0d9f355e81cd522ce91f857a4281ddf7bcc67ca07722143b50a85faa56a80e54fecc33228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/fa/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/fa/firefox-66.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "91e445acae442c8869fd1ceddd6e1fdf57481f12a602e2e412d20febf56e94ab610985519c9bac33e1caf87ff9a45d8799afdbc20a5ea859d2eb7af98990f97d"; + sha512 = "8860dd0db48cf7f1bb188f56635132d8fbf546adf18ded0b55ee5cb7b6b7a8e7f87b8392cdabcfd5e8dbe148c2ea9f8373c83a190c59a1711d7c733ae6c4e79d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ff/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ff/firefox-66.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "51e074fcdc448db24bfb503ea9aa67a3675702749fa82e8f274fc515563708a99c65f3af4d00b1be7b047ea3ac4b2b8f53793a7eea4142d5d6a6642e4044d218"; + sha512 = "14e218ada9f7385b8827e24be508cb0aea8b0e91a690320ae4967d55376845f055391e1866348682f9f8e9d2728c0efea4565d57eded76578a5b4c47caaca099"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/fi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/fi/firefox-66.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b6961673e15338cfadec038b330587e4494c2f45af0d88fe241143efaad131096ca271dd0a699cb096904950195791950b5fcd3e69c582d67353c75cd7cfc58f"; + sha512 = "b4a0f912e98e5a239caf064e92656fbee87071f725f8335d2dd27000fbb515f28e7dad97139ba77f6674e5ab6319035e069e9c447b4d4b4401d022c5db2a19a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/fr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/fr/firefox-66.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "840c4e53eca87139d72c9cd70f945fb330c97dbbbbbd87b5f8bc7fa06b4bc5a078d9920ad9c359e76ea736f3fd72872494c0182f0fb76381d9c687d1552939ad"; + sha512 = "625c70f3f1b3e7e99d1f43cefc52c30c2e7a70ed9515b848ed90e29d121e6aee6bfc9227e9e65a43098867e14c5c3263dcd0688ef0b7a55813b92952cc8c3f62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/fy-NL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/fy-NL/firefox-66.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "adb2d503aa77fade259ddd54f3d9ee7a8c96fa8ca869ecc2a66cbebbb8105aad19c5a6e16510266a665b6a94c25ac8f93ea92c93b7217aacd6d31895e1178c66"; + sha512 = "312fc732fa9eb982e4d9db1e78e70e4b5e9781054e8e1712c1c35f23b38e07ba341070e77c93130944de0e616a05758ec3e49b3180b1e78a83aaaf7c9144414a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ga-IE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ga-IE/firefox-66.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "2a98196dfa12012903381adf701caca85f4009419e50f7bed203b34005c2c7f5e4eda082d87107a96b36cbc63297c417b14a40b2c73fa72ea988e8915a3d2049"; + sha512 = "0acc8fb6b4d3ce6d9b46d340f73796eb05912171b84b248832e28632392581dc9cae1e66dca93e3229294c28ef0645066716cc5bd65b0281a8a86ef8af0fcaae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/gd/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/gd/firefox-66.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1ad14ef60b620648fba5fcf0a6ed1bebc0fb5b7bc7226f868de39259a817f3439595922afdd23c9eeb09b2a0353f26e7a86a9e4a6b5b3d73dea31831e735418e"; + sha512 = "7725052204d2317231e8299f481d5d38135c2af3b47976b13d7ba00bfa820be6e9920466c23bc9cb2bf702cd09507dc4cc504cbe4395c89c78cacc0bfeacd70b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/gl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/gl/firefox-66.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b54f3ef1498c26ce6a9e8468877390a0b3e8694e19e0e8a63e54a53615bc845e78cf7a8a5dc21c59946f46c984feb3565d42415a82c1800ac1b31c7d89b71bbe"; + sha512 = "a9f8a9b7688d262783d73a5b3f1b9a7f6e54c3ad97be6f33f2e9f423abcc071a877c69b033e0fa0bd858d9457cbca34f1a6de006128657cc93260c12d680c28a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/gn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/gn/firefox-66.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d82a5205cd7787128d6d7cb057e3108baf6b00f35e4433d0a14dcebd396b3320aa44d5e83590e36e04a81f555152f945719f4cb7384ca3b28a0b03e77115886f"; + sha512 = "d84d48636c5e78a6f66c5e4ee69f67d05efe9fd11ab82e0a68b477b007e9283a2de0a9b0f81e2c0be3474f2f985ac31c2c19fbe4b11b7dd06660158e923f11f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/gu-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/gu-IN/firefox-66.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "59c88c04730920a1988f23c464668f1e553fa0c6acac36a3c7e7a4a9a578bb3fa7d59ab8820191746e101a2be425c2d4d81638c6ac057fa8384bb1a5056d89e6"; + sha512 = "c5c67a26cffa558b5620ca5655951c8bf3b43236979c8ab67e6c69b9d55df604a7b6b1ae53aaf9c555604ce0243153d553cf737d5b29f483669b5de241032320"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/he/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/he/firefox-66.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "24f330143248632be24921eaa24332295ba2e5af6453a87f92035a155c562224520ac087c3b58df8996400c1aab7fbd321b6e7499892c61d4af0b6b878d93ee0"; + sha512 = "31f38e4afad9726f5de0abbe4cbba334006eefeff47bbdf633d3d2566fed78cb8d4d8e6473e093cda7ae0b3473850d9db26c231ea6213f7256deab0ece86d421"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/hi-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/hi-IN/firefox-66.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f19f1dfbd9facfe74e87a5a26d34d5542bc00fa3c36d64b202d4cc6f9aa90f46da97f78b48ab2ff40e0b26bd3c9f9b45e025a7d99163643619663c0777e5de75"; + sha512 = "6b0c4d191817347270bf6165a40e2f735f2659a517d3ea586b61b230175bc6e4f5abed5df5856cc135a733bd55faa8da6c02383e663f82dcfcb5c653b0ec17fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/hr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/hr/firefox-66.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "57008a9cf9a4fa8b52577fa6f1f8c7d8cd7973b27dfc35127d88a4fefdc8c499f8c22d8ef6a2951c595028c824239341d46c4b7ddf7cb7019ffe6c10d1190aea"; + sha512 = "9b784c153ca5262383521e71f8c10a1d72e06df1715a910958fed2418bae1e6f572b12aa616bd9a18006dc804d5dd48e0ca1fc1c288979bafa89861eae5529c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/hsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/hsb/firefox-66.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c7b74073f3ae4923315216884df87245f4140a4732446357da1b0f4c6867de3186ce2c921934c2855ed5647f02710150d10c403ad60eb0b8cdaa72651c75f36c"; + sha512 = "35c83506043651fcd2144c87355dea590306ffcbd1d9701341a2df97ae2092df1ffcf2ebfed6ebef82b5bab6184b9c362cc51d948c986828469543f45c9925df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/hu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/hu/firefox-66.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "77bef2c9cb636f06421ba05a012a32e36669669b912183c8e3c1266af7f74a68d5254ce78813f5605122b62eb6924b22167383aa860380179e45dcfed4b5a7cd"; + sha512 = "4df11967f8b6bbfeb5ac880fc7119001da3fbb114c706189e75b1d175f14f7f10196fdb447ded3300725d53dad4b2b28b97c0c06f6d859616fad294a6cd7e919"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/hy-AM/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/hy-AM/firefox-66.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "3e43757a8081f8d7bed688e06c309fe8860460c22c30e46f8370415c675103870fbaf77af1b9aa0881c3dacf91cdb68b5346fe50bea8526d5cf6cfcf938eeb21"; + sha512 = "8ca4a4bbb669c025c0e07dca8da87f0aa1c608c37e067d737fc67dbfe01480e59c965ef5d202818c54b2b954eff1a7e8628f42a792ad2a0a6c725ff852e8acc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ia/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ia/firefox-66.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "11edc3490a6c8687957e7c3d3a8dacd1a71d7bbb5d106041075032d00ae2d445a2330d5972cfc67fd499e203f11ceb2ebbc0f3c23286e9f256861e21469c843a"; + sha512 = "66eed33cacbd69d03e644bbe8f56b4d4dbe043de30579a46869d094b414a90e2303f6ea03e791980e9f0d73f2cd1ac05ea6c7a9247afe5a5930bdc0bd7289ec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/id/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/id/firefox-66.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "79f74e60be948586de8c8209ba01fd38a6e680afb471ea99da5eda21740baedccb515e1378dd951f49de5e133fd05762f59f37d672e8efdda882c9ed73af9b01"; + sha512 = "39f7e0ba578b69d5b144bc323a2f64bc7cb78dcf961a460452508ac0bf8a529ee2d2390de243d46364d9145827bca65573b0fea728c868d4396ab5c693bda38e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/is/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/is/firefox-66.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5a3a222703b74d1a98a259e9b2cfa29a40e256eaecfcd91acb60070239fcab9ea6518a0fa03dfe790305389be2b8d8e34ff4056c345f66faa403d835ff9c90d4"; + sha512 = "99abf689e2ad1dcd4b7d17b0a522eadcc952d4905a38a2ff139685832851a7b9507dd5653e674d27dc0268e289144203661798dfec8829c2744531a7f26afc0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/it/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/it/firefox-66.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "590f983e1173c70c12c78c947d6c05817b3e359e838d8deb873eebcb9a968afe90da208aa6bdb0323f25624c4b1c9d244bf6caadc704b630e60d29ad5c246801"; + sha512 = "7ee57e6533cb5e3f652e0865f9b3631755cc4ff57c5d4c8793c53508bd1a447f724f7e2b40d181de2f0239206ddf95a2070feafe0c022ffec3759157c207f95f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ja/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ja/firefox-66.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "684b520d8f7deb0ee0fcb76ccb7bba41b436db799b6a457045b359dfb7fa681581f0e94d315f9d7680d97385a5058cf85ead3e3ac09029e866809933c9c7f559"; + sha512 = "62af46d5830bcd9ac6fbd33f5abaeaa2c1fae3a6389d8b37a7ccec9dd788ba35785a40f2d9752f9e6aaada65bb4fb46fa2cc0969f00ac551c81ef250a7cb0153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ka/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ka/firefox-66.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "128d0c1a7fce4a03ddc01914567e7202c760dfd331b1ca7dc11098aed3b3e49c04c27aea5fe387fb43eeefd8b8ddd24b1883cc124ef5d1c143c29ef4cdb65676"; + sha512 = "261dcb33ab1871c69ac8b19e652bafacc58041f32467cd29029352b18c6caf1e7152df52de0826402644b2e417b19ca7bb9c83b83583d18d38aa6fd2069d2099"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/kab/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/kab/firefox-66.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e78daa26d12317cca1d442298eacec69af20ca0819e74738f355c38ebe759018b92e0dc058569422d13431835603e06dd1e2f5b686327c6a5a5fa23029bcc312"; + sha512 = "5fbf1a074f25c8c47b0d25606e71328b8c2ab856277cbac8fa37261b94d520f37c0ce699c573886fe8c9b04604e0795ca07aeda131c18dce53d99b93b7f225c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/kk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/kk/firefox-66.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1463df7925166e744d33b3994c66a3f2bbf3711232b4640887ca4ae25cf60c6ebba23b4ba8a964d7fbcd770c445e5cf02aa8a9e485b3d87d67dad7972ef5a610"; + sha512 = "2739437c49a9b388fb82bf6b44db9f8d5c5cff02eccf94d3fb93a8bb5655d57366efa7cda265c09e2bb063b35fcbdff34781ad43a7f05e60614e3e715b9d44d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/km/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/km/firefox-66.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3a77e2cb15bad980a03c58e1f44c9024beaf9e7d1d99ecaeb88f28a2d3cd77a9759c5717c18577eb1f30ef34c7da3dae5c318ad2fc651aab29082fbb7073d322"; + sha512 = "011b7c4d9f6857057e8607ac8f69f178f4e8de77396733b21738045c2bff81ab711024ac95e82b7bdeaf213feea442f7ff700f444390f5ef80b94509de549658"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/kn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/kn/firefox-66.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2f98dbd7330516878bc21e4b56b1319de79737187e40feac74a4c55ae738cc71d68564982e8cfb293649bd1e25eba94c7ea72b7d649bca25b5a30627a071df4a"; + sha512 = "eb89b59ab5bae6eef0acb1e1ac30451bcfaae7681fa42759ecadfbb338f8b558f07e6e3427725e94ce4d94196237bf2d033420826489a37e2544939fec133ef8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ko/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ko/firefox-66.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f82050c688a1c426d13fd32a5ec0b9ba699fe73c4b2c34e0ab2409537b3ca6502a5580c35068e1c99a3ca66f5e112ee2edb66bffe552d7318fd5aa266766b71b"; + sha512 = "c4e08417852e68838060540fe831a72d6611006ac509d6208ca78a8d3e762728bc5afb94cb013c6c43c792d899040a87bef6df405b2c98440223e350d9c18027"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/lij/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/lij/firefox-66.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "3d12d3e786f9ab9f4dbdb4152245c0d7f01fdc4617ee7ce1699db251f4c43345dbce2c4e6a2a45fad7d5263d8863001931e22aaca516a7fa6dae5d64ee234d51"; + sha512 = "267884130be18b499161262925b5de68ec40aaf1fc267df7b11ddd2036428834c16dfaf6f20ed8f1e9248f2f1451e6c7b7095bb7a473d1d772d110209e29ddfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/lt/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/lt/firefox-66.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "608f2a9db88e90bfcf68d11387f076add7c71a617f1488ba00116c3df6e285613a18d4cda373452e7433529f1f98c6a1f1274f2875ddda21636cd3adf72f53b0"; + sha512 = "578718cf5de78dfdbb22d5a1efcd48a1321e759e12309af63825eb698c88a3b925995015e7508ec89ee5fce25477797623a49ba9a7a5586899481745153f92ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/lv/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/lv/firefox-66.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ad2488e1a446f67cea4cc7ccc24c0e064dc0ba91c1638afb4ac1aa2e5a209474c7840c40ebe68b9af75c961a3bfe661c19a8ddedcfb765ffe098760b92c1666e"; + sha512 = "2c74f96707899311cc62433fc98d8896374d16e516463896da461a69eb871d5cd4ca9e88b2d5a442a551b26f9a822c3f963e875e925be8978eda9213f901140b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/mai/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/mai/firefox-66.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b9636239894e7197c0dce0661c29a977c94486a054386b3a0205b3f6ef70112ad274ec23d0a54edf65ce89d8c4b8df3d9c06563c340b880102f698daad98c197"; + sha512 = "eae04d6ac52a3c9623c755f57e4a17aac57f60c5c889c00ffc5c4c0f57f3837aafbdd43e037750220db74c0b6c9295b66248376b5ee7cae68ab7a73b9bcf2168"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/mk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/mk/firefox-66.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a98a21a46ef9a1abf5b70a40c5588f91d984b48757f360c02c44592fdea51b3c7ca8313447c613045be7703e138407be36af0269f06bffdd1cab7a5cd44c6156"; + sha512 = "ce9c7cb9cea54322ee3bc1f07581f22c398d38dc443d9143960b4bdd7dc2e1474626dbf38eabd2e17b553b150365fbf77fb4e9bce817fece14d902f9b0ff59a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ml/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ml/firefox-66.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "decf0cc717a7d823104409f01ae4f198156812ae5e17fa05e03729628e6ff0212178cd71a87c97bee9bde71c28705f030b69073f5994ae4d8dddaa85becc1d64"; + sha512 = "eee76deedf8524cb06d256b9fb50de142ba5e16f3cff76380792f54081709949675158a10c2ab83aa9e8339584e213f369da19fc01cd7fdb69d833c81094a772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/mr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/mr/firefox-66.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0f3850f8fb8b9a49a1cabb63480b4d710836a437a4c537e31624eb862648eca566e05219b36bac3b3bdcd862afa3c882c575018e0a8808dc51b54d10df588a80"; + sha512 = "58ee6496342814dae13a92dd6fdff18dec31c4d191c1a17a3986d87238cd062cd8a74bf00ee111953664e8e0c0c74a1c41fa4214fa7bf5c6251aecf24bffaf49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ms/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ms/firefox-66.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d2ec65d9105d9cc1ece9306b838e259c8b6feb4de1e956d700c0cad658ac1c3385cd42ab73204d5e35c88c0d9c35a7662d0df70609264ad2df5f6294c7ea9f5f"; + sha512 = "74c86993f3080b9afc8440c0196ed9343606465058d589d4b03567511095ac5081d90ee19d340ee6bc1fe5a65c4c2c8d18f0a58675b80850e7912cca8cb68232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/my/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/my/firefox-66.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b6724c65075bb2eaf30e0f784ba9817b32e267c7e3ddc673d55d3cec432303ea1d631dd152d72c874975f7fd2d54d5cdc10782dcee8f4f7086a01e8f3f32007f"; + sha512 = "008f2806832692ec9bc809daabe2dcc57616cc07477b41eb52d738efc9e326594f7536092db6ba1e3fa025c5c0733a36b06d8ddc497abf3bde85ee51605806ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/nb-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/nb-NO/firefox-66.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "16ed971443c7b91c5089ecc495bc331c47801f3e8893c6a3db23b54ed8ff307fdad445d9b39cfef6168339e3dd71e6dfde4f477a1ee27ff83dde0e2a913c99ba"; + sha512 = "239a904354c659e338337455a99a51a04c582ab3f73912a7dbf6e6735b1eb1a0a7a396f5786f5c129b947c6f436d048658da17d7e9f6adb19e011bec9a3726f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ne-NP/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ne-NP/firefox-66.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "97f68d3e119209034eb9b6272f422fb5a18c0bfdb5cdf8d5cf3b92ae706fe2b7785ac90479a7dad39e0fa91f3152e57542890c06ca1637f44ab6f2f04ed1abe9"; + sha512 = "34d3a3fdf506b0933a2fa3c43afb180d0cdcea1028337eae66e951b003b7f0db9cd7d4d0040c99a414c851a1ff687c1b5150ed627d235c4fd0c2bbd3f27e5c5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/nl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/nl/firefox-66.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4409bdd3edb3b614121e35ad4584c096c9c78cca55e2e49f35d59193d0bf8d5a4999221847f7ea391afa96681efc0adc85ea61041ac38b17e81e6ed01a3d1f4b"; + sha512 = "44f0fa195f4a4216eb3b6acb42444d989f1ea31b8765b9337e160b57b99b78748cfc595f3ae2143a7519faff6703252e816c764fb0a461592fbb99a1f8e279ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/nn-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/nn-NO/firefox-66.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d993c4d5c34546c9129c148ce7044886c7db752abd557290b055e41212c57c691b423be873d39baa9e6fd180ce47fca70fae11fe318a362919bfc05010f9d2af"; + sha512 = "b932be406340322cabedfc446298f524fcf76154d48674797fd96ae2afab5437efb322391e7a2b00ac68d2dc6529175c8d08e0e57933de503bd0b98665d58ff7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/oc/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/oc/firefox-66.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "2e9c9b85a4b1edb73ad7e19d112bca9bc0969c665dd16e1e10904116dfd5c77964421c49e6ad164120bc9548446864975a9854cabb98c8818210dafe541cd327"; + sha512 = "482f69ee1d58af746f4a612777aacef1fab1758417abf589cbb10b5491f463ca606b5e33b3b6c892dde96c69fa6e15cfa5ab12acff650a9d7114b8da481b5480"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/or/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/or/firefox-66.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "835364a97f049a995ad9642c42039598ec64697109a3951c2ec9798494ddddd6fd1b3a36a294359746740124d4e8d4c1fcee9652b553236b16e99a902997fe1d"; + sha512 = "554a4e53d16f08ed9e276f81077066ebb69fd4db0f151d8268a62e0bbb81c784c21b16249a6f84658748b5fae42c3afbd0ffbfa65cbec5f0ba2eabfa6e0a2146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/pa-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/pa-IN/firefox-66.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a42e4d887b7e59314cea4bfdef6500d36b7692f373f16a194b170f57848474c3bb551ef66d63291810c51bde7024276de288d189716a1aba93e99b7d6a28a823"; + sha512 = "7fb384bf0ed916582ab826862bedc0c0bb77247a8d805f73c738901d3320673913fab94d9587fc065d19f6d968b6d6c8da393b122eb3b4cf4488bf841ff3e361"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/pl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/pl/firefox-66.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "191360c19eb69eaf7d95621a4ca591990bcbaa1be307e2e2868939521065808c344ad0f8f23076527a405ffaaf8931ec40ad5aeebd65715f8cc2f6a2285c92b7"; + sha512 = "808ac5f7f6806d656db76c6a36178256745d17cb88983f158f31d492ac89bd512788075dbd6eb2c4faf1d166838a1d23c8f5eaec59e8d7da2f32325cd8ece911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/pt-BR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/pt-BR/firefox-66.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "1e6074cfb8ea2dc863b3bb16f6a78474ae640517f56c80cf8ab544a1d85f808f9b99f27f008fe5719c485fa56fd89aee2892fe220d713b5f50f648630edf1cac"; + sha512 = "e6fd6c8279c5a69f9f4945d1d0fd86e3d8c8f81836922dfbee9ab38a51c55de5cef8c9fd120edecf1b2bd75a705f84255262a0fa1607505a63d6417bc4ebd2bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/pt-PT/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/pt-PT/firefox-66.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9adfe03d73ad528a911826c6cca937b32a2204e9b5bb49763476ed88d25b1303c1fd17225383d4db247b15a54640a3d9085a8e836abb2c76d71eae7dcd77d0c6"; + sha512 = "d30f3d4077e6993f84a610fe7cf78e9392d92f72a3644af79b98bde26ca13268bf5146ebd0aa52d10d3e9c0570b7d9451ad82355514fa22d9669a3e8a89edc65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/rm/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/rm/firefox-66.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c3afff6afec93641f7c05d9e288ab33eb93f96920a1b93d22906feb65b40a7553ba342b3aabeaa1492dfff4b9a883b4fc125c5600d0d9ccf3913b42483153f56"; + sha512 = "fb3b8746d409dbf3992f1dfd1ccd981e22728365bc08737270003863587a6076430d41dfb6301ae6fe70d92bb294ac52f48e07c2253571fbf032e21fd0632691"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ro/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ro/firefox-66.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8f382a093e4e78b694f06d715d57966d826b749bd86b9d5e9747f0461c930dbae1eb734ef8e5d90a0ef1883f7ca2ff0be0adb3cad5babc7821109b2b820c7c25"; + sha512 = "bf97d0d6e880147cd8c3ddc225eecfbb984d8c3a5a4b3b040202f0238804d37ee2c0a53ba5d2ee08c54252d6dda1b9e98ddab6092269091982daeae22f738b26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ru/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ru/firefox-66.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "47c1813bcb7b75febb886a03fe6a3709bad774124e3030a6f744a14f9654e0aba48a059f1cb60bb43e87290d8f13796e8e0bb4ed3580d8df430b28760c51fc53"; + sha512 = "d46b84f37200616d8211e93ead7aba568178632527c719821477b95b074e25ab6f6b52a2d6f2340b203f696329ba7ab56c3cdb59f5bfc4dd05b149ab2e119dc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/si/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/si/firefox-66.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "01b601f437090095b3d1fde4c57b2c63378c17b171560504ca038e4dc5c69090af905ec926fb78f7b61ad41b621498d1a46c1d4ba0c5467f12fcc2b1dfacfe45"; + sha512 = "bb830b564fe6f4de5df65e95c31d1de95183e3f79452b50714607eaa68ee629761aa17470a922c996bfb4a26811ec576026f17ef986046f740887b49b3a075da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/sk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/sk/firefox-66.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c1045ead7e12496fb54a7396854fd83249a5305017c3655193a41167e30df16e1118337d5abd19dceab26504bf578fc36c7bd79a99711f2fb65a4eb5b712aad0"; + sha512 = "09b7e8d592f3da593035a8311396ff7ab4d458874c8963662e6b1b3bb92ddf09d2d940e91a7056f505fd42e20d9367b9b6cf8ab94f38eb43fc9679bc3180addc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/sl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/sl/firefox-66.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "8210d258c0d0e0ae3229d0a5ce15987d272b42af61397315faa55bc62cb601ae73cbc0d39f88946639bd6ff4b80a1e6904296a7c22534580f60c9c2d6bddd080"; + sha512 = "ebcad781c6b6283f690a9fb63ccc2d4a917290e12db85e6d48d2a8ddf70206fc12a857c5ad944e010fe0178769e408b082d943d8e14c92ebed990eee3316ddde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/son/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/son/firefox-66.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0f6887d35d57cf5a4ea61fc78bb1f16f323827c1e0b2a1a85b4488a4d2ce8d6bd7a4f0e6b5a709b39fe9a3b8710b4707599b3add76ff210c65d9e3a576d0fd6e"; + sha512 = "528dea79f97889cd64c6dc91f4212a776c7743395ebf0e955048679a3316eb8b9a06be3bd130af1081416dba4226afef4aa5e4cab6fb3179774f2b4575027fe0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/sq/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/sq/firefox-66.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "eff2e6ab20685b2473e158b1bdabe069208eec5af16a55f1bce34fbb3a11aac454bd06ea1350aa0e0e1713a01c321675ee4bdeb50a50e0329885647907ba3d8e"; + sha512 = "454ef28169422d558929ea2f2be5c087f355ffd85869159f06d12d2328de38e0d624cb384722474d50bc8cbab529d1e830b776d2d138e26bf488e4e75e72039a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/sr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/sr/firefox-66.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ee81e7e0689678b6c513f8e71b4828b5269b14f1904dfe3c2995600b65c852ebf898f7cdd36b51fc3edc114aab4bf616d9ccf154b55e4ee2f29c719fad3f4b32"; + sha512 = "a3fa4b1db89ce3e1938d603d76b6b488b28a69886554b9f43503bebcfb9c65514b151321540a86ae60d2f1d01f6a4a62cf81a0526a248e9ce694732702ec77b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/sv-SE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/sv-SE/firefox-66.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a39ae0d39bbe4981115151ce5c06b3e396e95abdec70723366276cf9ba52a0ef79e086b5f359497b915d40e32d565f42b1cf04b2346d9306a3a93da2887138f3"; + sha512 = "c11bdbacea1c45d42c48c8eeb96a6300aca16625f0a69a4e78e7b9806aef48ae3cf8b4c2317afdfc2593b919022d30fb5dc2089309c507bb88d9c55cbc21cdc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ta/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ta/firefox-66.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0af46020c1da005375e04c56b464519de5cb9237aa78bdf11815911f76c1fe3460291a29278f01289479a8436d2de6e2954edb96d22ff422e04e2e71e4735b0e"; + sha512 = "558a598ee70a958c9dee23b3ee4bdd325749e52d416dd2eea95af5eb1c6f748d27577a2c5f07e7d44b412be4e3bbf806ddf78a5628df32f83d30008b34eb4721"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/te/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/te/firefox-66.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2e89b629924b44a3a134dfe90ad6420e42d68748884856aea940561b6d75bbb9362d331cb8fbfd7b477fbc5c38792ccafd0a86e154c05e9c6ee69b189082d512"; + sha512 = "39fd59f8e54e7bc7ff510ab153c3627c4abeb5f7b6bfc084aa9ac58b95ae8a0a6fee42b0b8110d6cda8c1b62da77d6429b41546a469c9d148ea38f2fa056b638"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/th/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/th/firefox-66.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "093bd58a5c4a2cb5b0380d111f77e26bd937ec0341a38d63f259a8f2725835245b09431b4a7fa74f9058885a252962a73a73ee8b923da29203d3263ff1d53710"; + sha512 = "41591bf6b657dd239a6dbd42d3edd24b9f4991f15fd9b60b8a9a5bad67dafe745e7b115a3e5c6d10db1319b0a1008238fcd710c6230e01055067aa7f8c62141f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/tr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/tr/firefox-66.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e0488ac5f6b78c736dfc606bdccde8d25c055ae556a4a5bea1ca4d1d6a14e8df30d06615ca0d4df1c7125ba04e29b8dfd5095c79c1e0601d28ffc152782260c8"; + sha512 = "dbc3db4a3d815e25a78b127fc290fa35ea9bc1aab5d3ad5a9e77e74dcd0314b8fe2d4e0bed8c00935e0ac724eb743d05341dcfa6690eb7064f74a65b8316a79f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/uk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/uk/firefox-66.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "8517b088e5bc6c38797cc457de76d7cebdad04aeed7c89a9fd8c5495d0b9d79c4057103290726f6afff356ac994216c907abb6f96f3f1cbe829b7c2cc58faf9b"; + sha512 = "f15e73810339fb17baf16ae271f2707624d3fe06cdbffd090f1cf52f5f90885dfb555dfc09f19e6438926d93a50b282a6904c5af163ac7eec8862d8a62420b19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/ur/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/ur/firefox-66.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "631318f12de4352d18def39e30eba75343a23b72b649fa6e4a121b7842e7c2487d44ff69f0990c19a9101ff9168431633dda74ff53fc3af134cd99bde2fdc379"; + sha512 = "d138690ac1d8e1447efef0f76ff4030ba3e8d866f635c5ba3caebfe417baaf9cd795446284f8078851abd13dcbee83b7ea9366dd486a12a0d29beb70f6f2e7b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/uz/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/uz/firefox-66.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "f0b19818762d8ffa31c8cc1d7b8d495e517cf8a6e59427da4c908ca88eee23e1aebdcdb400ef752f6fe3fb93d75bf0407e820d832ba5780dc72f290835bdba8c"; + sha512 = "a6cbad45bde64d738fc4df3a63af45d2c059af7d02c86a313d5c39a30c6a56065c79cfc3dcd4e719c7ad8fb823784ffb57cdb0dea6da78dc5431736ced8e7de0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/vi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/vi/firefox-66.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b74584f5e7c571ab3d8e7e4246b6e9ae11f41da1929e925cae20627a80d26b2529fab3d91efb1606a804f745869781e7a1f6a13f553f68e163479f20650986b0"; + sha512 = "7ae0ac3d309658510c34fe3714f56b6ff4393bf6cec9e8072d94eb36493a4bb3abce47eb634a02be2669f4f123f35bf5ece733dbbbd3fa4cc1dd50bef6a61224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/xh/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/xh/firefox-66.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6eaf693f0eb44ff86d669b9c7410d21bd957e1e6b37c6d50618b776920758fef8eefb03d8c2223b27cba8c67b737527da50e03584c1e00a9aec81f58163412fc"; + sha512 = "c31f304029f6700bafc919ad61ca103b4fe59001b5d8452619ac563d30e08758c8341e2c48d64a623dbd5c1cfc91ca7d80ea6c8dc3661169a3526b597fad37b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/zh-CN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/zh-CN/firefox-66.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "930364894d0e00e05f64a90768461c5b89d277bb6ba0df569d5820fba476507c1f92065639a47454b4f302515be8c010367f98c68af29d904c87d3e6e99bdc40"; + sha512 = "4b1d6acea615d0bd84f270ca6fb19ffb93d9f98a924c6d59593954c7131fa454759bb93676323f5983b79888b9c54cd1ea922a8db05fc09845039d118be97982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b3/linux-i686/zh-TW/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b5/linux-i686/zh-TW/firefox-66.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "b392f6c4c1071772cf85ba0b5632fac9c7d5f3469cfecbfd1a6606ad560e95f0a369dc752a8fd3573680aaa649376349c02419874fb6a8265a9dc19c233cdad5"; + sha512 = "d51268f8fffde7b00a4a73a0eb6089cd6c059ad55237c74134442f097d6eccb2b7c4b6031925a41f5d3a20694233d760e6370dc6783d2fc54e6264d52f5125c4"; } ]; } From 33fa29386f16404cc0346b932255fed06ebfb1f2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 6 Feb 2019 17:56:55 +0000 Subject: [PATCH 340/467] firefox-beta-bin: 66.0b3 -> 66.0b5 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 50022425fcf0..034233f5584e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0b3"; + version = "66.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ach/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ach/firefox-66.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "a2229736e4e852fe4002b0899f2b7a64fe1b7f6376bb581a4876fab181ec8abc231ffeb38503d57312efa0fb91fedd8b5f861ceb59433c760e066b5b6effd0d8"; + sha512 = "b5957997add09fa4b9028592b70e806ef20fc4e6a6751be15d4550483294202f8306cdacb28601aaf0c80aa69b06086d2de99acce23766a31d7742213c9d8331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/af/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/af/firefox-66.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "79c3bc782340cb3eefe838a40942cb108fafd8c22fa08b6f69c464eb7751692d6d35d96007c67bd4f026543de8495747e30e2c248d5a3ddcc2f74796554595b4"; + sha512 = "1d418384b2e6cadfac08831685190b8ce76821e93557c1a6ac9df59ce0417ced658eb748b0aa4518d8ab44bc6e6c43c226f2a3ba09941393c793f814ed644be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/an/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/an/firefox-66.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "81ef8003e58be0c58978aeb5af3bf85efe96a9bd9c57174a7d86dc36e037fcc39979be2b61e2c94e36d138b83fabe74d1dc7d196810a22e75511c36733a25843"; + sha512 = "8f220e66d870c90341594f7540c45573df82299e81da690e89bf3ed8c46dc045a000d654a55836f859261832e66021dd17f5e2d70bbaa3a676a49be80551e41d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ar/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ar/firefox-66.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "5adbfa5a871c188c846ce3594572d717570095e1671ba75b4df0b758d3fc7a0a51d6bc28d37c89de295216453d8379b1c6a958e0a13f1986bd95fd9b9184d51a"; + sha512 = "e5d06993972b484af5a046f3e97d796102c74cfb01ced3ac2df00e9b3d5e40147648242d96d6e75457e686c9ad36bd9bb40735b60a169709df13da9290982291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/as/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/as/firefox-66.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "6dcb24489e1561dfa5f034f207ad2e63e1ba428b10eeffaab2721f03f700abdf8363f5531b693897b22e606a55d1af8666a5f2c33d265c47f3b737dfa411816c"; + sha512 = "58463c5abd64b223b78892b38b9a79781184be2d2f41b1f7560cbb3d1f7467ad1a5575ba2b71b3c42cc07991fc68aa8320d690933892d1b1be9d1107b25eb428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ast/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ast/firefox-66.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "35f3ef7800c629d88bccaebaf453a299b4a578a85fe99456dc3355b5bfb6dc6d8f791c0e6b3050b8aaf0c522eac452caec7030bb3fe7dd4eba0d5f027a832c21"; + sha512 = "0e74d2d591240e226d1ce114f478e64f44c37ecd972f26348a10157ecd73c7b345b241bb5af33dcc616e64e5092369fa5fd0387a1f6590461f2612d3eae2da79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/az/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/az/firefox-66.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "05dad5d6c68c0dd5495d8affbc9063082e643c455ebe7ba6fe1355092fce621f9b0d5a8c1655904ff083f14fdedd2fea7e90e659ca93ef8c1bfa9c7fb54f11d9"; + sha512 = "a6cc5568b6e64c6c74acbfbcc9a1e0ff7538044cffddb5e15ba4db8ad1192b7aa0e2089ce98dcc92c5f85c184a661db61682e4d4adfcfe3fbba382daeaf2709a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/be/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/be/firefox-66.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "072ef94e0dea9c28b196dd8853c2ae4bb108d6677b106a65d7376fc5c1e9a1eb98cc027ef3cee45cdfe77e6eae431e04cd54b6e13b6acd44edcfc3b42e50c9de"; + sha512 = "81beac303061212219dfa42b8384f7a012daa4179a29e75e25abfa2eb9361cab82cbd21b47299afd4645b6ba87a67d7d67fdc3836c9c0040e5043c92625945a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/bg/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/bg/firefox-66.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d682997cd34074c46b43f8d4cf3b2f18e03b4e1d7f56c18751d09a6c3414146edad2c3f824d7447f77b8d08a337376f632b3392fac2473b2782689a75495fd9c"; + sha512 = "da0cfe495b9da30dbdfaa6cbea6d07a25af447e7e83dce20464e640759ca2348e6ea77955525746c0171d10a27a8748dfdb74646d7c135aaa1f2888a64cd8acf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/bn-BD/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/bn-BD/firefox-66.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d96db1a1bfd6ef3502685333afa92fa8fc846a618827da1d8f903448b55573d37ff6043b42f6ed0338f271d3a02e2c47736c4f2bd442acfc512e5a9a7b167df2"; + sha512 = "6eee7056b84ad2443de448030e484a049bacceaef63286e1d5631b7c10324876d0f05e95ea66da82cf3211851be684831edc16a25e5640bca58aeda6db2e95a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/bn-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/bn-IN/firefox-66.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0781e759403b8dcaad9357914744ed5a272d7988681a476dbe8a27370e3729a9e1d73e01044aef8e9c8eec732c85dacdc420f909fce1ac0077fd99a63dc7064b"; + sha512 = "7453484e69ebf0292149eb152a54f40dc3c1eb255012b4abdab16b76b6355769f63d3262f2fc9bed8a56628fc11d38e5bbc36f00ef0871c3852888d26b1a21f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/br/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/br/firefox-66.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "734a0be4db59b2887b6c8b78475eb936076870936310876102e4b1d81212d133d13c05bf1ac94856358f67ac863f0dff926b3c556331e07c033457959f06ac72"; + sha512 = "cfdde95f2e88d8a37e94172d0d8e99bb8db21a603321908f1fcac80d3159b6c3b1fdaabebfc57ff7afeae37cab68cb8f4d02de0bd8296d5c59946972b3afbc3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/bs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/bs/firefox-66.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "8e947b734fc4cd3d920f12a4662aa6142053925593574e93a53b15f207c31a040c5fffe095ed36fb3975e170e8637ae0ac4fd9950772f7c809301892820f491a"; + sha512 = "e44490b4beef84863fa10bfcacca31be4787fabb22ff4220f1d84bf9fe300a36be59497ca0185416e97a701fd90e8a8dc00f7a497a093a8e80d0a67b6aea734c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ca/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ca/firefox-66.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e252b5cb9d649487390047d47b6a4931b6bcdd657f443dc516c99a814b3b8f0eaf7aa8e4a71bc28fec9c4d1469fe0027a956d13ccfc0fb6b94bf4dbda815d58c"; + sha512 = "f9c05ad50c07decf275e6dfb6d3831722730314bf001416e27ec927ca4e5a9d45ca8bb0c009aa0b5370b01cf17bc1ca4632f39dfc9162964361f07675adb1678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/cak/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/cak/firefox-66.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "17014a33f3ec15dbf822101c80e9504b19888dd3cead25ded59bf30e094ae7929743c27e9369d45435f0588c254e68de6567a1925fb782e182846c049d8dd5c3"; + sha512 = "2883d7e61851e2882d5645bf4326e09f5d47e15568764b474e1f36896840dc04b8a303f340007e2f65cdfa7e6f4d15fc4942a1cbb3e5cda6bde9153be5a55a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/cs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/cs/firefox-66.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1a44eb115146c3216f21b29b461fbc9804b3bc4dac983d6d1c0d26e40bde034cce7b03560ceed82c8c259783665b401f3a3ae6fb157a748e14f103f6bfb46397"; + sha512 = "5ee15567822019959ff4603b62181704e5f1391317e4b7ed7bd12d8a40e4b6aac23f3a264c4de342eaf9a9792db7c05b14b2ccbc3f7ff4fe79948d21f0dc8179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/cy/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/cy/firefox-66.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "beb8f29109a462ac153d1eb9e20485684c811bffe5b0a8e565475aa4b54773e4c81e9d6b019d46794547b2ccbb3ed2a735d95cddba3d4a5bdc097dc2b8421c14"; + sha512 = "0e66f4815303d33cdca113a5021d184fa38cf548070442e028a70d5b30483780cbfa0fa8306579e631ce962801aa1cafd9e201607fb78bbaf6d50c6a7e5b700e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/da/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/da/firefox-66.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "88f6fe8d5e85957924cb1c554fd64f1e5f7a30c84b220f5fa50a5faffff0351244dd4915b24ccc261508068ed62716183a1398db584e2a37eb8cfbfd991f52fe"; + sha512 = "f074c6b756d61e4d5bf15783a5555679cf699af48e32205631862d9a5e56f12c2c91ddcc6c61a1f95dfb9bde06611699d2c1df98c56368bba757b8682af4137b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/de/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/de/firefox-66.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6c611c56246d7e124b8fb194191295731a963a6103a4f10ce2363a83934aabe2d3a349175ba2228dc8a4d7c78483b41c538c1c9df790666898b2bcadb17adacf"; + sha512 = "70863cc157ee70ac03244bafdf5901c198ef8b8dc10b3ac19b80006c7b11e266f6dc54476d3c940f5ee389f4c335ed6ae3e015308b3de2030f2c4a0807d5e0a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/dsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/dsb/firefox-66.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "383f74faf27da6d34316acf7fece30602cd99032347707101424737a34ab3b79906ac244cc3530e94ca383ead0bd2e9a010fa01437497f48ba12d7f43361fa94"; + sha512 = "952ef64c7f77bdc3541df6894c82e6bb7e69b43ba9ec6c14aaac5ed4453669f8badb349489dc72172c3e37d3e334af85efc68301d2011f07e873c9d2a39ac8e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/el/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/el/firefox-66.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "fc61f25a04de4d347f9c62f57f049352bf0da2fc3ee7252a2ef89497032c6c37b1073f5c676af661d2aa51355160855ee21f5937ef7c4a18b63516120317a826"; + sha512 = "bd0e30ff52325fcefd28b258333daa66255fab64361e94044c206f46359dda3246defe69d0f59a170fed5161806b2160577f2a7c83608aa7e3d9d0c46da84503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/en-CA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/en-CA/firefox-66.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "9f6fe9e55b940b7675b90fa4f1ac100479277810da4816a0789b9489989f55568070f1ccf2d8754a416aa4709a4adec199b3f1ef54f71402ab8f7248aa7729cf"; + sha512 = "129e14645815df6ad04d319264382a2e1faa4aa6a6d6335f981f6ec3c4f1c7c6c50855dbf35c95924ae8de491f59089576f19e3af44a43f65d1b67998a30bd9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/en-GB/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/en-GB/firefox-66.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e214b396517e6cbb3061ab8a87aec78ee87edb76a409c6c1b0f6d164618b95e6a4d5893d6d3700cf90bcb4c9b5271dc34e5ba72e4d6d2bdde8cc3cf1b400d71f"; + sha512 = "570afe2ed7b152c5671d7b590a7a6ab377f3b63ea92b3308143d66273ebc3fd6333595f8adc42bd8fa1c1964ef7de2d66d4bd07569f03b4ac63df1333a47e3d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/en-US/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/en-US/firefox-66.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "97a298453cba10f22313e43ff84f2c6469f1f823aa7f6581b07fbb14b140959f0f9cb8bd39d0930b6139b27d4d40f2a95da72b84cb25a5fd50606e1c67eda28f"; + sha512 = "161d87cc80e4af1b71c13331c1d17fe6b7229c250bb72b389130cb09351c169e99107597bc55d682f2094c3c645d214ae24180582eecb515557efe27ccf137a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/en-ZA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/en-ZA/firefox-66.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "70462d2182268bf5071daee8e69af76368ecd176248602b4bb792fd4e173557fc5faab87a975941764da56190f2d802584167fde06bb45639dd52e32dc7ddc2a"; + sha512 = "9fe2d6b2334e75bceb72148f6433856fd31a7ac2d0ed8ebfbb8e9c71a2a6d19ed664bbfece7ba5574ec5a83f83f89a726cbc36393f8c6fa56d89d59caaf96691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/eo/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/eo/firefox-66.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "470e53584ea5a39de018ae0eb40cd235a425e36d3cc6e772cb6b6e9838b789c95f38cd19c65d04502215712879436b5c664b447cbca105154a1da49c7a7bed9f"; + sha512 = "ec6e6974c1ed4f871fe9ebdee155611d873eedf620e2f206ca986a1f45ad77dea05788bb04e93dfc9a0cbb94fab2bc2b387703a62ad8f31b1353a4b23ddc58be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/es-AR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/es-AR/firefox-66.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "30bab16a44c90a765523732b3cc0b1d57c0a3daa81d069679e899c7ee138dcf968fc29e944858c37571bf98170fff710a19a1e53cd7ac53711c4cebe222836b2"; + sha512 = "9d3a64195546b27db28d948df9d5980df6459ec0d358a95e94f86efd867cb96c310cc821ca7c7e10f5eda698d7385bffbaf92d9d28f6b01b01932c5dee400a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/es-CL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/es-CL/firefox-66.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d047be325bf922e4f2f062f075cee4173f1ba4f60ee209822998e5da069f97806e2f82fbc96c59e8c60fa95d1b6fdfcc9325e5b10210a1b25b5314a6636931ff"; + sha512 = "0f07f5f2cad886aa130b1013c967a07bcb8cba7acfd8301dc451c9436cab061c1a94d2bd431ee8a52b1690d790af6da908c44925707fbe515f5833481cb708ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/es-ES/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/es-ES/firefox-66.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b689f1850b6ab28c620cb77b65c0e096c948bbe1b1764fd7d02049ab161799bffea6f9b742b07c4f60c86bf8f507d5c20a5a35949be35affc3b167a5f814eccc"; + sha512 = "f4d344fe36152717fd269838c312e872b6df86c6cc7abcade8ddac7a6a0d720f0142dff83fe84c54dd0ed710e2b8c4ab24b4c45fdb6f60cb15bcfd48550d93ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/es-MX/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/es-MX/firefox-66.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "88a0c93b68ceba1a8a46da0b5457b6c4459ed54f778757d044d8ab97c1907a9bde78d79de530756f9e0e79ba466a1ead0c7459cc9c5c77a60f1fb886ad9eccdf"; + sha512 = "f1bb74b82ae4d7d1f82b75afed2346256c7555fa9a3ba0b7ed6d54e57fed1c91c9e2a8ef2bcf1253692ecbc84147620382f3e3f5ca04e9ec519e25710328fbd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/et/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/et/firefox-66.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "eeaf6d3392a0e04630d7d2c41986508328035585ada3e31aead513bcdaf7b00856c3cfd37892546cb2815c4363e5381b1666600829df7c9e521f18b478beb8d2"; + sha512 = "cecbcc2041c4b04ea4eacc6120fdc3cdb1fb9133bb569920842d3fe8d64d07ea40d50cbb970e8cab16dcc54f32774aa199cee0790d5161ea72dec2083b7419a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/eu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/eu/firefox-66.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "799bd58f76a3de0e05d25bc70dd59de20d4a5f02df6f749810a6c4ede3a41def7cc353d470e74b5ab6119357fc49108ac07280b9db54d76dd2eec7055156f87a"; + sha512 = "8817aeb29cfd46ef9efe18faee7c6e94aec40fe878aca4dc07735746b3e2096768845ff26acf1e16e0f462d5bf4e5cb6474708e9c7b23c810b9004e57ebefac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/fa/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/fa/firefox-66.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5772846a4fccb8cf1abf19150f2b4d0c12d70204f68d0d03b2da38b93580f3e4f41cfe5a2651da03ae29fa6c240f0dba11d30d79df981b3d278769976d7a355a"; + sha512 = "ee96f6c5423b6fd62e3cc14a9fc5d9d56717e344247456a159a347e738e3ab6ddc7f6ae2a84a1660e3bc69be552a56083488c650334c3d83df90d7377392d3c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ff/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ff/firefox-66.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9c8b19656bbc421e785eb8315ee716da4638f8aabea150a42023c85c2fec40ea40883b9113601545f74a77d28833a9dfff8029866832efb4dab10ee3cecc149d"; + sha512 = "b58e5f52c373a18d4347b7edfe4b1f3f43656a7c1d738c631185d4349ac7ddfe2d92cbe5cf432839fd9151cd8f2f6bfd75fbf7d05132bb754a7c1f0588101048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/fi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/fi/firefox-66.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "29f101fce420847277e735b2aeefce011cf2f3f642a1d8daaa86f7f09dbe5f03c35b435c2013be4507906f1a70752f4a53f7996bfa0642282d1c4e07183ede21"; + sha512 = "cfee9e191dbacc1d944e2d0c14e097e46991950a045811709bad3cdea7f1079b0b7d02d7fffd015c5fa06aa8b2edf295e05b7b39458d36946dd78db59a0a0bda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/fr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/fr/firefox-66.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8a5e5eddf6462199a410c1f749ac0c15f457080c79d7a91281332348385735e6b512954bede3490f1566d34a8084a9e2c2e3340a5485eb396cf205c6c35d9626"; + sha512 = "427cb37c240bda6f6052d53c0e71abdba268c8b6b5400a5c998e22a14c6fd467ae00b738b6f182c4b3aafa37149d2a9e6d635bcabecd7389128f616de45e0196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/fy-NL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/fy-NL/firefox-66.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "86296ac123d9112c46dd12ea61aa9c587696d399ea8afdb78dadad326b51b4cbd568236c16839a4ccf142a44ae2eb5f5ac0f028973163bedd72830235743b506"; + sha512 = "19b4025da91acc7ee659c8dca0f82a50e2897a661ae9e3c24acd822847c3e6e6fe0d09751b9dab7db7260b453fe0a5eadd0260c11381e93acac7a7ad7e7dd23d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ga-IE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ga-IE/firefox-66.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d88b931cc86644f940c54bf76403956682b61d3beef7e14939059553600ada9a722054da0475a068de38b93b9174cc67013a8a2787ab9f48495a4d369d67aeb9"; + sha512 = "bffd46e4ec82e0dc8c356dc10e3c8d3ef682937da7f3a868c01a032f22f3138a4a57be9a94e5cf557ccdc02c0505dfb366b061f9be21f8183f66803ce4dcbd5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/gd/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/gd/firefox-66.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d1b3316371325719974e3bff6013d90dfede682e1bf376a810a5a27a50afdb0264a90f175e2504068b1f6d98e0c6af25d2cd1c346abc9f13063d7d1785c427b0"; + sha512 = "5d692158ed41d1c26df007c17292e9e48dbe7128321d7a808dbef29cd879023a3366605fc9d0918afcec92794ea3aac88051008261baec2ef821a8b7f9d00276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/gl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/gl/firefox-66.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "669057989a843ce1b06ae4b7887c299e2c71d750598cfea22178b91457fbc6aed0b15921d8a80180b5a9164da263a7a2fca4ce3ff85145d393f40a84ea37ee32"; + sha512 = "cf052890d269278ac9cbf19a826d8eab3cdad47a0b6d108675f1e895781f961b93d084f267b498cffd06d31f6cb77ef6b677c18c4893db4c8e0733eb7f9120f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/gn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/gn/firefox-66.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "d65903bcddea608143441642e1b7e5e3de13c6adf89d1048cfc8621325a4472a607b8542918477bbb9e15c5880f9947c1001bc2972ad650f1c0c2e855a54a177"; + sha512 = "5caf6e5e6a1f73237f335466eef0b06cbe76c8da802d2e94820d027819c105d66fe61e3cdc44ddf34a9f45fbaa3354ecab30a19989b8945a809f234f6a8aab91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/gu-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/gu-IN/firefox-66.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "d075547a61812d08e6d6d6e158fa53ad30f5ee4814016eb16e79b07af560a0c92436059d28d9adf2d69496196de20d6fe32c2ddffe7313bc8ed10bd0c9077a8e"; + sha512 = "706536893c8e767ae7675812eebf7a6b49e1861e7acc52a327baeaf0ec3e59c8a7a8817094993619d1e40a8e5b194baa5bcc27ed712e6c69ec2dc4881238167c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/he/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/he/firefox-66.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b5c1b94c8e911f974d1becb27439b1e2a52bcfd545d85dbee184ac53c7645cdf32c8547a42c669ea367775ad70d6a3ccefa81c7df55ababe3766ac4840b7cdfb"; + sha512 = "714bdc7f102d0bcb2c3b206408aaa21800a35f39554edd030ef545add4e2cb58a9d5dcc604674122b41d75c9aae07ae34f42909bb451f9b64be1c56f9c99fe47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/hi-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/hi-IN/firefox-66.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "04a9c45ce36dc5cc4e624e0afb5d6cb43f208b8ba668836286be07a98004f7e0cd89c3a66c115207bf5d6a999391c9af4da3c532fcf94938d9ff54e889a1be72"; + sha512 = "cbceb8b13f08586e5cd90677176dd5fe48a1e0cfe53264aac97ab3a6513867ea746fd6be59baa707118d20e5d755fe575e4da892c430f188d6d19201b8ef114b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/hr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/hr/firefox-66.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "344a20bdc20273fa395ce0b441fcc604c0f7e6aaf9d99a438fcdd32646ab8bb34ae9a9f6888a9073f248e0d5421f007d58f4bdce90a04d40663dfb26b1fc591b"; + sha512 = "b2bffd7c73b063f08fa241120d4031f672e0b01ffa66e999917a2030a0b4e5c901a7cd1528f1e1c5c4397da3ab59b814a242f1052fa0adaf3aa8536b7dfc2a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/hsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/hsb/firefox-66.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "113560f263a481fa7192efe97c4b220d6488a9e9ecf5d704f1393b8728cf70499729ef35cff580fbedfc427027b9d3aff9fe683202975be069775e7bb2ae5a18"; + sha512 = "44d05298f99396dc6316096bc36686ccbdf01d52dde72705cb58fafb69fbdfb7c310ac3250d3f3999f4d0fa997f6d328ff83a46538b2b1e343b87d31b4ef5fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/hu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/hu/firefox-66.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2792db41977f66dc1436416a1ad4fbcc32230b87c62f6c4562b2cfe867d52b606882ec7fa0bd7b206f651b98e7ea6769969b2b3688a347784173e776299991a4"; + sha512 = "15a65d61e28c2e9010c6f1be1d7ea6df2fc207be95d6d8b446f98c2a1cfb3dd935eff4492c092e81ec2e2077a621bdf8378c3dad2d70c348b19754867705addd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/hy-AM/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/hy-AM/firefox-66.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "676bbc2aee0755a5966d4b815e849712870bc2aebc00cec97852ef675ab157de83e79de1748c5c9b3e375a8eae59735725c3b7c305dde9dcb0d52e808c601a3c"; + sha512 = "bc2ddfc378fd96d41fd71057a3070e41c2838c2649d41bddcc2f8c8fa6933e2726292f82dd2feb3e399802f9d68fc0f7917a8ca6cbf81caeb5cb66417e7f4a8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ia/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ia/firefox-66.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c31a02b5f43d1751af75da38fff3e09de39d12200d3ff64536e6b77d24f885dedbdce8cc7c1c404399bbb6f683f610e060c9ddfeda07aa29b9829fa0b29b9f27"; + sha512 = "1b9ef7026c47fa41a60d945c700298936b3c4db1771f27402a7647d5d7660debcbe5cce1da6756546601a0645b62dd6cadbb2a05b38d3023f92e5041c5fc8d5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/id/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/id/firefox-66.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "4f67ff6f4269c32f78d650bd4a0ee4b3709c6a17a6b2e47a5f480e602e5a7a885884bc9590694108f060623146ecb9de3c23ce5bae5a08a321f65bfb9a5fab66"; + sha512 = "a8bb6a29b456190929101b5c8ae99eeeec5e69619034621ecd99831591385e39b7f1396f05685de41737884a22524035cff37734e796bc1118ba569ae690c042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/is/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/is/firefox-66.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "644de50569ca1f30392f5220b10a0596ac316b3e8011372e5154576e43938f4b4fb443f7b3efcbdc46c28a47497807c661c62e139b7b513241df74393fc4a8b9"; + sha512 = "54782924071fdd9ac884a1f69506fdefc49145279c50bb05f81ac45cd678559ba90d6b6048ba59d4bfd0cbafda854372f512241b50bf6118ff7f04898702d0a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/it/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/it/firefox-66.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f2e9bd32d339f350450bfc6ecfd32c34d0eae28e93ecd815336094781bb5bb3e9f0bb06d6e5e9eb0e3b03537560d209498b679e1b19e3132291d004294a6e3a7"; + sha512 = "b32a853c2c8a4a8409987f3ea48f2c0a3d6366c1772b8a20228a288186ed185286aeda598ef4c9bf64c380669903b2f2ae216f06b08e5d12c7b38fa4f707ac64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ja/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ja/firefox-66.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ae793e183b81055f150d1a2b33de8d1c4d093857bc605a7fdf79eea494dd1e209695793743731353c7d187f4590f50876dbffa1136f7805a57a4c6fbc1a7469b"; + sha512 = "d914524a4175d6a10b0d312980cd1acc6070461e178199382139cc84f5e63081d4c52705d25bd48613edbf7ab1f5ad735e7ceb552636639175da408407b5f6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ka/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ka/firefox-66.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "21a151676946a87809ec9f2e5f8ebbb6ebc87b5364bd741bbe22ab9f85bd7fd0144c376fbfdea4cc58383afc544bbaecaa663550cfefbc7fc51d30d99be4d794"; + sha512 = "0f9501b06727c7453fd476fe4f964f36bcd0c66c94f0126b9d2faa30893154da8b1ffa8559a6199552531eab791863d3c758bdaa1eb516325d5c75f28b01a9d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/kab/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/kab/firefox-66.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "da7a5fe6cbdd348e1490396cc36596728e1635d3231507bb62c041c3b234e0386106ad669a6806ce73e100266bb949656590f5ebb4e852c0ff8c704aeab76acb"; + sha512 = "8057d581fdf438ff18672e272fc5e6a884125dd5373fba46f07ad7e18eff7699f1c2d1dfa75740534ba6da096d2c6d6629c30df402d7b5470a6ca2c8600fe357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/kk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/kk/firefox-66.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7f5054a1356c4a82c07390ea9e1224876294bdd4ee0f3082e60cd717d8c811b30c0558188b1315fdcdc4b17c682804248ad5b7615896f85dfbb1ce0b01d6b4ab"; + sha512 = "f70962ec356a8615b8543ffc50b3614d19634d53a9510c069c2ea75fa4d398a8008875180451ce3bcede6395beef6a4d69913d2ac14104fabcc20d5f3b3d03b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/km/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/km/firefox-66.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6acf8ad5acf61f9f0318c5063b6b3346a789719d3a840dcc8d21c57ab1d2abac264b83bbb2908a1c290b6dfdbde7e76f89612ca378306aa95825109cda02a461"; + sha512 = "64174660cb1f85ad2d6112092e970f190cf5b597ff127ca3a99e3b3871ce93e2e30371f900d045fb54e8dbf8a3643dd05ee694140dea4c1600cb806c8e0157a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/kn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/kn/firefox-66.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ed4d2df128db6e5670622ec71ebdaa6c79f9752a6f90e2c15d41f2c3a3a5dbd24a6d8d0dae2ee3c953f10a6b5f72957af6cd6787ce3a01bd235e17ffdf71e5fa"; + sha512 = "56392c5b1e02ce9bd96873fb3901c3d6a70b74dbe657be2b94bb3b811953305ac59b64ecfb9eb4cbd1458815af009a56837650d5bf79224a569c95035eda8586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ko/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ko/firefox-66.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e319d251d7e4d1efb2405c51d5316aec9aee63c98f3bcbe1ec037ce090c9d094ae11daad97b463fe42c23c58e77170d0b16ecc631ede3c90337dcd04384be8b0"; + sha512 = "321cac5287ab454ad1e346f5adf9cdbc69ccefa06cb474fbde80be7ac54e54992820123b1b76b4c29a5d60947cada45e2c98a358c7bd698df0b6507455a2a5d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/lij/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/lij/firefox-66.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9e2f94c28c23474ecb0447f1458f4bab621a792fa3359fef52d205a4198efcea8a649bb831714e3a2de53838207e9f86101b0ef0d9fd50812fc92da342afa5c3"; + sha512 = "b67fbc7af8627f543de0df869a9134133dd4d30376fc137179598caabaaf7160e1806bac696a02150c503571b088dbbfbf3b5577d2e06f09aeeeb465e9616f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/lt/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/lt/firefox-66.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "72068471659887142c90ad842ba73896718be564d10ec76e18198b5584491c627bb557d763f439724f9e9157a049782e2d13405f90e53ab80c40b3e4c612eab4"; + sha512 = "771ccf815293a9183983d1a4aa2912093b310acfba822243f854936ad9c9b79f4df9391ac3e144f67ee7bc39691bc5cc1e3179ced5c7e5f05ab3b388040f0001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/lv/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/lv/firefox-66.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b892e92bbfc4351cad6770b4a9854c463bdcf64d23b3253122cea97a051df6c6269499e9009e37e5d2644b1f25750a3047c4961d4004fd7e8eca5c1d2dc5af6a"; + sha512 = "62b1193f369d26c0b9bf2ef0dcf98eb703867af28158c64d95b5c839fef389eed2abdaf8958140a1c88be5a71f58b4d84596e23f3f8311f61b0f33ba17d9c5f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/mai/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/mai/firefox-66.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "5684b7d102b044c1bbd7b75984c91322561264043711fb85c3ee81e3c4f8bd618dbde04636df4a8c0d5ed2f379c95868adf195583e85fb12bd41ec62c82e6ba1"; + sha512 = "9d7b247552894fd8a44568c1b82135d7250a689af7c4e26084221d49f00429e0893b41492615478bcf33a71c69a0f590319cbaf73d979046f65475d5115cd4e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/mk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/mk/firefox-66.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "d2f5d4bd7265e1b1c1bd94160826b789329c40e3d10ad5b7e5315dbcb231a0c3e08017f9eb718d4611d39fd620996d7b40a7ec539c5558ce7af4631bfb128545"; + sha512 = "9e3e412010552ffcc6278227547712a8e89fb461b218ac34d1c93d0101ac7692204be297c7f23624c1fa0d93452f94b1f061d9fe4fec09e932a2d14780120ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ml/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ml/firefox-66.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "6804d739bfaca5f8018758772b07ad988f456f93ae041499296cc09de0b57f58f9b6409bd45ca40dcf7fb6b1a8425a9f336300a0d2262e54b50421c038328d46"; + sha512 = "f9bb6bafde2f4f921c091214094af3077561b28c8a7679ec81582fe51928c632ca1e4c48d456bc11cb5778fbdfff58f445e0f4ab1db4b8bffd3a940601ca9e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/mr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/mr/firefox-66.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "0ed764c1568d2634fe89dbf52177b1ad01a7db061fca07a2438ee9f05b5177afd4f0b18bc3041bd7af156e8822142d98c184f8c2ed8bff36ea8884229850f915"; + sha512 = "6e65c37476ce375145bea07b44076daf52c9ef8a14a62846a2e3db93ef03a7ccf4a380415ede0f16bf3a7a5fc4c9a9ee9c820f5581b87210a905c43c928fac25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ms/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ms/firefox-66.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "521127d5e752d1c1216535b422f8922456c38c9475f67a2883250371377f5effeedb08dfea88f7613eaca0da5fa44e0f01e8a179d71b0836c5b13e2f3ce7fb32"; + sha512 = "312cda69acaa74d1ed20ce40450f38770fadac2e084d0c76cafdaddbd30da11c36c93297cb5be8b01bbe3615ba0b97f1ecf41167782e34aebac66a31c07027da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/my/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/my/firefox-66.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "4e523629a73e0e925b19cd091bb11f2eb57e9e412434d46ec5de13d504a45f5205ccbb3366d858bb0841ebe0493747cd73b9725ed3fe66855eb7e1f0e70de8eb"; + sha512 = "5b45f982181504b24c910b1356250964e847abd07139d34b7e1190e78c70be6e5cdd31964ecc760f2d4db108294d59c038b610ae10afd84e4c19e6213ef075ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/nb-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/nb-NO/firefox-66.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9b10a0af07fdc45d0617a98cfd4e3ced92984b78baeb77ce0a1cd1fd3e42b1b38c2b43875055e26ad7f1bf8a532ee61d4b0a86149fa9f2989b1002e1b1804511"; + sha512 = "43247585441af4909aa77460a6007b467fa40e1895251f832d804c585d8d0e6d8f4cd3d6a4f3f6bee8111e45eda58f717fb22b158bcac820f1de054eb47fc8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ne-NP/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ne-NP/firefox-66.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "044367898e728fcff62ca906768bfe32dffa5476edef56a9c907b976b4f1acd479951f4b151d4fde01af0ade732903bc3966234b85a0d3a5e3a7790e492ffa72"; + sha512 = "25c5f829400f52ffb51d4d5a3f7ef4de9a6c66f1e255a7033831e6dafd56b865d73a8d01f00d1a955d35a3616ef95722edba3da000928aaa15d06da89ad5a1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/nl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/nl/firefox-66.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1c35bc58d9a730dbcc433deb9446aee2cb17631a6da83c27037a6cfcd0cf2574d3d9f1a3bc5ecfea83039b94618d141c9e1e503c8c369230805bd4dfa3e31be0"; + sha512 = "e0a2c85e99eda6285728943bebe15890676b5afa6e91e0710faf2c7c4f49f37a2468d8ef7323f399c54f1ddeac220256d24039e903c5f130c410e8f8b5c6e621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/nn-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/nn-NO/firefox-66.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6221ccfc6872289408a3cc6ea479f64654951c34b2611797171718a24be8629d73d5f38a83d4ae600d913c32d13a71fe92a9d87c7fcac1531c7c0190efe82964"; + sha512 = "576ee70811932214094da2b97f5c5356cda2bc72de3471b9257c09477762fb82abc0e7bed024379ea02d47fdedef517a2f34f48cd32475e5bf17b83a68b86eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/oc/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/oc/firefox-66.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "31eb098344d612e4c4722e998c9924f7e6447bf7d5ae47726ffe3ff755d4792efdbdd4cd7ab6169dc540467485d79d673f39e689c04210e7494d5e876a539c8e"; + sha512 = "240bbea3568d4886235dd1de0350b5098d49e70531770d66e853b30ae11317672a75756e6ad2536b776887aee45cd7fa6baf880f15b3f3bffaa7a9429ffc7066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/or/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/or/firefox-66.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f01cbea1684f80e7116b18015a8294b18c63e668a3a536e5175a3a43b7ff1ae01e7ace8275149c4ebe93120be5be5e036ddd516cfb7dbef49083071a9d7f1b80"; + sha512 = "ffac97d9be1a3a5d7bcfd2a0fdfb5fa68998699ada6eb6db6a6d006bfcbcf88ee8ef0aadcfdda69c6f8045f97a2b5ca0e201db3aefb72f408cc877d5bed6f002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/pa-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/pa-IN/firefox-66.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f315cbb9d94c648755efadbdd2c19498e9c75aa09eec717a2816a6901e8168f2f751bdce7bc1206e98546e28de71edce9906e5875de6d516e6e9fe9baf690178"; + sha512 = "e459c3f0044dc8224aaabcaa5256f3b5cf7decebd191c5f839723eb3608a01eacce21d47fb91a4a120327372705a8e208e36e9fcb99890cfd9bb298c2f05331c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/pl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/pl/firefox-66.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e9da494d3503e8fe8a7513fd147857670123aa2459596efe6952c3dc2784bb415a19a93bb059bb93c9628cbd5aa82706976a7ff69da001593afce9cd4de5f71d"; + sha512 = "9eaa7159dd9cd99474bcc5bbaf610b1946a16789c218e1277c05d2821426f27b1be6f1b4d4a1ba2927d277da319d75084cba6b47a27c62d63555d1122804bd21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/pt-BR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/pt-BR/firefox-66.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "38481f53629fafcfb905a4147d4eddbe18747f06b197aa4ae465342e6ab43b20c7521195c40d0fef2aa05de32c62f29b4bed2d929d3177ccd3664023b8dc2a77"; + sha512 = "951c1159274551ca2308c88ee779d56a80baf2f109c872a0e8001a70d3c3ec53761bf5923422d2b918035b18ddf52593b20cb8f26b7c3933d600d1b2fdac21c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/pt-PT/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/pt-PT/firefox-66.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6edbb91888a9c914a5e9e360f5cdf967c4403122d9d3baed46d15a184537d6461b02384f9e6cc7de7524c6b191fc780b1bc791866d5694b62cba09e6d923d005"; + sha512 = "6d92321d8d67c360ab1e528ab6e29e6220797f5eb889dfb46836bbd70760c22fedf8504ba8554622ec6675e48567cfb785327707c1e8439383f6a41615a28336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/rm/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/rm/firefox-66.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "2b34ac855d18e336c02532fab08d40fe7875a3b6a4c772cd0978ec5ac7ae2a21e6e18c47cb5eecd236016d77709c59cc530d9aa3d3f9953c08c0569e40d08210"; + sha512 = "f87c7663a94c32d3ed66b2cd1994834e02701225cba13dddc9b692ed7f6880b7d3a92839b7c06f8e84d26d5b1b0c0da5249055c2a611229dca4617cb060f2240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ro/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ro/firefox-66.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "15753687c277c9a62ba1fc813a5606aa78a58e5010de247401724d9d13f01656cd99a51d39a912bc00aaf0d376e2207299393aefcf88670c3b618cd343fd5267"; + sha512 = "0ab53dc62c6f4e676fafec406b6ded994b47853c51cb82ec6a807870fe3caf42f7e920613f9d3d5f157a426f2b8b80948c5074a0742a2ee85ca07f43de273554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ru/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ru/firefox-66.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f626d3cebd9a87dfeecda01364cb5764b213d4636a3d4f358b523549e77550d8c2118ede62c523a9cf216a94fd0e627c03c12deb9766a2be41756570bc74bd2d"; + sha512 = "42e6fb0a99b881f96379cc39db5e43831796e97a2f609334e0a1d5bc9981ff50925ffd718ec39509398ee9d890b104e0bef4adcbc75e9aa159f5f323ae90eba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/si/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/si/firefox-66.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "21c6cb7218e57841f7ab34f1bbdf03a29c1fc5dca0a2417776091922073f0e09a2822742efd95858b4bcfa11ae2e4ebc1ba37b6a5999b37c62e83017f30767b6"; + sha512 = "a0559234ee97e75926bb0fc8a1f65418be9075f52494525785b7f00d34a32a9b05d7cfe11582e466c82c473b61fa9ae7b10580c7f1f04419af371f2c17f3d2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/sk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/sk/firefox-66.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e66aa2a2b3bd52559fe7510f4f972b84ce013a75f1f9a5c3224ddaee426670e33e44f1984923d190fa214a756571016328f739499df2f9eab26c63bcf32bb198"; + sha512 = "40898d79bbc86bf9245000314e699e5c5fc3eb05105d315f2b91fda81bb5ab06e7c03b7b27e76eef6ad79dd91569d0ac8595ecda5cdfa6eb5767ad53a3064174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/sl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/sl/firefox-66.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "8ba46d4148c668b00e32c98599673457662a6947e9e2554909e7048f7e245ad94ba145cf7b51d06d02040f757ecd9c3a3a315a2a01f23e12ecdb38c3fcf571b3"; + sha512 = "8f1d9559e2bfe57ade3d48c1e055d9f5612065763e2582cf1a670fe9e7c41d9685bfbc67d959da8cc1e3f6290769348ceefbabf90350a419ee0ac614572e27d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/son/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/son/firefox-66.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2c5e363c9495d8fc2a38e020dd487b7d33248e46028e5c06fe51297fbc3a44bbe6bb42b870454926c7d45cd954039cbc454dd3fb7831d264a415381d42f35aee"; + sha512 = "5092730bd40688e34b634e0830dd7de04d1e072551b88c456501e7914ea1ad92ae0f33414132e53b547620efb9ca22385744b48fb79795665cd139fa92cbe6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/sq/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/sq/firefox-66.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9d7ffd3fc2c73de397d48c2852210bd4168ca554d04c86b2e156de6df648858b89c1f6912fd650d302da766234253dfb1dce5aa7aa08104b9e3a3861e546f964"; + sha512 = "412864be5d648473bb78110682b0cd9aa6b01e4402166d86a36b6c7a7408601c88b2ea69bd1ea4caf6afbe6b87afa590dbea6614190109c50b2a65fb5681198d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/sr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/sr/firefox-66.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aa2ae93ec9ee8734b8c2f841285b72ed546ae27567b53a279ac40ac0c423e9661b463daa21cba4eeca64b8176d62eafdb3f81650dd42167a243c6bd5d2a96c69"; + sha512 = "01ebaad52af07ad1399e14052b2fd2632f19037304d58020ba750f88a58db7c505a45f504181543a908fe52a2a84539087b70e81d8276aae8a3f713e500194d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/sv-SE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/sv-SE/firefox-66.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "fb9d031823173907de73bbd407b0b61edfcea42332e33a910d599b180b7359570b029f67531ae3f5688d0bb48db964c21e6a642d9b25bba6c678e42734432914"; + sha512 = "49531117a7552cd051f36019ba0b9337db6f8331c048e61470d7a878c0bfff2593899d637f692eed420bee8af8b3da40a2c3b161eb29b542081cf9875633cd1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ta/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ta/firefox-66.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "64debf3d89a54a9c89fc83285cf96629c125dce7f6aad3ecdec0faa8eebc7fc104c513a4ac9be56389780073b55c16e25bb587367784daaa539941c72247b0b3"; + sha512 = "04b56ee60504f9e1c4e1bb1a7b1ff37440a6977bfba23647563fa118b859b705dfcc5fdbea86ab7b427f034665d8f09725e2be4b84c21111505f12bf285c3d46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/te/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/te/firefox-66.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "df3fc45781c47406885925c13d188e547117a1bd80fe57e2b9afea68d0d48c2c27aa0a3da548bb5aff8d9db3579efdec2526a7dd13e1af7c91a473c13c8f970f"; + sha512 = "ff9f40c05e21e4a67d5c94d64af6377a5f246314374069fe619c1354ee94f12a9ee434d0f1416195fa31d675bb2541e44965b661dc75c1d4c5df618fb6291794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/th/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/th/firefox-66.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7860d110f84777ad8074a1713121fb2e90d72718952267cc851012965208edc4be5312681b1deb21b5df3c7f99e955914e5c1f15cf3d26db05f3cee4999eb9c1"; + sha512 = "78a9f8946efbcc9c6779028303870ee5fcee11071404ff2676a4fe011f17995ac1d91adf3e248dccca48537aebb2c55c03bc5d61d6309222d186a716f53f16a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/tr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/tr/firefox-66.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6fb526c76e8eff65a7d36da0cdfaac93d198c6407d31208de01a1f23f819c29ad31964f9362b9fe356ac82c19eb2c9b50293145edaf1741870e2474ba0e5c157"; + sha512 = "3a37cd4e1fee84242ae1e95dd465c0522605f015cb0aaad146014e55a5219633c839fa5086d664b8099ea4ec4faff5f9a4b8bea437bce6238a2fb62a5af4c143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/uk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/uk/firefox-66.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4402b4a759f86a57ba75c745f3d437ce0b818b09769311bcb1a1f4ca6b4f2227ed5ab73c45be3b22f541aa5b362f38e6848c614058a8f831ce0a5f95a582da38"; + sha512 = "d33d74d025eb6629c3ebc3b82356d1edab6748757728f71d1d409b8faac92d6d86c5a2fabbe4aa83baa422ad29dc471e48ec6ef1e0fd715f3b036fd213bcff79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/ur/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/ur/firefox-66.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "bf5686a37c863a0a63bd42d1aeda6a802daf2e83fc7f997c6b1ed6387d0cbefb125bcc621f833abff3e280fdffdbe3bb3b1d70ac1c4b21cb9f2c1aacd31cf48b"; + sha512 = "1c613f838a041145954743c43388fcf0c31466a6ab6e1f880c1234166d31597bb975de56d0110a06ab84a11bdf9bd171b1203523b6fe119a404636be8fc0372c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/uz/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/uz/firefox-66.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8b6e320928f2b06f13801e4cf5f8928dc1c5459dcd1a621d9b6f46cbd552a8a3965ef65f344991b8e6357557d9f635f19b8759945eb7e060ac5aea46e4f86489"; + sha512 = "f436c7f41dbe7df9a7f5924c9a51394062fc6eaa4d26968f6e9b4c1b34348a69ed39a2289169e146902b16a581cb77334eb4679bf6b1bf2d10b2ded6d4592611"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/vi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/vi/firefox-66.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "500c6605eed5ba9d458a8a38c2f1b06fd1db98c4be94407bb1d2a34e7e41c673baebe1a2362d79dd9b9be8e8fe74043154be855d337cd07471777b7901aee711"; + sha512 = "293acecd98c82d48d1275e77f6c87210372f8e4367f63767af25d111e414e88027e7e37142778d77fcf45b345a92bed9b4aea4d9006340341b093a013961273c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/xh/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/xh/firefox-66.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "75561d2be12bfe577234b2831a6954060dedc545e92b6e90b8c5952f390d5325a69218757664e0bcea825275b41e5c6bdb045dc5f1a5d281239c8b35380ffc55"; + sha512 = "bab6aa319dcc64180019d9851bd64bcd006ba17fd845c87bc4de704b21f532327edb263528e4f4982299b215020cbfa79824b28a49970f0ec57d6dc06a3a57dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/zh-CN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/zh-CN/firefox-66.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "77988acd29995af3cb3593090d718318ca2ae65b6e4f28749a8a3587eb69dae88d10568afa5941d99731d1d046146c1e0a2d1207151e5389244701e209b03f2f"; + sha512 = "80311defe5844b72e4fe8db4c1105dbd89bd2c99e1ea895ac123bea6bf90aa7d6dd08be6f80246bce78f2dc3043afd247c9bbbb38b72de9ceead64ec7495d19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-x86_64/zh-TW/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-x86_64/zh-TW/firefox-66.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4b824bf090231b802859ce4c721f1e90cb6420239ccc0e3f42b1a38ea1ab0127a379392c84b01960598433ceebdd91ca1d0ce4b5bf34cb42dbd1a9bd1babd58b"; + sha512 = "472b950c11ef9c00dcc09ad7611e7faff448f733830ab22d7e65e201e9b50001ff57a240043714500ea73ce601a7bb8b7af775f8dd4254fc14c52640c5518c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ach/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ach/firefox-66.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c605a5b5e699499b1ef199d38e05264ce4a0dd83ec456d4bef444cd12312037107b930aabbe83c356dcd1a13b2ad6c3837ca756b75e60b16bb8a5a51d39c0b9f"; + sha512 = "c47045c6699383211bed301363a13a9dc34c48820e052841c502268d9baff93b8027b9277594a3edeea107a602d6a5d3d843e9da166c14f04b63469aa7d911fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/af/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/af/firefox-66.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a884a196724d271a1ccf90885a83df31a8834c0ab6eb7819d30c59ae7b006cb2de7768ecf57198743136e16771d53442d640400abcbdb84858c52cda2af318f9"; + sha512 = "6eca15f4a6cbc8012430fbe702a499f705d233db0ef8cbefb4dcbef9c5f7842c03e932de1a2c69f42d23636ac8abb0bd5b9aef577392ba67386fee0a1975a48e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/an/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/an/firefox-66.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bf5e9c56fde242d2e3d77208de68c6486509b7423cf153e7cc2a697aac8946568ebfd283dffc1cdd865b282c53d4bf3964627b5d46ff4ef159ca96f95982e754"; + sha512 = "9a9709ce33eb7f3e53526f81657d501f82c5f13429394b5d3f887f960478ecc778e16fdb97bfef02f62d08bca4a60ab46d9a2c36590b045cc28b30f7e020deb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ar/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ar/firefox-66.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "372f45f427bcee173d4dda5e1ad5de06283c5e7dd1f37f406ba7705b59b5f252f5a40668465392b8e762e62fe3fa0dae3a07ed5f8aafc399e88dc7b7733c0ffb"; + sha512 = "b7086e1c06710c7bf6858c8b5c70c25d6401c381e2df716dd3ee0469b3e321797522c4ce13fca13354f11295d246a60b8aa20f417167bb57c58437202a6614d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/as/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/as/firefox-66.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "240d344cd349ec19e1935d64aa8f12aa76720b49b549db2c62c44a56738ac94c1c372cb6e6935fe4d21d7cc58fb7dfff521eb4203563d7c3abeac3c87cbdeb74"; + sha512 = "809415dc2269a2d024f304e0954b1288915ebdc709c28488afbca635b6b471919e399c124c91e5bf17287853f9fad58f7d3c1fc47e8bf593f6604ddf171ccd65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ast/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ast/firefox-66.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "67cc7493c3a45f7754af08f1de2418c4026bc30cb235b46cd13559829c48d1553763f41f7652d22dfd8fd375dd523272f3bf6ce55496da78e5c07cb2a8376b54"; + sha512 = "6bcd4deeb5b4ce4dd94b9a803a7aaefdc5706fc95fa3c30aefcfcdafbbd7f7848235955b983c04c64de42c0a0b9856df303fe8655273e2f5e7c1cf6f54f0e8d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/az/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/az/firefox-66.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "723a2ab02b80e097ccbe50533df491191436498840519bc4e43c4a611dae2d7f090ca8fa0e5163234eee3a614c5e630bd4098c9d47a63809b9cdbb6b2d27ff56"; + sha512 = "06a7d2d6043033bb832f31ca928c06c774471d4812cd421c53e23c9c6dd32a205fc5d65e9519d50cf8d12f7a0cb8d38bdd17e0fe5a41f707b3ae96918ad22ce6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/be/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/be/firefox-66.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "451e0abc32fcc703310efff44afa7e8c14b5c714c1ded7d6854d41c1571d3bf48d6f6856c300c0043c2215e865f601d8aaf12d49af93114e1bc006b814f263ce"; + sha512 = "0cc5e3ed7c49891c9febdbeba2f040e520d3dfa0ca66d0c692b2c1f9c0c0364e1c7ffcc3b2d694f2a5babc107ca9c4ff2a4cb8c03fe6f2d047f910eb05c4970c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/bg/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/bg/firefox-66.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "6f9ae70eedec128f5a0f785f773bf124db92a9399a2833211349d7c93fb31cd3fb0d5bf5f55c72b05c992f98a179e52c24f3816e1252e68fd4a9baf9ac95243d"; + sha512 = "7a71063021eb636b2e51514154d6c8e58a377e55151b29acbe6a0153bc753edcfe6ea70ba9ff2d52fca8e0b6511b6adf26e566ede0e85bfdbac229eb324b1061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/bn-BD/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/bn-BD/firefox-66.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "a93033beb1004d4c56a6c5fc532e1ac270e941df86a22393b593e373aa28a64ce787115481c0237500f2f98055685a7e1503ceef7e0d4ea8f1f4a95f83ed8c3e"; + sha512 = "143efc40a8c34f884cdfb08925e452e42db1d068a9483ff7f8a292a2c01323bfb12b838af09764c2c0171bfb8b56e591969e43e8dc8fc5eb788c554157c54fe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/bn-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/bn-IN/firefox-66.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1b5e5b4c258f8c11a3380fbf4f0b07c5cfbbe87c5af0dabdd51790d72d134ee30829a855f5370a4910d90d8e063206c3470e7d50697142e85e8d9308d483f0e0"; + sha512 = "441330d6475064d420b69544a3fea66ac9a8feda732ba8fbdb8f0aed0faaf7d253a97830a48551e29b8ce51d97de6daac0b0aeef9f00fd0954ac02a52148ee03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/br/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/br/firefox-66.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "286c700852dcfc136504983cb883b7050450aef104339e98a1db849d4a6b68f81a37937ed95382786f9880174021b11e7a409c2ee790129cc9c846ca5ca69557"; + sha512 = "cd92fdd7159df93d3ce973d10c17e6df1744c6477a596c07cfe22aadd659ede27c3d48bab0031415fc156403efaee66cad692652713bb6ffcaabfe2eff0f5777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/bs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/bs/firefox-66.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "856db21f663186c9ed2baad6372731efa6221c3af3a1669988b5680c20ee2831900206f61ac67d5141c48d4900f1a2afac3df02289cde2475c2d74e2653cd4be"; + sha512 = "4775876631629a46cd7eb2e622e15f201dbfab5d298808ec6379b34191685b853400c8566a985704c189266a6a4bf53c918d5bd8a880cb72c1fe7be8048d6cf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ca/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ca/firefox-66.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d98d92cd2745dd114c29ea71d28215657acb219f87e24a33a1f16097bb9605432cd9f4719aa1dea2085eb9d28c571194084310c201ad0fccb0382030ee4f5dbe"; + sha512 = "06e784702c1b7ab02d0239bd2bb0797cee3b0aec800e52369c59a1c5b6fd1e668e7ea69d14218c077a9ee5855d609eb7a61b1ada19501bb6a68acd422eb510d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/cak/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/cak/firefox-66.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f63d23382352607627de382b512deab34c2b67e70861f0e1ec04b147cbf5884c437ace4c840c50af5d7a970fcdcfabef3908b3781465306c25b37ab79e66edbd"; + sha512 = "e03e7e8694e9bb511989ab6a09d604a5595593167f2778c78e3619785ec3b36472c681e4b72a489d3d1c6baa32ad571b374579812372104bb45b1f90f16685e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/cs/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/cs/firefox-66.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1ce8b4822f69e6341bcbc2494b9fb0c90dfc7d7733760bae7d372f80457c06b96dd6a3f5ec408c6a6b8dd685c2ec3d36243543915ff0dd609c894b016c13c644"; + sha512 = "fbabc26beb7dd799c5b62f240f19aa6cc69cfe1f8cf0a61df02cafab9c8c55e522667fa12295178b874d5c021da57c3d470a8a1e3bd98295fc177e3588497f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/cy/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/cy/firefox-66.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3e11402ea2fd162840e78e93cfec0d02b489677b772b9e21b011894a266a4260b5db1cf10c52b98047162dc54c0304ee6f8af882a5a29e78021a23d9910ed576"; + sha512 = "65dc25a0f3a7299bfac43cd911abe336bf97c0f6f2dc2c5476e7325d0447501bb04b231e1772b776c8687f518b4a2cd797ae9f3ab65850d6702eacb891657c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/da/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/da/firefox-66.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "51ad603b328740e507794f8d90f052d7ed112acd48bb5d875b4a58e50ce950df22055c207098680c2d02df7de3dbca793a1d43bc1f5c54d93cf350f54f05810e"; + sha512 = "8b1647f905e9d91202c94740f26e7b3e453edba2d017d125b68d89045c20ecac0ac4f14951a03018d4fb104f59ad8fcbe4bea79677d594119daedc517f5adf4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/de/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/de/firefox-66.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ae17ef5190a4d8c626db026b51041fb86f44a678773aa564b868dfdc82ba3d1860bd00bb45bd24f859f5fcfe3bdb767269cb069a394d9dd2f2495f30df2493d2"; + sha512 = "7d69c2c1c1bf73b4e7c687e4a07122a2ff31f5616bf5a1314989860e2b4a7f6dddd9992ef4ba2a3f7f85de39a726ecb3732a04a668599d19b80c34919dce9f08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/dsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/dsb/firefox-66.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "4a6b8e623b7880a9dba05600e6fd20bdeab2fa888f6aa91483378267756a714382b281a96e94bfff416a9f80acc46f476be9e6f4c37a2820a02d305902a89db7"; + sha512 = "9b991a471eaaa5ca6144664ebdab98ad80f660785edd5cd9ced392b67180bbedc7102bc2085ed701f3c076b8fe9f2795415649ee344b5bf0fe0d98f96788a402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/el/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/el/firefox-66.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "0fd9cb9e7ef3072ce32fccaab8fbf54e829c8c7ba34d46d395732c0dda292a375c2c3eeadfd895609bc162bcfbe7478dfafae211048fc97ad74b2a395ac876bd"; + sha512 = "361e9b75b5344f2883affbd9b7de1cbbae8bab6c6f5ecdf1bf44bcdcb7f6f6bb67653e980c16c16c335bc6ba6cc3028cca7846ca751a42a3c7b0f9a3e39c920d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/en-CA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/en-CA/firefox-66.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "8648829446a21a7692824b8dca6ba466df0485d46b84012810b7c845af74b6820977b8a4b085d93d6b117399692ee637351a5c02255b8b37e9e98a087c53ef76"; + sha512 = "485dabf1339f159ce379433b1fa7547e15bb9b3c0afdbabe0da33d5e4a21562824dbbd480c179252429bf35f8d8dfc949b56f3597feb84eb69838a532e993e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/en-GB/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/en-GB/firefox-66.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "835e02e1223dc4c3d147b4ea89be1a4e65fae9c2a6e30cac6a6f348ef96be3c2174a125b0245d81ad60e17ec9324aad8854206e8a8fd8cf4d85e9b5859df5e80"; + sha512 = "ef7e6a2e7b7f59b3c52d799b8db2a85c3ad63fe26bc396d8bf3661180c8f60790fac4d325e20f6174181d33c732eb10247001688d18d18a5aa0d5bba70a73a95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/en-US/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/en-US/firefox-66.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4a4e3e94da618099abf739d5a2fe8d6f9aea5a21e943734232db73481163397d6721dd8082dd71d766abd1ca1a730233822adfc01b847cc951a77495e14cd8de"; + sha512 = "555204f491f8f3a41dacb6b9bce3f387e1bf844eea772241a6eb12f4421015d512face0f66ce7d9cf49b6767c1494087ee45986ea58313b8f1bc0684c79a0d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/en-ZA/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/en-ZA/firefox-66.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "8708f982e83fd85d978bd8ca9a11ba20d63e281a379f2b41c0c2acab68a47540db82d95027b2f5ca5891963c3af2eed7589b0429b50a8a73f82414035c9761bb"; + sha512 = "4940d6f32abd3c3c2d39bdbb3a88bbde13623e7dc135a17907593a39844c2785923941add69c0e0a2b278842853b312e9a4bb0d75c07cbe0f2ca59cac56fc723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/eo/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/eo/firefox-66.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "71b272742b881a9514d4764b89c412309de2b30ae01871511ad0ca47673d249fb733aa46ca17c4e168ea99a0260c8527b67792c1ea1d54508f5030cb3e8e44d9"; + sha512 = "be905b576473d576e28824f759d3fed11bac2d6b0a85e1eaf7ad432e64524780fb4b3a811c24117838c6b58ad7f5d2c84bd46cb28f33f6ee8786491b37a297f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/es-AR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/es-AR/firefox-66.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6f4be1dbe04453c1bf7a85551a74e6644a95498302a572cf5ef47301fad61257b380af0a856bbee3f44600115eddcb5b2d5d7bc47c5cc95f1da5b3b716d43326"; + sha512 = "9d4ab435d363c4bfa527fd128dfa2a9e919bdfa5b2d842736b75a0aa19f2e0eac960ee15705a8608ff2f0802b99fef7a4f621f3bd09842bec73326dcdbeeb2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/es-CL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/es-CL/firefox-66.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "2d41e718fa6feb50c95217cbdd014866b1623868d701505f99b00ef0b83649c3fe15b80c77b03a39bccf7428a7e5e7e2c91940635f962220df1b128827fee800"; + sha512 = "a987ff3bbd830d02e20fe1419b418360d2c748e80f7277e32d8c761b59ea306da8a6d9320817dc6bc2347bf8dced0cd7ecf4aab7e8ec6808ead94a56f95c7e18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/es-ES/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/es-ES/firefox-66.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "67fefe6356a64eb8c65c91c77dc70af758d4256f2d616abb513cff0f23d554d24ae02ae880ba422e218f6e321882acd341b7967059f72a96705b565823fbf0e1"; + sha512 = "35da9f6118eb78aa49d8171a39ec430fd12683040f762bafb3b14f8df8694e1fbc3dc301f0b18fbbca6709d99f4e360094b77ee2bb58deb57983d0399fdea477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/es-MX/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/es-MX/firefox-66.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1a2e7acc5e13815c11de38c9e8c682fb742a1025d75c99ce5214de20a66c41a8320d7fdcd31362638012407a5b0de9662f0838c838cfe147e8b5ea81a3679019"; + sha512 = "97bf164fabccf3451f0e39870d00fd587e2b26c246e954845845eaaa8a6d39413afb961a0165790593fc923eeecbdd73d8e4bc86f787361e25e7a297e625fffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/et/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/et/firefox-66.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e7eb8c1b0b8c8cec8ebd3ec17df4f7cdb13ff0e45f77e4f5bcfe37ebbf3d84c378aa4d3d79435c3fea13a0b32749b9a5bfb23f115461c598a626be90198d52a1"; + sha512 = "707fdd1963ab1d75cf094f04e597aca20530d2fcba055aeaa6ef74ec7fa9186200de6433ac2e432632d4cc39de12599b0858d2c2db2053e4badae51f1c14c9ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/eu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/eu/firefox-66.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d9d2733b2760434d036965d681f2249003c92eb1a984073a0c67e9319fffac99946c56375b7ec8bd6ca57256312f0d01be5a0fdc7b23e8fec6433700fc3306e7"; + sha512 = "9cb29a886e9597da6eaf7a3d152ceaf44dc547bfaf1a2497fa15d1758f180a225d034d98accb4e9553a78c7645a73939059d0738dca17e5323cefe0a0f2d0e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/fa/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/fa/firefox-66.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "bc197cb508a0172cebfbefc622a7dd75238077c83c6e702472bbc50124a8e356f6601fa7022e193d2f87c5fc7ffd3ab8e768be2d69b339141d380ae6203df5a8"; + sha512 = "c19e5fa05cb7e471c6d136d39bece2abf72273edc9c54f7ce82e4ee345b15cdd4ee697a10dd381bc540cde2e0ae539133ac08aadf3663fbab1e7fc32dfa6cd36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ff/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ff/firefox-66.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "54ca7e12e727d0332971922393ec07a0fd510a20a512876f3ea31814bc4fca7400ebb74bcfb47e3eb01f7f8ca9cd12613724e098fd722be332b7d16fbc700893"; + sha512 = "88757fea37c73db887c9bb0e71ddafb95da3ea5d376b9fb68109f28ff0f553af29eb8389f382616629a07d2f5bb5528b4d51befd50efe521e2b94b69b7be25ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/fi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/fi/firefox-66.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8a1e67c72ac42c1843a1045d4c61f4e735006c14791f0be3cfb99b6b83e33025566084e4873b790f6651e061e3d9bdb6459fe671e58978d9023717aeb88027db"; + sha512 = "2374d4211f8c9b10a3e5ea4b7732585bf553784c7ff85fba80bd21757a609abade8d90039fcbc17322690c18b5468a5ccdec2c9ce1865ea34b459adca6cde0dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/fr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/fr/firefox-66.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "65152e19e4612f94ac6b442b833b65014d8758c9ef7e0d504e917c4874071544936dca6b2951ee9712ee3e1e64272184a6b58f9980755a11d71f9f8e3b49226f"; + sha512 = "1a482f75b4f376b195a52f447cef072a61f6d245a2f47ce55109293b08c00c770f7d3afa5ff3aea13866d2e7db072f8ac683978623c9186553ac79efa8cec7fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/fy-NL/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/fy-NL/firefox-66.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "b1dabeace3e716c7f1bbb495f3dc1fab176642722a421165b16b42f508d543e2df417d7550dc3b3bbb0beaf78afac096354e85c913d67c0f0e540ac2fb91b439"; + sha512 = "5ccfe081568b897776aeb5d96a7873d8cec47f4a7963b1d56646d29b726a487e0602196ba4b827ba21566e3a685f96267070b1e5da973affbe849085e3df5e66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ga-IE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ga-IE/firefox-66.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7fcf6700bd46ec19f26c4da6407a41bbdf4b4eea882bcb97952ec969a48300019ff2e314b0ffcf4b89267f9a0bfdb353cae6c32f9e50057279e10bb7d7bde2a6"; + sha512 = "c4f13e86f06c61792257312b4f418ef9c666b93c8c414a2b9506ffd3566e19ed253e044fc53cfa731c8d3b65953f428110c848c7862b4ad0c2a31c9b975a9f11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/gd/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/gd/firefox-66.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bfc8119a10d14d09c58410406fe5e21bb9dd88a3f33006b11b91f305df52cad007195fa54eeb39b428b69b3a37ceba1fc8ea98b26ac3d593eb012580640e2a4e"; + sha512 = "f0079622dadf311201519d4570adc5fdfdad3b38ea7594f34af23a5505dac1d750550f0eb20f3ab4978d6b86c45c21bdbe60e5c141acb633e8194bc519c3a627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/gl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/gl/firefox-66.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "56c57bfe8bf4073bffa03272f3eebdc49d570f1f3fa53d038613887f0763b8a7e914a4a69e7127a67e7c2184d4945d036afe14b5668ba8870a9e7e214faaab93"; + sha512 = "0b979589837f24fd91faa6c782c81b92e96ac90aed278cf74b5982e95505f130b698c382d34a9cad384d9eebdd4d9e6653e0af04a09456b911be368b1b3bc96f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/gn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/gn/firefox-66.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1e02e41ec22d02f3abb17c171e22eff6275314159a72262895042ebf0a2806295758b1d4b6bd58481eac767d4ba0e0c80ab301c92eebc4514f718f4bc367798c"; + sha512 = "88568e41debc6545cd39cbb8a0e62a1cb40c5482cf450c12cbf6a3cf3a2557d71f6523d0b5b3c0cc90043bf4df7008b262146059e435b45796a5ed47956acf1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/gu-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/gu-IN/firefox-66.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ad11aeceec2f2280a976423ec25a00e83d4739bec1ff5db15d64a0acda19e21c5bd72757e3dad86aa6264c3fb7a60a98f512d58f020b3cbcc496569877bc94c2"; + sha512 = "cf0d599afd3de9ed20196e102ed8621a0939936ee4e67622dc720cad15a5267f24bef8b0a34c1fc7899942c32e97a1db6fe214438de6eec4380543481a297ef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/he/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/he/firefox-66.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "653875867187273cae0fe42a55c11cf90c5353ec74be8bb4c3fafc84b46fe379ff66ae9048d84d3e7592ec77d9c16bc9f79fbc5f1f984fbc26dd52528afcaad9"; + sha512 = "794cbc9c32a43250dc805dd701fbb74228a7327bf83ec577e38e96126c7d0a0c6d9fa529cddb27eaf6614fad1b0cc1b32b6edad01370fbb8cde8115be282d2ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/hi-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/hi-IN/firefox-66.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5ef85794ca608ea279719a4607fa3c19de7678073ec39d7ab07b533d5945e706cea27aa5055a1727678d668c70b8c69164644047b13d198dbcaf243e6aea1fa9"; + sha512 = "deeb33b41d33c511dcd92f1c5e42ea1ed2102261b2b4f77b86d3d5463fab14e7082c145bdd57706d0e21706d2c9a2251d7a543684c13485242ee2b835655468b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/hr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/hr/firefox-66.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e6f606ab720cd6086d25f6fbf7b166f1930cca4d93ba6e8491866f3573a8a1f7f8b9b26913bf39397d83dc6d978ccb6d08ca7a44ed801aa02debac0b9656f72a"; + sha512 = "91dc7cf83687bb625a6a94e923d02a8953b4a5524c6c0253cd6fda2c17c5ee6155dbf844fbad8d6f75c0fa6b2c6dbaebc41cf45481082b8f5bc73509b07cb017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/hsb/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/hsb/firefox-66.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5bf1738b898da2782e3a11e0e6d15efe010d918dd34803fd53e94dba509aded4ff541972e697b0306c685dd5793bd1feb8c168fface4a6c5e65c13c5350f135a"; + sha512 = "644a6b77beade4b1cb04e9eafa1d9dbbb60af80cbc14f41414002e7a2465b7bc1cb2388fe64f60b66d123fb85d2082b50b33c341037a7bbfe01c8334efaa3cdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/hu/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/hu/firefox-66.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "f0c76e538847f6b1cbbc8761700c9ef9bb6602078fc6181f2aae3790b38a50eb83ed0bcfe2c6ead9ce482df7cf8dbebd12ccd544c072ac0f353158409c2a4966"; + sha512 = "56275b977e2e765d43c8fa12af06e1b52f5dd0e48bdbcd4370650f79be72bc95c60de3546db9d2998703243356f9059eedcd3c721cb68f9ec71aa66bfac6de7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/hy-AM/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/hy-AM/firefox-66.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "8213daf1fd248aa18c951e66d7dd933831a21dd60dbb46e4867ee0dc9f88edaf1958eeb0a2df25719b7f19d10ed343e554b5b1ab4e46cf2d148d99ebb9732964"; + sha512 = "7fba962b860921df46aaeb9e2ac41bda9477da99fb28c2f363c7f40bcf0090c2bcd43f5e68bd0a3494c8baa4af9a7dcf2f9bd11c75e45996708318ab7bad7a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ia/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ia/firefox-66.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "ee20cd3826f9d1d8980d634b4a986087f2c2fb78a80526a9a192867065d0f55995090e6e574aa81bdd5b4ff433ad4b9b9f32c21e358e4105b421b881bf799beb"; + sha512 = "39d24c785a21c070724e6edcecec0ddcaba74f5c88333919d3ad3d104bf451b1c8e85e14f0b6ea4ed5f32932c0bee86545a9ad0d00ba58820b6cf4e8720ff26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/id/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/id/firefox-66.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "35b8dc914bfc552a033089d04aafc7b33e4ee0c105d874eae04b93e496bf41e4ae6685503301d8712bc3284f9a222985f80b689b951c906c91e822a98bab0279"; + sha512 = "56e13c3ec4c3df9e20f83a71415079cdbd6939f4b833e5531bbb98b22a2985dd655b73edec7ba41d650397753ea43626e88ada55dcfb40eb79c8873f8e25ef81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/is/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/is/firefox-66.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5dc55f41b0a536488a8e130babc34feeaf00ad888a6d2d4b47b3be166a7a45f46fe3f106771e3b2683fa65d1a5187d7db2488aad4f242685086bf36e0bcfc279"; + sha512 = "a459eacff46d061b245caf654c6a71e8145ec3af7832770e9bcad23fd038f3a36ada724f0f617d128880b2b1deae324c08e20a4ffce6acc851f69785aaedf300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/it/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/it/firefox-66.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3d2f1e3a3a0258aa4608d241041c08016697265cd41d662c50f0fa6a6899d2fe597e0d0940b9cc50ed02c8de574ca7c183ef2f67d3590f40801de17e20fdf066"; + sha512 = "bbe3e9e9272b952567f084ea21d2ddfdb1c95bc9dfb793a1f80f044a4c72eb312a856eb351f7461f0d4eea5914077fa822ae3fab1ec52055f74b1034d62f0c4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ja/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ja/firefox-66.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "772e0f234d6e3b2147aaf6470325797be2cb6c7b448940b06b123100692786b7a071bd904d82baf202f98f83336324a164dc4e4c6281f19e2b3da3f72b7f856c"; + sha512 = "550163a74ebd42ffe10833e0c5695fecea871c82740736167fae0e03e7622f617276a9b7d8e19f5e4a0c0c8d3226144319296c68cbaa74e362bb283d97f1b4aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ka/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ka/firefox-66.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "0049f94ed2bc20169fb7bb89dd752af87d4c30921b02f5556c112421af3a6d768f3b90a0814f43f0464c2628d5b2e560021f1cd12e9e08eda12b72f3c52507d0"; + sha512 = "5da70946bae103e8489e1e8263f1406fe49e2a20bb3bbb9db5c2af7132b75295e864fb76d4b7504128e42a257357157f704564eb6519782d010c4ff59cb98c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/kab/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/kab/firefox-66.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "4190fa7bb3491a717ae8b8cce8a24c3abe12b7d9ed688a748171f13147839c164824d26d533deea66f7684401d864ed607cdfbe3043ac768541ec8da0695d206"; + sha512 = "d0ff02c64597f7b30ec1a520b753533a87383f9f64e6382b3b2cb483bd3f550a01d603c31a6ad1a3992c48a85e1402aa8f6769315a88a7b3fd4b2861d914400a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/kk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/kk/firefox-66.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c20f717f79f903a112a5d8c3f16c3ea10c249916b2b9b201fd8b6c0a1f81ee6e57b3f05c72326da49b71c696eb59e163143c227aa4f5ee0a4ccfc4faa56a5008"; + sha512 = "4545d22c026ac27149cf1d5fbab6eedb983c5536b487c89eafcca900ec091b3c61b817f7bb74c01acb52d6a7e9ba36aa19bb0ffc269a05b5c9032ffb6088d887"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/km/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/km/firefox-66.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "84ceaa70ba9d29025026224c57518c0bbff8aec61ea346642e827eb5e3eb73a7c484d0f980b7aebbc40bf945f0ab82138f0ecff01141e28a963f1c8d9fc64b84"; + sha512 = "79856d400cdabbc02f3dce7ec4c8e11633b08169d5a252dd989bc5febeffc088b6db153be1da5f70d325d75cf00a29ee7dec07aac0cab1b2bc8e57c655f225c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/kn/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/kn/firefox-66.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9ba7390169fd78cc2ebdd3f7d7a38b16cb2e7ca3e294f531d09531018e1fa78a00c16d8ad934fba425a39ca22cd5e2795bdc16402c5c76c65a75e6c94d0a1deb"; + sha512 = "54f893ebb03e129b59e5fb443d132a8cfe3180459aa01b998d3a8942872510bb48e2108a7df9da0cb42a716daa1a683d664db49480c7effa4090740d07c27871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ko/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ko/firefox-66.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0fca2abe6a92f85e4d84cd4f5228e9f7cac1cf8404f356d77be36847e91c37c05c63fccf083ed159b175631dc60273bc87ddec6ae032d112bf7a8790a4de38e2"; + sha512 = "45b08d4ca4de61dd9fead4f89c6919ecaa600529e8dcb6b4866aa4c4005c2a0e62d2076f6e5d7325c3fdbb8492fff42a61d32f7d3e738b38cbe46fe6afe3a783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/lij/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/lij/firefox-66.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "5088aef9f047655d3f6288c952dde072407566f49ac392bb9ac02ca490ce59cd281245e507beee509990ce9da77f606ff8204ea90056f23503c337a072b0685c"; + sha512 = "17c79e53824cf7f097adfbca26c3859b5dd3a48cadbf6f186ef008f8f1e6b6ad6f96df49eb85039240775d1fc1f40e1be81d53f199d048328f67a099c1abba8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/lt/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/lt/firefox-66.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b4d37ce9e1afecf5775af799c0fb38422b22b6ff4a5335c6c0dd972ce55a1a2dc1c34fb4902471f80c0f9b4514775ca0c2bede8bf1482e52fd6174c002684fe3"; + sha512 = "218212b60ab67f2864fc86f5516e406c49b2ba5733e545e855e088a41a53a701ef9c8a2623715679def5075da4cb94f7bee9a3c17f3f09603e0f739f577f9c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/lv/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/lv/firefox-66.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "7d091632ff589215e8f1c2bf4124628d7dd608387b09f34432ca9ec99f5fc88a446266c475f3f2d9874dd3d316c1e7131500b4974636e326011052703b6eb20a"; + sha512 = "e77484741c6abbd8ed9346bb29ef27f1da3f0120ff80f25b80e52413ac81e38b715724b8d257554fdadb41a20892487eab11511ec0c9a47eb0e5c1eda31a6ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/mai/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/mai/firefox-66.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ab24e1be56956890ba266ff651dc7d815dcaa3599ba056f7078117b094ebb5daf78a02d28e801398cb9382848d5fefa27be2059d25e8c8ef7ff87f442d9ad924"; + sha512 = "7d95c25206045221ae9934785105c00d411b03d5f8dca5271e562f8be928ad58777bb6641fc25be8b56a329dd91ba6bda33c17a2345197dbeceac17801c89145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/mk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/mk/firefox-66.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "545004af54d119b2b01fe5ac33b56b26bc5200526f60d34990f62a41e42f3f364661b8a9e837da4826686386aeb286219c42e30da7d83c82c700c0219017493b"; + sha512 = "6700da362a918b4e4262a2eb74bfbeb78c7761bd8fc8fc1d63fb3a9ca0a6eccf61f141c46a208f924f4d440615bad623e304bbf95aad90dc9ac740fe2d6ac1ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ml/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ml/firefox-66.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "b89b4c8e3e5d2f1b12f425b6a8d7d6471c636769e7f78e7d49344415c9b0d0d8cc43126a84a13dcb1eabd2a628b72c35c6da7649f440ded75431ba313286ebea"; + sha512 = "f25f57cd6286023de12e4e17d3260ecead8c0c06060d31a125c39cd1cf459054577ad873d3d43510e4452879d1e136b28fe9af9afc2a71ba5b8d27205565f976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/mr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/mr/firefox-66.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5db3bdadf9ea1bcab2dc6eac4ffadb13a5768c865ccc7bc504c9d1ac87a4230ffb9255080e56b4f9209cdbc8dbce0a4090b13e5cc956a12de6d3b622efa293e4"; + sha512 = "76e2fc7cc86bc1b846716d18a5e4a34c3be7afe951130f83cdf81fb5b0ecda6ad663fce4f904fbb39838a04af138dce92ca3f8ec7d6331360fe2198d1583f8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ms/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ms/firefox-66.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0c3b830546a016dd9f08d20d7d0b3da18a17ef990ce007509af9465f2e73e37e0e0d8f06f0906e1cb5122b8a8c3a972a2d478e662e967ea4b494ad359803877e"; + sha512 = "c8beb0a1d4a0710a9321b44f783badb2ee616d9cb2ad7d66e932f80b8d0198d45ba46accb650660db93aa82663b1d057c42427737a6e37f371e6041e3a41c48c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/my/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/my/firefox-66.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b807f5b1f0e0e6503a211cef506d573868fe49c30fb3143be532ee0007473de5ab87a57e0df6276a8a8b1a768402ec5e9695d8919309ae4f2187e9449b4d2dcc"; + sha512 = "ec8974168b8645f36caeab22f6848cfe59b891ee44bd275168288cf80cc111155b5c17ff9c97dfc67735ee8f361ac8d68c1c51f70c912fa5a9efae78f1ebe01f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/nb-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/nb-NO/firefox-66.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "11d7d12b4fc52a7aebcd29112c6e40c29c7ecd45d59a2bde75e0908c8092d896f90365c7f0056bfd5974efd783e2b5d45b022dc9630cf0452cb3d79f79f6609e"; + sha512 = "d48b0b2bd8aa81bef1be4bfd06055c3b51ad9aae0f990ac9d7482a9b57f1676695b9f74a0b074ca52cf13ccb3e9dfab9d86009a6674e8038fe0935fd1aec7b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ne-NP/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ne-NP/firefox-66.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9efce88e3d801b8feb7ace5d17a602caf8c3ed19f062988c94bfc00184f38ca076cbbf0bfdf9a452d1b479dfa2d68b2e43785d10777025d3f079987f7e14396d"; + sha512 = "c501e6a854429852173519c50383b21eddf510614953ef6d660492ae5026f70287a29e4fdc531ebbd38f94dceaf378d45dfa9b1229fdedaeebb8c7c533a660d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/nl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/nl/firefox-66.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7683f4fa2dde95380465206f3c5c3744ac6e9896af4a2ca44ee2d277f6db365dfa2f047152a09629abe0ce4fd0aee24fae7b9562d3e0d14c9d086ba649b34278"; + sha512 = "2e984172251a8c6dbf0acb02cadcf96dcfffa0f4ddcaa2275895dbbc0693ff4c8d232d0f1347fe5a14bd31c357224c14c0685d501eae84172e29b44012ffabdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/nn-NO/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/nn-NO/firefox-66.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f0dfed1fa1fc76a77af266a5ead81acc5d35620d43fad05d11bd8f40bdc4fac3a4dc0f5e05a8e3b9d58b2c7abaf9e601c261b2cacedda549321e437e1d61d521"; + sha512 = "15198a68f4084f760bc2c4c6e96afab57598837e08cb8eaec02cfc5a24d077a9c56585a9581c51de188a18fe644780b84a563408f025f87d34d809b0c25d4733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/oc/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/oc/firefox-66.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8cc69b3d970e3937981b10bebf44c16cf196f182abb78bc3ae5eb1be585ef3eb70704976b31032e66586bf759518e7641dfe10f3acee265f3aaccd4495fccfa3"; + sha512 = "e62f496333f6fb2aa4f4e2c3d96c0fe2090bb8b620f0ac7aedbbc09abffbf1de4b320461e40ec9f7567e21ac02356119722e21b1f61732aaac7e0e50b592ace8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/or/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/or/firefox-66.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "65214f0af43b9a42c9ea15cc1800b3771ca64374d0d81c03d2cffeabb3583d576313b1755a9c291769aaa5546b1ac58cfdfd53784645029c8c15a1f657305b3c"; + sha512 = "b9a49bd6f409a298a562b54648545269437fefccecd65efe71400f2867795d446d022a1c0c44f662e520ff56f6ebe1e1b4877b05d784b4217ce7fc5b33ed6c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/pa-IN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/pa-IN/firefox-66.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1ebd79261ea28652fee45c6fe3f167339d4d95c9cf495b1a34ed736e7af0f305a1a15d79c90f2db5b73bcc473131b2b393ba32bdd0543789d7a3ce8dccc419b3"; + sha512 = "e35f801bf3fb6917ab2110d9281370bed92a1f2441252d58bdabd114d40f04b2842cd8b1dc45bfc812b3ed892829d76eb1c519a42e36c31db3a8dc2686ac67f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/pl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/pl/firefox-66.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ce97ccbe13353ae817c9e8e19059a9aa3a2543149c7537f0cee6aebc4e5c022ccbbb002634b0e805522c3a3b5fe0c4e7e54c4d447274f25e301db1fb0b0a99d5"; + sha512 = "22a564b61a00aa55c7c1e00bdd36878f39739cc6a54633ab69cfeca815b0b41c46f93f82934a679d9c40d987a8fb75bfcf08a009c5942716a60e83c0b8533e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/pt-BR/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/pt-BR/firefox-66.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "47e6e293f463ec4aeedad034918b84c2698d8df76cbbae3821deedf925b16ca90efa0168f2d5ab3aa9bc23e004e40849cbffe9bdb29fa3ac3c78876853e45b0e"; + sha512 = "ae66dc84c06048a870936bb06ee4498458db35c7929053230c2ab2f7e5bbf4ca042a5e46323fb99bca8cb48739d4e1fffd9f715f1df5874d03a4f4d84ad231bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/pt-PT/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/pt-PT/firefox-66.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2e75f5e119bc15619b3d51e439ce2e1456d70c0c03d7f0e34678bf673ea3231ed0a2e57f813f12ecd56fec7593ac8e3b307556142eaa2a43aac5bb0b862b4808"; + sha512 = "8b40937027764544b33f08f46cef9e564f9173a445dc0ee1447752b048e410a277ad68aef93a6ae0e1ce14dcae6734a7a3e6a4d5744b9f81d54b824a3478423d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/rm/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/rm/firefox-66.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "961b6800262c1bc8952594cf05b8817fb6fdbfbdca594ef0e8c4734bfd534aa7987c41c77f2e0e1dcadcb68aed146bd4e32d463dd6d638bcab6ebabcf7ac7545"; + sha512 = "ae538acf4ee91cec62adda2bd707e94ed166a9fa8622fc0d3848b6626aeeb7ac06935cf39740c3ab587852add1b0644db63a87b65331058975926616af2715db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ro/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ro/firefox-66.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "660b8b2a4a7e7b0076ef6f635e130731bb10b6264c29256fa523da74097affc5f32342347140575a3dff9605a992baa355246c66c1eab6e0e70ae26f9c135423"; + sha512 = "dde9f87a668ef5f49f6e67f846057eb0debaef62e7bc2ecdeda925c75a1a116ace10819740350fa9d84be1961d280748da470602bf9ab2f0fc1999fdb77796ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ru/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ru/firefox-66.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "eeb864a3dbb3bf8a9356bea55b20b279f8fbe4f21754e0ca28fa3e0e5d754482d44a70910448a26b53f5ee2e9071f1c32742e6ceba17495e852e55afa001981a"; + sha512 = "b1c2c86ad58200574175d408cf2ab4c2be895681a779f9097d32fda3fe31d10df6a23ca509f37ff4cd7934bd1a77540e00cb43021f82f9fbe7f894d5dd21efda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/si/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/si/firefox-66.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9ba3c81ae9ba6f685ae18b75e54fafe38e93a9b3a04613501647010143d292724f8bc367f9f1385cc60077b226bf8beafd21e8bc081bfc897213b94058222a7b"; + sha512 = "075a76e9df69deb4c82014a9668be33c5c4a42666c0b143519802d7461aef3d47ffdeb3e52b69c0393595848d92dd85da5f437365d189fa257fd55b7fde0a632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/sk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/sk/firefox-66.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f4988b0e3915b608bee7894f88b731d0cdc90e0194bc00ebcd93567295755205654f6f969bc97965b00b45e9d985b2f45dc4a616ebde3ed0a89b28f2dd13ac75"; + sha512 = "0676d6b0844f2156bf2a75201185d382f9cf187c20bf3246f2c1c7ace2aaf5048fab21fdaa362e5f06ffa9da74908d2e453f3596f441bbe299b88b96e0343c7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/sl/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/sl/firefox-66.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "cf30d88102dc62b688302ae2db3a138c74dce7fd95cd47193795a69aca7121920fbdfbaa36031c9a8b634acc5466a4e6dbbefca14ab02eefcb008fc8c01c51d3"; + sha512 = "a5444db839cc8a434a3989b0f7c7a26e6891e0f8d75fbeeee7d9e6670f549a7b3a6a2bffecf7e1ab12d87ee792e29aa7dfde608d8e939f70eb5f997c60159aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/son/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/son/firefox-66.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e9372e5604863cf9de7865c3f8970f699c9ace42bcc8681da483c021beceed82d6f31a0053aadcd1586006107403cf1c95632e8fbb03a8bd2d4879b88a4f2d42"; + sha512 = "13f3d79ed7c249dba15d56998157538b2f29d60f2dacdf2a7ef5842d647564ac97f1890f55944399294dab003469762d491011c96854662326289084c290f782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/sq/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/sq/firefox-66.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a45301f007f860800c62545678ac56d5a60ef41620a5728166aa16755bc26de788882c4a4deeded52d7d7797a810d00ce0365f1cab769307b61428a8e0b43506"; + sha512 = "5cdf63a339c39585c0fbdbdaee7a5dbcd429396e5d41690c67e71886343c8ad125a49a4d020aa8e2c76aa3ed2434dc5c75f0bc81f7820fa8cab2d6b5eba1ac7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/sr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/sr/firefox-66.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "446f1f990ca7cc82f08ef9665b752712b2437709953aafcd857160e7ec497dd4f20d83ea3aade19acc4423d4fea4fb68fcce79b214795833aee6003e9173a48e"; + sha512 = "c548c760e259cca3f9a3cc2a2f60b4bdca2465868e1ed163e254d762e362ea0254fc0abc8b9e499a6527dcc2c9e4e3061d1c51f73a175abf0ba763013f799990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/sv-SE/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/sv-SE/firefox-66.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "bb9c968e92df2eaaa30945a3b69ccaa791200ac9ca552a94662fd12842851f67ed259e16e331be7a750c4c3852b180f1652245e7a6c98c0647439dcfe95274f4"; + sha512 = "bb5301a7f95d981f2ce81c7d8bd0c9794dcb40cafa2319e4b78458c0a408257ca18898b94f5e794eded42e1f15805e2eb5cb6f74e72348974f4be61e10d659fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ta/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ta/firefox-66.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "f46a7ad1b7b289c200b7596285cbb0239b8735c029d15ed87be8c92cbcdc91de548c751aecf87891c167ee7d734d3bde6bf956aea81c59cb58349b46c3cdb43c"; + sha512 = "411606fa20a343c1b940daedd74fd31c475383a02a45a569e6b7267c7a32bd439eab8d878b27a84cb915dc78b9aa639e474c2fe84906f80a8a88b342416ce29a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/te/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/te/firefox-66.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "f26eb10cbc174a1064465dec4e80d72745646e83fbbb8366a88d30c9b125491a1c9f55925d47ffcbdddfe5124afe3143491030a7006b439e98e115a3a79e8613"; + sha512 = "6722d67504cd0ef6dddd6c61f9a29f30c3f465ac96c02d8793e1cd9e514d01b5a12f4d7054606379c2a270b0b9b0653c5da037f359eeaa19d526bfb003288ce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/th/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/th/firefox-66.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9c78a9e23fb7e2f285d2d6f6211502d0552663e628713f68a77a5660362bd849438676cdcc61ca7f82f15dd20d1d3a826a375d4213a482d2d2f5a9ad6c7a48a8"; + sha512 = "05246804e32d82f1ba05dbac7e8dc522dc9fd34191a5c179384fbe26465ad91536f126dcb747edfd413a67eaa47b69970a84929170596c8a3d9815b6adc0684d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/tr/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/tr/firefox-66.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "95719f36f6e51c06010002b864fb02d915116298aaf34bd53faaa27a7e3aadb72188470172242c5bcaf52af49cb95a7595b711be564f5707565490863ed971bf"; + sha512 = "3e28e2993dceacf4c749a7213eb1e49228c1ddc17902a8cbc9ebf5592cb58165d626a68bc9b49bf87214ac2b5994c832700fba1ce1b66995756c18ebe4844b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/uk/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/uk/firefox-66.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5c721f06d8bb447f64340f7b401113e12ea7218e955447618f664e6342338d4d4be37b5428138945ab3974020b8f93dbdb470633e95b220d1b2773b4aba2084f"; + sha512 = "ff4af647fde7eb734273df9dc1ea088c34a729d09f1c193ea949afc59b925de01925874e705e874825ff72435720b33c1ac6253afe4040bc99d9e4ccb6a79850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/ur/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/ur/firefox-66.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "44f05c92e5c8266fb7737d45b52850f3a74d9eace06b292b6e0ae2b89c2ea06365c8597b6a97f409bb6056cb1c25717715ee69a6ee67e0d70bce7355fc25d41c"; + sha512 = "5cebce4fb5458b8e9a4c13e17a6b0549e45a91427f6be40e73e1bce93bcdc4213953b011a2a05c15ff8331e467d96d5a7ea2b39aec59a65c788698d91d559c5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/uz/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/uz/firefox-66.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "48ea82a4a95ed7338ccd5c80e29b32a96fe7bde165332a0ad93d420ba9fd5cf100680d70d3e167e21a8fe3d590e107b91a4bb209907b491883c25d6e1fdfd5ae"; + sha512 = "c91a618f2ab715972030c6ff38c69933e600c73c8fd8dee73c7139ff1db97476b1d6416aced338152d32e79d9851d85c414f3eb7c5778647e57e3f657b1e25f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/vi/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/vi/firefox-66.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "bab39fb5f5f095d8f208a4f3d75a91c7e706aff5a2fbe5f967d83b2912f2735c870dd20d83ee9795da1f8dae407bae938f5992be2fb4cd9c428dc08161aa454a"; + sha512 = "5e6e08620a059e829e69081e283ec3657b52fa61efb7e764483d422e4cb22d4a9b9c5d6ea7ebc67536c3406e5056aad1d0f6ed3d67c90189d87c6258fa6672c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/xh/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/xh/firefox-66.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "768cc0ba0a00bd0df1264134a412c77642ad2c20189935004808d22ce00967b9fab001494c5baf99faa30cd9eed353e56ccec7521f10a60349af77f26f933972"; + sha512 = "4e3485546d357d2578819c2a8570ff68b80fa4df62606e9577ee2a66aa3239273ce6fb5576579153f6ce99e3199ffe75f1b1b7e585e116e9134a84fa015544b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/zh-CN/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/zh-CN/firefox-66.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "96fa0aa76a4dc6dddda66405e37fed714ca6011cd462186f8cd9dbafa4337751c6b83461a4723f76b24da92dd4c04d3616835d0dc4eabb126979b554b7e2c062"; + sha512 = "5c9453ba9d610030f4858d94fc5e5d7c9e66e1dccf5a6a3f0f257b73d04b2006908c01a684b2ea0c1d4ffb32414ef849145db1c6cc386d356dfed26f45e38dae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b3/linux-i686/zh-TW/firefox-66.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b5/linux-i686/zh-TW/firefox-66.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "55cdc0c69a457ba1056dc5a3f5fff645144edd32ef5a691caa83d72c7d72d7b939598367c7173133ce48e05a1e26fe5ca66374b9c9cf2a8fc8a2a6cc023f37d0"; + sha512 = "67e6c08be254c3b9de9edd05359ab682da5b44a5ab0d44923b3bbd57e83a1bfaa114b43a05b3fd559df27eb1aa3a19178b24ed48a68950431cdbc333c23e14bf"; } ]; } From 783c46531be2c6c08e2c4e3f5c3b6f1519ef0d82 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 5 Feb 2019 19:45:21 -0600 Subject: [PATCH 341/467] ledger: 3.1.1 -> 3.1.2 --- pkgs/applications/office/ledger/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 5c37a38f1d39..643d9ed894fd 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -3,14 +3,13 @@ stdenv.mkDerivation rec { name = "ledger-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; - rev = "v${version}"; - sha256 = "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp"; - fetchSubmodules = true; + rev = version; + sha256 = "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc"; }; buildInputs = [ @@ -32,13 +31,6 @@ stdenv.mkDerivation rec { make doc ''; - # Skip byte-compiling of emacs-lisp files because this is currently - # broken in ledger... - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/ - ''; - meta = with stdenv.lib; { homepage = https://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; From 117551ce2a9c909385f812705e2bb28d94aa9273 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Feb 2019 13:23:03 -0500 Subject: [PATCH 342/467] linux: 4.9.154 -> 4.9.155 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c63fa6189eff..6bc54ef44f6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.154"; + version = "4.9.155"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15jnkpf6kg061970cwh2z0l6nscffl63y1d0rq5f2y3gq4d4ycav"; + sha256 = "179w0yfnqk0rjdfl3fjqx5b9jn8i0bizhqckv49f63rwwc5wcam5"; }; } // (args.argsOverride or {})) From bd7e5b51b5395724dacdb4f8558ade0ebc65a5a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Feb 2019 13:23:24 -0500 Subject: [PATCH 343/467] linux: 4.14.97 -> 4.14.98 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a63dd96a7b62..78448b4bc389 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.97"; + version = "4.14.98"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1x25x6scd81npiald8i5ybb5yy3n0dh6x56avm0n5z5bvlqwilld"; + sha256 = "0pqc04ij6qdfhh3rpakas0qc0vqj8mm120z64q9v9vxin5qi20lg"; }; } // (args.argsOverride or {})) From 7870ada54950c484d0cec0df624ee76afdf3cb77 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Feb 2019 13:23:37 -0500 Subject: [PATCH 344/467] linux: 4.19.19 -> 4.19.20 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 05cfbb781734..b88196754a19 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.19"; + version = "4.19.20"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gb98s14w8gzbgd9r6hmppal92lqfjhf1s1rn1p6k7a7f3vcmbwr"; + sha256 = "1904zamsxxzm0qbjv9mprxamhs7a3dymxl0yfj777gylv9v2fzfw"; }; } // (args.argsOverride or {})) From 7b0bf31a74e4d032c3c4c63f6f58b14f91f74f44 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Feb 2019 13:23:47 -0500 Subject: [PATCH 345/467] linux: 4.20.6 -> 4.20.7 --- pkgs/os-specific/linux/kernel/linux-4.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index 9f2c3719f9fc..d3fce3b3ec07 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.6"; + version = "4.20.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09fzspfs1hhbqgb3fh54q1i5jmakmxb1y180m5dn1zqwsxayx1a1"; + sha256 = "0ivdz7kdc69n86rd489dhi4srhr4k3fic5vabf61l3syzqx7s3al"; }; } // (args.argsOverride or {})) From f825049742266616afe60a74380ffb5e3b6aaa45 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 6 Feb 2019 19:29:45 +0100 Subject: [PATCH 346/467] dmenu: 4.8 -> 4.9 --- pkgs/applications/misc/dmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3ee2006ab0c0..90754b8fb1d8 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-4.8"; + name = "dmenu-4.9"; src = fetchurl { url = "https://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy"; + sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"; }; buildInputs = [ libX11 libXinerama zlib libXft ]; From d4b243905f2181111b52d5a58b2119469ed689fc Mon Sep 17 00:00:00 2001 From: k32 <10274441+k32@users.noreply.github.com> Date: Wed, 16 Jan 2019 22:51:19 +0100 Subject: [PATCH 347/467] rebar3: 3.6.1 -> 3.9.0 Remove hermetic patch (make it compatible with the upstream) (Mostly) eliminate the need for hex package registry --- pkgs/development/beam-modules/default.nix | 30 +---- .../beam-modules/fetch-rebar-deps.nix | 32 ++++++ .../beam-modules/rebar3-release.nix | 85 +++++++++++++++ .../tools/build-managers/rebar3/default.nix | 88 ++++++++------- .../rebar3/hermetic-rebar3.patch | 103 ------------------ .../tools/erlang/hex2nix/default.nix | 30 ++--- .../tools/erlang/relx-exe/default.nix | 54 ++------- 7 files changed, 195 insertions(+), 227 deletions(-) create mode 100644 pkgs/development/beam-modules/fetch-rebar-deps.nix create mode 100644 pkgs/development/beam-modules/rebar3-release.nix delete mode 100644 pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f71379459dcb..a1eedaad6a0f 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -23,12 +23,8 @@ let hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { }; rebar = callPackage ../tools/build-managers/rebar { }; - rebar3-open = callPackage ../tools/build-managers/rebar3 { - hermeticRebar3 = false; - }; - rebar3 = callPackage ../tools/build-managers/rebar3 { - hermeticRebar3 = true; - }; + rebar3-open = callPackage ../tools/build-managers/rebar3 { }; + rebar3 = callPackage ../tools/build-managers/rebar3 { }; # rebar3 port compiler plugin is required by buildRebar3 pc_1_6_0 = callPackage ./pc {}; @@ -36,6 +32,9 @@ let fetchHex = callPackage ./fetch-hex.nix { }; + fetchRebar3Deps = callPackage ./fetch-rebar-deps.nix { }; + rebar3Relx = callPackage ./rebar3-release.nix { }; + buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; @@ -75,25 +74,6 @@ let lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; - # We list all base hex packages for beam tooling explicitly to ensure - # tha the tooling does not break during hex-packages.nix updates. - erlware_commons_1_0_0 = buildHex { - name = "erlware_commons"; - version = "1.0.0"; - sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7"; - beamDeps = [ cf_0_2_2 ]; - }; - cf_0_2_2 = buildHex { - name = "cf"; - version = "0.2.2"; - sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28"; - }; - getopt_0_8_2 = buildHex { - name = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; - }; - # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex {}; diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix new file mode 100644 index 000000000000..a94d803f0d32 --- /dev/null +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -0,0 +1,32 @@ +{ stdenv, rebar3, curl }: + +{ name, version, sha256, src +, meta ? {} +}: + +with stdenv.lib; + +stdenv.mkDerivation ({ + name = "rebar-deps-${name}-${version}"; + + phases = [ "downloadPhase" "installPhase" ]; + + downloadPhase = '' + cp ${src} . + HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps + ''; + + installPhase = '' + mkdir -p "$out/_checkouts" + for i in ./_build/default/lib/* ; do + echo "$i" + cp -R "$i" "$out/_checkouts" + done + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; +}) diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix new file mode 100644 index 000000000000..837d0ccf15cf --- /dev/null +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -0,0 +1,85 @@ +{ stdenv, writeText, erlang, rebar3, openssl, libyaml, + pc, lib }: + +{ name, version +, src +, checkouts ? null +, releaseType +, buildInputs ? [] +, setupHook ? null +, profile ? "default" +, installPhase ? null +, buildPhase ? null +, configurePhase ? null +, meta ? {} +, enableDebugInfo ? false +, ... }@attrs: + +with stdenv.lib; + +let + debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; + + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + customPhases = filterAttrs + (_: v: v != null) + { inherit setupHook configurePhase buildPhase installPhase; }; + + pkg = self: stdenv.mkDerivation (attrs // { + + name = "${name}-${version}"; + inherit version; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl ]; + propagatedBuildInputs = [checkouts]; + + dontStrip = true; + + inherit src; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + + configurePhase = '' + runHook preConfigure + ${if checkouts != null then + ''cp --no-preserve=all -R ${checkouts}/_checkouts .'' + else + ''''} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" + then '' escriptize'' + else '' release''} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + dir=${if releaseType == "escript" + then ''bin'' + else ''rel''} + mkdir -p "$out/$dir" + cp -R --preserve=mode "_build/${profile}/$dir" "$out" + runHook postInstall + ''; + + meta = { + inherit (erlang.meta) platforms; + } // meta; + + passthru = { + packageName = name; + env = shell self; + }; + } // customPhases); +in + fix pkg diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index e96852602fc7..6d64c82f90ff 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,46 +1,46 @@ { stdenv, fetchurl, - fetchHex, erlang, hermeticRebar3 ? true, + fetchHex, erlang, tree, hexRegistrySnapshot }: let - version = "3.6.1"; + version = "3.9.0"; bootstrapper = ./rebar3-nix-bootstrap; erlware_commons = fetchHex { pkg = "erlware_commons"; - version = "1.2.0"; - sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7"; + version = "1.3.1"; + sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; }; ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; version = "1.1.3"; - sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if"; + sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe"; }; certifi = fetchHex { pkg = "certifi"; - version = "2.0.0"; - sha256 = "075v7cvny52jbhnskchd3fp68fxgp7qfvdls0haamcycxrn0dipx"; + version = "2.3.1"; + sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68"; }; providers = fetchHex { pkg = "providers"; version = "1.7.0"; - sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb"; + sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6"; }; getopt = fetchHex { pkg = "getopt"; version = "1.0.1"; - sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak"; + sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; }; bbmustache = fetchHex { pkg = "bbmustache"; - version = "1.5.0"; - sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd"; + version = "1.6.0"; + sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df"; }; relx = fetchHex { pkg = "relx"; - version = "3.26.0"; - sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9"; + version = "3.28.0"; + sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5"; }; cf = fetchHex { pkg = "cf"; @@ -49,59 +49,71 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.4.2"; - sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav"; + version = "1.4.3"; + sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.5.0"; sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; - rebar3_hex = fetchHex { - pkg = "rebar3_hex"; - version = "4.0.0"; - sha256 = "0k0ykx1lz62r03dpbi2zxsvrxgnr5hj67yky0hjrls09ynk4682v"; + hex_core = fetchHex { + pkg = "hex_core"; + version = "0.4.0"; + sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f"; + }; + parse_trans = fetchHex { + pkg = "parse_trans"; + version = "3.3.0"; + sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; }; in stdenv.mkDerivation { name = "rebar3-${version}"; - inherit version; + inherit version erlang; src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0"; + sha256 = "14prx5bkyy9sisnp5rj2058xpylq80xygsj1hq8b7m0awvj3r9wy"; }; inherit bootstrapper; - patches = if hermeticRebar3 == true - then [ ./hermetic-rebar3.patch ] - else []; + buildInputs = [ erlang tree ]; - buildInputs = [ erlang tree ]; + # TODO: Remove registry snapshot propagatedBuildInputs = [ hexRegistrySnapshot ]; postPatch = '' ${erlang}/bin/escript ${bootstrapper} registry-only + mkdir -p _checkouts mkdir -p _build/default/lib/ - mkdir -p _build/default/plugins - cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons - cp --no-preserve=mode -R ${providers} _build/default/lib/providers - cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt - cp --no-preserve=mode -R ${bbmustache} _build/default/lib/bbmustache - cp --no-preserve=mode -R ${certifi} _build/default/lib/certifi - cp --no-preserve=mode -R ${cf} _build/default/lib/cf - cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable - cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters - cp --no-preserve=mode -R ${relx} _build/default/lib/relx - cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun - cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex + + cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons + cp --no-preserve=mode -R ${providers} _checkouts/providers + cp --no-preserve=mode -R ${getopt} _checkouts/getopt + cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache + cp --no-preserve=mode -R ${certifi} _checkouts/certifi + cp --no-preserve=mode -R ${cf} _checkouts/cf + cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable + cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters + cp --no-preserve=mode -R ${relx} _checkouts/relx + cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core + cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans + + # Bootstrap script expects the dependencies in _build/default/lib + # TODO: Make it accept checkouts? + for i in _checkouts/* ; do + ln -s $(pwd)/$i $(pwd)/_build/default/lib/ + done ''; buildPhase = '' HOME=. escript bootstrap ''; + installPhase = '' mkdir -p $out/bin cp rebar3 $out/bin/rebar3 @@ -109,7 +121,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rebar/rebar3; - description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' rebar is a self-contained Erlang script, so it's easy to distribute or diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch deleted file mode 100644 index 59004561126c..000000000000 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/bootstrap b/bootstrap -index 5dedd713..864056c4 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -101,7 +101,7 @@ extract(Binary) -> - request(Url) -> - HttpOptions = [{relaxed, true} | get_proxy_auth()], - -- case httpc:request(get, {Url, []}, -+ case rebar_hermeticity:request(get, {Url, []}, - HttpOptions, - [{body_format, binary}], - rebar) of -diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl -index e69de29b..8f6cc7d0 100644 ---- a/src/rebar_hermeticity.erl -+++ b/src/rebar_hermeticity.erl -@@ -0,0 +1,42 @@ -+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -+%% ex: ts=4 sw=4 et -+%% ------------------------------------------------------------------- -+%% -+%% rebar: Erlang Build Tools -+%% -+%% Copyright (c) 2016 Eric Merritt (eric@merritt.tech) -+%% -+%% Permission is hereby granted, free of charge, to any person obtaining a copy -+%% of this software and associated documentation files (the "Software"), to deal -+%% in the Software without restriction, including without limitation the rights -+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+%% copies of the Software, and to permit persons to whom the Software is -+%% furnished to do so, subject to the following conditions: -+%% -+%% The above copyright notice and this permission notice shall be included in -+%% all copies or substantial portions of the Software. -+%% -+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+%% THE SOFTWARE. -+%% ------------------------------------------------------------------- -+-module(rebar_hermeticity). -+ -+-export([request/5]). -+ -+-include("rebar.hrl"). -+ -+%% ==================================================================== -+%% Public API -+%% ==================================================================== -+ -+request(Method, {Url, _Headers}, _HTTPOptions, _Options, _Profile) -> -+ ?ERROR("A request is being made that violates Nix hermicity " -+ "This request has been stopped. Details of the request " -+ "are as follows:", []), -+ ?ERROR("Request: ~p ~s", [Method, Url]), -+ erlang:halt(1). -diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index 2cf167ee..6080aaca 100644 ---- a/src/rebar_pkg_resource.erl -+++ b/src/rebar_pkg_resource.erl -@@ -127,7 +127,7 @@ make_vsn(_) -> - request(Url, ETag) -> - HttpOptions = [{ssl, ssl_opts(Url)}, - {relaxed, true} | rebar_utils:get_proxy_auth()], -- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} -+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} - || ETag =/= false] ++ - [{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, [{body_format, binary}], rebar) of -diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index 17446311..4d44d794 100644 ---- a/src/rebar_prv_update.erl -+++ b/src/rebar_prv_update.erl -@@ -38,6 +38,8 @@ init(State) -> - {ok, State1}. - - -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -+do(State) -> {ok, State}. -+-ifdef(non_hermetic). - do(State) -> - try - case rebar_packages:registry_dir(State) of -@@ -53,7 +55,7 @@ do(State) -> - {ok, Url} -> - HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()], - ?DEBUG("Fetching registry from ~p", [Url]), -- case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, [{stream, TmpFile}, {sync, true}], - rebar) of - {ok, saved_to_file} -> -@@ -77,6 +79,7 @@ do(State) -> - ?DEBUG("Error creating package index: ~p ~p", [C, S]), - throw(?PRV_ERROR(package_index_write)) - end. -+-endif. - - -spec format_error(any()) -> iolist(). - format_error({package_parse_cdn, Uri}) -> diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index e21749f90d02..5a24c3c95256 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,29 +1,21 @@ -{ fetchFromGitHub, buildRebar3, +{ fetchFromGitHub, fetchRebar3Deps, rebar3Relx }: - # Erlang dependencies: - ibrowse_4_2_2, - getopt_0_8_2, - erlware_commons_1_0_0, - jsx_2_8_0 }: - -buildRebar3 rec { +rebar3Relx rec { name = "hex2nix"; version = "0.0.6-a31eadd7"; + releaseType = "escript"; + + checkouts = fetchRebar3Deps { + inherit name version; + src = "${src}/rebar.config"; + sha256 = "1b59vk6ynakdiwqd1s6axaj9bvkaaq7ll28b48nv613z892h7nm5"; + }; + src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex2nix"; rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0"; sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk"; }; - - beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ]; - - enableDebugInfo = true; - - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall - ''; - } +} diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index 9bbdc8c8334d..2c32cc5c6706 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,49 +1,19 @@ -{ stdenv, buildHex +{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }: -, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }: - -let - providers_1_6_0 = buildHex { - name = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; - beamDeps = [ getopt_0_8_2 ]; - }; - bbmustache_1_0_4 = buildHex { - name = "bbmustache"; - version = "1.0.4"; - sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03"; - }; - -in -buildHex rec { +rebar3Relx rec { name = "relx-exe"; version = "3.23.1"; - hexPkg = "relx"; - sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + releaseType = "escript"; - beamDeps = [ - providers_1_6_0 - getopt_0_8_2 - erlware_commons_1_0_0 - cf_0_2_2 - bbmustache_1_0_4 - ]; - - postBuild = '' - HOME=. rebar3 escriptize - ''; - - postInstall = '' - mkdir -p "$out/bin" - cp -r "_build/default/bin/relx" "$out/bin/relx" - ''; - - meta = { - description = "Executable command for Relx"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/erlware/relx"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + src = fetchHex { + pkg = "relx"; + sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + version = "3.23.1"; }; + checkouts = fetchRebar3Deps { + inherit name version; + src = "${src}/rebar.lock"; + sha256 = "046b1lb9rymndlvzmin3ppa3vkssjqspyfp98869k11s5avg76hd"; + }; } From b32491fd3cdc43141358a6ad42efaee715b49e35 Mon Sep 17 00:00:00 2001 From: Daniel Kuehn Date: Wed, 6 Feb 2019 19:52:42 +0100 Subject: [PATCH 348/467] libvirt: Add argument to enable support for ceph rbd storage --- pkgs/development/libraries/libvirt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9f183365aae3..85b8b128d208 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -7,6 +7,7 @@ , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi +, enableCeph ? false, ceph }: with stdenv.lib; @@ -45,6 +46,8 @@ in stdenv.mkDerivation rec { xen ] ++ optionals enableIscsi [ openiscsi + ] ++ optionals enableCeph [ + ceph ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -85,6 +88,8 @@ in stdenv.mkDerivation rec { "--with-storage-zfs" ] ++ optionals enableIscsi [ "--with-storage-iscsi" + ] ++ optionals enableCeph [ + "--with-storage-rbd" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; From 3b7713a4d636b4274b11a95480e7a9f6d6c5071a Mon Sep 17 00:00:00 2001 From: Daniel Kuehn Date: Wed, 6 Feb 2019 19:53:23 +0100 Subject: [PATCH 349/467] qemu: Add argument to enable support for ceph rbd storage --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 86cf5352d6b6..301a9211cf65 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -14,6 +14,7 @@ , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen +, cephSupport ? false, ceph , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] + ++ optionals cephSupport [ ceph ] ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals smbdSupport [ samba ]; @@ -117,6 +119,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux "--enable-linux-aio" ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" + ++ optional cephSupport "--enable-rbd" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; From e9982cc501655a803ca2612d05a9a4fcf33bc379 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 6 Feb 2019 20:06:57 +0100 Subject: [PATCH 350/467] rrdtool: 1.7.0 -> 1.7.1 --- pkgs/tools/misc/rrdtool/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index ab16d8cb6bf3..09df21e4c41c 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -2,21 +2,13 @@ , tcl-8_5, darwin }: stdenv.mkDerivation rec { - name = "rrdtool-1.7.0"; + name = "rrdtool-1.7.1"; src = fetchurl { url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr"; + sha256 = "1bhsg119j94xwykp2sbp01hhxcg78gzblfn7j98slrv9va77g6wq"; }; - patches = [ - # fix regression https://github.com/oetiker/rrdtool-1.x/issues/794 - (fetchpatch { - url = "https://github.com/oetiker/rrdtool-1.x/compare/0f28f99...f1edd12.patch"; - sha256 = "10g56zy0rdjpv3kvvmf6vvaysmla05wi8byy3l0xrz2x8m02ylqq"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] From 2fac8b2740c56b5471f366f6f3f4ffa218f323e8 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 25 Dec 2018 18:45:12 +0200 Subject: [PATCH 351/467] syncthing: use proper output for binaries in services --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9dfa7f9a0ab0..722d0695cc63 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -71,11 +71,11 @@ in { substitute etc/linux-systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace /usr/bin/syncthing $bin/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ $out/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace /usr/bin/syncthing $bin/bin/syncthing ''; }; @@ -99,7 +99,7 @@ in { substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $out/bin/strelaysrv + --replace /usr/bin/strelaysrv $bin/bin/strelaysrv ''; }; } From 3fa5f623bfc570d2cc7bb38f3f11cd34e40c700b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 25 Dec 2018 18:46:37 +0200 Subject: [PATCH 352/467] syncthing: move systemd files to bin output --- pkgs/applications/networking/syncthing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 722d0695cc63..8fe9af549bf7 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -63,18 +63,18 @@ in { done '' + lib.optionalString (stdenv.isLinux) '' - mkdir -p $out/lib/systemd/{system,user} + mkdir -p $bin/lib/systemd/{system,user} substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/lib/systemd/system/syncthing-resume.service \ + $bin/lib/systemd/system/syncthing-resume.service \ --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $out/lib/systemd/system/syncthing@.service \ + $bin/lib/systemd/system/syncthing@.service \ --replace /usr/bin/syncthing $bin/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $out/lib/systemd/user/syncthing.service \ + $bin/lib/systemd/user/syncthing.service \ --replace /usr/bin/syncthing $bin/bin/syncthing ''; }; From 6642f3f213a059a830538af8e03c80c7ca386280 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 25 Dec 2018 18:47:14 +0200 Subject: [PATCH 353/467] nixos/syncthing: setup user only on system service --- nixos/modules/services/networking/syncthing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index b2ef1885a955..702481ec5177 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -122,7 +122,7 @@ in { systemd.packages = [ pkgs.syncthing ]; - users = mkIf (cfg.user == defaultUser) { + users = mkIf (cfg.systemService && cfg.user == defaultUser) { users."${defaultUser}" = { group = cfg.group; home = cfg.dataDir; From 3592dd04e912a268c0eaba633abfc214c282e2fa Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Mon, 4 Feb 2019 16:17:08 +0100 Subject: [PATCH 354/467] jackett: 0.10.660 -> 0.10.707 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 064cbb407beb..0b9e43f4c319 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.660"; + version = "0.10.707"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "04dh3cdd0k0xjrhifshniwnkhwddis6y7z6az1fg9gzm3ivwyyi7"; + sha256 = "0ks5jsfdwhkr8mr5q73yhv4q6bpab15my4iq1163ad5lcb1981r1"; }; buildInputs = [ makeWrapper ]; From c7191de7dbb6ff712ae00d70549572119bb1d4ff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Feb 2019 14:40:21 -0500 Subject: [PATCH 355/467] linux: 4.4.172 -> 4.4.173 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 335abe645beb..9095a63355b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.172"; + version = "4.4.173"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1yrrwvj260sqnn8qh7a2b31d31jjnap6qh2f6jhdy275q6rickgv"; + sha256 = "0wj2y6y2ac5m6p6ghb4rmxfdxyx0gq7yv7b0qzmdyh4dkpi7qa0f"; }; } // (args.argsOverride or {})) From e4156fb421fd9886ab0f82e7923173e2fea60f3a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 6 Feb 2019 20:50:57 +0100 Subject: [PATCH 356/467] signal-desktop: 1.20.0 -> 1.21.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4bd92d56c290..30fadabcdf30 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1w75g7i7hf9b3yilnd6ivhd4xgp4z000x9wnrqcba2dgbr5pz7c7"; + sha256 = "01fkmav057l7z75g06b2f8h0q6cfa78nv26lnf0kp6a34z0g9a94"; }; phases = [ "unpackPhase" "installPhase" ]; From e5cb28030331656be7fcfbf72e3b1d17d796d891 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 6 Feb 2019 21:05:53 +0100 Subject: [PATCH 357/467] pdfpc: 4.3.1_0 -> 4.3.2 --- pkgs/applications/misc/pdfpc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 20c304074c30..0e424a97d8dd 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.3.1_0"; + version = "4.3.2"; src = fetchFromGitHub { - repo = "pdfpc"; - owner = "pdfpc"; + repo = product; + owner = product; rev = "v${version}"; - sha256 = "04bvgpdy3l030jd1f87a94lz4lky29skpak3k0bzazsajwpywprd"; + sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z"; }; nativeBuildInputs = [ From 063e245811b12df8e1b3d5033c8b5badf38a6695 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 6 Feb 2019 21:12:11 +0100 Subject: [PATCH 358/467] groovy: 2.5.5 -> 2.5.6 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 6b55f006cd2a..dc04e72c7411 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2"; + sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn"; }; buildInputs = [ unzip makeWrapper ]; From 87d8ba0ae62a4c121df4b1abd8590856b23c76fd Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 25 Jan 2019 22:43:58 +0100 Subject: [PATCH 359/467] imagemagick: add djvu support --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 669c7c8f9612..efbf5864faa8 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkgconfig, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif + libpng libtiff libxml2 libheif djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 79149dc83cf8..b3a1b64cae96 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif libde265 + libpng libtiff libxml2 libheif libde265 djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b61ad101db0..ea6131d99d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17703,6 +17703,7 @@ in freetype = null; ghostscript = null; libjpeg = null; + djvulibre = null; lcms2 = null; openexr = null; libpng = null; @@ -17732,6 +17733,7 @@ in freetype = null; ghostscript = null; libjpeg = null; + djvulibre = null; lcms2 = null; openexr = null; libpng = null; From 45fa569222a4a7800373c08742e2398ae7a86194 Mon Sep 17 00:00:00 2001 From: klntsky Date: Thu, 7 Feb 2019 00:52:01 +0300 Subject: [PATCH 360/467] nicotine-plus: init at 1.4.1 (#53717) --- .../soulseek/nicotine-plus/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/networking/soulseek/nicotine-plus/default.nix diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix new file mode 100644 index 000000000000..a38a9140b490 --- /dev/null +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python27Packages, geoip }: + +with stdenv.lib; + +python27Packages.buildPythonApplication rec { + pname = "nicotine-plus"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "Nicotine-Plus"; + repo = "nicotine-plus"; + rev = "4e057d64184885c63488d4213ade3233bd33e67b"; + sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c"; + }; + + propagatedBuildInputs = with python27Packages; [ + pygtk + miniupnpc + mutagen + notify + (GeoIP.override { inherit geoip; }) + ]; + + # Insert real docs directory. + # os.getcwd() is not needed + postPatch = '' + substituteInPlace ./pynicotine/gtkgui/frame.py \ + --replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')" + ''; + + postFixup = '' + mkdir -p $out/doc/ + mv ./doc/NicotinePlusGuide $out/doc/ + mv $out/bin/nicotine $out/bin/nicotine-plus + ''; + + meta = { + description = "A graphical client for the SoulSeek peer-to-peer system"; + homepage = https://www.nicotine-plus.org; + license = licenses.gpl3; + maintainers = with maintainers; [ klntsky ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea6131d99d73..8fafe7e9e092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18440,6 +18440,10 @@ in natron = callPackage ../applications/video/natron { }; + nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { + geoip = geoipWithDatabase; + }; + notion = callPackage ../applications/window-managers/notion { }; openshift = callPackage ../applications/networking/cluster/openshift { }; From fa5459a2cec0eaf36f5020f329867398820814b7 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Wed, 6 Feb 2019 23:51:28 +0100 Subject: [PATCH 361/467] defaultGemConfig.ovirt-engine-sdk: init --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8bc22d9c9a7f..e28f5d85a6b0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -275,6 +275,10 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + ovirt-engine-sdk = attrs: { + buildInputs = [ curl libxml2 ]; + }; + pango = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; From 884f7ad3cf87455b283ba0a47a9e873bb84ced7b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 6 Feb 2019 17:55:12 -0500 Subject: [PATCH 362/467] gnome3.gnome-keyring: disable test suite Seen these fail non-deterministically at a high enough frequency making it a good contender to disable completely. See also #55293, #51121. cc @hedning @jtojnar --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 1e3e98cba732..51ed38836f30 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { patchShebangs build ''; - doCheck = !stdenv.isi686; # https://github.com/NixOS/nixpkgs/issues/51121 + # Tends to fail non-deterministically. + # - https://github.com/NixOS/nixpkgs/issues/55293 + # - https://github.com/NixOS/nixpkgs/issues/51121 + doCheck = false; + # In 3.20.1, tests do not support Python 3 checkInputs = [ dbus python2 ]; From f3750e7b41a617a3db6bf4fc4a8f4a888658151d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 6 Feb 2019 17:55:26 -0500 Subject: [PATCH 363/467] gnome3.gnome-keyring: use placeholder --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 51ed38836f30..a72efc61e2fe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" + "--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/" ]; postPatch = '' From 130c76b320ad6da80e20723daf3b8a5bff8e40a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 06:39:23 -0800 Subject: [PATCH 364/467] python37Packages.beancount: 2.2.0 -> 2.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-beancount/versions --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 0544819570c5..61080e5e4c46 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , pytest, requests }: buildPythonPackage rec { - version = "2.2.0"; + version = "2.2.1"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1j3fyyqnr5gq71rmkb9q3im8pqppa134zzhmmp4hk4b274g18w31"; + sha256 = "0xrgmqv0wsc0makm5i6jwng99yp3rvm30v2xqmcah60fgjymkjzb"; }; # No tests in archive From fa81321c32d182a3a27ff7f8c33a00e698aa1bca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 18:54:09 -0800 Subject: [PATCH 365/467] mopidy-iris: 3.31.8 -> 3.32.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mopidy-iris/versions --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index dc129f945fdd..6e61e0377f80 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.31.8"; + version = "3.32.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16rrvby6rdiz53minfqsbgmymnc4agi2iwp0pf5ahsaxp1xq0cqy"; + sha256 = "0cbb3v9gysi0800ls9vva7clilyg295jcvawyvf0czdmv4wxg3mq"; }; propagatedBuildInputs = [ From 878965731f9e35580efc21b0d3e79022cfaeb0be Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 6 Feb 2019 20:04:24 -0500 Subject: [PATCH 366/467] nixos/lib/testing.nix: config defaults to {} Fixes #51858 56e12aae54bc67cabe5aa7c8d055438af4f62b5e ends up passing config to pkgs. Unfortunately this might be null and pkgs/top-level/default.nix assumes it is an attrset. To fix this, we just make the default for config = {}. Thanks to @kristoff3r for tracking this down. /cc @domenkozar --- nixos/lib/testing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index e68563ef48d2..a13e76a69560 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -3,7 +3,7 @@ # Use a minimal kernel? , minimal ? false # Ignored -, config ? null +, config ? {} # Modules to add to each VM , extraConfigurations ? [] }: From 17036309a34d7c37fdd0b54635b5da0727c59c69 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 6 Feb 2019 20:53:59 -0500 Subject: [PATCH 367/467] python3Packages.guestfs: init at 1.40.1 --- .../python-modules/guestfs/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/guestfs/default.nix diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix new file mode 100644 index 000000000000..238a1e9980bd --- /dev/null +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }: + +buildPythonPackage rec { + pname = "guestfs"; + version = "1.40.1"; + + src = fetchurl { + url = "http://download.libguestfs.org/python/guestfs-${version}.tar.gz"; + sha256 = "06a4b5xf1rkhnzfvck91n0z9mlkrgy90s9na5a8da2g4p776lhkf"; + }; + + propagatedBuildInputs = [ libguestfs qemu ]; + + meta = with stdenv.lib; { + homepage = "http://libguestfs.org/guestfs-python.3.html"; + description = "Use libguestfs from Python"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63d3e962b236..531488395946 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -406,6 +406,8 @@ in { gssapi = callPackage ../development/python-modules/gssapi { }; + guestfs = callPackage ../development/python-modules/guestfs { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; From 6c3df41c641437ac4365e54c8342180bbf6053fb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 6 Feb 2019 20:58:45 -0500 Subject: [PATCH 368/467] diffoscope: 99 -> 110 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 80e0cde7e54a..4e4e0c27d149 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,12 +9,12 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "99"; + version = "110"; src = fetchgit { url = "https://anonscm.debian.org/git/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "04a2sqv43g002b7s0crk9gnpdvf90j8j8p01b6shinxh6an8prs2"; + sha256 = "0rhjxigwxbqbqk7xv7n4m4rh693rg3cbp4x565jv68iy423mf2fb"; }; patches = [ From ddd96283fcbfd3b410d2026591c6abf1ff517899 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 6 Feb 2019 20:58:55 -0500 Subject: [PATCH 369/467] diffoscope: teach about guestfs --- pkgs/tools/misc/diffoscope/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4e4e0c27d149..b4272dac5317 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { ] ++ lib.optionals enableBloat [ apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv + python3Packages.guestfs ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root From 2167b4e1bf543e830488efa5991d2e9e761254f4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 31 Oct 2018 13:46:10 +0800 Subject: [PATCH 370/467] sonota: init at 2018-10-07 --- pkgs/tools/misc/sonota/default.nix | 54 +++++++++++++++++++ .../tools/misc/sonota/set_resource_path.patch | 20 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 76 insertions(+) create mode 100644 pkgs/tools/misc/sonota/default.nix create mode 100644 pkgs/tools/misc/sonota/set_resource_path.patch diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix new file mode 100644 index 000000000000..de9366d1d0ff --- /dev/null +++ b/pkgs/tools/misc/sonota/default.nix @@ -0,0 +1,54 @@ +{ fetchFromGitHub, fetchurl, lib, python3Packages +, coreVersion ? "1.13.3" # the version of the binary espurna image to flash +, coreSize ? "1MB" # size of the binary image to flash +, coreSha256 ? "0pkb2nmml0blrfiqpc46xpjc2dw927i89k1lfyqx827wanhc704x" }: + +with python3Packages; + +let + core = fetchurl { + url = "https://github.com/xoseperez/espurna/releases/download/${coreVersion}/espurna-${coreVersion}-espurna-core-${coreSize}.bin"; + sha256 = coreSha256; + }; + +in buildPythonApplication rec { + name = "sonota-unstable-${version}"; + version = "2018-10-07"; + + src = fetchFromGitHub { + owner = "mirko"; + repo = "SonOTA"; + rev = "d7f4b353858aae7ac403f95475a35560fb7ffeae"; + sha256 = "0jd9xrhcyk8d2plbjnrlpn87536zr6n708797n0k5blf109q3c1z"; + }; + + patches = [ + ./set_resource_path.patch + ]; + + postPatch = '' + substituteInPlace sonota.py --subst-var out + ''; + + format = "other"; + + propagatedBuildInputs = [ httplib2 netifaces tornado ]; + + installPhase = '' + runHook preInstall + + install -Dm755 sonota.py $out/bin/sonota + install -d $out/share/sonota + cp -r ssl static $out/share/sonota + cp ${core} $out/share/sonota/static/image_arduino.bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Flash Itead Sonoff devices with custom firmware via original OTA mechanism"; + homepage = src.meta.homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/sonota/set_resource_path.patch b/pkgs/tools/misc/sonota/set_resource_path.patch new file mode 100644 index 000000000000..f9a802657762 --- /dev/null +++ b/pkgs/tools/misc/sonota/set_resource_path.patch @@ -0,0 +1,20 @@ +diff --git a/sonota.py b/sonota.py +index f67128b..9f2752e 100644 +--- a/sonota.py ++++ b/sonota.py +@@ -475,14 +475,7 @@ def promptforval(msg): + return val + + def resource_path(relative_path): +- """ Get absolute path to resource, works for dev and for PyInstaller """ +- try: +- # PyInstaller creates a temp folder and stores path in _MEIPASS +- base_path = sys._MEIPASS +- except Exception: +- base_path = os.path.dirname(sys.argv[0]) +- +- return os.path.join(base_path, relative_path) ++ return os.path.join("@out@/share/sonota", relative_path) + + def checkargs(): + # Make sure all of the binary files that are needed are there diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e407c9dc44e7..7ec1de059816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2378,6 +2378,8 @@ in s-tar = callPackage ../tools/archivers/s-tar {}; + sonota = callPackage ../tools/misc/sonota { }; + tealdeer = callPackage ../tools/misc/tealdeer { }; teamocil = callPackage ../tools/misc/teamocil { }; From 11a819c72487395cef02aa3cfce793d09c193ccf Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 6 Feb 2019 22:35:58 -0500 Subject: [PATCH 371/467] Manual: make reproducible --- nixos/modules/services/misc/weechat.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml index b7f755bbc5c7..7255edfb9da3 100644 --- a/nixos/modules/services/misc/weechat.xml +++ b/nixos/modules/services/misc/weechat.xml @@ -8,7 +8,7 @@ WeeChat is a fast and extensible IRC client. -
+
Basic Usage @@ -35,7 +35,7 @@ in the state directory /var/lib/weechat.
-
+
Re-attaching to WeeChat From 96b66178f1f870aeec5227002cec7084a70730fd Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Thu, 7 Feb 2019 05:01:42 -0500 Subject: [PATCH 372/467] m2crypto: fix build with libressl (#53537) --- pkgs/development/python-modules/m2crypto/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index b034d5d090ce..4cab8f47250f 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchpatch , buildPythonPackage , fetchPypi , swig2 @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6"; }; + patches = [ + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/7946d12eb3d815e5ecd4578f1a6133d948694370/srcpkgs/python-M2Crypto/patches/libressl.patch"; + sha256 = "0z5qnkndg6ma5f5qqrid5m95i9kybsr000v3fdy1ab562kf65a27"; + }) + ]; + patchFlags = "-p0"; + buildInputs = [ swig2 openssl ]; propagatedBuildInputs = [ typing ]; @@ -30,6 +39,7 @@ buildPythonPackage rec { description = "A Python crypto and SSL toolkit"; homepage = http://chandlerproject.org/Projects/MeTooCrypto; license = licenses.mit; + maintainers = with maintainers; [ andrew-d ]; }; } From 68aa14eea21a3862804dda8eb0fa19d6f6f475e6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 7 Feb 2019 11:40:16 +0100 Subject: [PATCH 373/467] dwm: 6.1 -> 6.2 (#55354) --- pkgs/applications/window-managers/dwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index f18afb935278..a5d3f6ad1899 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}: let - name = "dwm-6.1"; + name = "dwm-6.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "https://dl.suckless.org/dwm/${name}.tar.gz"; - sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2"; + sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p"; }; buildInputs = [ libX11 libXinerama libXft ]; From 882131e7db7b9565aac1bdd0f270919559b17c6a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 7 Feb 2019 12:49:37 +0100 Subject: [PATCH 374/467] Revert "rustc: 1.31.0 -> 1.32.0" (#55379) This reverts commit 56dba36eb5bc783c314d0fa627585cab42cebe7a. --- pkgs/development/compilers/rust/bootstrap.nix | 16 ++++++++-------- pkgs/development/compilers/rust/cargo.nix | 8 ++++---- pkgs/development/compilers/rust/default.nix | 11 ++++++++--- .../rust/patches/disable-test-inherit-env.patch | 10 ++++++++++ pkgs/development/compilers/rust/rustc.nix | 8 ++++++-- 5 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 03b77c90fe9a..9528d798618f 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.31.0"; + version = "1.30.1"; - # fetch hashes by running `print-hashes.sh 1.31.0` + # fetch hashes by running `print-hashes.sh 1.30.0` hashes = { - i686-unknown-linux-gnu = "46333e8feec55bc1f99fd03028370f6163ef1e33e483da0389a9c424ec9634ed"; - x86_64-unknown-linux-gnu = "c8a2016109ffdc12a488660edc5f30c1643729efc15abe311ebb187437e506bf"; - armv7-unknown-linux-gnueabihf = "60bb75649b457ad971e94dd14c666b59deeee2176b14ae0f98e2fa435c172c1e"; - aarch64-unknown-linux-gnu = "4e68c70aba58004d9e86c2b4463e88466affee51242349a038b456cf6f4be5c9"; - i686-apple-darwin = "ec8d08eeea97d78d37430e9b32511e87854aad502f4e3e77e806788246b36e6f"; - x86_64-apple-darwin = "5d4035e3cecb7df13e728bcff125b52b43b126e91f8311c66b143f353362606f"; + i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf"; + x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e"; + armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b"; + aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874"; + i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083"; + x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 65aa4ea9292f..02ea7ebbbfbf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { inherit version src patches; # the rust source tarball already has all the dependencies vendored, no need to fetch them again - cargoVendorDir = "vendor"; - preBuild = "pushd src/tools/cargo"; + cargoVendorDir = "src/vendor"; + preBuild = "cd src; pushd tools/cargo"; postBuild = "popd"; passthru.rustc = rustc; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; - LIBGIT2_SYS_USE_PKG_CONFIG = 1; + LIBGIT2_SYS_USE_PKG_CONFIG=1; # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel - RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP=1; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 9640cd9b577e..1f24157eea42 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.32.0"; - cargoVersion = "1.32.0"; + version = "1.31.0"; + cargoVersion = "1.31.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; + sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs"; }; in rec { rustc = callPackage ./rustc.nix { @@ -22,6 +22,11 @@ in rec { # Re-evaluate if this we need to disable this one #./patches/stdsimd-disable-doctest.patch + + # Fails on hydra - not locally; the exact reason is unknown. + # Comments in the test suggest that some non-reproducible environment + # variables such $RANDOM can make it fail. + ./patches/disable-test-inherit-env.patch ]; withBundledLLVM = false; diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch new file mode 100644 index 000000000000..fcb75ed098ec --- /dev/null +++ b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch @@ -0,0 +1,10 @@ +--- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100 ++++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100 +@@ -1745,6 +1745,7 @@ + } + + #[test] ++ #[ignore] + fn test_inherit_env() { + use env; + diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 19d5156e02fb..c6350e42bc23 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, targetPackages, removeReferencesTo , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version , withBundledLLVM ? false @@ -20,6 +20,8 @@ let llvmShared = llvm.override { enableSharedLibraries = true; }; + prefixedJemalloc = jemalloc.override { stripPrefix = false; }; + target = builtins.replaceStrings [" "] [","] (builtins.toString targets); in @@ -60,6 +62,7 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" "--enable-vendor" + "--jemalloc-root=${prefixedJemalloc}/lib" "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] ++ optional (targets != []) "--target=${target}"; @@ -82,6 +85,7 @@ stdenv.mkDerivation { patchShebangs src/etc ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} + rm -rf src/jemalloc # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -93,7 +97,7 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/39522 echo removing gdb-version-sensitive tests... find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete - rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,generic-enum-with-different-disr-sizes.rs} + rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs} # Useful debugging parameter # export VERBOSE=1 From 9333c833a5abe5c61ac9c68bc46e7a92b2b92746 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 7 Feb 2019 18:44:39 +0900 Subject: [PATCH 375/467] vte-ng: 0.50.2.a -> 0.54.2.a --- pkgs/development/libraries/vte/ng.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index 3aee9e9dcdf3..6231b8315cd5 100644 --- a/pkgs/development/libraries/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -2,13 +2,13 @@ vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; - version = "0.50.2.a"; + version = "0.54.2.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; + sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; From 714b785909bcbd409cd72793506419a5e8e8efab Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Thu, 7 Feb 2019 19:14:36 +0700 Subject: [PATCH 376/467] pythonPackages.shodan: init at 1.10.4 (#54871) --- .../python-modules/shodan/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/shodan/default.nix diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix new file mode 100644 index 000000000000..0fde898ca04f --- /dev/null +++ b/pkgs/development/python-modules/shodan/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, click-plugins +, colorama +, requests +, XlsxWriter +}: + +buildPythonPackage rec { + pname = "shodan"; + version = "1.10.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4"; + }; + + propagatedBuildInputs = [ + click-plugins + colorama + requests + XlsxWriter + ]; + + # The tests require a shodan api key, so skip them. + doCheck = false; + + meta = with lib; { + description = "Python library and command-line utility for Shodan"; + homepage = https://github.com/achillean/shodan-python; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 531488395946..e485eda2e1d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4034,6 +4034,8 @@ in { simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + shodan = callPackage ../development/python-modules/shodan { }; + should-dsl = callPackage ../development/python-modules/should-dsl { }; simplejson = callPackage ../development/python-modules/simplejson { }; From 2d2f10475138b7206572dc3ec288184df2be022e Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 29 Dec 2018 23:13:53 -0500 Subject: [PATCH 377/467] k2pdfopt: 2.42 -> 2.51a Merge #55150. --- pkgs/applications/misc/k2pdfopt/default.nix | 96 ++++++++----------- .../applications/misc/k2pdfopt/load-jpx.patch | 29 ------ .../misc/k2pdfopt/tesseract.patch | 6 +- 3 files changed, 45 insertions(+), 86 deletions(-) delete mode 100644 pkgs/applications/misc/k2pdfopt/load-jpx.patch diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 2a3b2e61fc23..0049e9aca755 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -6,19 +6,29 @@ , enableJPEG2K ? true, jasper , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes -, enableTesseract ? true, leptonica, tesseract +, enableTesseract ? true, leptonica, tesseract4 }: with stdenv.lib; stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.42"; + version = "2.51a"; - src = fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1zag4jmkr0qrcpqqb5davmvdrabhdyz87q4zz0xpfkl6xw2dn9bk"; - }; + src = (fetchzip { + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip"; + sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9"; + }); + + # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip. + v251a_src = (fetchzip { + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip"; + sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6"; + }); + + postUnpack = '' + cp -r ${v251a_src}/* $sourceRoot + ''; patches = [ ./k2pdfopt.patch ]; @@ -27,65 +37,43 @@ stdenv.mkDerivation rec { buildInputs = let mupdf_modded = mupdf.overrideAttrs (attrs: { - name = "mupdf-1.10a"; - version = "1.10a"; - src = fetchurl { - url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; - sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; - }; # Excluded the pdf-*.c files, since they mostly just broke the #includes prePatch = '' cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/ cp ${src}/mupdf_mod/font-win32.c source/pdf/ ''; - # Patches from previous 1.10a version in nixpkgs - patches = [ - # Compatibility with new openjpeg - ./load-jpx.patch - - (fetchurl { - name = "CVE-2017-5896.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; - sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; - }) - - (fetchpatch { - name = "mupdf-1.10a-shared_libs-1.patch"; - url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch"; - sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; - }) - ]; - - # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 - preConfigure = '' - # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} - ''; - postPatch = let - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); - in '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c - ''; }); + leptonica_modded = leptonica.overrideAttrs (attrs: { + name = "leptonica-1.74.4"; + # Modified source files apply to this particular version of leptonica + version = "1.74.4"; + + src = fetchurl { + url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz"; + sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9"; + }; + prePatch = '' - cp ${src}/leptonica_mod/* src/ + cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/ ''; + patches = []; }); - tesseract_modded = tesseract.override { - tesseractBase = tesseract.tesseractBase.overrideAttrs (_: { + tesseract_modded = tesseract4.override { + tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { prePatch = '' - cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/ - cp ${src}/tesseract_mod/dawg.cpp api/ - cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/ - cp ${src}/tesseract_mod/openclwrapper.h opencl/ - cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/ - cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/ - cp ${src}/tesseract_mod/tesscapi.cpp api/ - cp ${src}/include_mod/{tesseract.h,leptonica.h} api/ + cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/ + cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/ + cp ${src}/tesseract_mod/genericvector.h src/ccutil/ + cp ${src}/tesseract_mod/input.cpp src/lstm/ + cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/ + cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/ + cp ${src}/tesseract_mod/params.cpp src/ccutil/ + cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/ + cp ${src}/tesseract_mod/tesscapi.cpp src/api/ + cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/ + cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/ + cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/ ''; patches = [ ./tesseract.patch ]; }); diff --git a/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/pkgs/applications/misc/k2pdfopt/load-jpx.patch deleted file mode 100644 index 02a3799d040a..000000000000 --- a/pkgs/applications/misc/k2pdfopt/load-jpx.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/source/fitz/load-jpx.c -+++ b/source/fitz/load-jpx.c -@@ -484,12 +484,16 @@ - /* Without the definition of OPJ_STATIC, compilation fails on windows - * due to the use of __stdcall. We believe it is required on some - * linux toolchains too. */ -+#ifdef __cplusplus -+extern "C" -+{ - #define OPJ_STATIC - #ifndef _MSC_VER - #define OPJ_HAVE_STDINT_H - #endif -+#endif - --#include -+#include - - /* OpenJPEG does not provide a safe mechanism to intercept - * allocations. In the latest version all allocations go -@@ -971,4 +975,8 @@ - fz_drop_pixmap(ctx, img); - } - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* HAVE_LURATECH */ diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch index 4827daa1a905..b882f5b949c3 100644 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -1,7 +1,7 @@ -diff --git a/api/Makefile.am b/api/Makefile.am +diff --git a/src/api/Makefile.am b/src/api/Makefile.am index d8c1e54..46ead13 100644 ---- a/api/Makefile.am -+++ b/api/Makefile.am +--- a/src/api/Makefile.am ++++ b/src/api/Makefile.am @@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS) if VISIBILITY libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS From 297c9314efb2b256286f11490f30a2d137266036 Mon Sep 17 00:00:00 2001 From: PsyanticY Date: Thu, 7 Feb 2019 16:08:48 +0100 Subject: [PATCH 378/467] pythonPackages.cfn-flip: init at 1.1.0 (#52944) --- .../python-modules/cfn-flip/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/cfn-flip/default.nix diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix new file mode 100644 index 000000000000..ab6abc4cd6f6 --- /dev/null +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }: + +buildPythonPackage rec { + pname = "cfn-flip"; + version = "1.1.0.post1"; + + src = fetchPypi { + pname = "cfn_flip"; + inherit version; + sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck"; + }; + + propagatedBuildInputs = [ six pyyaml click ]; + nativeBuildInputs = [ pytestrunner ]; + + # No tests in Pypi + doCheck = false; + + meta = with lib; { + description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; + homepage = https://github.com/awslabs/aws-cfn-template-flip; + license = licenses.asl20; + maintainers = with maintainers; [ psyanticy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e485eda2e1d6..5816754c03be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -298,6 +298,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; + chalice = callPackage ../development/python-modules/chalice { }; cleo = callPackage ../development/python-modules/cleo { }; From 6d19c1dc2beb1da8a4304c87ede6584b4880b5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 7 Feb 2019 16:14:34 +0100 Subject: [PATCH 379/467] python.pkgs.telethon-session-sqlalchemy: only supports python3 --- .../python-modules/telethon-session-sqlalchemy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index c6d3a21b10ba..da2fd2cd22d1 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, sqlalchemy, telethon }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, sqlalchemy }: buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; version = "0.2.5"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; From 467df7ba4ade1047b568ef1c5e53201eedae912f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 7 Feb 2019 16:28:57 +0100 Subject: [PATCH 380/467] python.pkgs.future-fstrings: dependency tokenize-rt missing for python<3.6 --- pkgs/development/python-modules/future-fstrings/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 7df148df09c9..9e49147315b5 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "A backport of fstrings to python<3.6"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; + broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged }; } From 4c0230eb566d48d7021f567897ee6d630c35a04a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Thu, 7 Feb 2019 16:35:24 +0100 Subject: [PATCH 381/467] nixos/manual: warn on missing xml:id --- nixos/doc/manual/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index faae4f205443..02b91773f5da 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -265,6 +265,7 @@ in rec { xsltproc \ ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ + --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml From 1649b4899fb90434310eee53e6183ec2410109f9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Feb 2019 23:58:20 +0100 Subject: [PATCH 382/467] nixos/hydra: enhance test for multiple Nix versions Hydra should support multiple Nix versions (and currently contains fixes to work with Nix 2.0 and higher). Further Nix versions can be added to the `hydraPkgs` expression in the test case which lists all supported Nix versions for Hydra. --- nixos/tests/hydra/default.nix | 138 +++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index db4e97e0039b..882bced86d39 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -1,77 +1,91 @@ -import ../make-test.nix ({ pkgs, ...} : +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } +}: let - trivialJob = pkgs.writeTextDir "trivial.nix" '' - { trivial = builtins.derivation { - name = "trivial"; - system = "x86_64-linux"; - builder = "/bin/sh"; - args = ["-c" "echo success > $out; exit 0"]; - }; - } - ''; - createTrivialProject = pkgs.stdenv.mkDerivation { - name = "create-trivial-project"; - unpackPhase = ":"; - buildInputs = [ pkgs.makeWrapper ]; - installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; - postFixup = '' - wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} - ''; - }; + trivialJob = pkgs.writeTextDir "trivial.nix" '' + { trivial = builtins.derivation { + name = "trivial"; + system = "x86_64-linux"; + builder = "/bin/sh"; + args = ["-c" "echo success > $out; exit 0"]; + }; + } + ''; -in { - name = "hydra-init-localdb"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn lewo ma27 ]; + createTrivialProject = pkgs.stdenv.mkDerivation { + name = "create-trivial-project"; + unpackPhase = ":"; + buildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; + postFixup = '' + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + ''; }; - machine = - { pkgs, ... }: + callTest = f: f { inherit system pkgs; }; - { - virtualisation.memorySize = 1024; - time.timeZone = "UTC"; + hydraPkgs = { + inherit (pkgs) nixStable nixUnstable; + }; - environment.systemPackages = [ createTrivialProject pkgs.jq ]; - services.hydra = { - enable = true; + tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix: + callTest (import ../make-test.nix ({ pkgs, lib, ... }: + { + name = "hydra-with-${name}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ pstn lewo ma27 ]; + }; - #Hydra needs those settings to start up, so we add something not harmfull. - hydraURL = "example.com"; - notificationSender = "example@example.com"; - }; - nix = { - buildMachines = [{ - hostName = "localhost"; - systems = [ "x86_64-linux" ]; - }]; + machine = { pkgs, ... }: + { + virtualisation.memorySize = 1024; + time.timeZone = "UTC"; - binaryCaches = []; - }; - }; + environment.systemPackages = [ createTrivialProject pkgs.jq ]; + services.hydra = { + enable = true; - testScript = - '' - # let the system boot up - $machine->waitForUnit("multi-user.target"); - # test whether the database is running - $machine->succeed("systemctl status postgresql.service"); - # test whether the actual hydra daemons are running - $machine->succeed("systemctl status hydra-queue-runner.service"); - $machine->succeed("systemctl status hydra-init.service"); - $machine->succeed("systemctl status hydra-evaluator.service"); - $machine->succeed("systemctl status hydra-send-stats.service"); + #Hydra needs those settings to start up, so we add something not harmfull. + hydraURL = "example.com"; + notificationSender = "example@example.com"; - $machine->succeed("hydra-create-user admin --role admin --password admin"); + package = pkgs.hydra.override { inherit nix; }; + }; + nix = { + buildMachines = [{ + hostName = "localhost"; + systems = [ "x86_64-linux" ]; + }]; - # create a project with a trivial job - $machine->waitForOpenPort(3000); + binaryCaches = []; + }; + }; - # make sure the build as been successfully built - $machine->succeed("create-trivial-project.sh"); + testScript = '' + # let the system boot up + $machine->waitForUnit("multi-user.target"); + # test whether the database is running + $machine->succeed("systemctl status postgresql.service"); + # test whether the actual hydra daemons are running + $machine->succeed("systemctl status hydra-queue-runner.service"); + $machine->succeed("systemctl status hydra-init.service"); + $machine->succeed("systemctl status hydra-evaluator.service"); + $machine->succeed("systemctl status hydra-send-stats.service"); - $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); - ''; -}) + $machine->succeed("hydra-create-user admin --role admin --password admin"); + + # create a project with a trivial job + $machine->waitForOpenPort(3000); + + # make sure the build as been successfully built + $machine->succeed("create-trivial-project.sh"); + + $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); + ''; + }))); + +in + tests From 6a0d2ff7c1d024914a3570b85f1c88df8930b471 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Feb 2019 16:52:01 +0100 Subject: [PATCH 383/467] nixos/iotop: don't install the package globally The binary will be in `/run/wrappers/bin` and adding `pkgs.iotop` won't have any effect. See also https://github.com/NixOS/nixpkgs/pull/51749#discussion_r254724170 --- nixos/modules/programs/iotop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/iotop.nix b/nixos/modules/programs/iotop.nix index 986d562ad0f8..5512dbc62f72 100644 --- a/nixos/modules/programs/iotop.nix +++ b/nixos/modules/programs/iotop.nix @@ -9,7 +9,6 @@ in { programs.iotop.enable = mkEnableOption "iotop + setcap wrapper"; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.iotop ]; security.wrappers.iotop = { source = "${pkgs.iotop}/bin/iotop"; capabilities = "cap_net_admin+p"; From e088eb34d93b0adcdfd46adf7eb7c35bcde346fc Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 7 Feb 2019 16:53:30 +0100 Subject: [PATCH 384/467] nixos/release-notes: mention breaking changes with matrix-synapse update --- nixos/doc/manual/release-notes/rl-1903.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index eca280afdf18..d00ffdbb04d9 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -378,6 +378,15 @@ (#54637) + + + matrix-synapse has been updated to version 0.99. It will + no longer generate a self-signed certificate on first launch + and will be the last version to accept self-signed certificates. + As such, it is now recommended to use a proper certificate verified by a + root CA (for example Let's Encrypt). + +
From a6abec9c660eaaf8a9885c235dda1eaeaa466286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 16 Jan 2019 13:13:27 +0100 Subject: [PATCH 385/467] mailutils: use system-sendmail instead of sendmailPath system-sendmail allows all sendmail's to be auto-detected, including on non-NixOS systems. This is, to me, a better UX than having to manually override the sendmailPath argument. In exchange, it is a breach of retro-compatibility. Given right now I can't see any uses for sendmailPath other than what is supported by system-sendmail, I didn't keep it, but it'd be possible to allow sendmailPath to override the choice of sendmail from system-sendmail. --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ pkgs/tools/networking/mailutils/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index daa47ad05953..428f9bef5fbd 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -387,6 +387,14 @@ root CA (for example Let's Encrypt). + + + mailutils now works by default when + sendmail is not in a setuid wrapper. As a consequence, + the sendmailPath argument, having lost its main use, has + been removed. + +
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index d6c670052959..f507e4dc2872 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, mysql, sendmailPath ? "/run/wrappers/bin/sendmail" }: +, python, gss, mysql, system-sendmail }: stdenv.mkDerivation rec { name = "${project}-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--with-gssapi" "--with-gsasl" "--with-mysql" - "--with-path-sendmail=${sendmailPath}" + "--with-path-sendmail=${system-sendmail}/bin/sendmail" ]; readmsg-tests = let From 76704e15a0205fb33f983a44601856636c66cee0 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 30 Oct 2018 11:02:22 +0100 Subject: [PATCH 386/467] kube-prompt: build only main package --- pkgs/development/tools/kube-prompt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix index 2ea69a0c56b5..02071e9e8a10 100644 --- a/pkgs/development/tools/kube-prompt/default.nix +++ b/pkgs/development/tools/kube-prompt/default.nix @@ -14,6 +14,7 @@ buildGoPackage rec { sha256 = "09c2kjsk8cl7qgxbr1s7qd9br5shf7gccxvbf7nyi6wjiass9yg5"; }; + subPackages = ["."]; goDeps = ./deps.nix; meta = { From 70765af1a695c06e5cbab64945faaab2bdaeeba7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 00:16:35 -0800 Subject: [PATCH 387/467] libiio: 0.16 -> 0.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libiio/versions --- pkgs/development/libraries/libiio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 312257304421..ec025d31ce3f 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h"; + sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg"; }; outputs = [ "out" "lib" "dev" "python" ]; From 320a57198ff1264028a97f54fdad2c9ff21d9527 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 7 Feb 2019 20:45:32 +0100 Subject: [PATCH 388/467] inxi: 3.0.30-1 -> 3.0.31-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 02379bcfe5c8..57e6c48867a7 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.30-1"; + version = "3.0.31-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "04dkws3716clscl6iq3sy6m822rqzwdg5mn03l0vhcdbqcng46s6"; + sha256 = "13dm8z7j8wg2sj7pzgxvivqhn88iy54aykhpplzqhp2s10smhs46"; }; buildInputs = [ perl ]; From 07b0483d89661acb3e138a616a7b749d3b346434 Mon Sep 17 00:00:00 2001 From: Benedict Aas Date: Mon, 28 Jan 2019 13:05:59 +0000 Subject: [PATCH 389/467] openapi-generator-cli: init at 3.3.4 --- maintainers/maintainer-list.nix | 5 +++ .../openapi-generator-cli/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/tools/networking/openapi-generator-cli/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38037c22b37f..f9aaf1dbba92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4141,6 +4141,11 @@ github = "shlevy"; name = "Shea Levy"; }; + shou = { + email = "x+g@shou.io"; + github = "Shou"; + name = "Benedict Aas"; + }; siddharthist = { email = "langston.barrett@gmail.com"; github = "siddharthist"; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix new file mode 100644 index 000000000000..020feb2c43b9 --- /dev/null +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + version = "3.3.4"; + pname = "openapi-generator-cli"; + + jarfilename = "${pname}-${version}.jar"; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; + sha256 = "24cb04939110cffcdd7062d2f50c6f61159dc3e0ca3b8aecbae6ade53ad3dc8c"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${jarfilename}" + ''; + + meta = with stdenv.lib; { + description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; + homepage = https://github.com/OpenAPITools/openapi-generator; + license = licenses.asl20; + maintainers = [ maintainers.shou ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ebc487ce6b3..21e3ca94e381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4523,6 +4523,8 @@ in inherit (gnome3) defaultIconTheme; }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; From 27e30893609058291e9cda4e088d6a49d324fe72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Thu, 7 Feb 2019 15:15:41 +0100 Subject: [PATCH 390/467] hunspell-dicts: add support for Hungarian dictionary LibreOffice has a comprehensive collection of Hunspell dictionaries. `mkDictFromLibreOffice` helper is introduced to make it easy to add new dictionaries from this repository. `license` is parametrized because each dictionary has its own license. --- .../libraries/hunspell/dictionaries.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 836d0128a8c1..aeb4253826b8 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -250,6 +250,35 @@ let }; }; + mkDictFromLibreOffice = + { shortName + , shortDescription + , dictFileName + , license + , readmeFile ? "README_${dictFileName}.txt" + , sourceRoot ? dictFileName }: + mkDict rec { + name = "hunspell-dict-${shortName}-libreoffice-${version}"; + version = "6.2.0.3"; + inherit dictFileName readmeFile; + src = fetchFromGitHub { + owner = "LibreOffice"; + repo = "dictionaries"; + rev = "libreoffice-${version}"; + sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj"; + }; + buildPhase = '' + cp -a ${sourceRoot}/* . + ''; + meta = with stdenv.lib; { + homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = license; + maintainers = with maintainers; [ vlaci ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -510,6 +539,15 @@ in { ]; }; + /* HUNGARIAN */ + + hu-hu = mkDictFromLibreOffice { + shortName = "hu-hu"; + dictFileName = "hu_HU"; + shortDescription = "Hungarian (Hungary)"; + license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + }; + /* SWEDISH */ sv-se = mkDictFromDSSO rec { From 406426b320ab99f2cb1fff7771a96f3d7394c2f5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 7 Feb 2019 21:24:59 +0100 Subject: [PATCH 391/467] supertux: 0.5.1 -> 0.6.0 --- pkgs/games/supertux/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index cf6ba4648687..cee65bfa5638 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,19 +1,22 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl , libogg, libvorbis, libGLU_combined, openal, boost, glew +, libpng, freetype }: stdenv.mkDerivation rec { name = "supertux-${version}"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "1i8avad7w7ikj870z519j383ldy29r6f956bs38cbr8wk513pp69"; + sha256 = "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4"; }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew ]; + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew + libpng freetype + ]; cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; From 9dd0b54bfb8b0057ca14465801934c4f832c485b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Feb 2019 21:20:29 +0100 Subject: [PATCH 392/467] pythonPackages.distributed: add missing dependencies Added `mpi4py` and `bokeh` to get the executables working. Also simplified the `lib.optional` expression as Python 3.2 and 3.4 aren't supported anymore. Rather than referencing unsupported Python 3.x versions it's far more obvious now to only use `futures` and `singledispatch` if Python2 is used. --- pkgs/development/python-modules/distributed/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index d2c8c0325ed9..29460f14eab3 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,9 +19,11 @@ , tornado , zict , pyyaml -, pythonOlder +, isPy3k , futures , singledispatch +, mpi4py +, bokeh }: buildPythonPackage rec { @@ -37,9 +39,8 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml - ] ++ lib.optional (pythonOlder "3.2") [ futures ] - ++ lib.optional (pythonOlder "3.4") [ singledispatch ]; + sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses From 59f6083281e0e481adf9ff1fbbd30165d4e1e897 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 19 Jan 2019 23:18:58 -0500 Subject: [PATCH 393/467] apvlv: fix build with poppler 0.73.0 Poppler was upgraded in [0] and therefore the build broke, as poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1]. Upstream issue is [2]. [0] https://github.com/NixOS/nixpkgs/commit/7757e43fcb15f3b3e21187787edaad54614ec7e6 [1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4 [2] https://github.com/naihe2010/apvlv/issues/28 --- pkgs/applications/misc/apvlv/default.nix | 1 + .../misc/apvlv/fix-build-with-poppler-0.73.0.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 2d9ea5e3574b..2da0de9ead8c 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; }) + ./fix-build-with-poppler-0.73.0.patch ]; installPhase = '' diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch new file mode 100644 index 000000000000..d2a7831dca63 --- /dev/null +++ b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc +index 765b112..83d133f 100644 +--- a/src/ApvlvPdf.cc ++++ b/src/ApvlvPdf.cc +@@ -29,7 +29,7 @@ + #include "ApvlvPdf.h" + + #ifndef POPPLER_WITH_GDK +-#include ++#include + + static void + copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, From b0e79359bd944b23fd97ea01023641744e2e076f Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 7 Feb 2019 13:17:57 -0800 Subject: [PATCH 394/467] nixos/unifi: Update TCP ports Fixes #55377 --- nixos/modules/services/networking/unifi.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 89b9ac4eadf5..c82e0af2803d 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -121,11 +121,12 @@ in }; networking.firewall = mkIf cfg.openPorts { - # https://help.ubnt.com/hc/en-us/articles/204910084-UniFi-Change-Default-Ports-for-Controller-and-UAPs + # https://help.ubnt.com/hc/en-us/articles/218506997 allowedTCPPorts = [ 8080 # Port for UAP to inform controller. 8880 # Port for HTTP portal redirect, if guest portal is enabled. 8843 # Port for HTTPS portal redirect, ditto. + 6789 # Port for UniFi mobile speed test. ]; allowedUDPPorts = [ 3478 # UDP port used for STUN. From 3ed1067750d289e4cd4fa9a9815b14aa6707447a Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Thu, 7 Feb 2019 20:28:07 +0100 Subject: [PATCH 395/467] mopidy-iris: 3.32.1 -> 3.32.4 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 6e61e0377f80..45006fb8ef62 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.1"; + version = "3.32.4"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0cbb3v9gysi0800ls9vva7clilyg295jcvawyvf0czdmv4wxg3mq"; + sha256 = "16b3dkxland4mjzjs2rz5gbqjapzzmap4d1mfhbrj2ch3plmdy7g"; }; propagatedBuildInputs = [ From e16e9c978d6426c4511e97e5f868346f39c0e88b Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Thu, 7 Feb 2019 17:57:22 -0500 Subject: [PATCH 396/467] python3Packages.sly: init at 0.3 (#55093) tests will be included with the next release https://github.com/dabeaz/sly/pull/25 --- .../python-modules/sly/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/sly/default.nix diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix new file mode 100644 index 000000000000..011fa1799abd --- /dev/null +++ b/pkgs/development/python-modules/sly/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "sly"; + version = "0.3"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "be6a3825b042a9e1b6f5730fc747e6d983c917f0f002d798d0b9f86ca5c05ad9"; + }; + + checkInputs = [ pytest ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "An improved PLY implementation of lex and yacc for Python 3"; + homepage = https://github.com/dabeaz/sly; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 061674d31b20..a1cf7c2d32c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -778,6 +778,8 @@ in { slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; + sly = callPackage ../development/python-modules/sly { }; + snapcast = callPackage ../development/python-modules/snapcast { }; spglib = callPackage ../development/python-modules/spglib { }; From 57044969535afec809d0a9786424e9aab1254908 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Fri, 11 Jan 2019 11:48:41 +0100 Subject: [PATCH 397/467] scid-vs-pc: 4.18.1 -> 4.19 --- pkgs/games/scid-vs-pc/default.nix | 37 ++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index db32cb70d413..94e102e57520 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: +{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "scid-vs-pc-${version}"; - version = "4.18.1"; + version = "4.19"; src = fetchurl { - url = "mirror://sourceforge/scidvspc/scid_vs_pc-4.18.1.tgz"; - sha256 = "01nd88g3wh3avz1yk9fka9zf20ij8dlnpwzz8gnx78i5b06cp459"; + url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; + sha256 = "1k2cgs6bjyrmxy5x6x1chmrxfmm224p3r9r9mpc37kridk4hshqs"; }; - buildInputs = [ tcl tk libX11 zlib makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tcl tk libX11 zlib ]; prePatch = '' sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ @@ -42,23 +43,33 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; postFixup = '' - for cmd in sc_addmove sc_eco sc_epgn scidpgn \ - sc_import sc_spell sc_tree spliteco - do - sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/$cmd" - done - + sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn" sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote" sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid" - for cmd in $out/bin/* - do + for cmd in $out/bin/* ; do wrapProgram "$cmd" \ --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" done ''; + postInstall = '' + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + + install -D icons/scid.png "$out"/share/icons/hicolor/128x128/apps/scid.png + ''; + + desktopItem = makeDesktopItem { + name = "scid-vs-pc"; + desktopName = "Scid vs. PC"; + genericName = "Chess Database"; + comment = meta.description; + icon = "scid"; + exec = "scid"; + categories = "Game;BoardGame;"; + }; meta = with stdenv.lib; { description = "Chess database with play and training functionality"; From 895f9d3b732a036103caff84945b53359eba8392 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Feb 2019 14:58:49 +0100 Subject: [PATCH 398/467] python3Packages.python-jenkins: 1.3.0 -> 1.4.0 Updates to the most recent version of `python-jenkins`. It was originally broken during the auto-update in b4588c6a0f2aba6da8cf52c2aef52a4fda6bdb89. The tests could be run by using `unittest2` and some dependencies for the test framwork. --- .../python-modules/python-jenkins/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index cdce1b337183..44f1c0d6c39d 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , python @@ -11,28 +11,33 @@ , testscenarios , testrepository , kerberos +, requests +, unittest2 +, requests-mock }: buildPythonPackage rec { pname = "python-jenkins"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b44b3c8e0dabed371a1a8a301cc8833c635625faf003fd68c176800c71a6597c"; + sha256 = "1h14hfcwichmppbgxf1k8njw29hchpav1kj574b4lly3j0n2vnag"; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf + buildInputs = [ mock ]; + propagatedBuildInputs = [ pbr pyyaml six multi_key_dict requests ]; + + checkInputs = [ unittest2 testscenarios requests-mock ]; + checkPhase = '' + unit2 ''; - buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml six multi_key_dict testtools testscenarios testrepository kerberos ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the remote Jenkins API"; homepage = https://pypi.python.org/pypi/python-jenkins; license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; }; } From 36e9fe820c8166aa6d3913d15cd3c884a8cdd410 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Feb 2019 13:25:26 +0000 Subject: [PATCH 399/467] coqPackages_8_9: disable a few packages that do not build --- pkgs/development/coq-modules/iris/default.nix | 2 +- pkgs/development/coq-modules/metalib/default.nix | 2 +- pkgs/development/coq-modules/stdpp/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 134ea45493df..ea26f3e1ca9d 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 46a6cafb6ab8..c196bdbcd766 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 91801850ebfb..883ed971b083 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } From 1f332e7b54108d686b4658dd3e8c3a9b81317b7c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 7 Feb 2019 20:55:14 -0500 Subject: [PATCH 400/467] keybase: 2.13.1 -> 3.0.0 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ae726544453a..36b7709c56a8 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.13.1"; + version = "3.0.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -14,7 +14,7 @@ buildGoPackage rec { src = fetchurl { url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; - sha256 = "0avq87y7cs3jipl444ssz1zd5jygpks20hls0fkqxxaikkpdsy4v"; + sha256 = "1mxzihgd3qfahlmnfrpbg2kbixbjmkajrl964kaxmihrkx0fylvf"; }; buildInputs = lib.optionals stdenv.isDarwin [ From 6d9c5259cfe9ba80dc2b12bb8d9866e3bc9b973c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 7 Feb 2019 21:07:21 -0500 Subject: [PATCH 401/467] keybase-gui: 2.13.1 -> 3.0.0 --- pkgs/tools/security/keybase/gui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index bd8166b214dc..d1a3e1706d3a 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -3,16 +3,16 @@ , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: let - versionSuffix = "20190115203650.eec94506e4"; + versionSuffix = "20190205202117.6394d03e6c"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.13.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "3.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "01663jknr8s4sp51mclw9llhx07ww6yh22apawxikvpwmw9yg2qr"; + sha256 = "0nwz0v6sqx1gd7spha09pk2bjbb8lgaxbrh0r6j6p0xzgzz6birw"; }; nativeBuildInputs = [ From ce8c243699808355e0a550c7bdebf4ca94f0480d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 7 Feb 2019 22:15:03 -0500 Subject: [PATCH 402/467] keybase-gui: drop gnome2.GConf --- pkgs/tools/security/keybase/gui.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index d1a3e1706d3a..40385940a942 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme -, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, gnome3 +, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: let @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gnome2.GConf gnome3.gsettings-desktop-schemas gtk3 libnotify From a87be72553fb68de5b254d39e95c251c5cf899b7 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Wed, 6 Feb 2019 17:17:17 -0800 Subject: [PATCH 403/467] chezmoi: init at 1.3.0 --- pkgs/tools/misc/chezmoi/default.nix | 29 ++ pkgs/tools/misc/chezmoi/deps.nix | 399 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 430 insertions(+) create mode 100644 pkgs/tools/misc/chezmoi/default.nix create mode 100644 pkgs/tools/misc/chezmoi/deps.nix diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix new file mode 100644 index 000000000000..f15dfc2adba7 --- /dev/null +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "chezmoi-${version}"; + version = "1.3.0"; + + goPackagePath = "github.com/twpayne/chezmoi"; + + src = fetchFromGitHub { + owner = "twpayne"; + repo = "chezmoi"; + rev = "v${version}"; + sha256 = "0dvdjx5khpw62lprn06k271xfc9fdrw4c1q74vd1vffaz60yfd8d"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = [ + "-ldflags=-s -w -X ${goPackagePath}/cmd.version=${version}" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/twpayne/chezmoi; + description = "Manage your dotfiles across multiple machines, securely"; + license = licenses.mit; + maintainers = with maintainers; [ jhillyerd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/chezmoi/deps.nix b/pkgs/tools/misc/chezmoi/deps.nix new file mode 100644 index 000000000000..4fb1bd535528 --- /dev/null +++ b/pkgs/tools/misc/chezmoi/deps.nix @@ -0,0 +1,399 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.4.2"; + sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.17.1"; + sha256 = "0iiwga57100r780k2d509fzx67x6l8z0wjl84pyzg5mpy6zp2y9y"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "v1.2.1"; + sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; + }; + } + { + goPackagePath = "github.com/danieljoos/wincred"; + fetch = { + type = "git"; + url = "https://github.com/danieljoos/wincred"; + rev = "v1.0.1"; + sha256 = "1bb1928nnikx5036aw4152p55g8xgwx42rv0n2i5zydh1031f50m"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v4.1.0"; + sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; + }; + } + { + goPackagePath = "github.com/google/renameio"; + fetch = { + type = "git"; + url = "https://github.com/google/renameio"; + rev = "v0.1.0"; + sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.2.0"; + sha256 = "0bn1kac5vcspxdpx4bygr4gngdbk67pnbqc04b0f7a4ny25n10iq"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.7"; + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.0.0"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/twpayne/go-shell"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-shell"; + rev = "v0.0.1"; + sha256 = "0nbbfxdwqy14izbfbk8c8ia90l31wbhkcwd2r7v6jhz58iaxcvxk"; + }; + } + { + goPackagePath = "github.com/twpayne/go-vfs"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-vfs"; + rev = "v1.0.3"; + sha256 = "138ykzmb4994qwbv3m99536p75804ap15c2drvz6d3k0v95rbw38"; + }; + } + { + goPackagePath = "github.com/twpayne/go-xdg"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-xdg"; + rev = "v1.0.0"; + sha256 = "06np468cl8bbpal6x0mf8q6jzlkz65rzma5y65n7wfmrg2k7yn72"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "github.com/zalando/go-keyring"; + fetch = { + type = "git"; + url = "https://github.com/zalando/go-keyring"; + rev = "6d81c293b3fb"; + sha256 = "1wah726fi08h6ga5wnwxd1zyxq7ckp3qliql44bxgliw2p35kkyb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a5c9d58dba9a"; + sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fafe7e9e092..eaeb409c08d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -629,6 +629,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + chezmoi = callPackage ../tools/misc/chezmoi { }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; From 1ad85dd41d12b0547b9a19dcd3fe60b373ce7dfa Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Thu, 31 Jan 2019 11:15:05 +0800 Subject: [PATCH 404/467] pythonPackages.yubico-client: init at 1.10.0 --- .../python-modules/yubico-client/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/yubico-client/default.nix diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix new file mode 100644 index 000000000000..ddd992a51447 --- /dev/null +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "yubico-client"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0skkmrpvpb1pwyqjf3lh9vq46xagvwdx9kagpdbba2v5dgrk34d1"; + }; + + propagatedBuildInputs = [ requests ]; + + # pypi package missing test_utils and github releases is behind + doCheck = false; + + meta = with lib; { + description = "Verifying Yubico OTPs based on the validation protocol version 2.0"; + homepage = https://github.com/Kami/python-yubico-client/; + maintainers= with maintainers; [ peterromfeldhk ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41fc79cc9f2f..61e2764523ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5061,6 +5061,8 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; + yubico-client = callPackage ../development/python-modules/yubico-client { }; + wptserve = callPackage ../development/python-modules/wptserve { }; yenc = callPackage ../development/python-modules/yenc { }; From 43e08168cd20364f80ace417fb688dd199baddc6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 8 Feb 2019 09:07:23 +0300 Subject: [PATCH 405/467] unit: 1.7 -> 1.7.1 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index a3948bb69088..f250dd5e9bb4 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -16,14 +16,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.7"; + version = "1.7.1"; name = "unit-${version}"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = "${version}"; - sha256 = "1klwricr0mxhw5wka35vnl919821vcvaf5w3ixvkbxaisml19qq4"; + sha256 = "1nz5xcwbwpr0jdbx9j052byarnc2qn987pdainy85in1aj0b57kf"; }; nativeBuildInputs = [ which ]; From f833a3e8817739d930f38efa1012323c3399c155 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 2 Feb 2019 17:09:31 +0000 Subject: [PATCH 406/467] ocamlPackages.ocp-index: 1.1.7 -> 1.1.8 --- pkgs/development/tools/ocaml/ocp-index/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 23aeceb41a75..6bc397cffcbe 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.1.7"; + version = "1.1.8"; name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "0i50y033y78wcfgz3b81d34p98azahl94w4b63ac0zyczlwlhvkf"; + sha256 = "0hfiwqi60xnwsmj7fmv1sk2gzr6wxdzbgd5zli2xnfrjvb4ydv12"; }; buildInputs = [ ocaml findlib dune ocp-build cmdliner re ]; From 56b1b0ada676ae72395f1056f292079b1465cca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 8 Feb 2019 06:54:38 +0000 Subject: [PATCH 407/467] lxd: 3.0.2 -> 3.10 --- pkgs/tools/admin/lxd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 9eb249bc5879..5bbe1e36551c 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -6,13 +6,13 @@ }: buildGoPackage rec { - name = "lxd-3.0.2"; + name = "lxd-3.10"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; - sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j"; + sha256 = "0vd0p3xf54s7f9vcjfiin29py6hxyyxnisvp6am67l5nwhg7rnnc"; }; preBuild = '' @@ -27,8 +27,8 @@ buildGoPackage rec { buildFlags = [ "-tags libsqlite3" ]; postInstall = '' - # binaries from test/ - rm $bin/bin/{deps,macaroon-identity} + # test binaries, code generation + rm $bin/bin/{deps,macaroon-identity,generate} wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables From 295acfcb33c17c0b2a60d16a6ec865e75683f99c Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 8 Feb 2019 12:24:15 +0100 Subject: [PATCH 408/467] Revert "rustfmt: 1.0.0 -> 1.0.1" (#55437) This reverts commit 7fff567ee99c1f343ecdd82fef2e35fb6f50e423. It depends on the rustc update I reverted in #55379. It should be re-introduced after that rustc update has gone through staging. --- pkgs/development/tools/rust/rustfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index dac00aa4c969..4684841cf478 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; rev = "${version}"; - sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; + sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy"; }; - cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; + cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From 535644a9dac27eeb0a38ac47395e5932d41664a1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 8 Feb 2019 15:22:46 +0300 Subject: [PATCH 409/467] haskellPackages.insert-ordered-containers: fix test phase --- .../haskell-modules/configuration-common.nix | 1 + .../insert-ordered-containers-fix-test.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5ddd18ff49b..423abfc2f7c2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1186,6 +1186,7 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 these = doJailbreak super.these; # until these >= 0.7.6 + insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch; # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC diff --git a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch new file mode 100644 index 000000000000..1e9ac5aa66a4 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch @@ -0,0 +1,25 @@ +diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal +index 0e8923a..bfbbec4 100644 +--- a/insert-ordered-containers.cabal ++++ b/insert-ordered-containers.cabal +@@ -21,8 +21,8 @@ tested-with: + GHC==7.10.3, + GHC==8.0.1, + GHC==8.2.2, +- GHC==8.4.3, +- GHC==8.6.1 ++ GHC==8.4.4, ++ GHC==8.6.3 + + extra-source-files: + CHANGELOG.md +@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests + , unordered-containers + , base + , insert-ordered-containers +- , tasty >= 0.10.1.2 && <1.2 ++ , tasty >= 0.10.1.2 && <1.3 + , tasty-quickcheck >= 0.8.3.2 && <0.11 + , QuickCheck >=2.7.6 && <2.13 + default-language: Haskell2010 + From 23a84e939ee9cdf06cebe267fd26373571648e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20T=C3=B6tterman?= Date: Fri, 8 Feb 2019 14:19:53 +0200 Subject: [PATCH 410/467] nixos/docker-registry: fix listenAddress listenAddress config option was previously unused in config generation --- nixos/modules/services/misc/docker-registry.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 9a3966ab30aa..f3d90e532c88 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -18,7 +18,7 @@ let delete.enabled = cfg.enableDelete; }; http = { - addr = ":${builtins.toString cfg.port}"; + addr = "${cfg.listenAddress}:${builtins.toString cfg.port}"; headers.X-Content-Type-Options = ["nosniff"]; }; health.storagedriver = { From 436701842b5f25f9dfe9d106a9d6f0fc7410bd17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 02:40:32 -0800 Subject: [PATCH 411/467] flow: 0.91.0 -> 0.92.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flow/versions --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index b011cb0b918a..84b74cfe1f32 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.91.0"; + version = "0.92.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "14snr65pbnczkv49lmhgyjzlgrrlfwsxkd7g6xbv9y5xl4sp0309"; + sha256 = "1v83hkkbls5x2062ry3gwrnn9al8rhsmargv2mvanxlpf0a63wx3"; }; installPhase = '' From 89dec63005452c7b9d991397089c50e2eb6884be Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 7 Feb 2019 17:48:08 +0100 Subject: [PATCH 412/467] php72: 7.2.14 -> 7.2.15 Changelog: https://secure.php.net/ChangeLog-7.php#7.2.15 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3d9235757c6e..11938cf0970d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -253,8 +253,8 @@ in { }; php72 = generic { - version = "7.2.14"; - sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm"; + version = "7.2.15"; + sha256 = "0m05dmad138qfxcb2z4czf9pfv1746g9yzlch48kjikajhb7cgn9"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; From 0f6571bae8047bbcc91e3668605ce942bbeda764 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 8 Feb 2019 08:19:09 -0500 Subject: [PATCH 413/467] linux: 4.4.173 -> 4.4.174 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9095a63355b5..8edd744ba66c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.173"; + version = "4.4.174"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wj2y6y2ac5m6p6ghb4rmxfdxyx0gq7yv7b0qzmdyh4dkpi7qa0f"; + sha256 = "0fdsxfwhn1xqic56c4aafxw1rdqy7s4w0inmkhcnh98lj3fi2lmy"; }; } // (args.argsOverride or {})) From a31ce0c69e6975ae62b0c3a0944b0f03d0bb0556 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 7 Feb 2019 17:41:52 +0100 Subject: [PATCH 414/467] php73: 7.3.1 -> 7.3.2 Changelog: https://secure.php.net/ChangeLog-7.php#7.3.2 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 11938cf0970d..39f8d2514108 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -261,8 +261,8 @@ in { }; php73 = generic { - version = "7.3.1"; - sha256 = "13iqfkz9rmx9vy106lvw1nbk88qgwdkvxam0l5s14r7jsw62pvxg"; + version = "7.3.2"; + sha256 = "1p8amf91i6lrrphd6ypfh3kic64bpqf04dxp7dj1xxnjrgd50vwl"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; From b02d87165297f67781fdb39fe6948a38df3fc53e Mon Sep 17 00:00:00 2001 From: tilpner Date: Fri, 8 Feb 2019 13:38:46 +0100 Subject: [PATCH 415/467] podman: install manpages --- pkgs/applications/virtualization/podman/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 753fada5e7d3..7fc74de1d2ee 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig , buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp +, go-md2man }: buildGoPackage rec { @@ -15,9 +16,11 @@ buildGoPackage rec { goPackagePath = "github.com/containers/libpod"; + outputs = [ "bin" "out" "man" ]; + # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig go-md2man ]; buildInputs = [ btrfs-progs libseccomp gpgme lvm2 @@ -26,11 +29,12 @@ buildGoPackage rec { buildPhase = '' pushd $NIX_BUILD_TOP/go/src/${goPackagePath} patchShebangs . - make binaries + make binaries docs ''; installPhase = '' install -Dm555 bin/podman $bin/bin/podman + MANDIR=$man/share/man make install.man ''; meta = with stdenv.lib; { From 2820e1df5ca3bd3a60a61aeee68adae1b9274afe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 29 Jan 2019 11:59:52 +0100 Subject: [PATCH 416/467] roundcubePlugins: init This meta-package is supposed to contain third-party roundcube plugins such as `persistent_login` that will be linked into the roundcube derivation. --- pkgs/servers/roundcube/plugins/default.nix | 11 +++++++++++ .../roundcube/plugins/persistent_login/default.nix | 13 +++++++++++++ pkgs/servers/roundcube/plugins/plugins.nix | 9 +++++++++ pkgs/servers/roundcube/plugins/roundcube-plugin.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 42 insertions(+) create mode 100644 pkgs/servers/roundcube/plugins/default.nix create mode 100644 pkgs/servers/roundcube/plugins/persistent_login/default.nix create mode 100644 pkgs/servers/roundcube/plugins/plugins.nix create mode 100644 pkgs/servers/roundcube/plugins/roundcube-plugin.nix diff --git a/pkgs/servers/roundcube/plugins/default.nix b/pkgs/servers/roundcube/plugins/default.nix new file mode 100644 index 000000000000..42333b69eb15 --- /dev/null +++ b/pkgs/servers/roundcube/plugins/default.nix @@ -0,0 +1,11 @@ +{ newScope, pkgs }: + +let + + callPackage = newScope (pkgs // plugins); + + plugins = import ./plugins.nix { inherit callPackage; }; + +in + + plugins diff --git a/pkgs/servers/roundcube/plugins/persistent_login/default.nix b/pkgs/servers/roundcube/plugins/persistent_login/default.nix new file mode 100644 index 000000000000..b66386222f76 --- /dev/null +++ b/pkgs/servers/roundcube/plugins/persistent_login/default.nix @@ -0,0 +1,13 @@ +{ roundcubePlugin, fetchFromGitHub }: + +roundcubePlugin rec { + pname = "persistent_login"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "mfreiholz"; + repo = pname; + rev = "version-${version}"; + sha256 = "1k2jgbshwig8q5l440y59pgwbfbc0pdrjbpihba834a4pm0y6anl"; + }; +} diff --git a/pkgs/servers/roundcube/plugins/plugins.nix b/pkgs/servers/roundcube/plugins/plugins.nix new file mode 100644 index 000000000000..4eed1227be68 --- /dev/null +++ b/pkgs/servers/roundcube/plugins/plugins.nix @@ -0,0 +1,9 @@ +{ callPackage }: + +{ + inherit callPackage; + + roundcubePlugin = callPackage ./roundcube-plugin.nix { }; + + persistent_login = callPackage ./persistent_login { }; +} diff --git a/pkgs/servers/roundcube/plugins/roundcube-plugin.nix b/pkgs/servers/roundcube/plugins/roundcube-plugin.nix new file mode 100644 index 000000000000..a756a3140cb2 --- /dev/null +++ b/pkgs/servers/roundcube/plugins/roundcube-plugin.nix @@ -0,0 +1,7 @@ +{ runCommand }: +{ pname, version, src }: + +runCommand "roundcube-plugin-${pname}-${version}" { } '' + mkdir -p $out/plugins/ + cp -r ${src} $out/plugins/${pname} +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6bf6773358..04e09b0bb499 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1619,6 +1619,8 @@ in roundcube = callPackage ../servers/roundcube { }; + roundcubePlugins = callPackage ../servers/roundcube/plugins { }; + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { From df0d11575c6beaa8f0562e5d0051f8b5e2eb7b14 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 29 Jan 2019 12:41:51 +0100 Subject: [PATCH 417/467] roundcube: add `withPlugins` function This function creates a new store path with roundcube sources and all specified plugins. It can be used like this: ``` roundcube.withPlugins (plugins: with plugins; [ persistent_login ]) ``` --- pkgs/servers/roundcube/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index c0648f5183d9..cda5ae1d6c55 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }: let version = "1.3.8"; in @@ -13,6 +13,11 @@ fetchzip rec { rm -rf $out/installer ''; + passthru.withPlugins = f: buildEnv { + name = "${roundcube.name}-with-plugins"; + paths = (f roundcubePlugins) ++ [ roundcube ]; + }; + meta = { description = "Open Source Webmail Software"; maintainers = with stdenv.lib.maintainers; [ vskilet ]; @@ -20,4 +25,3 @@ fetchzip rec { platforms = stdenv.lib.platforms.all; }; } - From 6fb825b057699cba1df25aad4f1e2088b61d11d9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 31 Jan 2019 22:45:14 +0100 Subject: [PATCH 418/467] nixos/roundcube: add package option With this option it's possible to specify a custom expression for `roundcube`, i.e. a roundcube environment with third-party plugins as shown in the testcase. --- nixos/modules/services/mail/roundcube.nix | 20 +++++++++++++++++--- nixos/tests/roundcube.nix | 4 +++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 6d81c7374f4d..66b1c1e3e6f9 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -25,6 +25,20 @@ in description = "Hostname to use for the nginx vhost"; }; + package = mkOption { + type = types.package; + default = pkgs.roundcube; + + example = literalExample '' + roundcube.withPlugins (plugins: [ plugins.persistent_login ]) + ''; + + description = '' + The package which contains roundcube's sources. Can be overriden to create + an environment which contains roundcube and third-party plugins. + ''; + }; + database = { username = mkOption { type = types.str; @@ -86,7 +100,7 @@ in forceSSL = mkDefault true; enableACME = mkDefault true; locations."/" = { - root = pkgs.roundcube; + root = cfg.package; index = "index.php"; extraConfig = '' location ~* \.php$ { @@ -140,12 +154,12 @@ in ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; fi PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ - -f ${pkgs.roundcube}/SQL/postgres.initial.sql \ + -f ${cfg.package}/SQL/postgres.initial.sql \ -h ${cfg.database.host} ${cfg.database.dbname} touch /var/lib/roundcube/db-created fi - ${pkgs.php}/bin/php ${pkgs.roundcube}/bin/update.sh + ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh ''; serviceConfig.Type = "oneshot"; }; diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix index 178134fd9b30..ed0ebd7dd19d 100644 --- a/nixos/tests/roundcube.nix +++ b/nixos/tests/roundcube.nix @@ -10,6 +10,8 @@ import ./make-test.nix ({ pkgs, ...} : { enable = true; hostName = "roundcube"; database.password = "notproduction"; + package = pkgs.roundcube.withPlugins (plugins: [ plugins.persistent_login ]); + plugins = [ "persistent_login" ]; }; services.nginx.virtualHosts.roundcube = { forceSSL = false; @@ -23,6 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : { $roundcube->waitForUnit("postgresql.service"); $roundcube->waitForUnit("phpfpm-roundcube.service"); $roundcube->waitForUnit("nginx.service"); - $roundcube->succeed("curl -sSfL http://roundcube/"); + $roundcube->succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'"); ''; }) From 997fd64006c145164ddbfd88fae069da75f54653 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 8 Feb 2019 14:45:12 +0100 Subject: [PATCH 419/467] transifex-client: 0.13.5 -> 0.13.6 --- pkgs/tools/text/transifex-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 62fdc0c7c84b..376f8ca9f70a 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.5"; + version = "0.13.6"; propagatedBuildInputs = [ urllib3 requests python-slugify @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "00igk35nyzqp1slj7lbhiv4lc42k87ix43ipx2zcrsjf6xxv6l7v"; + sha256 = "0y6pprlmkmi7wfqr3k70sb913qa70p3i90q5mravrai7cr32y1w8"; }; prePatch = '' From e7388fedc46cd4765aef886e6040dd9f0df1aa8c Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 7 Feb 2019 18:23:39 +0100 Subject: [PATCH 420/467] lguf-brightness: Init at unstable-2018-02-07 --- pkgs/misc/lguf-brightness/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/misc/lguf-brightness/default.nix diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/misc/lguf-brightness/default.nix new file mode 100644 index 000000000000..180aa9cbe766 --- /dev/null +++ b/pkgs/misc/lguf-brightness/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, libusb1, ncurses5 }: + +stdenv.mkDerivation rec { + pname = "lguf-brightness"; + + version = "unstable-2018-02-07"; + + src = fetchFromGitHub { + owner = "periklis"; + repo = pname; + rev = "d194272b7a0374b27f036cbc1a9be7f231d40cbb"; + sha256 = "0zj81bqchms9m7rik1jxp6zylh9dxqzr7krlj9947v0phr4qgah4"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libusb1 ncurses5 ]; + + installPhase = '' + install -D lguf_brightness $out/bin/lguf_brightness + ''; + + meta = with stdenv.lib; { + description = "Adjust brightness for LG UltraFine 4K display (cross platform)"; + homepage = https://github.com/periklis/lguf-brightness; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ periklis ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0e3075b8d0f..e18a2f862a70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22474,6 +22474,8 @@ in kops = callPackage ../applications/networking/cluster/kops { }; + lguf-brightness = callPackage ../misc/lguf-brightness { }; + lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { From acd4d1f3dd280bd0f2d783b9038482146bacc934 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 05:46:36 -0800 Subject: [PATCH 421/467] python37Packages.Nuitka: 0.6.1 -> 0.6.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-nuitka/versions --- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 7d7f7da753e1..ec68cb54afe3 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.1"; + version = "0.6.1.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0ncclbj9qdd88fs26mvgf217m7kgfcy1zgsyzi1j65b6z2wywl9a"; + sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm"; }; checkInputs = [ vmprof pyqt4 ]; From ce00827c5ab4b717ab53bbd42c820f0c2b24cefb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 10:55:21 -0800 Subject: [PATCH 422/467] python37Packages.django_reversion: 3.0.2 -> 3.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-django-reversion/versions --- pkgs/development/python-modules/django_reversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 35879a7bfb49..9dfdf51186fc 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b"; + sha256 = "0xjs803r5fxaqpkjbpsb17j8racxa4q1nvjjaj1akkgkgw9dj343"; }; # tests assume the availability of a mysql/postgresql database From 2aefbe241fa13c5e88947891116dc00d23632ab9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 10:00:07 -0800 Subject: [PATCH 423/467] python37Packages.daphne: 2.2.4 -> 2.2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-daphne/versions --- pkgs/development/python-modules/daphne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 772ca350f132..da85fbb1d9b7 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "2.2.4"; + version = "2.2.5"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi"; + sha256 = "0ixgq1rr3s60bmrwx8qwvlvs3lag1c2nrmg4iy7wcmb8i1ddylqr"; }; nativeBuildInputs = [ pytestrunner ]; From ea35c7645544a0031c72111c89f12fb33666866b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 06:26:23 -0800 Subject: [PATCH 424/467] python37Packages.keras-applications: 1.0.6 -> 1.0.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-keras_applications/versions --- .../development/python-modules/keras-applications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix index a069c205144d..c6fdd21d2ebe 100644 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Applications"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "a03af60ddc9c5afdae4d5c9a8dd4ca857550e0b793733a5072e0725829b87017"; + sha256 = "1yk9brcvr96s1slpgj9vr6np7fk8limcrw9v2pjq72c6k0mpnq30"; }; # Cyclic dependency: keras-applications requires keras, which requires keras-applications From 7842ba740bf1e47aa05750e166600f476edceae4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 05:06:11 -0800 Subject: [PATCH 425/467] python37Packages.pytest-django: 3.4.5 -> 3.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pytest-django/versions --- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 35b2ac34cabc..e0d60df69984 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s"; + sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y"; }; buildInputs = [ pytest setuptools_scm ]; From 87176a7384e1dd3416ebe3018e62fa79bac69a82 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 01:55:48 -0800 Subject: [PATCH 426/467] python37Packages.pycontracts: 1.8.7 -> 1.8.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pycontracts/versions --- pkgs/development/python-modules/pycontracts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 42d19bb87550..6ae90ac55243 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.7"; + version = "1.8.8"; src = fetchPypi { inherit pname version; - sha256 = "1b65jkbk9bcl10s49w9frsjcarfzi8gp22a40cz7zxry8b8yvcf0"; + sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va"; }; buildInputs = [ nose ]; From 8b4eb600c2607788077bd4c5b60a4ed1bc071067 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 01:02:14 -0800 Subject: [PATCH 427/467] python37Packages.qtawesome: 0.5.5 -> 0.5.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-qtawesome/versions --- pkgs/development/python-modules/qtawesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 446a86f3c8f5..ff2d8cf0740c 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.5.5"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0yb194c927g9nqknfb49nfqv32l74bb0m71wswijbbybb7syabbl"; + sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3"; }; propagatedBuildInputs = [ qtpy six pyside ]; From 7951d61ac25feb16213d548702befd5afdf3138a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 22:46:01 -0800 Subject: [PATCH 428/467] python37Packages.xarray: 0.11.2 -> 0.11.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-xarray/versions --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index c055618b2e60..997c4a2deeb6 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.11.2"; + version = "0.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1cnghx1xcgdq675abmrys311vspmzgjgiji4wh8iyw194qalfwdg"; + sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc"; }; checkInputs = [ pytest ]; From 13102e5352729362235a48aaca2c0e199f5978c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 23:56:00 -0800 Subject: [PATCH 429/467] python37Packages.rpmfluff: 0.5.5 -> 0.5.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rpmfluff/versions --- pkgs/development/python-modules/rpmfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index a8997e279b27..bdbc3629ec71 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; + sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l"; }; LC_ALL="en_US.utf-8"; From bc77a32a94934bf9203fe57f06734a69fa56fbe9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 22:28:08 -0800 Subject: [PATCH 430/467] python37Packages.slixmpp: 1.4.1 -> 1.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-slixmpp/versions --- pkgs/development/python-modules/slixmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index ed90291ba8a0..53d2006315c1 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.4.1"; + version = "1.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "020acd4507fd00c38835b78b5f338db60d3df840187623e0d41ab2ca89d7ae57"; + sha256 = "0rqpmscxjznxyz3dyxpc56gib319k01vl837r8g8w57dinz4y863"; }; patches = [ From a6c6fedf0a6c7c90ae14b70fc6e5847ea44e156b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 06:28:55 -0800 Subject: [PATCH 431/467] python37Packages.pynvim: 0.3.1 -> 0.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pynvim/versions --- pkgs/development/python-modules/pynvim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 3811e5082c0f..40aae88c3ab7 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x"; + sha256 = "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g"; }; checkInputs = [ nose ]; From 4a4e0a62d921a202fb13633ff5ce9d3962f45975 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 03:01:14 -0800 Subject: [PATCH 432/467] python37Packages.py3status: 3.15 -> 3.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-py3status/versions --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 412b3b2342a5..5f43ae32ea23 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.15"; + version = "3.16"; src = fetchPypi { inherit pname version; - sha256 = "78aa7fa0af707641e215ea93bfd4bb5fd47f18a7193d84ed60bb9e6cccb75b7f"; + sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; }; doCheck = false; From e6e43961e7d62aed1b6e1a364977953c03e31848 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jan 2019 09:53:30 -0800 Subject: [PATCH 433/467] python37Packages.sphinxcontrib-bibtex: 0.4.1 -> 0.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-sphinxcontrib-bibtex/versions --- .../python-modules/sphinxcontrib-bibtex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 700a7fad4aab..2daa9766a3af 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.4.2"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr"; + sha256 = "0af7651hfjh4hv97xns4vpf8n3kqy7ghyjlkfda5wxw56hxgp6hn"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; From bf4de776c4c0689dd0fb0db9628d8348f4d4970b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jan 2019 13:15:43 -0800 Subject: [PATCH 434/467] python37Packages.plotly: 3.4.1 -> 3.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-plotly/versions --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 58ad690ce2df..20a9c7ca9812 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.1"; + version = "3.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5dc85bde91bc80fa05f0d89e9f3a8eaee735b2b404047266874e0ff9c104407f"; + sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269"; }; propagatedBuildInputs = [ From c8547081cb61d6078f0681be98a5331717a115f3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 8 Feb 2019 12:06:16 -0500 Subject: [PATCH 435/467] cron: fix error when running crontab as sudo (issue #54827) --- pkgs/tools/system/cron/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 374f0ac19d89..aa047ca4a681 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, sendmailPath ? "/usr/sbin/sendmail"}: +{stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}: stdenv.mkDerivation { name = "cron-4.1"; @@ -25,6 +25,9 @@ stdenv.mkDerivation { #undef _PATH_SENDMAIL #define _PATH_SENDMAIL "${sendmailPath}" + #undef _PATH_VI + #define _PATH_VI "${vim}/bin/vim" + #undef _PATH_DEFPATH #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin" __EOT__ From 230f88a4363aec34184202ce6350dfec00eeb24b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 8 Feb 2019 12:26:33 -0500 Subject: [PATCH 436/467] hepmc3: init at 3.1.0 --- .../libraries/physics/hepmc3/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/physics/hepmc3/default.nix diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix new file mode 100644 index 000000000000..972dfdd7ad1a --- /dev/null +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, coreutils, root }: + +stdenv.mkDerivation rec { + name = "hepmc3-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; + sha256 = "12kzdqdbq7md0nn58jvilhh00yddfir65f0q2026k0ym37bfwdyd"; + }; + + buildInputs = [ cmake root ]; + + postInstall = '' + substituteInPlace "$out"/bin/HepMC3-config \ + --replace 'greadlink' '${coreutils}/bin/readlink' + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; + license = licenses.gpl3; + homepage = http://hepmc.web.cern.ch/hepmc/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e9680cb1b8..685e49633656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22204,6 +22204,8 @@ in hepmc = callPackage ../development/libraries/physics/hepmc { }; + hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; + herwig = callPackage ../development/libraries/physics/herwig { }; lhapdf = callPackage ../development/libraries/physics/lhapdf { }; From c8b2cd51b99219351d634de70570997337e7ef3b Mon Sep 17 00:00:00 2001 From: Craig Younkins Date: Thu, 6 Dec 2018 21:55:20 +0000 Subject: [PATCH 437/467] net_snmp: 5.7.3 -> 5.8 --- .../net-snmp/0002-autoconf-version.patch | 7 ++++ .../monitoring/net-snmp/CVE-2018-18065.patch | 30 ---------------- pkgs/servers/monitoring/net-snmp/default.nix | 35 ++++++++----------- 3 files changed, 22 insertions(+), 50 deletions(-) create mode 100644 pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch delete mode 100644 pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch diff --git a/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch b/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch new file mode 100644 index 000000000000..0ebb1751d6bf --- /dev/null +++ b/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch @@ -0,0 +1,7 @@ +diff --git a/dist/autoconf-version b/dist/autoconf-version +index 264f2ce..5e1b8b0 100644 +--- a/dist/autoconf-version ++++ b/dist/autoconf-version +@@ -1 +1 @@ +-2.68 ++2.69 diff --git a/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch b/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch deleted file mode 100644 index c33f7bb03fa8..000000000000 --- a/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 7ffb8e25a0db851953155de91f0170e9bf8c457d -Author: Robert Story -Date: Thu Oct 6 10:43:10 2016 -0400 - - CHANGES: BUG: 2743: snmpd crashes when receiving a GetNext PDU with multiple Varbinds - - skip out-of-range varbinds when calling next handler - -diff --git a/agent/helpers/table.c b/agent/helpers/table.c -index 32a08033a..2666638b5 100644 ---- a/agent/helpers/table.c -+++ b/agent/helpers/table.c -@@ -340,6 +340,8 @@ table_helper_handler(netsnmp_mib_handler *handler, - else if (reqinfo->mode == MODE_GET) - table_helper_cleanup(reqinfo, request, - SNMP_NOSUCHOBJECT); -+ else -+ request->processed = 1; /* skip if next handler called */ - continue; - } - -@@ -409,6 +411,8 @@ table_helper_handler(netsnmp_mib_handler *handler, - else if (reqinfo->mode == MODE_GET) - table_helper_cleanup(reqinfo, request, - SNMP_NOSUCHOBJECT); -+ else -+ request->processed = 1; /* skip if next handler called */ - continue; - } - /* diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index b228d6901014..d3528e93d6c0 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, unzip }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, perlPackages, unzip, nettools, ncurses }: stdenv.mkDerivation rec { - name = "net-snmp-5.7.3"; + name = "net-snmp-5.8"; src = fetchurl { - url = "mirror://sourceforge/net-snmp/${name}.zip"; - sha256 = "0gkss3zclm23zwpqfhddca8278id7pk6qx1mydpimdrrcndwgpz8"; + url = "mirror://sourceforge/net-snmp/${name}.tar.gz"; + sha256 = "1pvajzj9gmj56dmwix0ywmkmy2pglh6nny646hkm7ghfhh03bz5j"; }; patches = @@ -14,23 +14,11 @@ stdenv.mkDerivation rec { inherit name sha256; }; in [ - (fetchAlpinePatch "CVE-2015-5621.patch" "05098jyvd9ddr5q26z7scbbvk1bk6x4agpjm6pyprvpc1zpi0y09") - (fetchAlpinePatch "fix-Makefile-PL.patch" "14ilnkj3cr6mpi242hrmmmv8nv4dj0fdgn42qfk9aa7scwsc0lc7") (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") - (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j") - ./CVE-2018-18065.patch + ./0002-autoconf-version.patch ]; - preConfigure = - '' - perlarchname=$(perl -e 'use Config; print $Config{archname};') - installFlags="INSTALLSITEARCH=$out/${perl.libPrefix}/${perl.version}/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3" - - # http://article.gmane.org/gmane.network.net-snmp.user/32434 - substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v' - ''; - configureFlags = [ "--with-default-snmp-version=3" "--with-sys-location=Unknown" @@ -38,13 +26,20 @@ stdenv.mkDerivation rec { "--with-logfile=/var/log/net-snmpd.log" "--with-persistent-directory=/var/lib/net-snmp" "--with-openssl=${openssl.dev}" + "--disable-embedded-perl" + "--without-perl-modules" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ file perl unzip openssl ]; + postPatch = '' + substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" + ''; + + nativeBuildInputs = [ autoreconfHook nettools ]; + buildInputs = [ file perl unzip openssl ncurses ]; + propagatedBuildInputs = with perlPackages; [ perl JSON Tk TermReadKey ]; enableParallelBuilding = true; - doCheck = false; # fails + doCheck = false; # tries to use networking postInstall = '' for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do From b29ad6c2fc061c29b101257c6d7742bd8a80c663 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 8 Feb 2019 19:22:51 +0100 Subject: [PATCH 438/467] android-studio: 3.3.0.20 -> 3.3.1.0 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 1090bb7d8947..2d5028cf83bc 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.3.0.20"; # "Android Studio 3.3" - build = "182.5199772"; - sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw"; + version = "3.3.1.0"; # "Android Studio 3.3.1" + build = "182.5264788"; + sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42"; }; betaVersion = { version = "3.4.0.12"; # "Android Studio 3.4 Beta 3" From b0db4571a4cb633bd4d392ddcb68db4021ed59da Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 8 Feb 2019 19:25:18 +0100 Subject: [PATCH 439/467] inxi: 3.0.31-1 -> 3.0.32-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 57e6c48867a7..d69398e64f14 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.31-1"; + version = "3.0.32-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "13dm8z7j8wg2sj7pzgxvivqhn88iy54aykhpplzqhp2s10smhs46"; + sha256 = "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv"; }; buildInputs = [ perl ]; From 0879595c607b66a990693972a55a27fa54eccd79 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 8 Feb 2019 20:02:05 +0100 Subject: [PATCH 440/467] nagstamon: 2.0.1 -> 3.2.1 --- pkgs/tools/misc/nagstamon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 3163b78437ec..57036acb58e8 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -2,18 +2,18 @@ pythonPackages.buildPythonApplication rec { name = "nagstamon-${version}"; - version = "2.0.1"; + version = "3.2.1"; src = fetchurl { url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"; - sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b"; + sha256 = "1048x55g3nlyyggn6a36xmj24w4hv08llg58f4hzc0fwg074cd58"; }; # Test assumes darwin doCheck = false; propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests - beautifulsoup4 ]; + beautifulsoup4 keyring requests-kerberos kerberos lxml ]; meta = with stdenv.lib; { description = "A status monitor for the desktop"; From c95407b3278d82ddc82ed03f3cfc4f6ef74ebdd2 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Fri, 8 Feb 2019 11:36:09 -0800 Subject: [PATCH 441/467] boot/raspberrypi: replace deprecated configuration option --- nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 047651dc6426..7db60daa60b8 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -33,7 +33,7 @@ let avoid_warnings=1 '' + optional isAarch64 '' # Boot in 64-bit mode. - arm_control=0x200 + arm_64bit=1 '' + (if cfg.uboot.enable then '' kernel=u-boot-rpi.bin '' else '' From b416bb93937823b22299748369bb98926c8776a8 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 8 Feb 2019 22:16:22 +0000 Subject: [PATCH 442/467] tmsu: install manpage properly into man1 subdirectory --- pkgs/tools/filesystems/tmsu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index fef1d0699e73..fd557a7ff565 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/sbin - mkdir -p $out/share/man + mkdir -p $out/share/man/man1 mkdir -p $out/share/zsh/site-functions make install INSTALL_DIR=$out/bin \ MOUNT_INSTALL_DIR=$out/sbin \ - MAN_INSTALL_DIR=$out/share/man \ + MAN_INSTALL_DIR=$out/share/man/man1 \ ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions ''; From c5419d6f3fc2ce08f6988e84201e6d3ff6626782 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Fri, 8 Feb 2019 14:26:37 -0800 Subject: [PATCH 443/467] mattermost: 5.4.0 -> 5.7.1 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 2969f723b50a..02aa4fbab7da 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.4.0"; + version = "5.7.1"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "0sal5ydm1cwnvf3acmiy0400ghhd6v0wj64mkxqwqf8ysnbxizwq"; + sha256 = "1k4rd8383bz9q23wgxnqcp69hcixaa0zd256h54wmwqw6fdn3bc0"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "06dg0f6nrh3a2v3lnyn2s39nj5jpsvfkx3ypq4zjpks0srv4mgfz"; + sha256 = "0rxbgd3cb9m7rf0yg1vpd1af6x6bn0jilb0pfqr46dg42a70dx09"; }; installPhase = '' From b4178f233c67baa5862c1c7f7c942a16635fe73c Mon Sep 17 00:00:00 2001 From: Alec Snyder Date: Fri, 8 Feb 2019 14:36:50 -0800 Subject: [PATCH 444/467] Add Git-Town Package (#54732) * git-town: init at 7.2.0 add git-town package derivation --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/git-town/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/git-town/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ccffd9139b3..028da75188ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -241,6 +241,11 @@ email = "nix-commits@lists.science.uu.nl"; name = "Nix Committers"; }; + allonsy = { + email = "linuxbash8@gmail.com"; + github = "allonsy"; + name = "Alec Snyder"; + }; alunduil = { email = "alunduil@gmail.com"; github = "alunduil"; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix new file mode 100644 index 000000000000..afcf9cf4c781 --- /dev/null +++ b/pkgs/tools/misc/git-town/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + + buildGoPackage rec { + name = "git-town-${version}"; + version = "7.2.0"; + + goPackagePath = "github.com/Originate/git-town"; + + src = fetchFromGitHub { + owner = "Originate"; + repo = "git-town"; + rev = "v${version}"; + sha256 = "0hr0c6iya34lanfhsg9kj03l4ajalcfxkbn4bgwh0749smhi6mrj"; + }; + + buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + + meta = with stdenv.lib; { + description = "Generic, high-level git support for git-flow workflows"; + homepage = http://www.git-town.com/; + maintainers = [ maintainers.allonsy ]; + license = licenses.mit; + }; + } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ddd20cc18ab..fb54ee48b1d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -690,6 +690,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + git-town = callPackage ../tools/misc/git-town { }; + github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; gitless = callPackage ../applications/version-management/gitless { }; From 1cb81a69a025cf5abc7a3d4f13436fb299043bd5 Mon Sep 17 00:00:00 2001 From: tbenst Date: Fri, 8 Feb 2019 14:41:14 -0800 Subject: [PATCH 445/467] cmtk: init at 3.3.1 (#54016) * cmtk: init at 3.3.1 --- .../science/biology/cmtk/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/biology/cmtk/default.nix diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix new file mode 100644 index 000000000000..ed661db23e0a --- /dev/null +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation rec { + name = "cmtk-3.3.1"; + + src = fetchurl { + name = "cmtk-source.tar.gz"; + url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1"; + sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; + }; + + buildInputs = [cmake]; + + meta = with stdenv.lib; { + description = "Computational Morphometry Toolkit "; + longDescription = ''A software toolkit for computational morphometry of + biomedical images, CMTK comprises a set of command line tools and a + back-end general-purpose library for processing and I/O''; + maintainers = with maintainers; [ tbenst ]; + platforms = platforms.all; + license = licenses.gpl3; + homepage = https://www.nitrc.org/projects/cmtk/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb54ee48b1d1..4a53f0c0d2f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21499,6 +21499,8 @@ in bftools = callPackage ../applications/science/biology/bftools { }; + cmtk = callPackage ../applications/science/biology/cmtk { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; From 7a1d22c6008a73fd57a7178904b84cff8b61f93f Mon Sep 17 00:00:00 2001 From: ElXreno <40758597+ElXreno@users.noreply.github.com> Date: Sat, 9 Feb 2019 01:46:43 +0300 Subject: [PATCH 446/467] megasync: init at 3.7.1.0 (#53126) * megasync: init at 3.7.1.0 * Removed inkscape from dependencies --- pkgs/applications/misc/megasync/default.nix | 129 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 131 insertions(+) create mode 100644 pkgs/applications/misc/megasync/default.nix diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix new file mode 100644 index 000000000000..c0162ae729f0 --- /dev/null +++ b/pkgs/applications/misc/megasync/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, autoconf +, automake +, bash +, bashInteractive +, c-ares +, cryptopp +, curl +, doxygen +, freeimage +, fetchFromGitHub +, hicolor-icon-theme +, libmediainfo +, libraw +, libsodium +, libtool +, libuv +, libzen +, lsb-release +, makeDesktopItem +, pkgconfig +, qt5 +, readline +, sqlite +, swig +, unzip +, wget }: + +stdenv.mkDerivation rec { + name = "megasync-${version}"; + version = "3.7.1.0"; + + src = fetchFromGitHub { + owner = "meganz"; + repo = "MEGAsync"; + rev = "v${version}_Linux"; + sha256 = "1spw2xc3m02rxljdv8z3zm8a3yyrk4a355q81zgh84jwkfds9qjy"; + fetchSubmodules = true; + }; + + desktopItem = makeDesktopItem { + name = "megasync"; + exec = "megasync"; + icon = "megasync"; + comment = meta.description; + desktopName = "MEGASync"; + genericName = "File Synchronizer"; + categories = "Network;FileTransfer;"; + startupNotify = "false"; + }; + + nativeBuildInputs = [ + doxygen + libsodium + lsb-release + qt5.qmake + qt5.qttools + swig + ]; + buildInputs = [ + autoconf + automake + bash + c-ares + cryptopp + curl + freeimage + hicolor-icon-theme + libmediainfo + libraw + libtool + libuv + libzen + pkgconfig + qt5.qtbase + qt5.qtsvg + sqlite + unzip + wget + ]; + + patchPhase = '' + for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do + substituteInPlace "$file" \ + --replace "/bin/bash" "${bashInteractive}/bin/bash" + done + ''; + + configurePhase = '' + cd src/MEGASync/mega + ./autogen.sh + ./configure \ + --disable-examples \ + --disable-java \ + --disable-php \ + --disable-python \ + --enable-chat \ + --with-cares \ + --with-cryptopp \ + --with-curl \ + --with-sodium \ + --with-sqlite \ + --with-zlib \ + --without-freeimage \ + --without-termcap \ + --without-ffmpeg + cd ../.. + ''; + + buildPhase = '' + qmake CONFIG+="release" MEGA.pro + lrelease MEGASync/MEGASync.pro + make -j $NIX_BUILD_CORES + ''; + + installPhase = '' + mkdir -p $out/share/icons + install -Dm 755 MEGASync/megasync $out/bin/megasync + cp -r ${desktopItem}/share/applications $out/share + cp MEGASync/gui/images/uptodate.svg $out/share/icons/megasync.svg + ''; + + meta = with stdenv.lib; { + description = "Easy automated syncing between your computers and your MEGA Cloud Drive"; + homepage = https://mega.nz/; + license = licenses.free; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fb3266b9115..abe6cdffdf1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4150,6 +4150,8 @@ in megacli = callPackage ../tools/misc/megacli { }; megatools = callPackage ../tools/networking/megatools { }; + + megasync = callPackage ../applications/misc/megasync { }; memo = callPackage ../applications/misc/memo { }; From fcbcd327e516825606e4b07ce9d894785874220e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 9 Feb 2019 00:45:35 +0100 Subject: [PATCH 447/467] signal-desktop: 1.21.0 -> 1.21.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 30fadabcdf30..276bfca8bd55 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "01fkmav057l7z75g06b2f8h0q6cfa78nv26lnf0kp6a34z0g9a94"; + sha256 = "1vs42kvaacsx8smaqpn1q9i0pb5wcca22a9s4467286b5n0lfc4r"; }; phases = [ "unpackPhase" "installPhase" ]; From 401df493da07ac5d6b2e9236ee5391879fe576e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 8 Feb 2019 18:07:28 -0200 Subject: [PATCH 448/467] plano-theme: 3.30-2 -> 3.30-3 --- pkgs/data/themes/plano/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index e878943ff626..ebfafe98e5a6 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "plano-theme-${version}"; - version = "3.30-2"; + pname = "plano-theme"; + version = "3.30-3"; src = fetchFromGitHub { owner = "lassekongo83"; - repo = "plano-theme"; + repo = pname; rev = "v${version}"; - sha256 = "06yagpb0dpb8nzh3lvs607rzg6y5l6skl4mjcmbxayapsqka45hj"; + sha256 = "1rb9whr5r2pj6fmwa9g0vdrfki3dqldnx85mpyq07jvxkipcdq6g"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; From 2d9c747dc01cb5426902987257ad019fafdfbf94 Mon Sep 17 00:00:00 2001 From: markuskowa Date: Sat, 9 Feb 2019 02:17:25 +0100 Subject: [PATCH 449/467] Revert "megasync: init at 3.7.1.0 (#53126)" This reverts commit 7a1d22c6008a73fd57a7178904b84cff8b61f93f. --- pkgs/applications/misc/megasync/default.nix | 129 -------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 131 deletions(-) delete mode 100644 pkgs/applications/misc/megasync/default.nix diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix deleted file mode 100644 index c0162ae729f0..000000000000 --- a/pkgs/applications/misc/megasync/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ stdenv -, autoconf -, automake -, bash -, bashInteractive -, c-ares -, cryptopp -, curl -, doxygen -, freeimage -, fetchFromGitHub -, hicolor-icon-theme -, libmediainfo -, libraw -, libsodium -, libtool -, libuv -, libzen -, lsb-release -, makeDesktopItem -, pkgconfig -, qt5 -, readline -, sqlite -, swig -, unzip -, wget }: - -stdenv.mkDerivation rec { - name = "megasync-${version}"; - version = "3.7.1.0"; - - src = fetchFromGitHub { - owner = "meganz"; - repo = "MEGAsync"; - rev = "v${version}_Linux"; - sha256 = "1spw2xc3m02rxljdv8z3zm8a3yyrk4a355q81zgh84jwkfds9qjy"; - fetchSubmodules = true; - }; - - desktopItem = makeDesktopItem { - name = "megasync"; - exec = "megasync"; - icon = "megasync"; - comment = meta.description; - desktopName = "MEGASync"; - genericName = "File Synchronizer"; - categories = "Network;FileTransfer;"; - startupNotify = "false"; - }; - - nativeBuildInputs = [ - doxygen - libsodium - lsb-release - qt5.qmake - qt5.qttools - swig - ]; - buildInputs = [ - autoconf - automake - bash - c-ares - cryptopp - curl - freeimage - hicolor-icon-theme - libmediainfo - libraw - libtool - libuv - libzen - pkgconfig - qt5.qtbase - qt5.qtsvg - sqlite - unzip - wget - ]; - - patchPhase = '' - for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do - substituteInPlace "$file" \ - --replace "/bin/bash" "${bashInteractive}/bin/bash" - done - ''; - - configurePhase = '' - cd src/MEGASync/mega - ./autogen.sh - ./configure \ - --disable-examples \ - --disable-java \ - --disable-php \ - --disable-python \ - --enable-chat \ - --with-cares \ - --with-cryptopp \ - --with-curl \ - --with-sodium \ - --with-sqlite \ - --with-zlib \ - --without-freeimage \ - --without-termcap \ - --without-ffmpeg - cd ../.. - ''; - - buildPhase = '' - qmake CONFIG+="release" MEGA.pro - lrelease MEGASync/MEGASync.pro - make -j $NIX_BUILD_CORES - ''; - - installPhase = '' - mkdir -p $out/share/icons - install -Dm 755 MEGASync/megasync $out/bin/megasync - cp -r ${desktopItem}/share/applications $out/share - cp MEGASync/gui/images/uptodate.svg $out/share/icons/megasync.svg - ''; - - meta = with stdenv.lib; { - description = "Easy automated syncing between your computers and your MEGA Cloud Drive"; - homepage = https://mega.nz/; - license = licenses.free; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26246de9ba08..b0513ce3b292 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4152,8 +4152,6 @@ in megacli = callPackage ../tools/misc/megacli { }; megatools = callPackage ../tools/networking/megatools { }; - - megasync = callPackage ../applications/misc/megasync { }; memo = callPackage ../applications/misc/memo { }; From 69be72a64aa7ee9a9ce9c50429bbac8a64ca250d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 8 Feb 2019 19:26:54 -0500 Subject: [PATCH 450/467] desktop-files-utils: add setupHook to remove mimeinfo.cache Post-Installation scripts are running `update-desktop-database -q` creating these files which obviously results in a lot of collisions. Much better solution than eventually noticing their existence and removing them in postInstall. --- pkgs/applications/misc/font-manager/default.nix | 4 ---- pkgs/development/tools/profiling/sysprof/default.nix | 4 ---- pkgs/tools/misc/desktop-file-utils/default.nix | 2 ++ pkgs/tools/misc/desktop-file-utils/setup-hook.sh | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/misc/desktop-file-utils/setup-hook.sh diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index ee8766f766f1..bf97cff5030d 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -49,10 +49,6 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - postInstall = '' - rm $out/share/applications/mimeinfo.cache - ''; - meta = { homepage = https://fontmanager.github.io/; description = "Simple font management for GTK+ desktop environments"; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 3945af2794d5..8cd6a3f09eef 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -46,10 +46,6 @@ in stdenv.mkDerivation rec { "-Dsystemdunitdir=lib/systemd/system" ]; - postInstall = '' - rm $out/share/applications/mimeinfo.cache - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 8dc590c5d6fc..3e47ebd51d74 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libintl ]; + setupHook = ./setup-hook.sh; + meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; diff --git a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/pkgs/tools/misc/desktop-file-utils/setup-hook.sh new file mode 100644 index 000000000000..004d635cff0e --- /dev/null +++ b/pkgs/tools/misc/desktop-file-utils/setup-hook.sh @@ -0,0 +1,6 @@ +# Remove mimeinfo cache +mimeinfoPreFixupPhase() { + rm -f $out/share/applications/mimeinfo.cache +} + +preFixupPhases="$preFixupPhases mimeinfoPreFixupPhase" From baf6ba553f729f063359a59ceb54de11328e0aba Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 27 Jan 2019 20:48:47 -0500 Subject: [PATCH 451/467] vscode-extensions.ms-vscode.cpptools: 0.20.1 -> 0.21.0 --- pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 06f86582d535..e5b83511e72e 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -68,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.20.1"; - sha256 = "1gmnkrn26n57vx2nm5hhalkkl2irak38m2lklgja0bi10jb6y08l"; + version = "0.21.0"; + sha256 = "0zq81xfj4hyz01kcw131fmql1mfs9yrjzcmw8i0yha0hymrgwngv"; }; buildInputs = [ From 3fa313d46d05da87d10722817ea5f2a29989fc82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Feb 2019 08:43:13 +0100 Subject: [PATCH 452/467] python.pkgs.pyfakefs: 3.5.6 -> 3.5.7 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 3ec5998cadd7..4b128db82eac 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.5.6"; + version = "3.5.7"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "efe9c318b2a37ae498a555889684c30ccb6a1b06bd391cb3baf0eb5ba68e9062"; + sha256 = "8969435f8e7ca10f60c22096b02b15ad3af143de7d3bb4d73507b812bcdd8e37"; }; postPatch = '' From 287d1de51a8270994c316f94dad4a1089ed88b51 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 30 Dec 2018 10:31:42 +0100 Subject: [PATCH 453/467] haskellPackages.scat: fix build --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5ddd18ff49b..e60a05b1f70f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1203,4 +1203,13 @@ self: super: { sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; stripLen = 1; }); + + # Fix for base >= 4.11 + scat = overrideCabal super.scat (drv: { + patches = [(pkgs.fetchpatch { + url = "https://github.com/redelmann/scat/pull/6.diff"; + sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl"; + })]; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From c47dd4a38d96b56a7857401f351e1001495f27a2 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 9 Feb 2019 10:37:42 +0100 Subject: [PATCH 454/467] radarr: 0.2.0.1217 -> 0.2.0.1293 --- pkgs/servers/radarr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 62cb2d7f348b..cd032ce85343 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.1217"; + version = "0.2.0.1293"; src = fetchurl { - url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.v${version}.linux.tar.gz"; - sha256 = "09zzvfqpv58b79a906013pjq42qwbibf16rz24gnqg7wq7az83jy"; + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; + sha256 = "0wzwbgfvi48lq4zadzq3rlsbm6irwz534liw8k7hn69yv0wi3wfd"; }; nativeBuildInputs = [ makeWrapper ]; From fe7b682e6d9e2eb1c2a363a8abc53788adeca8a0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 9 Feb 2019 12:42:39 +0300 Subject: [PATCH 455/467] haskellPackages.uri-bytestring: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 423abfc2f7c2..75e2f80e463c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1188,6 +1188,11 @@ self: super: { these = doJailbreak super.these; # until these >= 0.7.6 insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch; + uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { + url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; + sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4"; + }); + # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC # 8.4 builds. beam needs to release a round of updates that relax From c5e953a7c30edd9a2c28add5f4821fff9c3ab9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Feb 2019 10:32:00 +0100 Subject: [PATCH 456/467] python.pkgs.prawcore: 1.0.0 -> 1.0.1 --- .../python-modules/prawcore/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 950d478b30f8..f1ce7ba2a087 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchPypi , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers @@ -6,19 +6,13 @@ buildPythonPackage rec { pname = "prawcore"; - version = "1.0.0"; + version = "1.0.1"; - src = fetchFromGitHub { - owner = "praw-dev"; - repo = "prawcore"; - rev = "v${version}"; - sha256 = "1j905wi5n2xgik3yk2hrv8dky318ahfjl5k1zs21mrl81jk0907f"; + src = fetchPypi { + inherit pname version; + sha256 = "ab5558efb438aa73fc66c4178bfc809194dea3ce2addf4dec873de7e2fd2824e"; }; - postPatch = '' - sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py - ''; - propagatedBuildInputs = [ requests ]; From d27e1c58e3f622d5f228253dc8a1fc9b3b5dfc73 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Fri, 8 Feb 2019 21:44:36 +0700 Subject: [PATCH 457/467] trilium: fix missing GSettings schemas --- pkgs/applications/office/trilium/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index c09f78cf873b..a72332f2f338 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -32,9 +32,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper + wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ atomEnv.packages gtk3 ]; installPhase = '' mkdir -p $out/bin @@ -48,10 +49,9 @@ in stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications ''; - - # This "shouldn't" be needed, remove when possible :) + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) preFixup = '' - wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}" + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) ''; dontStrip = true; From 590e07779c47db8f71903eaac580ff55098c264f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 3 Feb 2019 13:44:29 +0000 Subject: [PATCH 458/467] coqPackages.mathcomp-bigenough: init at 1.0.0 --- .../mathcomp-bigenough/default.nix | 29 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/coq-modules/mathcomp-bigenough/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix new file mode 100644 index 000000000000..fa4a2aaeddba --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "coq${coq.coq-version}-mathcomp-bigenough-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "bigenough"; + rev = version; + sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A small library to do epsilon - N reasonning"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index a624211f79f8..e257fa3f1327 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -33,6 +33,7 @@ let iris = callPackage ../development/coq-modules/iris {}; math-classes = callPackage ../development/coq-modules/math-classes { }; mathcomp = callPackage ../development/coq-modules/mathcomp { }; + mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough { }; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; paco = callPackage ../development/coq-modules/paco {}; From bafa15f1451d4a7a8f161baf005430da45f151d5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 3 Feb 2019 13:44:37 +0000 Subject: [PATCH 459/467] coqPackages.mathcomp-finmap: init at 1.1.0 --- .../coq-modules/mathcomp-finmap/default.nix | 29 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/coq-modules/mathcomp-finmap/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix new file mode 100644 index 000000000000..a5d0d006a38c --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.1.0"; + name = "coq${coq.coq-version}-mathcomp-finmap-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "finmap"; + rev = version; + sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A finset and finmap library"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index e257fa3f1327..485c8214cc92 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -34,6 +34,7 @@ let math-classes = callPackage ../development/coq-modules/math-classes { }; mathcomp = callPackage ../development/coq-modules/mathcomp { }; mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough { }; + mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap { }; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; paco = callPackage ../development/coq-modules/paco {}; From 5d3e350536905a2007e5ed54466dc0fdd19f3fd7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 3 Feb 2019 13:44:41 +0000 Subject: [PATCH 460/467] coqPackages.mathcomp-analysis: init at 0.1.0 --- .../coq-modules/mathcomp-analysis/default.nix | 30 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/coq-modules/mathcomp-analysis/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix new file mode 100644 index 000000000000..f90be596fef1 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "coq${coq.coq-version}-mathcomp-analysis-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "analysis"; + rev = version; + sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "Analysis library compatible with Mathematical Components"; + inherit (src.meta) homepage; + inherit (coq.meta) platforms; + license = stdenv.lib.licenses.cecill-c; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.8" ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 485c8214cc92..718215fda9d5 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -33,6 +33,7 @@ let iris = callPackage ../development/coq-modules/iris {}; math-classes = callPackage ../development/coq-modules/math-classes { }; mathcomp = callPackage ../development/coq-modules/mathcomp { }; + mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis { }; mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough { }; mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap { }; metalib = callPackage ../development/coq-modules/metalib { }; From 012b43dfbb63ce3f453a726cfbd6226a25ed283a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Feb 2019 03:39:55 -0800 Subject: [PATCH 461/467] python37Packages.httmock: 1.2.6 -> 1.3.0 (#55195) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-httmock/versions --- pkgs/development/python-modules/httmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index b50753c55864..53447544ca92 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "httmock"; - version = "1.2.6"; + version = "1.3.0"; src = fetchFromGitHub { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "0iya8qsb2jm03s9p6sf1yzgm1irxl3dcq0k0a9ygl0skzjz5pvab"; + sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q"; }; checkInputs = [ requests ]; From 3e2513fa826dad4423a74e2ff975fd6a3a8c4ddd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Feb 2019 03:41:02 -0800 Subject: [PATCH 462/467] python37Packages.libcloud: 2.3.0 -> 2.4.0 (#55219) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-apache-libcloud/versions --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 52cac7177803..e6a493f7b641 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0e2eee3802163bd0605975ed1e284cafc23203919bfa80c0cc5d3cd2543aaf97"; + sha256 = "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; From 05930fd187a28e0e115d725d3e5ba6596dbf49ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Feb 2019 03:42:36 -0800 Subject: [PATCH 463/467] python37Packages.tenacity: 5.0.2 -> 5.0.3 (#55180) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-tenacity/versions --- pkgs/development/python-modules/tenacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 596fa6b825fc..d34231ca9a9e 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.0.2"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1rjbj9wks7b7n75mbm01y0g2ngyai8yi05ck9gicmcdyix7vw42c"; + sha256 = "12z36fq6qfn9sgd1snsfwrk5j2cw29bsb7mkb0g818fal41g7dr4"; }; nativeBuildInputs = [ pbr ]; From 3ad71a13704dc50ba27a385c555c83410179ab3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Feb 2019 03:44:18 -0800 Subject: [PATCH 464/467] python37Packages.libusb1: 1.6.6 -> 1.7 (#55194) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-libusb1/versions --- pkgs/development/python-modules/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 8a9b5da68ef9..9b268686b8ff 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.6.6"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271"; + sha256 = "03vylg5mdsxp2nyk8sm7yxmb470hcb92q263dfq8d6b9xp96ckwx"; }; postPatch = '' From 9a1f8e0879b80c4cd21c084141930294230186e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Feb 2019 03:48:43 -0800 Subject: [PATCH 465/467] python37Packages.pywal: 3.2.1 -> 3.3.0 (#55169) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pywal/versions --- pkgs/development/python-modules/pywal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 7f908c943aef..3fd618918781 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pywal"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; + sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg"; }; preCheck = '' From d7574a7c3101260291417eeefa831ba8bc07b225 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 9 Feb 2019 13:58:07 +0100 Subject: [PATCH 466/467] st: 0.8.1 -> 0.8.2 --- pkgs/applications/misc/st/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index f8340b1bd227..47d7279a47fa 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.1"; + name = "st-0.8.2"; src = fetchurl { url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; + sha256 = "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf"; }; inherit patches; From efe98cbdc891b45ec780d57c9debfb091d18461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Feb 2019 15:24:54 +0100 Subject: [PATCH 467/467] nixos/home-assistant: make config.http.server_port an integer --- nixos/modules/services/misc/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 4eabda1d4188..4ccfa22c89e7 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -53,7 +53,7 @@ let # If you are changing this, please update the description in applyDefaultConfig defaultConfig = { homeassistant.time_zone = config.time.timeZone; - http.server_port = (toString cfg.port); + http.server_port = cfg.port; } // optionalAttrs (cfg.lovelaceConfig != null) { lovelace.mode = "yaml"; };