From a21de12920319a8c666d93d7a8361cb468151a2a Mon Sep 17 00:00:00 2001 From: Fabian Fink Date: Sun, 16 Dec 2018 23:42:02 +0100 Subject: duplicacy: init at 2.1.2 --- maintainers/maintainer-list.nix | 5 + pkgs/tools/backup/duplicacy/default.nix | 33 ++++ pkgs/tools/backup/duplicacy/deps.nix | 336 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 376 insertions(+) create mode 100644 pkgs/tools/backup/duplicacy/default.nix create mode 100644 pkgs/tools/backup/duplicacy/deps.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9b07e439e2e..f2591ac9f7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1467,6 +1467,11 @@ github = "fdns"; name = "Felipe Espinoza"; }; + ffinkdevs = { + email = "fink@h0st.space"; + github = "ffinkdevs"; + name = "Fabian Fink"; + }; fgaz = { email = "francygazz@gmail.com"; github = "fgaz"; diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix new file mode 100644 index 00000000000..b7b1541761c --- /dev/null +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "duplicacy-${version}"; + version = "2.1.2"; + + goPackagePath = "github.com/gilbertchen/duplicacy/"; + + src = fetchFromGitHub { + owner = "gilbertchen"; + repo = "duplicacy"; + rev = "v${version}"; + sha256 = "0v3rk4da4b6dhqq8zsr4z27wd8p7crxapkn265kwpsaa99xszzbv"; + }; + goDeps = ./deps.nix; + buildPhase = '' + cd go/src/${goPackagePath} + go build duplicacy/duplicacy_main.go + ''; + + installPhase = '' + mkdir -p $bin/bin + cp duplicacy_main $bin/bin/duplicacy + ''; + + meta = with lib; { + homepage = https://duplicacy.com; + description = "A new generation cloud backup tool "; + platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.unfree; + maintainers = with maintainers; [ ffinkdevs ]; + }; +} diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/pkgs/tools/backup/duplicacy/deps.nix new file mode 100644 index 00000000000..5511b2e6716 --- /dev/null +++ b/pkgs/tools/backup/duplicacy/deps.nix @@ -0,0 +1,336 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; + sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; + }; + } + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "b7fadebe0e7f5c5720986080a01495bd8d27be37"; + sha256 = "11zcmd17206byxhgz2a75qascilydlzjbz73l2mrqng3yyr20yk1"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "0ae36a9e544696de46fdadb7b0d5fb38af48c063"; + sha256 = "0f2qcv24l9bx3jys2m9ycyy77vqlx7dbfa3frxlk19wnrwiv3p6g"; + }; + } + { + goPackagePath = "github.com/aryann/difflib"; + fetch = { + type = "git"; + url = "https://github.com/aryann/difflib"; + rev = "e206f873d14a916d3d26c40ab667bca123f365a3"; + sha256 = "00zb9sx6l6b2zq614x45zlyshl20zjhwfj8r5krw4f9y0mx3n2dm"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "a32b1dcd091264b5dee7b386149b6cc3823395c9"; + sha256 = "1yicb7l6m4hs3mi724hz74wn8305qvx6g73mjqafaaqvh6dyn86m"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/gilbertchen/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/azure-sdk-for-go"; + rev = "bbf89bd4d716c184f158d1e1428c2dbef4a18307"; + sha256 = "14563izc2y05k8s20fmhanvjydbcq8k5adp4cgw91d9bs52qivx7"; + }; + } + { + goPackagePath = "github.com/gilbertchen/cli"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/cli"; + rev = "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98"; + sha256 = "00vbyjsn009cqg24sxcizq10rgicnmrv0f8jg3fa1fw6yp5gqdl5"; + }; + } + { + goPackagePath = "github.com/gilbertchen/go-dropbox"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/go-dropbox"; + rev = "90711b603312b1f973f3a5da3793ac4f1e5c2f2a"; + sha256 = "0y2ydl3mjbkfbqyygrwq7vqig9hjh7cxvzsn2gxc1851haqp4h19"; + }; + } + { + goPackagePath = "github.com/gilbertchen/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/go-ole"; + rev = "0e87ea779d9deb219633b828a023b32e1244dd57"; + sha256 = "1d937b4i9mrwfgs1s17qhbd78dcd97wwm8zsajkarky8d55rz1bw"; + }; + } + { + goPackagePath = "github.com/gilbertchen/go.dbus"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/go.dbus"; + rev = "9e442e6378618c083fd3b85b703ffd202721fb17"; + sha256 = "0q8ld38gnr4adzw5287lw5f5l14yp8slxsz1za5ryrkprh04bhkv"; + }; + } + { + goPackagePath = "github.com/gilbertchen/goamz"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/goamz"; + rev = "eada9f4e8cc2a45db775dee08a2c37597ce4760a"; + sha256 = "0v6i4jdly06wixmm58ygxh284hnlbfxczvcwxvywiyy9bp5qyaid"; + }; + } + { + goPackagePath = "github.com/gilbertchen/gopass"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/gilbertchen/keyring"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/keyring"; + rev = "8855f5632086e51468cd7ce91056f8da69687ef6"; + sha256 = "1ja623dqnhkr1cvynrcai10s8kn2aiq53cvd8yxr47bb8i2a2q1m"; + }; + } + { + goPackagePath = "github.com/gilbertchen/xattr"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/xattr"; + rev = "68e7a6806b0137a396d7d05601d7403ae1abac58"; + sha256 = "120lq8vasc5yh0ajczsdpi8cfzgi4ymrnphgqdfcar3b9rsvx80b"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; + sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f"; + sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bd9a64bf37eb297b492a4101fb28e80ac0b290f"; + sha256 = "081qrar6wwpmb2pq3swv4byh73r9riyhl2dwv0902d8jg3kwricm"; + }; + } + { + goPackagePath = "github.com/minio/blake2b-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/blake2b-simd"; + rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; + sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = "https://github.com/ncw/swift"; + rev = "ae9f0ea1605b9aa6434ed5c731ca35d83ba67c55"; + sha256 = "0a0iwynhgxsl3czabl7ajnxpyw6x0dzbiqz6il8aw7kn10ld1rvl"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "98203f5a8333288eb3163b7c667d4260fe1333e9"; + sha256 = "09wxyrhwwh20rzpzb06vsj8k2bmw52cjlx7j4115zhky27528sx9"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94"; + sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "9dfe39835686865bff950a07b394c12a98ddc811"; + sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "f95fa95eaa936d9d87489b15d1d18b97c1ba9c28"; + sha256 = "0p9kis69wvhv8a2qbcjxvn9ggpdh81cbfjpq5pjga7n8k6d065fh"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "82aafbf43bf885069dc71b7e7c2f9d7a614d47da"; + sha256 = "1jvngpvy0q40f7krkgmwf5bbjzhv449297awcr0y78kzn0cyawi2"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "88f656faf3f37f690df1a32515b479415e1a6769"; + sha256 = "0zakmgg6dlwnkhignwjajn0dckzqq18zxvnmmg0fq6455x7fs673"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "17b5f22a248d6d3913171c1a557552ace0d9c806"; + sha256 = "0gs78qsxfg89kpiiray1x9jiv6bh328jmjkwd3ghnygf3l98kc8c"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "891aceb7c239e72692819142dfca057bdcbfcb96"; + sha256 = "1axim84fqzsp6iialk6zl4fsbfpx658vssc6ccakn4yy1xc9h854"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5a9f7b402fe85096d2e1d0383435ee1876e863d0"; + sha256 = "1hlirgvmzb929jpb1dvh930646ih5ffg3b6pmlilqr7ffdkl5z3j"; + }; + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8cc825d6eb..774cb7fb01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2367,6 +2367,8 @@ in duo-unix = callPackage ../tools/security/duo-unix { }; + duplicacy = callPackage ../tools/backup/duplicacy { }; + duplicati = callPackage ../tools/backup/duplicati { }; duplicity = callPackage ../tools/backup/duplicity { -- cgit 1.4.1 From 9e293b3bdb8f767ce41db74e285c240571f61c37 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 17 Dec 2018 12:34:39 +0100 Subject: Apply suggestions from code review Co-Authored-By: ffinkdevs --- pkgs/tools/backup/duplicacy/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index b7b1541761c..d217864e93e 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "duplicacy-${version}"; + pname = "duplicacy"; version = "2.1.2"; goPackagePath = "github.com/gilbertchen/duplicacy/"; @@ -19,8 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp duplicacy_main $bin/bin/duplicacy + install -D duplicacy_main $bin/bin/duplicacy ''; meta = with lib; { -- cgit 1.4.1 From 2e9390861a9cc84c9758883676b0777ed04b609f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 14 Feb 2019 18:54:17 +0100 Subject: rippled-validatior-keys-tool: init at d7774bcc --- pkgs/servers/rippled/validator-keys-tool.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/rippled/validator-keys-tool.nix diff --git a/pkgs/servers/rippled/validator-keys-tool.nix b/pkgs/servers/rippled/validator-keys-tool.nix new file mode 100644 index 00000000000..684e070292c --- /dev/null +++ b/pkgs/servers/rippled/validator-keys-tool.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchgit, cmake, openssl, boost, zlib, rippled }: + +stdenv.mkDerivation rec { + name = "rippled-validator-keys-tool-20180927-${builtins.substring 0 7 rev}"; + rev = "d7774bcc1dc9439c586ea1c175fcd5ff3960b15f"; + + src = fetchgit { + url = "https://github.com/ripple/validator-keys-tool.git"; + inherit rev; + sha256 = "1hcbwwa21n692qpbm0vqy5jvvnf4aias309610m4kwdsnzfw0902"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl boost zlib rippled ]; + + hardeningDisable = ["format"]; + + preConfigure = '' + export CXX="$(command -v $CXX)" + export CC="$(command -v $CC)" + ''; + + installPhase = '' + install -D validator-keys $out/bin/validator-keys + ''; + + meta = with lib; { + description = "Generate master and ephemeral rippled validator keys"; + homepage = https://github.com/ripple/validator-keys-tool; + maintainers = with maintainers; [ offline ]; + license = licenses.isc; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27260d8e16..fee2303d060 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13995,6 +13995,12 @@ in boost = boost167; }; + rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { + boost = boost167.override { + enableStatic = true; + }; + }; + s6 = skawarePackages.s6; s6-rc = skawarePackages.s6-rc; -- cgit 1.4.1 From 82f9523e6f423d360cdf07599e9ec09b70a44950 Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Tue, 19 Feb 2019 21:50:35 +1100 Subject: td: init at 0.16.4 --- pkgs/tools/misc/td/Gemfile | 3 ++ pkgs/tools/misc/td/Gemfile.lock | 40 ++++++++++++++++ pkgs/tools/misc/td/default.nix | 15 ++++++ pkgs/tools/misc/td/gemset.nix | 103 ++++++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 163 insertions(+) create mode 100644 pkgs/tools/misc/td/Gemfile create mode 100644 pkgs/tools/misc/td/Gemfile.lock create mode 100644 pkgs/tools/misc/td/default.nix create mode 100644 pkgs/tools/misc/td/gemset.nix diff --git a/pkgs/tools/misc/td/Gemfile b/pkgs/tools/misc/td/Gemfile new file mode 100644 index 00000000000..d22bf73732c --- /dev/null +++ b/pkgs/tools/misc/td/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'td' diff --git a/pkgs/tools/misc/td/Gemfile.lock b/pkgs/tools/misc/td/Gemfile.lock new file mode 100644 index 00000000000..5726611b9af --- /dev/null +++ b/pkgs/tools/misc/td/Gemfile.lock @@ -0,0 +1,40 @@ +GEM + remote: https://rubygems.org/ + specs: + fluent-logger (0.8.0) + msgpack (>= 1.0.0, < 2) + hirb (0.7.3) + httpclient (2.8.3) + msgpack (1.2.6) + parallel (1.13.0) + ruby-progressbar (1.10.0) + rubyzip (1.2.2) + td (0.16.4) + hirb (>= 0.4.5) + msgpack + parallel (~> 1.8) + ruby-progressbar (~> 1.7) + rubyzip (>= 1.2.1) + td-client (>= 1.0.6, < 2) + td-logger (>= 0.3.21, < 2) + yajl-ruby (~> 1.1) + zip-zip (~> 0.3) + td-client (1.0.6) + httpclient (>= 2.7) + msgpack (>= 0.5.6, < 2) + td-logger (0.3.27) + fluent-logger (>= 0.5.0, < 2.0) + msgpack (>= 0.5.6, < 2.0) + td-client (>= 0.8.66, < 2.0) + yajl-ruby (1.4.1) + zip-zip (0.3) + rubyzip (>= 1.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + td + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/tools/misc/td/default.nix b/pkgs/tools/misc/td/default.nix new file mode 100644 index 00000000000..121eff450b5 --- /dev/null +++ b/pkgs/tools/misc/td/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "td"; + gemdir = ./.; + exes = [ "td" ]; + + meta = with lib; { + description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; + homepage = https://github.com/treasure-data/td; + license = licenses.asl20; + maintainers = with maintainers; [ groodt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/td/gemset.nix b/pkgs/tools/misc/td/gemset.nix new file mode 100644 index 00000000000..e4680640ae2 --- /dev/null +++ b/pkgs/tools/misc/td/gemset.nix @@ -0,0 +1,103 @@ +{ + fluent-logger = { + dependencies = ["msgpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yr6vrai4fqajpzybmdlajf8wzsgy29kr1318amn21y9nhjlnys5"; + type = "gem"; + }; + version = "0.8.0"; + }; + hirb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji"; + type = "gem"; + }; + version = "0.7.3"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + type = "gem"; + }; + version = "1.2.6"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "005shcy8dabc7lwydpkbhd3fx8bfqzvsj6g04r90mx0wky10lz84"; + type = "gem"; + }; + version = "1.13.0"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; + type = "gem"; + }; + version = "1.10.0"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + type = "gem"; + }; + version = "1.2.2"; + }; + td = { + dependencies = ["hirb" "msgpack" "parallel" "ruby-progressbar" "rubyzip" "td-client" "td-logger" "yajl-ruby" "zip-zip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nlxpc4nasgmv6mqanb6ag1q3wmryja2c174dzgwxngxa0y2j1yn"; + type = "gem"; + }; + version = "0.16.4"; + }; + td-client = { + dependencies = ["httpclient" "msgpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5jcsgg020cm8xarbbw67mca4k8cx5pfyd2mm3wcqrnc1cl2bgp"; + type = "gem"; + }; + version = "1.0.6"; + }; + td-logger = { + dependencies = ["fluent-logger" "msgpack" "td-client"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y56gilaqk9a4lfhzb777ysmsq77pi1aqkr4q485a7f5dwnpwl1p"; + type = "gem"; + }; + version = "0.3.27"; + }; + yajl-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; + type = "gem"; + }; + version = "1.4.1"; + }; + zip-zip = { + dependencies = ["rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ny3zv1sn9wasamykfkg7b7xgs6w7k5fy8kggiyjj9vrwfzzavqg"; + type = "gem"; + }; + version = "0.3"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dc8d14bc97..054302a1bc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6121,6 +6121,8 @@ in rcm = callPackage ../tools/misc/rcm {}; + td = callPackage ../tools/misc/td { }; + tegola = callPackage ../servers/tegola {}; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; -- cgit 1.4.1 From a2331a2b64adb97cf64ef9def0bbba02f380dc58 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 9 Mar 2019 19:21:36 +0100 Subject: slurm: 18.08.5.2 -> 18.08.6.2 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 5ae985ca048..7a01342e5ac 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.5.2"; + version = "18.08.6.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0x1pdq58sdf0m28cai0lcyzvhhjl7l85gq324pwh8fi3zy2h0n4k"; + sha256 = "0py1795jrgip00k46gr9f9y49gpv5478kc3v68d90nl158fngixc"; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From 62ea707e31329b0b38fe9f89a8910d07603df655 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 9 Mar 2019 22:31:40 +0100 Subject: nixos/tests: make slurm test more reliable --- nixos/tests/slurm.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index b4458d8d095..720c36d472e 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -108,6 +108,8 @@ in { # cluster in the database before slurmctld is restarted subtest "add_account", sub { $control->succeed("sacctmgr -i add cluster default"); + # check for cluster entry + $control->succeed("sacctmgr list cluster | awk '{ print \$1 }' | grep default"); }; subtest "can_start_slurmctld", sub { @@ -133,6 +135,7 @@ in { subtest "check_slurm_dbd", sub { # find the srun job from above in the database + sleep 2; $submit->succeed("sacct | grep hostname"); }; ''; -- cgit 1.4.1 From 728689a336b6d6eb1779b8db723fd53e87273f7b Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Mon, 11 Mar 2019 21:40:03 +0100 Subject: samsung-unified-linux-driver_1_00_36: init at 1.00.36 --- pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 116 +++++++++++++++++++++ pkgs/misc/cups/drivers/samsung/1.00.36/module.nix | 44 ++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 161 insertions(+) create mode 100644 pkgs/misc/cups/drivers/samsung/1.00.36/default.nix create mode 100644 pkgs/misc/cups/drivers/samsung/1.00.36/module.nix diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix new file mode 100644 index 00000000000..872e49dc3c7 --- /dev/null +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -0,0 +1,116 @@ +{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript, perl }: + +let + + arch = if stdenv.system == "x86_64-linux" + then "x86_64" + else "i386"; + +in stdenv.mkDerivation rec { + name = "samsung-unified-linux-driver-${version}"; + version = "1.00.36"; + + src = fetchurl { + sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + }; + + buildInputs = [ + cups + libusb + libxml2 + perl + ]; + + installPhase = '' + + mkdir -p $out/bin + cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin + + mkdir -p $out/etc/sane.d/dll.d/ + install -m644 noarch/etc/smfp.conf $out/etc/sane.d + echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf + + mkdir -p $out/etc/smfp-common/scanner/share/ + install -m644 noarch/libsane-smfp.cfg $out/etc/smfp-common/scanner/share/ + install -m644 noarch/pagesize.xml $out/etc/smfp-common/scanner/share/ + + mkdir -p $out/etc/samsung/scanner/share/ + install -m644 noarch/oem.conf $out/etc/samsung/scanner/share/ + + mkdir -p $out/lib + install -m755 ${arch}/libscmssc.so* $out/lib + + mkdir -p $out/lib/cups/backend + ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend + + mkdir -p $out/lib/cups/filter + ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $ghostscript/bin/gs $out/lib/cups/filter + + mkdir -p $out/lib/sane + install -m755 ${arch}/libsane-smfp.so* $out/lib/sane + ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1 + ln -s libsane-smfp.so.1 $out/lib/sane/libsane-smfp.so + + perl -pi -e \ + 's|/opt/smfp-common/scanner/.usedby/|/tmp/\0\0fp-common/scanner/.usedby/|g' \ + $out/lib/sane/libsane-smfp.so.1.0.1 + perl -pi -e 's|/opt|/etc|g' \ + $out/lib/sane/libsane-smfp.so.1.0.1 \ + $out/bin/rastertospl \ + noarch/package_utils \ + noarch/pre_install.sh + + mkdir -p $out/lib/udev/rules.d + ( + OEM_FILE=noarch/oem.conf + INSTALL_LOG_FILE=/dev/null + . noarch/scripting_utils + . noarch/package_utils + . noarch/scanner-script.pkg + fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules + chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules + ) + + mkdir -p $out/share + cp -R noarch/share/* $out/share + gzip -9 $out/share/ppd/*.ppd + rm -r $out/share/locale/*/*/install.mo + + mkdir -p $out/share/cups + cd $out/share/cups + ln -s ../ppd . + ln -s ppd model + ''; + + preFixup = '' + for bin in "$out/bin/"*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + done + + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "Unified Linux Driver for Samsung printers and scanners"; + homepage = http://www.bchemnet.com/suldr; + downloadPage = http://www.bchemnet.com/suldr/driver/; + license = licenses.unfree; + + # Tested on linux-x86_64. Might work on linux-i386. + # Probably won't work on anything else. + platforms = platforms.linux; + maintainers = with maintainers; [ tohl ]; + }; +} diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix new file mode 100644 index 00000000000..e98da9de2b6 --- /dev/null +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix @@ -0,0 +1,44 @@ +# the original samsung-unified-linux-driver_1_00_36 has some paths +# hardcoded in binary files +# +# nixos samsung-unified-linux-driver_1_00_36 tries to fix those paths +# by patching the binaries +# +# this module is needed to put the expected files in the new paths +# +# printing works without problems +# +# scanning works, except one detail: sometimes it is possible to scan +# more pages in sequence. most of the time though, scanning stops +# working after one page. this problem happens both with scanimage +# and simple-scan. errors indicate an I/O error. scanning works +# again after turning the device off and on. atm i have no idea how +# to fix this and no time to do more about it. +{config, pkgs, lib ? pkgs.lib, ...}: +with lib; +let + cfg = config.services.samsung-unified-linux-driver_1_00_36; + pkg = pkgs.samsung-unified-linux-driver_1_00_36; +in { + options = { + services.samsung-unified-linux-driver_1_00_36 = { + enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36"; + }; + }; + config = mkIf cfg.enable { + services.printing.drivers = [pkg]; + hardware.sane.extraBackends = [pkg]; + environment.etc = { + "samsung/scanner/share/oem.conf".source + = "${pkg}/etc/samsung/scanner/share/oem.conf"; + "smfp-common/scanner/share/libsane-smfp.cfg".source + = "${pkg}/etc/smfp-common/scanner/share/libsane-smfp.cfg"; + "smfp-common/scanner/share/pagesize.xml".source + = "${pkg}/etc/smfp-common/scanner/share/pagesize.xml"; + "sane.d/smfp.conf".source + = "${pkg}/etc/sane.d/smfp.conf"; + "sane.d/dll.d/smfp-scanner.conf".source + = "${pkg}/etc/sane.d/dll.d/smfp-scanner.conf"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 839d22137b4..f41b3ee1bef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22875,6 +22875,7 @@ in mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; 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 { }; -- cgit 1.4.1 From fe6860800b1e3729e6d05968f788c2b0eb7f8a01 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 12 Mar 2019 11:59:57 +0100 Subject: dockerTools.buildImage.runAsRoot: preserve layers ordering at image unpacking This patch preserves the ordering of layers of a parent image when the image is unpacked. Fixes #55290 --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8d47f157013..6efb447e142 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -200,7 +200,7 @@ rec { # Unpack all of the parent layers into the image. lowerdir="" extractionID=0 - for layerTar in $(cat layer-list); do + for layerTar in $(tac layer-list); do echo "Unpacking layer $layerTar" extractionID=$((extractionID + 1)) -- cgit 1.4.1 From fee854ed01d1df73fd64cf42d228697341b4377f Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 13 Mar 2019 17:29:13 +0000 Subject: nixos/nginx: add return option to location --- nixos/modules/services/web-servers/nginx/default.nix | 3 ++- nixos/modules/services/web-servers/nginx/location-options.nix | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index cfd7c8f4e5b..9f9e080bd92 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -276,6 +276,7 @@ let ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.root != null) "root ${config.root};"} ${optionalString (config.alias != null) "alias ${config.alias};"} + ${optionalString (config.return != null) "return ${config.return};"} ${config.extraConfig} ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} } @@ -373,7 +374,7 @@ in preStart = mkOption { type = types.lines; default = '' - test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs + test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs test `stat -c %a ${cfg.stateDir}` = "750" || chmod 750 ${cfg.stateDir} test `stat -c %a ${cfg.stateDir}/logs` = "750" || chmod 750 ${cfg.stateDir}/logs chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 9b44433d384..aeb9b1dd79e 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -64,6 +64,15 @@ with lib; ''; }; + return = mkOption { + type = types.nullOr types.str; + default = null; + example = "301 http://example.com$request_uri;"; + description = '' + Adds a return directive, for e.g. redirections. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; -- cgit 1.4.1 From ee910c110a8e77f99aac98f7dfe2cf02b85a8349 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 13 Mar 2019 11:43:38 -0700 Subject: terraform-providers: bump versions --- .../cluster/terraform-providers/data.nix | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 34945ea87a4..84e48ced284 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-acme"; - version = "1.1.0"; - sha256 = "1ha56pr5hixpz2nmqy5558ljkvcs4c23i0jnw4vqdv1a00hi035z"; + version = "1.1.1"; + sha256 = "0fva2kw82s94r4s4dpk38kcmssmcr71ia9jyg1rqmc00ifilfrzj"; }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.32.1"; - sha256 = "0gdx54iw6q3w5pkci7433rd5yrplv1f08svsl7r3a75pww16j103"; + version = "1.34.0"; + sha256 = "1vcf3jvwn7vgbsyp6lqibh3yy301sykjzl9hgzzwxg4p1wq6i038"; }; archive = { @@ -39,22 +39,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "2.0.0"; - sha256 = "17hf59wavv44a8a2vy2smcs3sxnws30h81jxiimg91vh1rrhisrw"; + version = "2.1.0"; + sha256 = "1gz7y8k6x3jg8jqy6n105vg2p4vj5zayfhand7xi82w0ykf8kipn"; }; azuread = { owner = "terraform-providers"; repo = "terraform-provider-azuread"; - version = "0.1.0"; - sha256 = "0jrsg3a9cb16jinzjhg2pfm65b1bfhdwnyhag1x3x4kffm3gm148"; + version = "0.2.0"; + sha256 = "01aiynw905gbn6dv23971yhwv0kfcbckcqp4f65sypn1l8szqyjg"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.22.1"; - sha256 = "0jg2vsfkk3z1gppcfwla5aqbn9vaxbl8px1hps7nhmylp06l9avv"; + version = "1.23.0"; + sha256 = "11v1832sxnigyiyy4i34mxwn7j18i6iwsff8sqabpa7v9a405ngp"; }; azurestack = { @@ -109,8 +109,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.11.0"; - sha256 = "14v4461bxxr5zdr11v1s89m1x9kpjxa1mff9inx2vwkdz9s02w0i"; + version = "1.12.0"; + sha256 = "1kq9mbs3if7w9jnsdkj104lvy532lwkd9wr4m0ilh7zql0vm9mpk"; }; cloudscale = { @@ -144,8 +144,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.6.0"; - sha256 = "16rp6kqax7i8fnl4id3sg0jmhjswx7wrnn1mp4z29gca46ji1nfh"; + version = "1.7.0"; + sha256 = "0a7nvq2nhfv2jg6jc83jjg11yzzkiwyifdj5ni76nri82mbhb14q"; }; digitalocean = { @@ -179,8 +179,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "1.1.0"; - sha256 = "1ba9z9fd69hpg6kg30nf95zzskzipi74s1aadywc068gfrkdm9jj"; + version = "1.1.1"; + sha256 = "0bqwdx8hb7bym4hh01a0n1zrgb1081rvn0qawck712wz0jkzv1r3"; }; dyn = { @@ -228,15 +228,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "2.1.0"; - sha256 = "1dcdk60xwqr9sazllzxai8g6ghk0pnrz4zwm5qf6m9d3l39y2gkr"; + version = "2.2.0"; + sha256 = "1cnybx6gbd6yfl8nmk2i0k4wag1x5srq927k3ayivr0jgk01d8cl"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - version = "2.1.0"; - sha256 = "04lx43bb1kwd36a78l49knk8n6g5bh6p970yhniyypr28zrss1by"; + version = "2.2.0"; + sha256 = "0m34qas6plh4pchp9vf0hnb3f07y8lzywwmrycfllqg6f7c38869"; }; grafana = { @@ -249,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.8.0"; - sha256 = "1gahka6012rq1p2wwvsbb1w353vm4aaifgb08a6s9la47ca7944s"; + version = "1.8.1"; + sha256 = "07s2fgd9dxajqj0w7pyma0fz5q5a96s7hbpmk1pmbw9lqvxmabgf"; }; hedvig = { @@ -263,8 +263,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.8.0"; - sha256 = "1v30sr5dql2365bf63gcr0hqn85gk6lk9lzz1i3w0j232jw700bh"; + version = "0.9.0"; + sha256 = "1psqabifb1kabg268ca1x4l79z1xga1pr2sf8x9lrd7z856v18l9"; }; heroku = { @@ -305,8 +305,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.0.3"; - sha256 = "1mdarb65v977680q55bis9ds84vx8vv84p7sgf0f0svfwq8z9r0k"; + version = "1.1.0"; + sha256 = "1mxvc3pwzgj7r79a5vz8n489xny12wa75zpppgh7948fy8m8b23f"; }; kubernetes = { @@ -417,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.17.0-rc1"; - sha256 = "0c49i4fic0bqgpwg05q60a99w7a236kxyhdww5k4sk04cdg3aa1f"; + version = "3.18.0-rc1"; + sha256 = "08i08lvvi3i2xyz49yk59k9qsiywds9l0cp6xijj16vkkgwysiw2"; }; oneandone = { @@ -613,8 +613,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - version = "1.2.2"; - sha256 = "1ypsfm48c30szg3zc1sknblhwcnca8aapfgp62bhszyqxq6zq37s"; + version = "1.3.0"; + sha256 = "1pdzzrg4qrsjiv67yr2g6a9l1n9vqi5n4m53kbb1fp04g3s2sw31"; }; terraform = { @@ -648,8 +648,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - version = "1.2.0"; - sha256 = "1pq0288lgj288xjs647n740fbpxgbly0hxy5kz9xr3lf7ld1cclq"; + version = "1.3.0"; + sha256 = "16mnkm781x5ijbdcsxc56kw7ppag4js0gmlx64ry8fwywm8ma0pp"; }; ultradns = { @@ -662,8 +662,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.5.0"; - sha256 = "1lny94555ws0nd2lp9zkbq6c1324h50izfk88941irl7apjmwzw5"; + version = "1.6.0"; + sha256 = "06hykz37yhwhj6fjz2zi5c80mzv8i91kpsr5cdqkc8rnfmcbhzqx"; }; vcd = { -- cgit 1.4.1 From 0eb6d0735f599fa84e99b727c93681bcae96c845 Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 16 Mar 2019 12:51:18 +0100 Subject: filesystems: Add autoResize assertion Assert that autoResize is only used when fsType is explicitly set to a supported filesystem: if it's set to "auto", the default, the required resizing tools won't be copied into the initrd even if the actual filesystem is supported. --- nixos/modules/tasks/filesystems.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 07f8214cea2..43764bb82f1 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -209,10 +209,17 @@ in assertions = let ls = sep: concatMapStringsSep sep (x: x.mountPoint); + notAutoResizable = fs: fs.autoResize && !(hasPrefix "ext" fs.fsType || fs.fsType == "f2fs"); in [ { assertion = ! (fileSystems' ? "cycle"); message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}"; } + { assertion = ! (any notAutoResizable fileSystems); + message = let + fs = head (filter notAutoResizable fileSystems); + in + "Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = \"${fs.fsType}\"':${if fs.fsType == "auto" then " fsType has to be explicitly set and" else ""} only the ext filesystems and f2fs support it."; + } ]; # Export for use in other modules -- cgit 1.4.1 From 69756b8bbb153d76b89a994eeefb1963d1df3d0d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Mar 2019 03:17:22 -0500 Subject: flow: 0.94.0 -> 0.95.1 --- 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 e2b1b6d2fe6..f5317519d76 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.94.0"; + version = "0.95.1"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1bdxbyy2gchqffsk2qi0sbdlyaxp7fgmikrk7nsn5vdfzqswa6gq"; + sha256 = "0sxmk8qg61j6wdylkw53di65152mynv4agji865h23ay66nyi3lw"; }; installPhase = '' -- cgit 1.4.1 From e71445c33062be78f11f80a0069a2e1e2c7c1fb6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 17 Mar 2019 09:46:05 -0300 Subject: plan9port: 2018-09-20 -> 2019-02-25 --- pkgs/tools/system/plan9port/default.nix | 64 +++--- pkgs/tools/system/plan9port/sam_chord_9front.patch | 215 --------------------- 2 files changed, 31 insertions(+), 248 deletions(-) delete mode 100644 pkgs/tools/system/plan9port/sam_chord_9front.patch diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 83b006e786f..c14fbc49e0d 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchgit, which, libX11, libXt, fontconfig, freetype +{ stdenv, fetchFromGitHub, which, libX11, libXt, fontconfig, freetype , xorgproto ? null , libXext ? null , zlib ? null - # For building web manuals -, perl ? null -, samChordingSupport ? true #from 9front +, perl ? null # For building web manuals }: stdenv.mkDerivation rec { - name = "plan9port-2018-09-20"; + pname = "plan9port"; + version = "2019-02-25"; + name = "${pname}-${version}"; - src = fetchgit { - # Latest, same as on github, google code is old - url = "https://github.com/9fans/plan9port.git"; - rev = "a82a8b6368274d77d42f526e379b74e79c137e26"; - sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1"; + src = fetchFromGitHub { + owner = "9fans"; + repo = "plan9port"; + rev = "047fd921744f39a82a86d9370e03f7af511e6e84"; + sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; }; - patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; - postPatch = '' #hardcoded path substituteInPlace src/cmd/acme/acme.c \ @@ -36,37 +34,20 @@ stdenv.mkDerivation rec { --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" ''; - builder = ./builder.sh; - - NIX_LDFLAGS="-lgcc_s"; buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ - which - perl - libX11 - fontconfig - xorgproto - libXt - libXext - freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. + which perl libX11 fontconfig xorgproto libXt libXext + freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. ]; - enableParallelBuilding = true; + builder = ./builder.sh; - meta = with stdenv.lib; { - homepage = http://swtch.com/plan9port/; - description = "Plan 9 from User Space"; - license = licenses.lpl-102; - maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ]; - platforms = platforms.unix; - }; - libX11_dev = libX11.dev; libXt_dev = libXt.dev; libXext_dev = libXext.dev; fontconfig_dev = fontconfig.dev; freetype_dev = freetype.dev; zlib_dev = zlib.dev; - + xorgproto_exp = xorgproto; libX11_exp = libX11; libXt_exp = libXt; @@ -75,4 +56,21 @@ stdenv.mkDerivation rec { zlib_exp = zlib; fontconfig_lib = fontconfig.lib; + + NIX_LDFLAGS="-lgcc_s"; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://9fans.github.io/plan9port/; + description = "Plan 9 from User Space"; + longDescription = '' + Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs + from their native Plan 9 environment to Unix-like operating systems. + ''; + license = licenses.lpl-102; + maintainers = with maintainers; [ AndersonTorres bbarker + ftrvxmtrx kovirobi ]; + platforms = platforms.unix; + }; } +# TODO: investigate the mouse chording support patch diff --git a/pkgs/tools/system/plan9port/sam_chord_9front.patch b/pkgs/tools/system/plan9port/sam_chord_9front.patch deleted file mode 100644 index 8920770e810..00000000000 --- a/pkgs/tools/system/plan9port/sam_chord_9front.patch +++ /dev/null @@ -1,215 +0,0 @@ -diff -r -c p9p/src/cmd/sam/xec.c p9p-patched/src/cmd/sam/xec.c -*** p9p/src/cmd/sam/xec.c 2016-04-18 21:07:22.000000000 +0300 ---- p9p-patched/src/cmd/sam/xec.c 2016-08-31 06:35:26.910876148 +0300 -*************** -*** 277,282 **** ---- 277,283 ---- - else - while(n++ && undo(FALSE)) - ; -+ moveto(f, f->dot.r); - return TRUE; - } - -diff -r -c p9p/src/cmd/samterm/flayer.c p9p-patched/src/cmd/samterm/flayer.c -*** p9p/src/cmd/samterm/flayer.c 2016-04-18 21:07:22.000000000 +0300 ---- p9p-patched/src/cmd/samterm/flayer.c 2016-08-31 06:46:19.441411045 +0300 -*************** -*** 254,274 **** - int - flselect(Flayer *l) - { -- int ret; - if(l->visible!=All) - flupfront(l); -! frselect(&l->f, mousectl); -! ret = 0; -! if(l->f.p0==l->f.p1){ -! if(mousep->msec-l->clickf.p0+l->origin==l->p0){ -! ret = 1; - l->click = 0; -! }else -! l->click = mousep->msec; -! }else -! l->click = 0; - l->p0 = l->f.p0+l->origin, l->p1 = l->f.p1+l->origin; -! return ret; - } - - void ---- 254,271 ---- - int - flselect(Flayer *l) - { - if(l->visible!=All) - flupfront(l); -! if(l->f.p0==l->f.p1) -! if(mousep->msec-l->clickf.p0+l->origin==l->p0 && -! l->f.p0==frcharofpt(&l->f, mousep->xy)){ - l->click = 0; -! return 1; -! } -! l->click = mousep->msec; -! frselect(&l->f, mousectl); - l->p0 = l->f.p0+l->origin, l->p1 = l->f.p1+l->origin; -! return 0; - } - - void -diff -r -c p9p/src/cmd/samterm/main.c p9p-patched/src/cmd/samterm/main.c -*** p9p/src/cmd/samterm/main.c 2016-04-18 21:07:22.000000000 +0300 ---- p9p-patched/src/cmd/samterm/main.c 2016-08-31 06:52:05.670322598 +0300 -*************** -*** 23,33 **** - char hostlock = 1; - char hasunlocked = 0; - int maxtab = 8; -- int chord; - int autoindent; - -- #define chording 0 /* code here for reference but it causes deadlocks */ -- - void - notifyf(void *a, char *msg) - { ---- 23,30 ---- -*************** -*** 39,45 **** - void - threadmain(int argc, char *argv[]) - { -! int i, got, scr, w; - Text *t; - Rectangle r; - Flayer *nwhich; ---- 36,42 ---- - void - threadmain(int argc, char *argv[]) - { -! int i, got, scr, chord; - Text *t; - Rectangle r; - Flayer *nwhich; -*************** -*** 84,89 **** ---- 81,87 ---- - startnewfile(Tstartcmdfile, &cmd); - - got = 0; -+ chord = 0; - if(protodebug) print("loop\n"); - for(;;got = waitforio()){ - if(hasunlocked && RESIZED()) -*************** -*** 108,163 **** - continue; - } - nwhich = flwhich(mousep->xy); -! scr = which && ptinrect(mousep->xy, which->scroll); - if(mousep->buttons) - flushtyping(1); -! if(chording && chord==1 && !mousep->buttons) - chord = 0; -! if(chording && chord) - chord |= mousep->buttons; -! else if(mousep->buttons&1){ -! if(nwhich){ -! if(nwhich!=which) -! current(nwhich); -! else if(scr) -! scroll(which, 1); -! else{ -! t=(Text *)which->user1; -! if(flselect(which)){ -! outTsl(Tdclick, t->tag, which->p0); -! t->lock++; -! }else if(t!=&cmd) -! outcmd(); -! if(mousep->buttons&1) -! chord = mousep->buttons; - } - } - }else if((mousep->buttons&2) && which){ - if(scr) - scroll(which, 2); - else - menu2hit(); -! }else if((mousep->buttons&4)){ - if(scr) -! scroll(which, 3); - else - menu3hit(); - } - mouseunblock(); - } -- if(chording && chord){ -- t = (Text*)which->user1; -- if(!t->lock && !hostlock){ -- w = which-t->l; -- if(chord&2){ -- cut(t, w, 1, 1); -- chord &= ~2; -- }else if(chord&4){ -- paste(t, w); -- chord &= ~4; -- } -- } -- } - } - } - ---- 106,159 ---- - continue; - } - nwhich = flwhich(mousep->xy); -! scr = which && (ptinrect(mousep->xy, which->scroll) || -! mousep->buttons&(8|16)); - if(mousep->buttons) - flushtyping(1); -! if((mousep->buttons&1)==0) - chord = 0; -! if(chord && which && which==nwhich){ - chord |= mousep->buttons; -! t = (Text *)which->user1; -! if(!t->lock){ -! int w = which-t->l; -! if(chord&2){ -! cut(t, w, 1, 1); -! chord &= ~2; -! } -! if(chord&4){ -! paste(t, w); -! chord &= ~4; - } - } -+ }else if(mousep->buttons&(1|8)){ -+ if(scr) -+ scroll(which, (mousep->buttons&8) ? 4 : 1); -+ else if(nwhich && nwhich!=which) -+ current(nwhich); -+ else{ -+ t=(Text *)which->user1; -+ if(flselect(which)){ -+ outTsl(Tdclick, t->tag, which->p0); -+ t->lock++; -+ }else if(t!=&cmd) -+ outcmd(); -+ if(mousep->buttons&1) -+ chord = mousep->buttons; -+ } - }else if((mousep->buttons&2) && which){ - if(scr) - scroll(which, 2); - else - menu2hit(); -! }else if(mousep->buttons&(4|16)){ - if(scr) -! scroll(which, (mousep->buttons&16) ? 5 : 3); - else - menu3hit(); - } - mouseunblock(); - } - } - } - -- cgit 1.4.1 From dfa314c38212cc462e64761c2c476d984da99e4c Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Sat, 3 Nov 2018 19:33:58 +0100 Subject: linuxPackages.anbox: init at 2018-09-08 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Luke Adams Co-authored-by: Volth Co-authored-by: Jörg Thalheim Co-authored-by: Edward Tjörnhammar Co-authored-by: Gabriel Ebner --- pkgs/os-specific/linux/anbox/kmod.nix | 43 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/os-specific/linux/anbox/kmod.nix diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix new file mode 100644 index 00000000000..8a102996cab --- /dev/null +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, kernel, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "anbox-modules"; + version = "2018-09-08-" + kernel.version; + + src = fetchFromGitHub { + owner = "anbox"; + repo = "anbox-modules"; + rev = "27fd47e11ef6eef93738f8f3df3e42c88975544e"; + sha256 = "1hnf5x5swjcws6mnxmd3byll8l7qsxxj9pgki2k31rbmqqf2sb0x"; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + KERNEL_SRC="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + buildPhase = '' + for d in ashmem binder;do + cd $d + make + cd - + done + ''; + + installPhase = '' + modDir=$out/lib/modules/${kernel.modDirVersion}/kernel/updates/ + mkdir -p $modDir + for d in ashmem binder;do + mv $d/$d*.ko $modDir/. + done + ''; + + meta = with stdenv.lib; { + description = "Anbox ashmem and binder drivers."; + homepage = https://github.com/anbox/anbox-modules; + license = licenses.gpl2; + platforms = platforms.linux; + broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d95ef3723e2..aa6766052ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14762,6 +14762,8 @@ in amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; bcc = callPackage ../os-specific/linux/bcc { -- cgit 1.4.1 From 07632cbaab66e119f9b9cc605897e5d37373bdaa Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Sat, 3 Nov 2018 19:33:58 +0100 Subject: properties-cpp: init at 0.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Luke Adams Co-authored-by: Volth Co-authored-by: Jörg Thalheim --- .../libraries/properties-cpp/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/properties-cpp/default.nix diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix new file mode 100644 index 00000000000..06444e77670 --- /dev/null +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchurl, cmake, pkgconfig, gtest, doxygen +, graphviz, lcov, writeText }: + +stdenv.mkDerivation rec { + pname = "properties-cpp"; + version = "0.0.1"; + + src = let srcver = version+"+14.10.20140730"; in + fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; + sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; + }; + + buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ]; + + patchPhase = '' + sed -i "/add_subdirectory(tests)/d" CMakeLists.txt + ''; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/properties-cpp; + description = "A very simple convenience library for handling properties and signals in C++11."; + license = licenses.lgpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa6766052ad..7c8f02a0f9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19012,6 +19012,8 @@ in python = python3; } // (config.profanity or {})); + properties-cpp = callPackage ../development/libraries/properties-cpp { }; + protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; psi = callPackage ../applications/networking/instant-messengers/psi { }; -- cgit 1.4.1 From e42b5d93266be2459e07b3631f76e1247acfec48 Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Sat, 3 Nov 2018 19:33:58 +0100 Subject: anbox: init at 2019-03-07 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Luke Adams Co-authored-by: Volth Co-authored-by: Jörg Thalheim Co-authored-by: Edward Tjörnhammar Co-authored-by: Gabriel Ebner --- pkgs/os-specific/linux/anbox/default.nix | 127 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 129 insertions(+) create mode 100644 pkgs/os-specific/linux/anbox/default.nix diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix new file mode 100644 index 00000000000..bd85b6620ba --- /dev/null +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -0,0 +1,127 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl +, cmake, pkgconfig, dbus, makeWrapper +, gtest +, boost +, libcap +, systemd +, mesa +, libGL +, libglvnd +, glib +, git +, SDL2 +, SDL2_image +, properties-cpp +, protobuf +, protobufc +, python +, lxc +}: + +stdenv.mkDerivation rec { + pname = "anbox"; + version = "2019-03-07"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "d521e282965462e82465045ab95d4ae1c4619685"; + sha256 = "1wfx4bsyxvrjl16dq5pqgial8rnnsnxzbak2ap0waddz847czxwz"; + }; + + buildInputs = [ + cmake pkgconfig dbus boost libcap gtest systemd mesa glib + SDL2 SDL2_image protobuf protobufc properties-cpp lxc python + makeWrapper libGL + ]; + + patchPhase = '' + patchShebangs scripts + + cat >cmake/FindGMock.cmake <<'EOF' + add_library(gtest INTERFACE) + target_include_directories(gtest INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest INTERFACE ${gtest}/lib/libgtest.so ''${CMAKE_THREAD_LIBS_INIT}) + add_dependencies(gtest GMock) + + add_library(gtest_main INTERFACE) + target_include_directories(gtest_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest_main INTERFACE ${gtest}/lib/libgtest_main.so gtest) + + add_library(gmock INTERFACE) + target_include_directories(gmock INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock INTERFACE ${gtest}/lib/libgmock.so gtest) + + add_library(gmock_main INTERFACE) + target_include_directories(gmock_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock_main INTERFACE ${gtest}/lib/libgmock_main.so gmock gtest_main) + + set(GTEST_LIBRARIES gtest) + set(GTEST_MAIN_LIBRARIES gtest_main) + set(GMOCK_LIBRARIES gmock gmock_main) + set(GTEST_BOTH_LIBRARIES ''${GTEST_LIBRARIES} ''${GTEST_MAIN_LIBRARIES}) + EOF + ''; + + postInstall = '' + wrapProgram $out/bin/anbox \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \ + --prefix PATH : ${git}/bin + + mkdir -p $out/share/dbus-1/services/ + cat < $out/share/dbus-1/services/org.anbox.service + [D-BUS Service] + Name=org.anbox + Exec=$out/libexec/anbox-session-manager + END + + mkdir $out/libexec + cat > $out/libexec/anbox-session-manager < $out/bin/anbox-application-manager < Date: Sat, 3 Nov 2018 19:33:58 +0100 Subject: nixos/anbox: init module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Luke Adams Co-authored-by: Volth Co-authored-by: Jörg Thalheim Co-authored-by: Edward Tjörnhammar Co-authored-by: Gabriel Ebner --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/anbox.nix | 144 +++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 nixos/modules/virtualisation/anbox.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b2f2c1ac8cb..c28d495dc98 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -873,6 +873,7 @@ ./tasks/trackpoint.nix ./tasks/powertop.nix ./testing/service-runner.nix + ./virtualisation/anbox.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/docker.nix diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix new file mode 100644 index 00000000000..9cb89e7b292 --- /dev/null +++ b/nixos/modules/virtualisation/anbox.nix @@ -0,0 +1,144 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.anbox; + kernelPackages = config.boot.kernelPackages; + addrOpts = v: addr: pref: name: { + address = mkOption { + default = addr; + type = types.str; + description = '' + IPv${toString v} ${name} address. + ''; + }; + + prefixLength = mkOption { + default = pref; + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = '' + Subnet mask of the ${name} address, specified as the number of + bits in the prefix (${if v == 4 then "24" else "64"}). + ''; + }; + }; + +in + +{ + + options.virtualisation.anbox = { + + enable = mkEnableOption "Anbox"; + + image = mkOption { + default = pkgs.anbox.image; + example = literalExample "pkgs.anbox.image"; + type = types.package; + description = '' + Base android image for Anbox. + ''; + }; + + extraInit = mkOption { + type = types.lines; + default = ""; + description = '' + Extra shell commands to be run inside the container image during init. + ''; + }; + + ipv4 = { + container = addrOpts 4 "192.168.250.2" 24 "Container"; + gateway = addrOpts 4 "192.168.250.1" 24 "Host"; + + dns = mkOption { + default = "1.1.1.1"; + type = types.string; + description = '' + Container DNS server. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + assertions = singleton { + assertion = versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.18"; + message = "Anbox needs user namespace support to work properly"; + }; + + environment.systemPackages = with pkgs; [ anbox ]; + + boot.kernelModules = [ "ashmem_linux" "binder_linux" ]; + boot.extraModulePackages = [ kernelPackages.anbox ]; + + services.udev.extraRules = '' + KERNEL=="ashmem", NAME="%k", MODE="0666" + KERNEL=="binder*", NAME="%k", MODE="0666" + ''; + + virtualisation.lxc.enable = true; + networking.bridges.anbox0.interfaces = []; + networking.interfaces.anbox0.ipv4.addresses = [ cfg.ipv4.gateway ]; + + networking.nat = { + enable = true; + internalInterfaces = [ "anbox0" ]; + }; + + systemd.services.anbox-container-manager = let + anboxloc = "/var/lib/anbox"; + in { + description = "Anbox Container Management Daemon"; + + environment.XDG_RUNTIME_DIR="${anboxloc}"; + + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + preStart = let + initsh = let + ip = cfg.ipv4.container.address; + gw = cfg.ipv4.gateway.address; + dns = cfg.ipv4.dns; + in + pkgs.writeText "nixos-init" ('' + #!/system/bin/sh + setprop nixos.version ${config.system.nixos.version} + + # we don't have radio + setprop ro.radio.noril yes + stop ril-daemon + + # speed up boot + setprop debug.sf.nobootanimation 1 + '' + cfg.extraInit); + initshloc = "${anboxloc}/rootfs-overlay/system/etc/init.goldfish.sh"; + in '' + mkdir -p ${anboxloc} + mkdir -p $(dirname ${initshloc}) + [ -f ${initshloc} ] && rm ${initshloc} + cp ${initsh} ${initshloc} + chown 100000:100000 ${initshloc} + chmod +x ${initshloc} + ''; + + serviceConfig = { + ExecStart = '' + ${pkgs.anbox}/bin/anbox container-manager \ + --data-path=${anboxloc} \ + --android-image=${cfg.image} \ + --container-network-address=${cfg.ipv4.container.address} \ + --container-network-gateway=${cfg.ipv4.gateway.address} \ + --container-network-dns-servers=${cfg.ipv4.dns} \ + --use-rootfs-overlay \ + --privileged + ''; + }; + }; + }; + +} -- cgit 1.4.1 From d0133e662440202a7901df31a1e0e6272b078164 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Mar 2019 07:18:04 -0500 Subject: strace: 4.26 -> 5.0 https://lists.strace.io/pipermail/strace-devel/2019-March/008672.html --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 3e764470f65..c3553d04981 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.26"; + version = "5.0"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw"; + sha256 = "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; -- cgit 1.4.1 From 0fd37a2da19d8cfc5c8113e1bf02256fdd639cbc Mon Sep 17 00:00:00 2001 From: Carlos D'Agostino Date: Wed, 20 Mar 2019 21:13:59 +1100 Subject: dnscrypt-proxy2: 2.0.15 -> 2.0.21 --- pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix index cdf9c778838..a7b564be868 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "dnscrypt-proxy2-${version}"; - version = "2.0.15"; + version = "2.0.21"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = "${version}"; - sha256 = "0iwvndk1h550zmwhwablb0smv9n2l51hqbmzj354mcgi6frnx819"; + sha256 = "00sz5gn4l56rp4xcvxfpq6c64inpgzbwpqy1yc5sima6ijrayi9g"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From eb5afaf06b092469cc3875f48aa20879573f404f Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 20 Mar 2019 11:16:22 +0000 Subject: nix-review: 1.0.5 -> 2.0.0 --- pkgs/tools/package-management/nix-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index a57056569c0..367405f552f 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "13dv2zpnhf218hfmixsgsbvy9zgrp7b0d125hvq8sk5x57f6114q"; + sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0"; }; makeWrapperArgs = [ -- cgit 1.4.1 From 22d083e6598293c7c23a062689bb84e751e35ee7 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Fri, 8 Mar 2019 14:17:28 +0000 Subject: doc/reviewing-contributions: nix-review instead of nox-review It is faster, handles more edge cases and allows to test/review the built packages interactively. --- .github/PULL_REQUEST_TEMPLATE.md | 3 +-- doc/reviewing-contributions.xml | 10 +++++----- doc/submitting-changes.xml | 22 +++++++++++----------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 22940f5ea98..7b4ec78e409 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,11 +11,10 @@ - [ ] macOS - [ ] other Linux distributions - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) -- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` +- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) - [ ] Assured whether relevant documentation is up to date - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). --- - diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index f541b7f22da..f3448475192 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -187,14 +187,14 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - The nox tool can - be used to review a pull request content in a single command. It doesn't - rebase on a channel branch so it might trigger multiple source builds. + The nix-review + tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end - of the pull request title. + of the pull request title. You can also provide the full github pull + request url. -$ nix-shell -p nox --run "nox-review -k pr PRNUMBER" +$ nix-shell -p nix-review --run "nix-review pr PRNUMBER" diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index 4a6a2c634a5..33abfb634ea 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -351,26 +351,26 @@ Additional information.
- Tested compilation of all pkgs that depend on this change using <command>nox-review</command> + Tested compilation of all pkgs that depend on this change using <command>nix-review</command> - If you are updating a package's version, you can use nox to make sure all - packages that depend on the updated package still compile correctly. This - can be done using the nox utility. The nox-review - utility can look for and build all dependencies either based on uncommited - changes with the wip option or specifying a github pull - request number. + If you are updating a package's version, you can use nix-review to make sure all + packages that depend on the updated package still compile correctly. + The nix-review utility can look for and build all dependencies + either based on uncommited changes with the wip option or + specifying a github pull request number. - review uncommitted changes: -nix-shell -p nox --run "nox-review wip" + review changes from pull request number 12345: + nix-shell -p nix-review --run "nix-review pr 12345" - review changes from pull request number 12345: -nix-shell -p nox --run "nox-review pr 12345" + review uncommitted changes: + nix-shell -p nix-review --run "nix-review wip" +
-- cgit 1.4.1 From afea6fbf92a4153ab042497a05e030c2e623c492 Mon Sep 17 00:00:00 2001 From: Rommel MARTINEZ Date: Wed, 20 Mar 2019 19:33:38 +0800 Subject: deco: 0.0.1 -> 0.0.2 --- pkgs/applications/misc/deco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index e5dc011d553..7f4629100d5 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "deco"; - version = "0.0.1"; + version = "0.0.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; repo = pname; - rev = "037f473ae4bdce5d3e2f76891785f0f7479cca75"; - sha256 = "1fv15nc9zqbn3c51vnm50yidj5ivpi61zg55cs46x3gi2x79x43q"; + rev = "49cded5ad123b0169f47cd0dc0f5420f4b581837"; + sha256 = "19rvqhw0blwga8ck86yy8hj7j1l9hriphlld6yrfd3yip4jprjzz"; }; installPhase = '' -- cgit 1.4.1 From 9fd4d6cbcb87c50be5b95062bb5d0bb0665952c7 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Wed, 20 Mar 2019 13:26:45 +0100 Subject: maintainers: add ggpeti --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d794dc84fc..a89a70aee07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1770,6 +1770,11 @@ github = "Gerschtli"; name = "Tobias Happ"; }; + ggpeti = { + email = "ggpeti@gmail.com"; + github = "ggpeti"; + name = "Peter Ferenczy"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; -- cgit 1.4.1 From 12e425c17b25b991c60cf190c888bbe2bf632d49 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Wed, 20 Mar 2019 13:27:13 +0100 Subject: musly: init at unstable-2017-04-26 --- pkgs/applications/audio/musly/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/musly/default.nix diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix new file mode 100644 index 00000000000..cb61214b51d --- /dev/null +++ b/pkgs/applications/audio/musly/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: +stdenv.mkDerivation rec { + pname = "musly"; + version = "unstable-2017-04-26"; + src = fetchFromGitHub { + owner = "dominikschnitzer"; + repo = "musly"; + rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6"; + sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; + fixupPhase = if stdenv.isDarwin then '' + install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly + install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly + install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib + '' else ""; + + meta = with stdenv.lib; { + homepage = https://www.musly.org; + description = "A fast and high-quality audio music similarity library written in C/C++"; + longDescription = '' + Musly analyzes the the audio signal of music pieces to estimate their similarity. + No meta-data about the music piece is included in the similarity estimation. + To use Musly in your application, have a look at the library documentation + or try the command line application included in the package and start generating + some automatic music playlists right away. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ ggpeti ]; + platforms = with platforms; [ darwin linux ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90daabcf890..0dddd5598e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22577,6 +22577,8 @@ in muse = callPackage ../applications/audio/muse { }; + musly = callPackage ../applications/audio/musly { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; inherit (callPackage ../tools/package-management/nix { -- cgit 1.4.1 From a6bb05be4594bf6e0b7103fba1c7a308ce68b50f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 20 Mar 2019 13:35:53 +0100 Subject: subversion_1_10: 1.10.3 -> 1.10.4 bugfix release for CVE-2018-11803 [0]. [0] https://subversion.apache.org/security/CVE-2018-11803-advisory.txt --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 64e8e5d2d25..e5940c93956 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -121,8 +121,8 @@ in { }; subversion_1_10 = common { - version = "1.10.3"; - sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz"; + version = "1.10.4"; + sha256 = "18c1vdq32nil76w678lxmp73jsbqha3dmzgmfrj76nc0xjmywql2"; extraBuildInputs = [ lz4 utf8proc ]; }; -- cgit 1.4.1 From 84c1b2fbd82e478f79dbc31c2eee6c57cedea0da Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 20 Mar 2019 14:04:12 +0100 Subject: ldb: apply patch for CVE-2019-3824 --- pkgs/development/libraries/ldb/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 5566b1f4f0e..12f7b176bb7 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { cmocka ]; + patches = [ + # CVE-2019-3824 + # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to + # https://bugzilla.samba.org/attachment.cgi?id=14857 + (fetchurl { + name = "CVE-2019-3824.patch"; + url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch"; + sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd"; + }) + ]; + preConfigure = '' sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf ''; -- cgit 1.4.1 From 5acc543233d990abeff543b8c99d97068ef7a37b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 20 Mar 2019 14:04:31 +0100 Subject: samba4: apply patch for CVE-2019-3824 --- pkgs/servers/samba/4.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4da3ae362c4..53bfa6df8dc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -33,10 +33,18 @@ stdenv.mkDerivation rec { [ ./4.x-no-persistent-install.patch ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch + + # conditionall disable MacOS incompatible tests (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/samba-team/samba/pull/107.patch"; sha256 = "0r6q34vjj0bdzmcbnrkad9rww58k4krbwicv4gs1g3dj49skpvd6"; }) + + (fetchpatch { + name = "CVE-2019-3824.patch"; + url = "https://attachments.samba.org/attachment.cgi?id=14859"; + sha256 = "02qf3zr55mzbimqdv01k3b22jjb084vfr5zabapyr5h1f588mw0q"; + }) ]; buildInputs = -- cgit 1.4.1 From 8ff37d9c45468951f18e0c5dc4d456c9f85817dd Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 20 Mar 2019 14:30:49 +0100 Subject: rssh: mark as insecure There seems to be a consensus among many packagers that RSSH is probably no longer a good idea. There are a few fixes for some of the issues but people should move on and use other software these days. Removing it from further (stable) releases is probably a good idea. If someone really needs it we still have it in the tree and they can whitelist it again. --- pkgs/shells/rssh/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index c58fda28db0..d061c888f60 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -84,6 +84,11 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ arobyn ]; + knownVulnerabilities = [ + "CVE-2019-1000018" + "CVE-2019-3463" + "CVE-2019-3464" + ]; }; passthru = { -- cgit 1.4.1 From 11919c3a3a30d922ed012b232da892807ec136f5 Mon Sep 17 00:00:00 2001 From: CrazedProgrammer Date: Wed, 20 Mar 2019 21:31:37 +0100 Subject: ccemux: 1.1.0 -> 1.1.1 --- pkgs/misc/emulators/ccemux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index bd2be99a284..77d9f5094d0 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -3,19 +3,19 @@ }: let - version = "1.1.0"; - rev = "a12239148332ca7a0b1c44a93e1585452d3631c9"; + version = "1.1.1"; + rev = "af12e2e4da586275ba931eae8f40a2201251bf59"; baseUrl = "https://emux.cc/versions/${stdenv.lib.substring 0 8 rev}/CCEmuX"; jar = if useCCTweaked then fetchurl { url = "${baseUrl}-cct.jar"; - sha256 = "1i767v3wnb8jsh7ciqqvw548pka1b8vl18k1rdv5dn21la6n0r1d"; + sha256 = "0d9gzi1h5vz32fp4lfn7dam189jcm7bwbqwmlpj0c47p8l0d4lsv"; } else fetchurl { url = "${baseUrl}-cc.jar"; - sha256 = "0x9hs814ln193cwybd565mcj6vhnii4wirkiz9na7vcas0y5vmmq"; + sha256 = "0ky5vxh8m1v98zllifxif8xxd25j2xdp19hjnj4xlkck71lbnb34"; }; desktopIcon = fetchurl { -- cgit 1.4.1 From f116d046f6e79c5400ebb0bdce5d8f4cf33b1015 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 21 Mar 2019 10:04:07 +0100 Subject: openstackImage: set the / fsType to reenable root FS resizing Since 34234dcb511066dd1e4fe75d80ee89519a8c8001, the reisizefs tool is embeded only if the `fsType` starts with `ext`. The default `fsType` value is `auto`. --- nixos/modules/virtualisation/openstack-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index d5e862da0ea..c2da5d0d230 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -20,6 +20,7 @@ in config = { fileSystems."/" = { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; autoResize = true; }; -- cgit 1.4.1 From e3521e9d8fc539742d66bae48914f47ca160975d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 21 Mar 2019 10:17:42 +0100 Subject: musly: fix platforms Co-Authored-By: ggPeti --- pkgs/applications/audio/musly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index cb61214b51d..47370d4bc2f 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mpl20; maintainers = with maintainers; [ ggpeti ]; - platforms = with platforms; [ darwin linux ]; + platforms = with platforms; darwin ++ linux; }; } -- cgit 1.4.1 From 0b87a56015003fe7f19580cd596d1c3fcc2db473 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 11:43:26 +0100 Subject: python.pkgs.click: make patch version-agnostic --- pkgs/development/arduino/platformio/chrootenv.nix | 2 +- pkgs/development/python-modules/click/default.nix | 12 ++++++------ pkgs/development/python-modules/click/fix-paths.patch | 13 ------------- 3 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/python-modules/click/fix-paths.patch diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 8f93a0b3772..182f8fbefab 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -13,7 +13,7 @@ let inherit version; sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; }; - patches = []; + postPatch = ""; }); platformio = self.callPackage ./core.nix { }; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 561c47069cb..1ae0cba4844 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: buildPythonPackage rec { pname = "click"; @@ -10,10 +10,10 @@ buildPythonPackage rec { sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; }; - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll { - src = ./fix-paths.patch; - locale = "${locale}/bin/locale"; - }); + postPatch = '' + substituteInPlace click/_unicodefun.py \ + --replace "'locale'" "'${locale}/bin/locale'" + ''; buildInputs = [ pytest ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { # https://github.com/pallets/click/issues/823 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://click.pocoo.org/; description = "Create beautiful command line interfaces in Python"; longDescription = '' diff --git a/pkgs/development/python-modules/click/fix-paths.patch b/pkgs/development/python-modules/click/fix-paths.patch deleted file mode 100644 index b44a08e591e..00000000000 --- a/pkgs/development/python-modules/click/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/click/_unicodefun.py b/click/_unicodefun.py -index 620edff..85a3c98 100644 ---- a/click/_unicodefun.py -+++ b/click/_unicodefun.py -@@ -63,7 +63,7 @@ def _verify_python3_env(): - if os.name == 'posix': - import subprocess - try: -- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, -+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate()[0] - except OSError: - rv = b'' -- cgit 1.4.1 From c0409de98d0736eaf5c45e8444265a51b5e6c9f9 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 11:44:08 +0100 Subject: elasticsearch-curator: add top-level package using older click See https://github.com/NixOS/nixpkgs/pull/58023 for a discussion of why this is necessary. The upstream issue can be found at https://github.com/elastic/curator/pull/1280. --- nixos/modules/services/search/elasticsearch-curator.nix | 2 +- .../python-modules/elasticsearch-curator/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 12 ++++++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index 8cb1275284a..9620c3e0b6d 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -86,7 +86,7 @@ in { startAt = cfg.interval; serviceConfig = { ExecStart = - "${pkgs.python3Packages.elasticsearch-curator}/bin/curator" + + "${pkgs.elasticsearch-curator}/bin/curator" + " --config ${curatorConfig} ${curatorAction}"; }; }; diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index 42fb8dee488..b65e524346f 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -45,13 +45,6 @@ buildPythonPackage rec { funcsigs ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace 'click>=6.7,<7.0' 'click' - substituteInPlace setup.py \ - --replace 'click>=6.7,<7.0' 'click' - ''; - meta = with stdenv.lib; { homepage = https://github.com/elastic/curator; description = "Curate, or manage, your Elasticsearch indices and snapshots"; @@ -69,5 +62,8 @@ buildPythonPackage rec { * Perform various actions on the items which remain in the actionable list. ''; maintainers = with maintainers; [ basvandijk ]; + + # https://github.com/elastic/curator/pull/1280 + broken = versionAtLeast click.version "7.0"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81a1b4b0f68..4ae8b09cdc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2534,6 +2534,18 @@ in callPackage ../servers/search/elasticsearch/plugins.nix { } ); + elasticsearch-curator = with (python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "6.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + }; + }); + }; + }).pkgs; toPythonApplication elasticsearch-curator; + embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emem = callPackage ../applications/misc/emem { }; -- cgit 1.4.1 From 76bfc09ff3403fa23f0837e4f43645fd8c72338e Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:27:03 +0100 Subject: python.pkgs.envs: fix build --- pkgs/development/python-modules/envs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index e39292049da..600cb3b0320 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi -, click, jinja2, terminaltables }: +, mock, jinja2, click, terminaltables +}: buildPythonPackage rec { pname = "envs"; @@ -10,7 +11,7 @@ buildPythonPackage rec { sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; }; - checkInputs = [ click jinja2 terminaltables ]; + checkInputs = [ mock jinja2 click terminaltables ]; meta = with lib; { description = "Easy access to environment variables from Python"; -- cgit 1.4.1 From 8519983a319967586f76c807eedd8cda1f0df51f Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:35:29 +0100 Subject: python.pkgs.python-mapnik: fix build fallout of https://github.com/NixOS/nixpkgs/pull/54182 --- .../python-modules/python-mapnik/default.nix | 49 +++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 692bbe4bcd8..02097d75ac8 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -8,7 +8,16 @@ , pycairo }: -buildPythonPackage rec { +let + boost = pkgs.boost.override { + enablePython = true; + inherit python; + }; + mapnik = pkgs.mapnik.override { + inherit python boost; + }; + +in buildPythonPackage rec { pname = "python-mapnik"; version = "3.0.16"; @@ -28,25 +37,25 @@ buildPythonPackage rec { export BOOST_THREAD_LIB="boost_thread" export BOOST_SYSTEM_LIB="boost_system" ''; - buildInputs = with pkgs; [ - (boost.override { - enablePython = true; - inherit python; - }) - (mapnik.override { - inherit python; - boost = (boost.override { enablePython = true; inherit python; }); - }) - cairo - harfbuzz - icu - libjpeg - libpng - libtiff - libwebp - proj - zlib - ]; + + nativeBuildInputs = [ + mapnik # for mapnik_config + ]; + + buildInputs = [ + mapnik + boost + ] ++ (with pkgs; [ + cairo + harfbuzz + icu + libjpeg + libpng + libtiff + libwebp + proj + zlib + ]); propagatedBuildInputs = [ pillow pycairo ]; meta = with stdenv.lib; { -- cgit 1.4.1 From 48d1219a92e93954bbae6cd7402a8fe1c9b3ea9f Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:36:11 +0100 Subject: python.pkgs.tilestache: fix build --- pkgs/development/python-modules/tilestache/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index 097a7368c83..2b0fc68ca4c 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -16,7 +16,8 @@ buildPythonPackage rec { disabled = !isPy27; src = fetchPypi { - inherit pname version; + pname = "TileStache"; + inherit version; sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27"; }; -- cgit 1.4.1 From 56d9affaeabe17dff46b8d6cf6f336c31d5ed046 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:44:45 +0100 Subject: Revert "python-suds-jurko: disable the test suite" This reverts commit c103b5b236019323ab0df03b7e5a45f86dc2542e. --- pkgs/development/python-modules/suds-jurko/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 5459a39fc1f..5c04c5bd5d3 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -18,7 +18,11 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - doCheck = false; # v0.6 is broken with recent pytest 4.x + preBuild = '' + # fails + substituteInPlace tests/test_transport_http.py \ + --replace "test_sending_unicode_data" "noop" + ''; meta = with stdenv.lib; { description = "Lightweight SOAP client (Jurko's fork)"; -- cgit 1.4.1 From 77ab98861cded2dc538bef782a6d098353b1b30d Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:45:08 +0100 Subject: python.pkgs.suds-jurko: use pytest_3 --- pkgs/development/python-modules/suds-jurko/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 5c04c5bd5d3..efb8383c8fd 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytest_3 , isPyPy }: @@ -16,9 +16,9 @@ buildPythonPackage rec { sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; - preBuild = '' + postPatch = '' # fails substituteInPlace tests/test_transport_http.py \ --replace "test_sending_unicode_data" "noop" -- cgit 1.4.1 From 2f69e363a5225d2b467bbc2018586929015c5568 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 21 Mar 2019 14:57:26 +0100 Subject: mautrix-telegram: 0.5.0 -> 0.5.1 --- pkgs/servers/mautrix-telegram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 07c397b84e2..7c50c9cb27b 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3d5156f205b94dbac76f7eafb0ca732ba16fa568d4440210f7dd4be5c3252dda"; + sha256 = "51951845e52c4ca5410e0f4a51d99014dd6df2fcedfca8b7241e045359cbf112"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From aefea5f0bde9fb9282eb51a629f638e93283d095 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Wed, 20 Mar 2019 16:36:30 -0400 Subject: gpgme: cross compilation --- pkgs/development/libraries/gpgme/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index fc98af8b2ca..ed2c3e6b800 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -3,6 +3,7 @@ , autoreconfHook, fetchpatch , git , texinfo +, buildPackages , qtbase ? null , pythonSupport ? false, swig2 ? null, python ? null }: @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + patches = [ (fetchpatch { name = "fix-key-expiry.patch"; @@ -46,6 +49,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libassuan-prefix=${libassuan.dev}" ] ++ lib.optional pythonSupport "--enable-languages=python"; NIX_CFLAGS_COMPILE = -- cgit 1.4.1 From d1f0f10cf1c2ec1764a3f6c4a31eae109b5aa816 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Wed, 20 Mar 2019 16:38:09 -0400 Subject: libatasmart: add build time cc --- pkgs/os-specific/linux/libatasmart/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 3c8c71bdde5..018f8c62435 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev, buildPackages }: stdenv.mkDerivation rec { name = "libatasmart-0.19"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; -- cgit 1.4.1 From d716cad907e2f617c3c6c8506d1299569b2f2d90 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:55:00 +0100 Subject: python.pkgs.retry: init at 0.9.2 --- pkgs/development/python-modules/retry/default.nix | 43 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/retry/default.nix diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix new file mode 100644 index 00000000000..a4743dcbfe4 --- /dev/null +++ b/pkgs/development/python-modules/retry/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, decorator +, py +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "retry"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f8bfa8b99b69c4506d6f5bd3b0aabf77f98cdb17f3c9fc3f5ca820033336fba4"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + decorator + py + ]; + + checkInputs = [ + mock + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Easy to use retry decorator"; + homepage = https://github.com/invl/retry; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df0b374689c..20b77c87108 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4092,6 +4092,8 @@ in { restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + retry = callPackage ../development/python-modules/retry { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robotframework = callPackage ../development/python-modules/robotframework { }; -- cgit 1.4.1 From dc884633a4fa8c5700850a4c9976fa1d0563d0b4 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 21 Mar 2019 12:58:04 +0100 Subject: python.pkgs.pytest-server-fixtures: fix build --- .../development/python-modules/pytest-server-fixtures/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index df34c3361d0..98cae527672 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil -, requests, future }: +, pytest_3, pytest-shutil, pytest-fixture-config, psutil +, requests, future, retry }: buildPythonPackage rec { pname = "pytest-server-fixtures"; @@ -11,8 +11,8 @@ buildPythonPackage rec { sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests future ]; + buildInputs = [ pytest_3 ]; + propagatedBuildInputs = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; # RuntimeError: Unable to find a free server number to start Xvfb doCheck = false; -- cgit 1.4.1 From 173f79f6908e6832b8136b3015325298874d9911 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Mar 2019 10:24:20 -0500 Subject: zsh: don't export HISTFILE and friends Just set them normally. Exporting them will propagate them to all executed programs such as bash (as used by nix-shell or nix run), and badness ensues when different formats are used. --- nixos/modules/programs/zsh/zsh.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 4b995b66a26..deb94922da8 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -189,9 +189,10 @@ in . /etc/zinputrc - export SAVEHIST=${toString cfg.histSize} - export HISTSIZE=${toString cfg.histSize} - export HISTFILE=${cfg.histFile} + # Don't export these, otherwise other shells (bash) will try to use same histfile + SAVEHIST=${toString cfg.histSize} + HISTSIZE=${toString cfg.histSize} + HISTFILE=${cfg.histFile} ${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"} -- cgit 1.4.1 From 48f13a3afe395d085051c09fae99a57b89d8e6b7 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Thu, 21 Mar 2019 17:29:41 +0200 Subject: vimPlugins.nord-vim: init at 0.10.0 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e1746b67583..fdc207b933c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1244,6 +1244,17 @@ let }; }; + nord-vim = buildVimPluginFrom2Nix { + pname = "nord-vim"; + version = "2019-03-21"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-vim"; + rev = "bfa069b12b3af000b07eb23c01ff516bab452db7"; + sha256 = "1wyslhazi9vwnk3z68ibd4gswvc340mwnffg9lnpskqi56qpw005"; + }; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 101ac0a2112..ba153ea9bb5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,6 +11,7 @@ andreshazard/vim-logreview andsild/peskcolor.vim andviro/flake8-vim ap/vim-css-color +arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 -- cgit 1.4.1 From 6c14a2f3f8c3b2311e8ac69acb2e572a3b4ec28c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Mar 2019 10:40:06 -0700 Subject: eagle: 9.1.2 -> 9.3.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/eagle/versions --- pkgs/applications/science/electronics/eagle/eagle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index b97ede41396..831ec9662b0 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "9.1.2"; + version = "9.3.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0y7ahl9z5a7l9cjk8hzmyv6ga8chlry5rr8v116q5mnsgs4i11an"; + sha256 = "0hrbw368kskjzwjnqrri5j7c10d0z5m81h3s9zhqfrmwym42vdc5"; }; desktopItem = makeDesktopItem { -- cgit 1.4.1 From 657ed24d6728d2e5455f851535d21ee8912080ea Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Thu, 21 Mar 2019 19:37:34 +0100 Subject: nodePackages.indium: init at 3.4.1 --- .../node-packages/node-packages-v10.json | 1 + .../node-packages/node-packages-v10.nix | 571 ++++++++++++++------- 2 files changed, 376 insertions(+), 196 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 8afa8b4ccbb..54261521a34 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -45,6 +45,7 @@ , "ionic" , "ios-deploy" , "imapnotify" +, "indium" , "jake" , "javascript-typescript-langserver" , "jsdoc" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 109e13f2a6a..ea5dd14b8c2 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -85,6 +85,15 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; + "@babel/core-7.3.4" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz"; + sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; + }; + }; "@babel/core-7.4.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -103,6 +112,15 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; + "@babel/generator-7.3.4" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.3.4.tgz"; + sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; + }; + }; "@babel/generator-7.4.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -301,13 +319,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.4.0" = { + "@babel/helpers-7.4.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.4.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.0.tgz"; - sha512 = "2Lfcn74A2WSFUbYJ76ilYE1GnegCKUHTfXxp25EL2zPZHjV7OcDncqNjl295mUH0VnB65mNriXW4J5ROvxsgGg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.2.tgz"; + sha512 = "gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg=="; }; }; "@babel/highlight-7.0.0" = { @@ -319,13 +337,22 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; - "@babel/parser-7.4.0" = { + "@babel/parser-7.3.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.4.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.0.tgz"; - sha512 = "ZmMhJfU/+SXXvy9ALjDZopa3T3EixQtQai89JRC48eM9OUwrxJjYjuM/0wmdl2AekytlzMVhPY8cYdLb13kpKQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.3.4.tgz"; + sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; + }; + }; + "@babel/parser-7.4.2" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz"; + sha512 = "9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -535,13 +562,13 @@ let sha512 = "umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.4.0" = { + "@babel/plugin-transform-flow-strip-types-7.3.4" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.4.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.0.tgz"; - sha512 = "C4ZVNejHnfB22vI2TYN4RUp2oCmq6cSEAg4RygSvYZUECRqUu9O4PMEMNJ4wsemaRGg27BbgYctG4BZh+AgIHw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.3.4.tgz"; + sha512 = "PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA=="; }; }; "@babel/plugin-transform-for-of-7.4.0" = { @@ -580,6 +607,15 @@ let sha512 = "mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw=="; }; }; + "@babel/plugin-transform-modules-commonjs-7.2.0" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz"; + sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; + }; + }; "@babel/plugin-transform-modules-commonjs-7.4.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; @@ -607,13 +643,13 @@ let sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.3.0" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.4.2" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz"; - sha512 = "NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz"; + sha512 = "NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ=="; }; }; "@babel/plugin-transform-new-target-7.4.0" = { @@ -733,13 +769,22 @@ let sha512 = "8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug=="; }; }; - "@babel/preset-env-7.4.1" = { + "@babel/preset-env-7.3.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.4.1"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.1.tgz"; - sha512 = "uC2DeVb6ljdjBGhJCyHxNZfSJEVgPdUm2R5cX85GCl1Qreo5sMM5g85ntqtzRF7XRYGgnRmV5we9cdlvo1wJvg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz"; + sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; + }; + }; + "@babel/preset-env-7.4.2" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.2.tgz"; + sha512 = "OEz6VOZaI9LW08CWVS3d9g/0jZA6YCn1gsKIy/fut7yZCJti5Lm1/Hi+uo/U+ODm7g4I6gULrCP+/+laT8xAsA=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -760,13 +805,31 @@ let sha512 = "7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA=="; }; }; - "@babel/runtime-7.4.0" = { + "@babel/runtime-7.3.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.4.0"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz"; + sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; + }; + }; + "@babel/runtime-7.4.2" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.0.tgz"; - sha512 = "/eftZ45kD0OfOFHAmN02WP6N1NVphY+lBf8c2Q/P9VW3tj+N5NlBBAWfqOLOl96YDGMqpIBO5O/hQNx4A/lAng=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz"; + sha512 = "7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA=="; + }; + }; + "@babel/template-7.2.2" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz"; + sha512 = "zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g=="; }; }; "@babel/template-7.4.0" = { @@ -778,6 +841,15 @@ let sha512 = "SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw=="; }; }; + "@babel/traverse-7.3.4" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.3.4.tgz"; + sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; + }; + }; "@babel/traverse-7.4.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; @@ -796,6 +868,15 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; + "@babel/types-7.3.4" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.3.4.tgz"; + sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; + }; + }; "@babel/types-7.4.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -1516,58 +1597,58 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@node-red/editor-api-0.20.2" = { + "@node-red/editor-api-0.20.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.2.tgz"; - sha512 = "NQjj3TfOk353FuENij7TPrj8F1y32rrThPM/tiJjsc7LKQZCmLEelVvEkNRpELH7b9in3TkUg1jYcfNUesjLag=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.3.tgz"; + sha512 = "FQtWytVp3JrsDz9m7KIUwKh3TFwi+8yuBZ9y5sx7v6vj9LICcaLH5CZALH9SSeWUBLpwJ6ZesKEm2fGVCgty4Q=="; }; }; - "@node-red/editor-client-0.20.2" = { + "@node-red/editor-client-0.20.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.2.tgz"; - sha512 = "+EE9TVgWHjAUo75aV9OpxYrWvX2Qf5l7+Il/Sp4xJ2oT7QaRmHeN+/Iyq04tpjBIh02Kk8ZD4uENy4T6x5adKQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.3.tgz"; + sha512 = "5R0A2vqv36fSWkoiU3LMg4Q1Arvvy5iq7nFlowlZlcw3/RJBUdw+EJjd05RRBfnUkgk/Z2ycwus23G9BbIyCAw=="; }; }; - "@node-red/nodes-0.20.2" = { + "@node-red/nodes-0.20.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.2.tgz"; - sha512 = "iu69M4X9lQI3HgQ4IL5K9+zsowkLmNT3PyIbh6jEfsxHvz0myfchm2lVbJgUPVV3DqXcjXpxHxGtAGIE8wEheg=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.3.tgz"; + sha512 = "ZqFQPPn2lMxhELuzftm7K7YJ7NOm83iFWNe9IV89B0+8eRxcLjNHKLFp4SN/CzDvN/EM/vNadpUC8wNLtSLVcA=="; }; }; - "@node-red/registry-0.20.2" = { + "@node-red/registry-0.20.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.2.tgz"; - sha512 = "kShpSWIH7rFjt9n5KabI4Y4SNi9xu461ZpiM6dUDF2Kk6XS65sjcRK5v7LBs4pLR9CnqhlIhjd9pN174xAli4Q=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.3.tgz"; + sha512 = "KiQ39lxNJEHz3tce0c/ipe1HsKtU49u4xte+cjCqne0GECwEeMWie+L+WYL1dK05LoURxm0TFFnNCWRHmqq+Gg=="; }; }; - "@node-red/runtime-0.20.2" = { + "@node-red/runtime-0.20.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.2.tgz"; - sha512 = "YWYsFg1pF1uHjow3NHjXXx+UmMnBTVAy5+SUFy50OJpLtDP6WBVhylQJ5ES8gDy5aC5iVrwvfe5GfnT4vTSvXw=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.3.tgz"; + sha512 = "eIVf5VonAHGf9MI4XBdRlNUIbgy4WJsHZWjEYYZ5AdqV5+mv9R4nXoeZLWHHWcHXmoQrWuW+1EEITss9z90W4w=="; }; }; - "@node-red/util-0.20.2" = { + "@node-red/util-0.20.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.2.tgz"; - sha512 = "+3dPsR6jUp4Jbqu3n5yBiyXn/9LcLvnjzt5T89TSLZY4Mx0cwAKIpXQw9K5fdPm9DhfaA5G4tqFPRFkV84l4Qg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.3.tgz"; + sha512 = "dvUkwhf9jXp8ME9cRWsgeN7IOKa678BtKBmWvSZEbCfyhrLZ6ng3EncaPvwNYIdW2YU2hX03z6tWt7PsYxuG0A=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -1606,13 +1687,13 @@ let sha512 = "lxVlYYvwGbKSHXfbPk5vxEA8w4zHOH1wobado4a9EfsyD3Cbhuhus1w0Ye9Ro0eMubGO8kNy5d+xNFisM3Tvaw=="; }; }; - "@octokit/rest-16.19.0" = { + "@octokit/rest-16.20.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.19.0"; + version = "16.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.19.0.tgz"; - sha512 = "mUk/GU2LtV95OAM3FnvK7KFFNzUUzEGFldOhWliJnuhwBqxEag1gW85o//L6YphC9wLoTaZQOhCHmQcsCnt2ag=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.20.0.tgz"; + sha512 = "tN5j64P6QymlMzKo94DG1LRNHCwMnLg5poZlVhsCfkHhEWKpofZ1qBDr2/0w6qDLav4EA1XXMmZdNpvGhc9BDQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -4567,13 +4648,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.424.0" = { + "aws-sdk-2.425.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.424.0"; + version = "2.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.424.0.tgz"; - sha512 = "p+CWTXgYnERDTJ7wtftBK5SayxeXWNHTbx7jh8MPX0wjqB3Xz8Bddsep8cwj6ZvEwGnI1fxohVPf8EbkB5vWPg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.425.0.tgz"; + sha512 = "SM2qZJPlZUKVzSSqNuCvONOhJ2kcFvU+hAwutjQeje2VKpSAbUbFCFWl6cki2FjiyGZYEPfl0Q+3ANJO8gx9BA=="; }; }; "aws-sign2-0.6.0" = { @@ -6241,13 +6322,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.5.1" = { + "browserslist-4.5.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.1.tgz"; - sha512 = "/pPw5IAUyqaQXGuD5vS8tcbudyPZ241jk1W5pQBsGDfcjNQt7p8qxZhgMNuygDShte1PibLFexecWUPgmVLfrg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.2.tgz"; + sha512 = "zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ=="; }; }; "bser-2.0.0" = { @@ -7186,13 +7267,13 @@ let sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ=="; }; }; - "chloride-2.2.11" = { + "chloride-2.2.12" = { name = "chloride"; packageName = "chloride"; - version = "2.2.11"; + version = "2.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.2.11.tgz"; - sha512 = "g9xlvrL5QrNHczK2WJxzASP8FOhKUwPcEFTGDyj+qOqKLFeXvo4IuHbYa7RmLkEQKMLkeaER+ReeaV3JirDQnA=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.2.12.tgz"; + sha512 = "NNi7PsCL8gKKr3b2Lrg5WbMi76yqZBq01FyT2chj0ISE3UXjr1YezLkiJi2Lw9WFc5CeJteYsJY6hbh38KbUDQ=="; }; }; "chloride-test-1.2.4" = { @@ -7258,6 +7339,15 @@ let sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; }; }; + "chrome-remote-interface-0.26.1" = { + name = "chrome-remote-interface"; + packageName = "chrome-remote-interface"; + version = "0.26.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.26.1.tgz"; + sha512 = "ela482aJK0riFu05sl+zdbnb3ezMiqzwsqf/f/27HngWds+Fat3vcZWpIoDoeQuWMid/+LfKAteAYWaWPqsweg=="; + }; + }; "chrome-trace-event-1.0.0" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; @@ -11551,13 +11641,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.116" = { + "electron-to-chromium-1.3.118" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.116"; + version = "1.3.118"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.116.tgz"; - sha512 = "NKwKAXzur5vFCZYBHpdWjTMO8QptNLNP80nItkSIgUOapPAo9Uia+RvkCaZJtO7fhQaVElSvBPWEc2ku6cKsPA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.118.tgz"; + sha512 = "/1FpHvmKmKo2Z6CCza2HfkrKvKhU7Rq4nvyX1FOherdTrdTufhVrJbCrcrIqgqUCI+BG6JC2rlY4z5QA1G0NOw=="; }; }; "elegant-spinner-1.0.1" = { @@ -12335,13 +12425,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.18" = { + "esm-3.2.19" = { name = "esm"; packageName = "esm"; - version = "3.2.18"; + version = "3.2.19"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.18.tgz"; - sha512 = "1UENjnnI37UDp7KuOqKYjfqdaMim06eBWnDv37smaxTIzDl0ZWnlgoXwsVwD9+Lidw+q/f1gUf2diVMDCycoVw=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.19.tgz"; + sha512 = "thFxRC6o0gKfSiSwuUI2JO01f9JOm1qRWGfBLry0LF3L8mSeSTK58DqCE3+0ZKq02e/DClCJf3BW9nVwd/ejCw=="; }; }; "espree-3.5.4" = { @@ -13244,13 +13334,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.4.4" = { + "fast-redact-1.5.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.4.tgz"; - sha512 = "QOQZ8sDDQPZMJ6x6zlm6hLZ2cjPDqfN3R/AYnAbM+yy8VNPvOnVXdUF/E/xbMv7g44c1krhWuzgjH2u0V5Vhsg=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.5.0.tgz"; + sha512 = "Afo61CgUjkzdvOKDHn08qnZ0kwck38AOGcMlvSGzvJbIab6soAP5rdoQayecGCDsD69AiF9vJBXyq31eoEO2tQ=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -18519,6 +18609,15 @@ let sha512 = "QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q=="; }; }; + "js-yaml-3.13.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; + }; + }; "js2xmlparser-3.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -27886,13 +27985,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "querystringify-2.1.0" = { + "querystringify-2.1.1" = { name = "querystringify"; packageName = "querystringify"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz"; - sha512 = "sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="; + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; "quick-format-unescaped-3.0.2" = { @@ -28615,6 +28714,15 @@ let sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; }; }; + "registry-auth-token-3.4.0" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; + }; + }; "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -30820,13 +30928,13 @@ let sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA=="; }; }; - "snyk-gradle-plugin-2.2.0" = { + "snyk-gradle-plugin-2.3.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.2.0.tgz"; - sha512 = "z8Lz+qQc7920pUFVnXrlez74acsFjKKhmegGuvq0OY6/qE7ruMbDOB6Xq+OmlJJW7TWWrt3XFgXdTABOc+7A4g=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.3.0.tgz"; + sha512 = "XnADEkQ4YXxFrKnd+F2+ixmvhgDG4yyBpYE1RMx3i/2y9auXkt/E+pWTmU4xnofFEtuAnZiYcfvOE6dIGk06KA=="; }; }; "snyk-module-1.9.1" = { @@ -30910,13 +31018,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-4.0.2" = { + "snyk-resolve-deps-4.0.3" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.2.tgz"; - sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.3.tgz"; + sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; "snyk-sbt-plugin-2.0.1" = { @@ -31162,13 +31270,13 @@ let sha512 = "X3+Z4uYPGceVjRz6qLY/4clVU/gYo1KC9q4L4FSjqFfomzsndMutNAgbVoJa0nsilQw6I/Y7jDQ7SCbUdaOiKw=="; }; }; - "sodium-browserify-tweetnacl-0.2.4" = { + "sodium-browserify-tweetnacl-0.2.5" = { name = "sodium-browserify-tweetnacl"; packageName = "sodium-browserify-tweetnacl"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.4.tgz"; - sha512 = "R9VzbcUE2MkQUuL9GuO0/308T6XXx/N7cBfImhuDZ+yJlmO73AnidEALz/mpPqSxDVW15uN3d9vYMwFL8UPiiw=="; + url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.5.tgz"; + sha512 = "Q6YgyMyEB7dFLTt3vB8/YSjmSQrpQ/J4VEZfivOxRXFRs8BLjn39jA2X7sJO1Co4+Ma5kD+DSZm8x7Tum7ajQw=="; }; }; "sodium-chloride-1.1.2" = { @@ -32188,13 +32296,13 @@ let sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; }; }; - "stream-to-pull-stream-1.7.2" = { + "stream-to-pull-stream-1.7.3" = { name = "stream-to-pull-stream"; packageName = "stream-to-pull-stream"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz"; - sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde"; + url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; + sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; }; }; "stream-transcoder-0.0.5" = { @@ -34394,6 +34502,15 @@ let sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; }; + "uglify-js-3.5.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.1.tgz"; + sha512 = "kI+3c+KphOAKIikQsZoT2oDsVYH5qvhpTtFObfMCdhPAYnjSvmW4oTWMhvDD4jtAGHJwztlBXQgozGcq3Xw9oQ=="; + }; + }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -39210,7 +39327,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."request-2.88.0" sources."resolve-1.10.0" @@ -40417,7 +40534,7 @@ in sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-array-items-1.1.1" sources."remove-trailing-separator-1.1.0" @@ -40806,7 +40923,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.424.0" + sources."aws-sdk-2.425.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -41162,7 +41279,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -41541,7 +41658,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."querystringify-2.1.0" + sources."querystringify-2.1.1" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -42427,7 +42544,7 @@ in sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -42572,7 +42689,7 @@ in sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -43493,7 +43610,7 @@ in }; dependencies = [ sources."asyncmemo-1.0.0" - sources."chloride-2.2.11" + sources."chloride-2.2.12" sources."chloride-test-1.2.4" sources."commander-2.19.0" sources."debug-4.1.1" @@ -43615,7 +43732,7 @@ in sources."smart-buffer-4.0.2" sources."socks-2.3.2" sources."sodium-browserify-1.2.5" - (sources."sodium-browserify-tweetnacl-0.2.4" // { + (sources."sodium-browserify-tweetnacl-0.2.5" // { dependencies = [ sources."sha.js-2.4.11" sources."tweetnacl-1.0.1" @@ -43645,7 +43762,7 @@ in sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" sources."ssb-ref-2.13.9" - (sources."stream-to-pull-stream-1.7.2" // { + (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" ]; @@ -43966,7 +44083,7 @@ in sources."isstream-0.1.2" sources."iterall-1.2.2" sources."js-base64-2.5.1" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -44134,7 +44251,7 @@ in ]; }) sources."regenerator-runtime-0.11.1" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."replaceall-0.1.6" sources."request-2.88.0" @@ -45862,7 +45979,7 @@ in }) sources."rc-1.2.8" sources."readable-stream-2.3.6" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" @@ -46049,6 +46166,34 @@ in production = true; bypassCache = true; }; + indium = nodeEnv.buildNodePackage { + name = "indium"; + packageName = "indium"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indium/-/indium-3.4.1.tgz"; + sha512 = "RJ8nHsE4diosqkSpKot3unMn05ExCisUDy/URw/3M9t8MetvthBBQpcfaRPGftXRGebaMF1HnH6dLG994TpNVQ=="; + }; + dependencies = [ + sources."async-limiter-1.0.0" + sources."chrome-remote-interface-0.26.1" + sources."commander-2.11.0" + sources."node-fetch-2.3.0" + sources."safe-buffer-5.1.2" + sources."semver-5.6.0" + sources."source-map-0.7.3" + sources."ultron-1.1.1" + sources."ws-3.3.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Indium server"; + homepage = "https://github.com/NicolasPetton/Indium#readme"; + license = "GPL-3.0"; + }; + production = true; + bypassCache = true; + }; jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; @@ -46396,7 +46541,7 @@ in sources."graphlib-2.1.7" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."lodash-4.17.11" sources."methods-1.1.2" sources."mime-1.6.0" @@ -46625,7 +46770,7 @@ in sources."range-parser-1.2.0" sources."raw-body-2.3.3" sources."rc-1.2.8" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."request-2.88.0" sources."require-directory-2.1.1" @@ -46710,10 +46855,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.2"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz"; - sha512 = "QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; dependencies = [ sources."argparse-1.0.10" @@ -47507,7 +47652,7 @@ in sources."@octokit/endpoint-3.2.3" sources."@octokit/plugin-enterprise-rest-2.2.2" sources."@octokit/request-2.4.2" - sources."@octokit/rest-16.19.0" + sources."@octokit/rest-16.20.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -47861,7 +48006,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -48211,7 +48356,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - (sources."uglify-js-3.4.10" // { + (sources."uglify-js-3.5.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -49243,9 +49388,9 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.0" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.4.0" + sources."@babel/helpers-7.4.2" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.0" + sources."@babel/parser-7.4.2" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-class-properties-7.4.0" @@ -49274,7 +49419,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.4.0" sources."@babel/plugin-transform-modules-systemjs-7.4.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" sources."@babel/plugin-transform-new-target-7.4.0" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.4.0" @@ -49286,9 +49431,9 @@ in sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.4.1" + sources."@babel/preset-env-7.4.2" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.4.0" + sources."@babel/runtime-7.4.2" sources."@babel/template-7.4.0" sources."@babel/traverse-7.4.0" sources."@babel/types-7.4.0" @@ -49492,7 +49637,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.5.1" + sources."browserslist-4.5.2" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -49671,7 +49816,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.116" + sources."electron-to-chromium-1.3.118" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -51856,7 +52001,7 @@ in sources."graphlib-2.1.7" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" (sources."json-refs-3.0.12" // { dependencies = [ sources."commander-2.11.0" @@ -52840,7 +52985,7 @@ in sources."readable-stream-2.3.6" sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -52975,23 +53120,23 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.20.2.tgz"; - sha512 = "oFUJ5Eyzki7OK9Bw8QmutrThMr3tJU+TzIedzSaX0Zhlw+wjW28dOWUdKCKTqtGDCUJzQM7PtLR+ArwrekCSww=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.20.3.tgz"; + sha512 = "Ws9yCaG7LXWV5AlfM6z7wQYM7/LBkuulm78I+aXag0ED4HTcNoFNxtaez2eNvBYLiwHlvhhFvw/mthGDJ6HTow=="; }; dependencies = [ - sources."@node-red/editor-api-0.20.2" - sources."@node-red/editor-client-0.20.2" - (sources."@node-red/nodes-0.20.2" // { + sources."@node-red/editor-api-0.20.3" + sources."@node-red/editor-client-0.20.3" + (sources."@node-red/nodes-0.20.3" // { dependencies = [ sources."iconv-lite-0.4.24" sources."media-typer-1.0.1" ]; }) - sources."@node-red/registry-0.20.2" - sources."@node-red/runtime-0.20.2" - sources."@node-red/util-0.20.2" + sources."@node-red/registry-0.20.3" + sources."@node-red/runtime-0.20.3" + sources."@node-red/util-0.20.3" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."addressparser-1.0.1" @@ -53577,10 +53722,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.0.tgz"; - sha512 = "M0Q2tfsSoC5yU7XhAPCINey13lAKVxJygA2uwkJkDalhyCpMTlsUAoMV0oqoFOmLuBkaGe5Zmc7ATfIqFAtBZg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.1.tgz"; + sha512 = "xUf4iL28QAMjOkd9eH2CIxt98KMub3Z5BN1rkLMphb3WoGeiRZ4YDs82KmR3Jl5cheeWjJjI+HBXiiGFAxAYuQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -53646,7 +53791,7 @@ in sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."jju-1.4.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-1.0.1" @@ -53701,7 +53846,7 @@ in sources."pump-3.0.0" sources."rc-1.2.8" sources."rc-config-loader-2.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-5.0.0" sources."require-from-string-2.0.2" sources."requireg-0.2.1" @@ -54563,20 +54708,20 @@ in parcel-bundler = nodeEnv.buildNodePackage { name = "parcel-bundler"; packageName = "parcel-bundler"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.2.tgz"; - sha512 = "jgT72i0za+EAgnxPBhXOKKlEQtTa4BfYdhe2jzulnT7785v/zHZMCI6qw3oD/Cju850OZcSubIE3U8Bt8Lzw9w=="; + url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.3.tgz"; + sha512 = "8bq6lj0hhQeGxD9f9xEkFMXQ3d8TIlf2+isKxoi9bciB0KVEILRGllaPkUgp++5t0anToBh9+tG6ZyInXOC1/A=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" - (sources."@babel/core-7.4.0" // { + (sources."@babel/core-7.3.4" // { dependencies = [ sources."json5-2.1.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.4.0" // { + (sources."@babel/generator-7.3.4" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -54584,12 +54729,28 @@ in sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-builder-react-jsx-7.3.0" - sources."@babel/helper-call-delegate-7.4.0" - sources."@babel/helper-define-map-7.4.0" + (sources."@babel/helper-call-delegate-7.4.0" // { + dependencies = [ + sources."@babel/generator-7.4.0" + sources."@babel/parser-7.4.2" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/helper-define-map-7.4.0" // { + dependencies = [ + sources."@babel/types-7.4.0" + ]; + }) sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.4.0" + (sources."@babel/helper-hoist-variables-7.4.0" // { + dependencies = [ + sources."@babel/types-7.4.0" + ]; + }) sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" sources."@babel/helper-module-transforms-7.2.2" @@ -54597,13 +54758,34 @@ in sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.0.0" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.4.0" + (sources."@babel/helper-replace-supers-7.4.0" // { + dependencies = [ + sources."@babel/generator-7.4.0" + sources."@babel/parser-7.4.2" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" + sources."source-map-0.5.7" + ]; + }) sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.4.0" + (sources."@babel/helper-split-export-declaration-7.4.0" // { + dependencies = [ + sources."@babel/types-7.4.0" + ]; + }) sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.4.0" + (sources."@babel/helpers-7.4.2" // { + dependencies = [ + sources."@babel/generator-7.4.0" + sources."@babel/parser-7.4.2" + sources."@babel/template-7.4.0" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" + sources."source-map-0.5.7" + ]; + }) sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.0" + sources."@babel/parser-7.3.4" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-json-strings-7.2.0" sources."@babel/plugin-proposal-object-rest-spread-7.4.0" @@ -54625,15 +54807,15 @@ in sources."@babel/plugin-transform-dotall-regex-7.2.0" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-flow-strip-types-7.4.0" + sources."@babel/plugin-transform-flow-strip-types-7.3.4" sources."@babel/plugin-transform-for-of-7.4.0" sources."@babel/plugin-transform-function-name-7.2.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" - sources."@babel/plugin-transform-modules-commonjs-7.4.0" + sources."@babel/plugin-transform-modules-commonjs-7.2.0" sources."@babel/plugin-transform-modules-systemjs-7.4.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" sources."@babel/plugin-transform-new-target-7.4.0" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.4.0" @@ -54645,11 +54827,11 @@ in sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.4.1" - sources."@babel/runtime-7.4.0" - sources."@babel/template-7.4.0" - sources."@babel/traverse-7.4.0" - sources."@babel/types-7.4.0" + sources."@babel/preset-env-7.3.4" + sources."@babel/runtime-7.3.4" + sources."@babel/template-7.2.2" + sources."@babel/traverse-7.3.4" + sources."@babel/types-7.3.4" sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -54702,7 +54884,6 @@ in sources."aws4-1.8.0" (sources."babel-runtime-6.26.0" // { dependencies = [ - sources."core-js-2.6.5" sources."regenerator-runtime-0.11.1" ]; }) @@ -54739,7 +54920,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.5.1" + sources."browserslist-4.5.2" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -54782,9 +54963,7 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.0" - sources."core-js-compat-3.0.0" - sources."core-js-pure-3.0.0" + sources."core-js-2.6.5" sources."core-util-is-1.0.2" sources."cosmiconfig-5.1.0" sources."create-ecdh-4.0.3" @@ -54894,7 +55073,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.116" + sources."electron-to-chromium-1.3.118" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -55043,7 +55222,7 @@ in sources."js-beautify-1.9.0" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" - (sources."js-yaml-3.12.2" // { + (sources."js-yaml-3.13.0" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -55267,7 +55446,7 @@ in sources."readdirp-2.2.1" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.0.2" - sources."regenerator-runtime-0.13.2" + sources."regenerator-runtime-0.12.1" sources."regenerator-transform-0.13.4" (sources."regex-not-1.0.2" // { dependencies = [ @@ -56296,7 +56475,7 @@ in sources."character-entities-legacy-1.1.2" sources."character-reference-invalid-1.1.2" sources."charwise-3.0.1" - sources."chloride-2.2.11" + sources."chloride-2.2.12" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" sources."chownr-1.1.1" @@ -56879,7 +57058,7 @@ in sources."snapdragon-util-3.0.1" sources."socks-2.3.2" sources."sodium-browserify-1.2.5" - (sources."sodium-browserify-tweetnacl-0.2.4" // { + (sources."sodium-browserify-tweetnacl-0.2.5" // { dependencies = [ sources."sha.js-2.4.11" sources."tweetnacl-1.0.1" @@ -56934,7 +57113,7 @@ in ]; }) sources."statistics-3.3.0" - sources."stream-to-pull-stream-1.7.2" + sources."stream-to-pull-stream-1.7.3" sources."string-width-1.0.2" sources."string.prototype.trim-1.1.2" sources."string_decoder-1.1.1" @@ -57764,10 +57943,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.140.0"; + version = "1.143.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.140.0.tgz"; - sha512 = "ukACvP85wnxviHv4a7kPTL4kpfgFrM17zsCZSzbhsUM12Ue8HiGy85J0agZDAQhNMy73h9VrW17aePMrQtMVwA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.143.0.tgz"; + sha512 = "3hndcJH+fxQoC2Bg8YN/RqFBuQo+goZJnFlBm3PoQAaCg2zIWIfCuuzmn+6E/Ssy7LhJb0KbYmhxawS1Ib4rJg=="; }; dependencies = [ sources."@snyk/dep-graph-1.4.0" @@ -57900,7 +58079,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-yaml-3.12.2" // { + (sources."js-yaml-3.13.0" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -57979,7 +58158,7 @@ in ]; }) sources."recursive-readdir-2.2.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" @@ -58005,7 +58184,7 @@ in sources."snyk-config-2.2.1" sources."snyk-docker-plugin-1.22.0" sources."snyk-go-plugin-1.6.1" - sources."snyk-gradle-plugin-2.2.0" + sources."snyk-gradle-plugin-2.3.0" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" sources."snyk-nodejs-lockfile-parser-1.11.0" @@ -58015,7 +58194,7 @@ in sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.2" + sources."snyk-resolve-deps-4.0.3" sources."snyk-sbt-plugin-2.0.1" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -58229,7 +58408,7 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."mdn-data-1.1.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -58532,7 +58711,7 @@ in ]; }) sources."js-string-escape-1.0.1" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ @@ -58685,7 +58864,7 @@ in sources."readline2-1.0.1" sources."reduce-component-1.0.1" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -58823,7 +59002,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - (sources."uglify-js-3.4.10" // { + (sources."uglify-js-3.5.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59026,7 +59205,7 @@ in sources."is-whitespace-character-1.0.2" sources."is-word-character-1.0.2" sources."isarray-1.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" (sources."json5-1.0.1" // { @@ -59451,10 +59630,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.10"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"; - sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.1.tgz"; + sha512 = "kI+3c+KphOAKIikQsZoT2oDsVYH5qvhpTtFObfMCdhPAYnjSvmW4oTWMhvDD4jtAGHJwztlBXQgozGcq3Xw9oQ=="; }; dependencies = [ sources."commander-2.19.0" @@ -60012,7 +60191,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -60124,7 +60303,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.4.10" + sources."uglify-js-3.5.1" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -60433,7 +60612,7 @@ in sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.2.18" + sources."esm-3.2.19" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -60633,7 +60812,7 @@ in sources."joi-14.3.1" sources."js-message-1.0.5" sources."js-queue-2.0.0" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -60815,7 +60994,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -61197,7 +61376,7 @@ in sources."@babel/code-frame-7.0.0" sources."@babel/generator-7.4.0" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.0" + sources."@babel/parser-7.4.2" sources."@babel/template-7.4.0" sources."@babel/types-7.4.0" sources."@webassemblyjs/ast-1.8.5" @@ -62747,7 +62926,7 @@ in sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.4.4" + sources."fast-redact-1.5.0" sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -62892,7 +63071,7 @@ in sources."jetpack-id-1.0.0" sources."js-select-0.6.0" sources."js-tokens-4.0.0" - (sources."js-yaml-3.12.2" // { + (sources."js-yaml-3.13.0" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -63103,7 +63282,7 @@ in sources."regenerator-runtime-0.12.1" sources."regex-not-1.0.2" sources."regexpp-2.0.1" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { dependencies = [ @@ -63927,7 +64106,7 @@ in ]; }) sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" -- cgit 1.4.1 From 9595eb1b6d1d3476f3b9d1b3bcc21f2c878dafff Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 20 Mar 2019 22:27:25 -0500 Subject: sssd: 1.16.3 -> 1.16.4 https://docs.pagure.org/SSSD.sssd/users/relnotes/notes_1_16_4.html CVE-2019-3811, see notes. --- pkgs/os-specific/linux/sssd/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 79a79ac34a0..fdde2bedf55 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -12,21 +12,13 @@ let in stdenv.mkDerivation rec { name = "sssd-${version}"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; - sha256 = "1i2fq37w0k71xwqcq1i4l3nglmwybc4694xbrccrih33qsh1fpgf"; + sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; - patches = [ - (fetchpatch { - name = "duplicate-case-value.diff"; - url = "https://github.com/SSSD/sssd/commit/1ee12b05570fcfb8.diff"; - sha256 = "01y8i8cfs2gydn84097cl5fynx0db8b0vr345gh57ypp84in3ixw"; - }) - ]; - # Something is looking for instead of NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; -- cgit 1.4.1 From 7fbe20a8d100284e7a25b5cab51c255ba7ee6310 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 20 Mar 2019 15:45:35 -0500 Subject: libwhich: init at 2019-03-20 --- pkgs/development/tools/misc/libwhich/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/misc/libwhich/default.nix diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix new file mode 100644 index 00000000000..58aca8a8b5a --- /dev/null +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libwhich"; + version = "2019-03-20"; + + src = fetchFromGitHub { + owner = "vtjnash"; + repo = pname; + rev = "b348872107c77cba50b60475aa8ce2ddba86aac0"; + sha256 = "0fd8hsdc9b9v83j89mxvisgrz77q9rlxnbzd6j63wq66h95r02r9"; + }; + + installPhase = '' + install -Dm755 -t $out/bin libwhich + ''; + + meta = with stdenv.lib; { + description = "Like `which`, for dynamic libraries"; + homepage = https://github.com/vtjnash/libwhich; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f24e8ec1369..f513f9e93fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8957,6 +8957,8 @@ in libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; + libwhich = callPackage ../development/tools/misc/libwhich { }; + linuxkit = callPackage ../development/tools/misc/linuxkit { }; lit = callPackage ../development/tools/misc/lit { }; -- cgit 1.4.1 From 81200e7d4b36e7d015a9c7f69ac6796e2c666324 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Mar 2019 18:32:41 -0500 Subject: joplin-desktop: 1.0.120 -> 1.0.135 --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 90e56b44243..cf53c6306cc 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ { stdenv, appimage-run, fetchurl }: let - version = "1.0.120"; - sha256 = "0j32rg6hm5dirdcibhfhrclnx7vm37fbm4iwkzzinqhzj4jfgbfm"; + version = "1.0.135"; + sha256 = "139nk1pvwqjn6grzpq6dh9jad7450gy4b3rms1hbkj8cjcqaks9z"; in stdenv.mkDerivation rec { name = "joplin-${version}"; -- cgit 1.4.1 From 37dc79d003b9167f3b67d581f4cd0e3f0b55a8af Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Mar 2019 18:35:19 -0500 Subject: joplin: 1.0.135 -> 1.0.140 https://discourse.joplin.cozic.net/t/joplin-version-1-0-89/78 --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index cf53c6306cc..aa49f0e3d75 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ { stdenv, appimage-run, fetchurl }: let - version = "1.0.135"; - sha256 = "139nk1pvwqjn6grzpq6dh9jad7450gy4b3rms1hbkj8cjcqaks9z"; + version = "1.0.140"; + sha256 = "1114v141jayqhvkkxf7dr864j09nf5nz002c7z0pprzr00fifqzx"; in stdenv.mkDerivation rec { name = "joplin-${version}"; -- cgit 1.4.1 From 6347dee4b98fe7978d844d39e49d536bb379c2a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Mar 2019 15:16:16 -0700 Subject: fping: 4.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/fping/versions --- pkgs/tools/networking/fping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index e0cd0ff8849..4b5242818b3 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-4.1"; + name = "fping-4.2"; src = fetchurl { url = "https://www.fping.org/dist/${name}.tar.gz"; - sha256 = "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7"; + sha256 = "0jmnf4vmr43aiwk3h2b5qdsb95gxar8gz1yli8fswnm9nrs9ccvx"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; -- cgit 1.4.1 From 188179facab006efc41acebde01ab43f7d95ac9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Mar 2019 15:33:23 -0700 Subject: fstrm: 0.4.0 -> 0.5.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/fstrm/versions --- pkgs/development/libraries/fstrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 372cb50d05c..3fcf218d6b5 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fstrm-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny"; + sha256 = "1vm880h6vpnxqh7v0x17yfim6f2fbxwkm03ms58s2h9akmph9xm5"; }; outputs = [ "bin" "out" "dev" ]; -- cgit 1.4.1 From 8ab50871aa346940b348ff5912b2a80c8645dbdc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Mar 2019 17:24:40 -0700 Subject: geekbench: 4.2.3 -> 4.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/geekbench/versions --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index bc6f1a1ff0d..df623d0c178 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.2.3"; + version = "4.3.3"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1v42hr4p9nj7jvcjkffif6w7icns5iq0mgk9ih2mi5j2h1ngh1f7"; + sha256 = "0bqa0k4cf4w8gjs49lnrvns11jv21kqcgdbqp2zhwqgmkx9gr8ny"; }; dontConfigure = true; -- cgit 1.4.1 From a435269abf157287be753d20d5b62cf619256538 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Mar 2019 18:50:10 -0700 Subject: gnuplot: 5.2.5 -> 5.2.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/gnuplot/versions --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8de7ca3262c..2046514af6b 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.5"; + name = "gnuplot-5.2.6"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1ajw8xcb1kg2vy8n3rhrz71knjr2yivfavv9lqqzvp1dwv6b5783"; + sha256 = "1vllgap08nhvdmc03idmkdnk9cfl2bp81hps50q1pqrr640qzp9m"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; -- cgit 1.4.1 From 60b085adc550415bd4422f59f7c1c11bbec65136 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 22 Mar 2019 09:43:53 +0100 Subject: skaffold: 0.24.0 -> 0.25.0 Signed-off-by: Vincent Demeester --- pkgs/development/tools/skaffold/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index b7f8da65764..b1f8af2491c 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.24.0"; - # rev is the 0.24.0 commit, mainly for skaffold version command output - rev = "6a829c4b29e3a102b0b14c4584cd174f780402e9"; + version = "0.25.0"; + # rev is the 0.25.0 commit, mainly for skaffold version command output + rev = "0f4b8fe88969e9fa38346934ea6af7c46772d603"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0i1gafyi8wlnfpmkivxarvh2kiickz105cdmpjkxya54rhl4c7i7"; + sha256 = "0adcim029w64494sb3cw14xhv2vf33l8vhwm2wz8mnmr402nbvkx"; }; meta = { -- cgit 1.4.1 From 63154c89e3c887a5bbee87add585378a2a05957c Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 22 Mar 2019 10:14:12 +0100 Subject: minishift: 1.32.0 -> 1.33.0 Signed-off-by: Vincent Demeester --- pkgs/applications/networking/cluster/minishift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 9515b6ce3d0..a8161ed3077 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.32.0"; + version = "1.33.0"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.15.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "06qhcycnr06fw5dmmzwizmknm0j34j43894nl3kxa5mxh8x542pa"; + sha256 = "0n3pj410bgjblv27p55piln0vi618mnyzzswcyfc2v73bfnzrydf"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; -- cgit 1.4.1 From ce5504bc7492269538a7ba4d3c78a39d43684878 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Mar 2019 11:09:37 +0100 Subject: hackage2nix: drop broken entry for hfsevents The package has its meta.platforms set up correctly already in cabal2nix's post-processing code. Fixes https://github.com/NixOS/nixpkgs/issues/58028. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8cd3b979906..ff9934cd632 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2474,7 +2474,6 @@ unsupported-platforms: gi-ostree: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux ] hcwiid: [ x86_64-darwin ] - hfsevents: [ x86_64-darwin ] HFuse: [ x86_64-darwin ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-fs: [ x86_64-darwin ] -- cgit 1.4.1 From 11318d1ba2d3a06dcffa9144042c1397eff4ac9e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 22 Mar 2019 11:16:15 +0100 Subject: elan: 0.7.4 -> 0.7.5 --- pkgs/applications/science/logic/elan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 693aaa53001..eddc4b9b208 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "elan-${version}"; - version = "0.7.4"; + version = "0.7.5"; cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0yf8mfgp4l78f5cjq1imh462axaa24jfhn69cgf7prw4jrmw3bch"; + sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From cd8a8bab4b70d0ff77c1ab84f8b64484865a5a63 Mon Sep 17 00:00:00 2001 From: Александр Бантьев Date: Fri, 22 Mar 2019 13:46:36 +0300 Subject: wmfs: init at 201902 --- pkgs/applications/window-managers/wmfs/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/window-managers/wmfs/default.nix diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix new file mode 100644 index 00000000000..d615b4fe010 --- /dev/null +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, gnumake, + libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: +stdenv.mkDerivation rec { + name = "wmfs-${version}"; + + version = "201902"; + + src = fetchFromGitHub { + owner = "xorg62"; + repo = "wmfs"; + sha256 = "sha256:1m7dsmmlhq2qipim659cp9aqlriz1cwrrgspl8baa5pncln0gd5c"; + rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2"; + }; + + nativeBuildInputs = [ + gnumake + ]; + + buildInputs = [ + imlib2 + libX11 + libXinerama + libXrandr + libXpm + libXft + ]; + + preConfigure = "substituteInPlace configure --replace '-lxft' '-lXft'"; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "XDG_CONFIG_DIR=${placeholder "out"}/etc/xdg" + "MANPREFIX=${placeholder "out"}/share/man" + ]; + + meta = with stdenv.lib; { + description = "Window manager from scratch"; + license = licenses.bsd2; + maintainers = [ maintainers.balsoft ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35a03a448c4..e3a11a68f29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17800,6 +17800,8 @@ in wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; + wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icewm = callPackage ../applications/window-managers/icewm {}; -- cgit 1.4.1 From 5cb066c9b910ea1f90ad28b9efd6f6e911e911e4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Mar 2019 12:12:48 +0100 Subject: gns3Packages.{server,gui}Stable: 2.1.14 -> 2.1.15 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 58335f1faad..a22b72b2f1b 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.14"; + stableVersion = "2.1.15"; previewVersion = "2.2.0a2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1k4g1sd9s6nc3rsc918chnkr515qik4hfd4z5lw065bp3lshf48b"; - serverSrcHash = "0npm9p52jk04g9cmflsfph4dkj6373mfyvd3hff1caqmjalnfxg4"; + guiSrcHash = "116wigkh5kwna00q200yv2wm8dpi4kmsns96iglzwrrl19fk538p"; + serverSrcHash = "1mqwydxn58v5ddpnsxvf6vgqwhrfm3mwjwf030lv83zmcjhx237q"; in { guiStable = mkGui { stable = true; -- cgit 1.4.1 From 11d204a9c4fa5b562b2588af9326d1ee2319481c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 22 Mar 2019 13:59:48 +0100 Subject: nixos docs: improve GPU driver documentation I'm not 100% sure about the incompatibility lines, but I believe it's better to discourage these anyway. If you find better information, feel free to amend... The 32-bit thing is completely GPU-agnostic, so I can't see why we had it separately for proprietary drivers and missing for the rest. --- nixos/doc/manual/configuration/x-windows.xml | 30 +++++++++++++--------------- nixos/modules/services/x11/xserver.nix | 7 ++++++- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index e7d66f391f5..3bcb288b5eb 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -35,8 +35,8 @@ NixOS’s default display manager (the program that - provides a graphical login prompt and manages the X server) is LightDM. You can - select an alternative one by picking one of the following lines: + provides a graphical login prompt and manages the X server) is LightDM. You + can select an alternative one by picking one of the following lines: = true; = true; @@ -59,9 +59,16 @@ # systemctl start display-manager.service + + + On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, + you should also set the following: + + = true; + - NVIDIA Graphics Cards + Proprietary NVIDIA drivers NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because @@ -71,6 +78,7 @@ Or if you have an older card, you may have to use one of the legacy drivers: + = [ "nvidiaLegacy390" ]; = [ "nvidiaLegacy340" ]; = [ "nvidiaLegacy304" ]; = [ "nvidiaLegacy173" ]; @@ -78,16 +86,9 @@ You may need to reboot after enabling this driver to prevent a clash with other kernel modules. - - On 64-bit systems, if you want full acceleration for 32-bit programs such as - Wine, you should also set the following: - - = true; - - - AMD Graphics Cards + Proprietary AMD drivers AMD provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because @@ -99,11 +100,8 @@ other kernel modules. - On 64-bit systems, if you want full acceleration for 32-bit programs such as - Wine, you should also set the following: - - = true; - + Note: for recent AMD GPUs you most likely want to keep either the defaults + or "amdgpu" (both free). diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index c4d5b6a9cde..e767b0eda31 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -246,7 +246,7 @@ in default = [ "ati" "cirrus" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" - "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" + "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" ]; # TODO(@oxij): think how to easily add the rest, like those nvidia things relatedPackages = concatLists @@ -259,6 +259,11 @@ in The names of the video drivers the configuration supports. They will be tried in order until one that supports your card is found. + Don't combine those with "incompatible" OpenGL implementations, + e.g. free ones (mesa-based) with proprietary ones. + + For unfree "nvidia*", the supported GPU lists are on + https://www.nvidia.com/object/unix.html ''; }; -- cgit 1.4.1 From 4c3ec0e32522bd6891418ba4d0e561a9b14c4cde Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 22 Mar 2019 14:44:11 +0100 Subject: nixos docs: run the formatting tool (no content change) As documented in the docs themselves :-) --- nixos/doc/manual/configuration/config-file.xml | 5 +- nixos/doc/manual/configuration/kubernetes.xml | 127 ++-- nixos/doc/manual/configuration/matrix.xml | 134 +++-- nixos/doc/manual/configuration/modularity.xml | 16 +- nixos/doc/manual/configuration/profiles.xml | 6 +- .../manual/configuration/profiles/all-hardware.xml | 9 +- nixos/doc/manual/configuration/profiles/base.xml | 12 +- .../manual/configuration/profiles/clone-config.xml | 10 +- nixos/doc/manual/configuration/profiles/demo.xml | 10 +- .../configuration/profiles/docker-container.xml | 11 +- .../manual/configuration/profiles/graphical.xml | 5 +- .../doc/manual/configuration/profiles/hardened.xml | 8 +- .../doc/manual/configuration/profiles/headless.xml | 7 +- .../configuration/profiles/installation-device.xml | 21 +- .../doc/manual/configuration/profiles/minimal.xml | 6 +- .../manual/configuration/profiles/qemu-guest.xml | 2 + nixos/doc/manual/configuration/wireless.xml | 8 +- .../installation/installing-virtualbox-guest.xml | 8 +- nixos/doc/manual/man-nixos-generate-config.xml | 6 +- nixos/doc/manual/man-nixos-rebuild.xml | 72 ++- nixos/doc/manual/release-notes/rl-1809.xml | 3 +- nixos/doc/manual/release-notes/rl-1903.xml | 643 +++++++++++---------- nixos/doc/manual/release-notes/rl-1909.xml | 19 +- nixos/modules/programs/zsh/oh-my-zsh.xml | 6 +- nixos/modules/services/web-apps/matomo-doc.xml | 33 +- nixos/modules/services/web-apps/nextcloud.xml | 82 +-- nixos/tests/common/webroot/news-rss.xml | 26 +- 27 files changed, 685 insertions(+), 610 deletions(-) diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index c77cfe137ba..eadafb94b8f 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -200,8 +200,9 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; = pkgs.postgresql_10; The latter option definition changes the default PostgreSQL package used - by NixOS’s PostgreSQL service to 10.x. For more information on packages, - including how to add new ones, see . + by NixOS’s PostgreSQL service to 10.x. For more information on + packages, including how to add new ones, see + . diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixos/doc/manual/configuration/kubernetes.xml index ddc026c0c01..54a100e4479 100644 --- a/nixos/doc/manual/configuration/kubernetes.xml +++ b/nixos/doc/manual/configuration/kubernetes.xml @@ -4,15 +4,13 @@ version="5.0" xml:id="sec-kubernetes"> Kubernetes - - The NixOS Kubernetes module is a collective term for a handful of - individual submodules implementing the Kubernetes cluster components. + The NixOS Kubernetes module is a collective term for a handful of individual + submodules implementing the Kubernetes cluster components. - - There are generally two ways of enabling Kubernetes on NixOS. - One way is to enable and configure cluster components appropriately by hand: + There are generally two ways of enabling Kubernetes on NixOS. One way is to + enable and configure cluster components appropriately by hand: services.kubernetes = { apiserver.enable = true; @@ -33,95 +31,82 @@ services.kubernetes = { = [ "node" ]; - Assigning both the master and node roles is usable if you want a single - node Kubernetes cluster for dev or testing purposes: + Assigning both the master and node roles is usable if you want a single node + Kubernetes cluster for dev or testing purposes: = [ "master" "node" ]; Note: Assigning either role will also default both and - to true. - This sets up flannel as CNI and activates automatic PKI bootstrapping. + to true. This sets up + flannel as CNI and activates automatic PKI bootstrapping. - - As of kubernetes 1.10.X it has been deprecated to open - non-tls-enabled ports on kubernetes components. Thus, from NixOS 19.03 all - plain HTTP ports have been disabled by default. - While opening insecure ports is still possible, it is recommended not to - bind these to other interfaces than loopback. - - To re-enable the insecure port on the apiserver, see options: - - and - + As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports + on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have + been disabled by default. While opening insecure ports is still possible, it + is recommended not to bind these to other interfaces than loopback. To + re-enable the insecure port on the apiserver, see options: + and + - As of NixOS 19.03, it is mandatory to configure: - . - The masterAddress must be resolveable and routeable by all cluster nodes. - In single node clusters, this can be set to localhost. + . The masterAddress + must be resolveable and routeable by all cluster nodes. In single node + clusters, this can be set to localhost. - - Role-based access control (RBAC) authorization mode is enabled by default. - This means that anonymous requests to the apiserver secure port will - expectedly cause a permission denied error. All cluster components must - therefore be configured with x509 certificates for two-way tls communication. - The x509 certificate subject section determines the roles and permissions - granted by the apiserver to perform clusterwide or namespaced operations. - See also: - - Using RBAC Authorization. + Using RBAC Authorization. - - - The NixOS kubernetes module provides an option for automatic certificate - bootstrapping and configuration, - . - The PKI bootstrapping process involves setting up a certificate authority - (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert - for the cluster, and uses the CA-cert for signing subordinate certs issued to - each of the cluster components. Subsequently, the certmgr daemon monitors - active certificates and renews them when needed. For single node Kubernetes - clusters, setting = true - is sufficient and no further action is required. For joining extra node - machines to an existing cluster on the other hand, establishing initial trust - is mandatory. + + The NixOS kubernetes module provides an option for automatic certificate + bootstrapping and configuration, + . The PKI bootstrapping + process involves setting up a certificate authority (CA) daemon (cfssl) on + the kubernetes master node. cfssl generates a CA-cert for the cluster, and + uses the CA-cert for signing subordinate certs issued to each of the cluster + components. Subsequently, the certmgr daemon monitors active certificates and + renews them when needed. For single node Kubernetes clusters, setting + = true is sufficient and + no further action is required. For joining extra node machines to an existing + cluster on the other hand, establishing initial trust is mandatory. - - To add new nodes to the cluster: - On any (non-master) cluster node where - is enabled, the helper - script nixos-kubernetes-node-join is available on PATH. - Given a token on stdin, it will copy the token to the kubernetes - secrets directory and restart the certmgr service. As requested - certificates are issued, the script will restart kubernetes cluster - components as needed for them to pick up new keypairs. + To add new nodes to the cluster: On any (non-master) cluster node where + is enabled, the helper + script nixos-kubernetes-node-join is available on PATH. + Given a token on stdin, it will copy the token to the kubernetes secrets + directory and restart the certmgr service. As requested certificates are + issued, the script will restart kubernetes cluster components as needed for + them to pick up new keypairs. - Multi-master (HA) clusters are not supported by the easyCerts module. - - In order to interact with an RBAC-enabled cluster as an administrator, one - needs to have cluster-admin privileges. By default, when easyCerts is - enabled, a cluster-admin kubeconfig file is generated and linked into - /etc/kubernetes/cluster-admin.kubeconfig as determined by - . - export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig - will make kubectl use this kubeconfig to access and authenticate the cluster. - The cluster-admin kubeconfig references an auto-generated keypair owned by - root. Thus, only root on the kubernetes master may obtain cluster-admin - rights by means of this file. + In order to interact with an RBAC-enabled cluster as an administrator, one + needs to have cluster-admin privileges. By default, when easyCerts is + enabled, a cluster-admin kubeconfig file is generated and linked into + /etc/kubernetes/cluster-admin.kubeconfig as determined by + . + export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig + will make kubectl use this kubeconfig to access and authenticate the cluster. + The cluster-admin kubeconfig references an auto-generated keypair owned by + root. Thus, only root on the kubernetes master may obtain cluster-admin + rights by means of this file. - diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml index a9a5d6de1f1..66965460a15 100644 --- a/nixos/doc/manual/configuration/matrix.xml +++ b/nixos/doc/manual/configuration/matrix.xml @@ -5,31 +5,34 @@ xml:id="module-services-matrix"> Matrix - Matrix - is an open standard for interoperable, decentralised, real-time communication over IP. - It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - - or anywhere you need a standard HTTP API for publishing and subscribing to data whilst tracking the conversation history. + Matrix is an open standard for + interoperable, decentralised, real-time communication over IP. It can be used + to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things + communication - or anywhere you need a standard HTTP API for publishing and + subscribing to data whilst tracking the conversation history. - This chapter will show you how to set up your own, self-hosted Matrix homeserver using the Synapse reference homeserver, - and how to serve your own copy of the Riot web client. - See the Try Matrix Now! - overview page for links to Riot Apps for Android and iOS, desktop clients, - as well as bridges to other networks and other projects around Matrix. + This chapter will show you how to set up your own, self-hosted Matrix + homeserver using the Synapse reference homeserver, and how to serve your own + copy of the Riot web client. See the + Try + Matrix Now! overview page for links to Riot Apps for Android and iOS, + desktop clients, as well as bridges to other networks and other projects + around Matrix. -
Synapse Homeserver + - Synapse - is the reference homeserver implementation of Matrix from the core development team at matrix.org. - The following configuration example will set up a synapse server for the example.org - domain, served from the host myhostname.example.org. - For more information, please refer to the + Synapse is + the reference homeserver implementation of Matrix from the core development + team at matrix.org. The following configuration example will set up a + synapse server for the example.org domain, served from + the host myhostname.example.org. For more information, + please refer to the - installation instructions of Synapse - . - + installation instructions of Synapse . + let fqdn = let @@ -116,28 +119,29 @@ }; + - If the A and AAAA DNS records on example.org - do not point on the same host as the records for myhostname.example.org, - you can easily move the /.well-known virtualHost section of the code - to the host that is serving example.org, - while the rest stays on myhostname.example.org - with no other changes required. - This pattern also allows to seamlessly move the homeserver from myhostname.example.org - to myotherhost.example.org by only changing the /.well-known redirection target. + If the A and AAAA DNS records on + example.org do not point on the same host as the records + for myhostname.example.org, you can easily move the + /.well-known virtualHost section of the code to the host that + is serving example.org, while the rest stays on + myhostname.example.org with no other changes required. + This pattern also allows to seamlessly move the homeserver from + myhostname.example.org to + myotherhost.example.org by only changing the + /.well-known redirection target. - If you want to run a server with public registration by anybody, - you can then enable - . - Otherwise, or you can generate a registration secret with pwgen -s 64 1 - and set it with - . - To create a new user or admin, - run the following after you have set the secret and have rebuilt NixOS: - - + If you want to run a server with public registration by anybody, you can + then enable . Otherwise, or you can generate a registration secret with + pwgen -s 64 1 and set it with + . To + create a new user or admin, run the following after you have set the secret + and have rebuilt NixOS: + $ nix run nixpkgs.matrix-synapse $ register_new_matrix_user -k <your-registration-shared-secret> http://localhost:8008 New user localpart: <your-username> @@ -147,31 +151,32 @@ Success! In the example, this would create a user with the Matrix Identifier - @your-username:example.org. - Note that the registration secret ends up in the nix store and therefore is world-readable - by any user on your machine, so it makes sense to only temporarily activate the - option until a better solution for NixOS is in place. + @your-username:example.org. Note that the registration + secret ends up in the nix store and therefore is world-readable by any user + on your machine, so it makes sense to only temporarily activate the + option until a better solution + for NixOS is in place.
-
Riot Web Client - - Riot Web - is the reference web client for Matrix and developed by the core team at matrix.org. - The following snippet can be optionally added to the code before to complete the synapse - installation with a web client served at - https://riot.myhostname.example.org and https://riot.example.org. - Alternatively, you can use the hosted copy at - https://riot.im/app, - or use other web clients or native client applications. - Due to the /.well-known urls set up done above, - many clients should fill in the required connection details automatically - when you enter your Matrix Identifier. - See Try Matrix Now! - for a list of existing clients and their supported featureset. - + + Riot Web is + the reference web client for Matrix and developed by the core team at + matrix.org. The following snippet can be optionally added to the code before + to complete the synapse installation with a web client served at + https://riot.myhostname.example.org and + https://riot.example.org. Alternatively, you can use the hosted + copy at https://riot.im/app, + or use other web clients or native client applications. Due to the + /.well-known urls set up done above, many clients should + fill in the required connection details automatically when you enter your + Matrix Identifier. See + Try + Matrix Now! for a list of existing clients and their supported + featureset. + services.nginx.virtualHosts."riot.${fqdn}" = { enableACME = true; forceSSL = true; @@ -183,15 +188,16 @@ }; + - Note that the Riot developers do not recommend running Riot and your Matrix homeserver - on the same fully-qualified domain name for security reasons. - In the example, this means that you should not reuse the myhostname.example.org - virtualHost to also serve Riot, but instead serve it on a different subdomain, - like riot.example.org in the example. - See the - Riot Important Security Notes - for more information on this subject. + Note that the Riot developers do not recommend running Riot and your Matrix + homeserver on the same fully-qualified domain name for security reasons. In + the example, this means that you should not reuse the + myhostname.example.org virtualHost to also serve Riot, + but instead serve it on a different subdomain, like + riot.example.org in the example. See the + Riot + Important Security Notes for more information on this subject.
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 5ff5bc22c85..724abd31ca4 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -112,9 +112,8 @@ true $ nixos-option [ "tun" "ipv6" "loop" ... ] - Interactive exploration of the configuration is possible using - nix repl, a read-eval-print loop for Nix expressions. - A typical use: + Interactive exploration of the configuration is possible using nix + repl, a read-eval-print loop for Nix expressions. A typical use: $ nix repl '<nixpkgs/nixos>' @@ -127,11 +126,10 @@ nix-repl> map (x: x.hostName) config. - +
diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml index 92c0f6202f2..c0a8f55785f 100644 --- a/nixos/doc/manual/configuration/profiles.xml +++ b/nixos/doc/manual/configuration/profiles.xml @@ -12,14 +12,14 @@ That is to say, expected usage is to add them to the imports list of your /etc/configuration.nix as such: - + imports = [ <nixpkgs/nixos/modules/profiles/profile-name.nix> ]; - Even if some of these profiles seem only useful in the context of - install media, many are actually intended to be used in real installs. + Even if some of these profiles seem only useful in the context of install + media, many are actually intended to be used in real installs. What follows is a brief explanation on the purpose and use-case for each diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixos/doc/manual/configuration/profiles/all-hardware.xml index 17297519947..2936f71069d 100644 --- a/nixos/doc/manual/configuration/profiles/all-hardware.xml +++ b/nixos/doc/manual/configuration/profiles/all-hardware.xml @@ -1,15 +1,16 @@ -
All Hardware + - Enables all hardware supported by NixOS: i.e., all firmware is - included, and all devices from which one may boot are enabled in the initrd. - Its primary use is in the NixOS installation CDs. + Enables all hardware supported by NixOS: i.e., all firmware is included, and + all devices from which one may boot are enabled in the initrd. Its primary + use is in the NixOS installation CDs. + The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixos/doc/manual/configuration/profiles/base.xml index f58a35d626e..b75f6ba25b4 100644 --- a/nixos/doc/manual/configuration/profiles/base.xml +++ b/nixos/doc/manual/configuration/profiles/base.xml @@ -1,15 +1,15 @@ -
Base + - Defines the software packages included in the "minimal" - installation CD. It installs several utilities useful in a simple recovery or - install media, such as a text-mode web browser, and tools for manipulating - block devices, networking, hardware diagnostics, and filesystems (with their - respective kernel modules). + Defines the software packages included in the "minimal" installation CD. It + installs several utilities useful in a simple recovery or install media, such + as a text-mode web browser, and tools for manipulating block devices, + networking, hardware diagnostics, and filesystems (with their respective + kernel modules).
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml index 87c8b9ee31b..234835845e2 100644 --- a/nixos/doc/manual/configuration/profiles/clone-config.xml +++ b/nixos/doc/manual/configuration/profiles/clone-config.xml @@ -1,14 +1,14 @@ -
Clone Config + - This profile is used in installer images. - It provides an editable configuration.nix that imports all the modules that - were also used when creating the image in the first place. - As a result it allows users to edit and rebuild the live-system. + This profile is used in installer images. It provides an editable + configuration.nix that imports all the modules that were also used when + creating the image in the first place. As a result it allows users to edit + and rebuild the live-system.
diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixos/doc/manual/configuration/profiles/demo.xml index 98829e4696d..395a5ec357c 100644 --- a/nixos/doc/manual/configuration/profiles/demo.xml +++ b/nixos/doc/manual/configuration/profiles/demo.xml @@ -1,13 +1,15 @@ -
Demo + - This profile just enables a demo user, with password demo, uid 1000, wheel - group and - autologin in the SDDM display manager. + This profile just enables a demo + user, with password demo, uid 1000, + wheel group and + autologin + in the SDDM display manager.
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixos/doc/manual/configuration/profiles/docker-container.xml index bf962442cce..efa7b8f24c4 100644 --- a/nixos/doc/manual/configuration/profiles/docker-container.xml +++ b/nixos/doc/manual/configuration/profiles/docker-container.xml @@ -1,15 +1,16 @@ -
Docker Container + This is the profile from which the Docker images are generated. It prepares a - working system by importing the Minimal and - Clone Config profiles, and setting appropriate - configuration options that are useful inside a container context, like - . + working system by importing the + Minimal and + Clone Config profiles, and + setting appropriate configuration options that are useful inside a container + context, like .
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml index 5ded61d9763..73e3abc59d0 100644 --- a/nixos/doc/manual/configuration/profiles/graphical.xml +++ b/nixos/doc/manual/configuration/profiles/graphical.xml @@ -1,20 +1,21 @@ -
Graphical + Defines a NixOS configuration with the Plasma 5 desktop. It's used by the graphical installation CD. + It sets , , ( - without Qt4 Support), and + without Qt4 Support), and to true. It also includes glxinfo and firefox in the system packages list. diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixos/doc/manual/configuration/profiles/hardened.xml index b3b433792f5..dc83fc837e2 100644 --- a/nixos/doc/manual/configuration/profiles/hardened.xml +++ b/nixos/doc/manual/configuration/profiles/hardened.xml @@ -1,22 +1,24 @@ -
Hardened + A profile with most (vanilla) hardening options enabled by default, potentially at the cost of features and performance. + This includes a hardened kernel, and limiting the system information available to processes through the /sys and /proc filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via - ). See the ). See the + - profile source for further detail on which settings are altered. + profile source for further detail on which settings are altered.
diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixos/doc/manual/configuration/profiles/headless.xml index 54dc61f236e..1b64497ebf7 100644 --- a/nixos/doc/manual/configuration/profiles/headless.xml +++ b/nixos/doc/manual/configuration/profiles/headless.xml @@ -1,18 +1,19 @@ -
Headless + Common configuration for headless machines (e.g., Amazon EC2 instances). + Disables sound, vesa, serial consoles, emergency mode, - grub splash images and - configures the kernel to reboot automatically on panic. + grub splash images + and configures the kernel to reboot automatically on panic.
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml index 44ccfc538ad..3dcdf403d89 100644 --- a/nixos/doc/manual/configuration/profiles/installation-device.xml +++ b/nixos/doc/manual/configuration/profiles/installation-device.xml @@ -1,31 +1,34 @@ -
Installation Device + Provides a basic configuration for installation devices like CDs. This means enabling hardware scans, using the - Clone Config profile to guarantee + Clone Config profile to guarantee /etc/nixos/configuration.nix exists (for nixos-rebuild to work), a copy of the Nixpkgs channel snapshot used to create the install media. + Additionally, documentation for - Nixpkgs and NixOS - are forcefully enabled (to override the - Minimal profile preference); the - NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled. - Autologin is enabled as root. + Nixpkgs and NixOS + are forcefully enabled (to override the + Minimal profile preference); the + NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled. + Autologin is enabled as root. + - A message is shown to the user to start a display manager if needed, - ssh with are enabled (but + A message is shown to the user to start a display manager if needed, ssh with + are enabled (but doesn't autostart). WPA Supplicant is also enabled without autostart. + Finally, vim is installed, root is set to not have a password, the kernel is made more silent for remote public IP installs, and several settings are diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixos/doc/manual/configuration/profiles/minimal.xml index a24af21bd7f..179f2d0be64 100644 --- a/nixos/doc/manual/configuration/profiles/minimal.xml +++ b/nixos/doc/manual/configuration/profiles/minimal.xml @@ -1,16 +1,16 @@ -
Minimal + This profile defines a small NixOS configuration. It does not contain any graphical stuff. It's a very short file that enables noXlibs, sets - i18n.supportedLocales - to only support the user-selected locale, + i18n.supportedLocales to + only support the user-selected locale, disables packages' documentation , and disables sound. diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml index d08068650fb..5d055c45d2d 100644 --- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml +++ b/nixos/doc/manual/configuration/profiles/qemu-guest.xml @@ -4,10 +4,12 @@ version="5.0" xml:id="sec-profile-qemu-guest"> QEMU Guest + This profile contains common configuration for virtual machines running under QEMU (using virtio). + It makes virtio modules available on the initrd, sets the system time from the hardware clock to work around a bug in qemu-kvm, and diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 96b0a44f840..7c7b3b4a65a 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -28,11 +28,9 @@ Be aware that keys will be written to the nix store in plaintext! When no networks are set, it will default to using a configuration file at /etc/wpa_supplicant.conf. You should edit this file - yourself to define wireless networks, WPA keys and so on (see - - wpa_supplicant.conf - 5 - ). + yourself to define wireless networks, WPA keys and so on (see + wpa_supplicant.conf + 5 ). diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 766785dfe07..5c86eacfbf4 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -77,10 +77,10 @@ Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the - /etc/nixos/configuration.nix to auto-mount them. If you - do not add "nofail", the system will no boot properly. - The same goes for disabling rngd which is normally used - to get randomness but this does not work in virtual machines. + /etc/nixos/configuration.nix to auto-mount them. If you do + not add "nofail", the system will no boot properly. The + same goes for disabling rngd which is normally used to get + randomness but this does not work in virtual machines. diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 43d6c2696a2..160ada9fff3 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -13,18 +13,18 @@ - nixos-generate-config + nixos-generate-config - + root - + diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 654b5f4b284..0b0c0b8f6ea 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -13,39 +13,39 @@ - nixos-rebuild + nixos-rebuild - + - + - + - + - + - + - + - + @@ -54,33 +54,33 @@ - + - + - + - + + - - builder-spec + builder-spec - + - + @@ -198,7 +198,7 @@ $ nix-build /path/to/nixpkgs/nixos -A system - Opens configuration.nix in the default editor. + Opens configuration.nix in the default editor. @@ -334,25 +334,23 @@ $ ./result/bin/run-*-vm - - - builder-spec - - - - Allow ad-hoc remote builders for building the new system. - This requires the user executing nixos-rebuild (usually - root) to be configured as a trusted user in the Nix daemon. This can be - achieved by using the nix.trustedUsers NixOS option. - Examples values for that option are described in the - Remote builds chapter in the Nix manual, - (i.e. --builders "ssh://bigbrother x86_64-linux"). - By specifying an empty string existing builders specified in - /etc/nix/machines can be ignored: - --builders "" for example when they are not - reachable due to network connectivity. - - + + builder-spec + + + + Allow ad-hoc remote builders for building the new system. This requires + the user executing nixos-rebuild (usually root) to be + configured as a trusted user in the Nix daemon. This can be achieved by + using the nix.trustedUsers NixOS option. Examples + values for that option are described in the Remote builds + chapter in the Nix manual, (i.e. --builders + "ssh://bigbrother x86_64-linux"). By specifying an empty string + existing builders specified in /etc/nix/machines can + be ignored: --builders "" for example when they are + not reachable due to network connectivity. + + diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 8715a05f508..3f10b26223d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -639,7 +639,8 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - Groups kvm and render are introduced now, as systemd requires them. + Groups kvm and render are introduced + now, as systemd requires them. diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 3871d54c59c..7d40637df93 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -20,25 +20,27 @@ - The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6. + The default Python 3 interpreter is now CPython 3.7 instead of CPython + 3.6. - Added the Pantheon desktop environment. - It can be enabled through services.xserver.desktopManager.pantheon.enable. + Added the Pantheon desktop environment. It can be enabled through + services.xserver.desktopManager.pantheon.enable. - services.xserver.desktopManager.pantheon default enables lightdm - as a display manager and using Pantheon's greeter. + services.xserver.desktopManager.pantheon default + enables lightdm as a display manager and using Pantheon's greeter. - This is because of limitations with the screenlocking implementation, whereas the - screenlocker would be non-functional without it. + This is because of limitations with the screenlocking implementation, + whereas the screenlocker would be non-functional without it. - Because of that it is recommended to retain this precaution, however if you'd like to change this set: + Because of that it is recommended to retain this precaution, however if + you'd like to change this set: @@ -52,17 +54,19 @@ - to false and enable your preferred display manager. + + to false and enable your preferred display manager. + - - A major refactoring of the Kubernetes module has been completed. - Refactorings primarily focus on decoupling components and enhancing - security. Two-way TLS and RBAC has been enabled by default for all - components, which slightly changes the way the module is configured. - See: for details. - + + A major refactoring of the Kubernetes module has been completed. + Refactorings primarily focus on decoupling components and enhancing + security. Two-way TLS and RBAC has been enabled by default for all + components, which slightly changes the way the module is configured. See: + for details. +
@@ -87,10 +91,11 @@ There is a new security.googleOsLogin module for using - OS Login - to manage SSH access to Google Compute Engine instances, which supersedes - the imperative and broken google-accounts-daemon used - in nixos/modules/virtualisation/google-compute-config.nix. + OS + Login to manage SSH access to Google Compute Engine instances, + which supersedes the imperative and broken + google-accounts-daemon used in + nixos/modules/virtualisation/google-compute-config.nix. @@ -101,8 +106,9 @@ There is a new services.cockroachdb module for running - CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available - on x86_64-linux and aarch64-linux. + CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, + available on x86_64-linux and + aarch64-linux. @@ -110,15 +116,15 @@ - ./security/duosec.nix + ./security/duosec.nix The PAM module for Duo - Security has been enabled for use. One can configure it using - the options along with the - corresponding PAM option in + Security has been enabled for use. One can configure it using the + options along with the corresponding PAM + option in . @@ -184,36 +190,37 @@ - The buildPythonPackage function now sets strictDeps = true - to help distinguish between native and non-native dependencies in order to - improve cross-compilation compatibility. Note however that this may break - user expressions. + The buildPythonPackage function now sets + strictDeps = true to help distinguish between native + and non-native dependencies in order to improve cross-compilation + compatibility. Note however that this may break user expressions. - The buildPythonPackage function now sets LANG = C.UTF-8 - to enable Unicode support. The glibcLocales package is no longer needed as a build input. + The buildPythonPackage function now sets LANG + = C.UTF-8 to enable Unicode support. The + glibcLocales package is no longer needed as a build + input. - The Syncthing state and configuration data has been moved from - services.syncthing.dataDir to the newly defined - services.syncthing.configDir, which default to - /var/lib/syncthing/.config/syncthing. - This change makes possible to share synced directories using ACLs - without Syncthing resetting the permission on every start. + The Syncthing state and configuration data has been moved from + services.syncthing.dataDir to the newly defined + services.syncthing.configDir, which default to + /var/lib/syncthing/.config/syncthing. This change makes + possible to share synced directories using ACLs without Syncthing + resetting the permission on every start. - The ntp module now has sane default restrictions. - If you're relying on the previous defaults, which permitted all queries - and commands from all firewall-permitted sources, you can set - services.ntp.restrictDefault and - services.ntp.restrictSource to - []. + The ntp module now has sane default restrictions. If + you're relying on the previous defaults, which permitted all queries and + commands from all firewall-permitted sources, you can set + services.ntp.restrictDefault and + services.ntp.restrictSource to []. @@ -241,17 +248,21 @@ - Options - services.znc.confOptions.networks.name.userName and - services.znc.confOptions.networks.name.modulePackages - were removed. They were never used for anything and can therefore safely be removed. + Options + services.znc.confOptions.networks.name.userName + and + services.znc.confOptions.networks.name.modulePackages + were removed. They were never used for anything and can therefore safely + be removed. - Package wasm has been renamed proglodyte-wasm. The package - wasm will be pointed to ocamlPackages.wasm in 19.09, so - make sure to update your configuration if you want to keep proglodyte-wasm + Package wasm has been renamed + proglodyte-wasm. The package wasm + will be pointed to ocamlPackages.wasm in 19.09, so make + sure to update your configuration if you want to keep + proglodyte-wasm @@ -279,37 +290,41 @@ - Package consul-ui and passthrough consul.ui have been removed. - The package consul now uses upstream releases that vendor the UI into the binary. - See #48714 + Package consul-ui and passthrough + consul.ui have been removed. The package + consul now uses upstream releases that vendor the UI + into the binary. See + #48714 for details. - Slurm introduces the new option - services.slurm.stateSaveLocation, - which is now set to /var/spool/slurm by default - (instead of /var/spool). - Make sure to move all files to the new directory or to set the option accordingly. + Slurm introduces the new option + services.slurm.stateSaveLocation, which is now set to + /var/spool/slurm by default (instead of + /var/spool). Make sure to move all files to the new + directory or to set the option accordingly. - The slurmctld now runs as user slurm instead of root. - If you want to keep slurmctld running as root, set - services.slurm.user = root. + The slurmctld now runs as user slurm instead of + root. If you want to keep slurmctld running as + root, set services.slurm.user = + root. - The options services.slurm.nodeName and - services.slurm.partitionName are now sets of - strings to correctly reflect that fact that each of these - options can occour more than once in the configuration. + The options services.slurm.nodeName and + services.slurm.partitionName are now sets of strings to + correctly reflect that fact that each of these options can occour more + than once in the configuration. - The solr package has been upgraded from 4.10.3 to 7.5.0 and has undergone - some major changes. The services.solr module has been updated to reflect - these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading. + The solr package has been upgraded from 4.10.3 to 7.5.0 + and has undergone some major changes. The services.solr + module has been updated to reflect these changes. Please review + http://lucene.apache.org/solr/ carefully before upgrading. @@ -321,46 +336,49 @@ - The option services.xserver.displayManager.job.logToFile which was + The option + services.xserver.displayManager.job.logToFile which was previously set to true when using the display managers - lightdm, sddm or xpra has been - reset to the default value (false). + lightdm, sddm or + xpra has been reset to the default value + (false). Network interface indiscriminate NixOS firewall options - (networking.firewall.allow*) are now preserved when also - setting interface specific rules such as networking.firewall.interfaces.en0.allow*. - These rules continue to use the pseudo device "default" - (networking.firewall.interfaces.default.*), and assigning - to this pseudo device will override the (networking.firewall.allow*) - options. - - - - + (networking.firewall.allow*) are now preserved when + also setting interface specific rules such as + networking.firewall.interfaces.en0.allow*. These rules + continue to use the pseudo device "default" + (networking.firewall.interfaces.default.*), and + assigning to this pseudo device will override the + (networking.firewall.allow*) options. + + + + The nscd service now disables all caching of passwd and group databases by default. This was interferring with the correct functioning of the libnss_systemd.so module which is used by systemd to manage uids and usernames in the presence of - DynamicUser= in systemd services. This was already the + DynamicUser= in systemd services. This was already the default behaviour in presence of services.sssd.enable = - true because nscd caching would interfere with - sssd in unpredictable ways as well. Because we're - using nscd not for caching, but for convincing glibc to find NSS modules - in the nix store instead of an absolute path, we have decided to disable - caching globally now, as it's usually not the behaviour the user wants and - can lead to surprising behaviour. Furthermore, negative caching of host + true because nscd caching would interfere with + sssd in unpredictable ways as well. Because we're using + nscd not for caching, but for convincing glibc to find NSS modules in the + nix store instead of an absolute path, we have decided to disable caching + globally now, as it's usually not the behaviour the user wants and can + lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. - - - If the old behaviour is desired, this can be restored by setting - the services.nscd.config option - with the desired caching parameters. - + + + If the old behaviour is desired, this can be restored by setting the + services.nscd.config option with the desired caching + parameters. + services.nscd.config = '' server-user nscd @@ -393,97 +411,109 @@ shared hosts yes ''; - See #50316 + See + #50316 for details. - - - - + + + + GitLab Shell previously used the nix store paths for the gitlab-shell command in its authorized_keys file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each - startup. As gitlab-shell has now been changed to use + startup. As gitlab-shell has now been changed to use /var/run/current-system/sw/bin/gitlab-shell, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the authorized_keys file via sudo -u git -H gitlab-rake gitlab:shell:setup in that case. - - - - + + + + The pam_unix account module is now loaded with its control field set to required instead of sufficient, so that later PAM account modules that - might do more extensive checks are being executed. - Previously, the whole account module verification was exited prematurely - in case a nss module provided the account name to - pam_unix. - The LDAP and SSSD NixOS modules already add their NSS modules when - enabled. In case your setup breaks due to some later PAM account module - previosuly shadowed, or failing NSS lookups, please file a bug. You can - get back the old behaviour by manually setting - .text]]>. - - - - + might do more extensive checks are being executed. Previously, the whole + account module verification was exited prematurely in case a nss module + provided the account name to pam_unix. The LDAP and + SSSD NixOS modules already add their NSS modules when enabled. In case + your setup breaks due to some later PAM account module previosuly + shadowed, or failing NSS lookups, please file a bug. You can get back the + old behaviour by manually setting +.text]]> + . + + + + The pam_unix password module is now loaded with its control field set to sufficient instead of - required, so that password managed only - by later PAM password modules are being executed. - Previously, for example, changing an LDAP account's password through PAM - was not possible: the whole password module verification - was exited prematurely by pam_unix, - preventing pam_ldap to manage the password as it should. - - - - - fish has been upgraded to 3.0. - It comes with a number of improvements and backwards incompatible changes. - See the fish release notes for more information. - - - - - The ibus-table input method has had a change in config format, which - causes all previous settings to be lost. See - this commit message - for details. - - - - - NixOS module system type types.optionSet and - lib.mkOption argument options are deprecated. - Use types.submodule instead. - (#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). - The new manual chapter on Matrix contains a working example of using nginx as a reverse proxy - in front of matrix-synapse, using Let's Encrypt certificates. - - + required, so that password managed only by later PAM + password modules are being executed. Previously, for example, changing an + LDAP account's password through PAM was not possible: the whole password + module verification was exited prematurely by pam_unix, + preventing pam_ldap to manage the password as it + should. + + + + + fish has been upgraded to 3.0. It comes with a number + of improvements and backwards incompatible changes. See the + fish + release + notes for more information. + + + + + The ibus-table input method has had a change in config format, which + causes all previous settings to be lost. See + this + commit message for details. + + + + + NixOS module system type types.optionSet and + lib.mkOption argument options are + deprecated. Use types.submodule instead. + (#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). The new manual + chapter on Matrix contains a working example of using nginx as a + reverse proxy in front of matrix-synapse, using Let's + Encrypt certificates. + + 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. + the sendmailPath argument, having lost its main use, + has been removed. - graylog has been upgraded from version 2.* to 3.*. Some setups making use of extraConfig (especially those exposing Graylog via reverse proxies) need to be updated as upstream removed/replaced some settings. See Upgrading Graylog for details. + graylog has been upgraded from version 2.* to 3.*. Some + setups making use of extraConfig (especially those exposing Graylog via + reverse proxies) need to be updated as upstream removed/replaced some + settings. See + Upgrading + Graylog for details. @@ -500,206 +530,219 @@ The module gained the option - which determines the used - Matomo version. + which determines the used Matomo + version. - The Matomo module now also comes with the systemd service matomo-archive-processing.service - and a timer that automatically triggers archive processing every hour. - This means that you can safely + The Matomo module now also comes with the systemd service + matomo-archive-processing.service and a timer that + automatically triggers archive processing every hour. This means that you + can safely - disable browser triggers for Matomo archiving - at Administration > System > General Settings. + disable browser triggers for Matomo archiving at + Administration > System > General Settings. Additionally, you can enable to - delete old visitor logs - at Administration > System > Privacy, - but make sure that you run systemctl start matomo-archive-processing.service - at least once without errors if you have already collected data before, - so that the reports get archived before the source data gets deleted. + delete old visitor logs at Administration > System > + Privacy, but make sure that you run systemctl start + matomo-archive-processing.service at least once without errors + if you have already collected data before, so that the reports get + archived before the source data gets deleted. - composableDerivation along with supporting library functions - has been removed. + composableDerivation along with supporting library + functions has been removed. - The deprecated truecrypt package has been removed - and truecrypt attribute is now an alias for + The deprecated truecrypt package has been removed and + truecrypt attribute is now an alias for veracrypt. VeraCrypt is backward-compatible with - TrueCrypt volumes. Note that cryptsetup also - supports loading TrueCrypt volumes. + TrueCrypt volumes. Note that cryptsetup also supports + loading TrueCrypt volumes. - The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. - This change is made in accordance with Kubernetes making CoreDNS the official default - starting from - Kubernetes v1.11. - Please beware that upgrading DNS-addon on existing clusters might induce - minor downtime while the DNS-addon terminates and re-initializes. - Also note that the DNS-service now runs with 2 pod replicas by default. - The desired number of replicas can be configured using: - . + The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This + change is made in accordance with Kubernetes making CoreDNS the official + default starting from + Kubernetes + v1.11. Please beware that upgrading DNS-addon on existing clusters + might induce minor downtime while the DNS-addon terminates and + re-initializes. Also note that the DNS-service now runs with 2 pod + replicas by default. The desired number of replicas can be configured + using: . - - The quassel-webserver package and module was removed from nixpkgs due to the lack - of maintainers. - + + The quassel-webserver package and module was removed from nixpkgs due to + the lack of maintainers. + - The manual gained a - - new chapter on self-hosting matrix-synapse and riot-web - , the most prevalent server and client implementations for the - Matrix federated communication network. + The manual gained a new chapter on + self-hosting matrix-synapse and + riot-web , the most prevalent server and client + implementations for the + Matrix federated + communication network. - - The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore. - + + 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 - easier integration with the logrotate service. - + + The httpd service now saves log files with a .log file extension by + default for easier integration with the logrotate service. + - - The owncloud server packages and httpd subservice module were removed - from nixpkgs due to the lack of maintainers. - + + The owncloud server packages and httpd subservice module were removed from + nixpkgs due to the lack of maintainers. + - - It is possible now to uze ZRAM devices as general purpose ephemeral block devices, - not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, - but is still possible by setting zramSwap.swapDevices explicitly. - - - ZRAM algorithm can be changed now. - - - Changes to ZRAM algorithm are applied during nixos-rebuild switch, - so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, - use nixos-rebuild boot; reboot. - + + It is possible now to uze ZRAM devices as general purpose ephemeral block + devices, not only as swap. Using more than 1 device as ZRAM swap is no + longer recommended, but is still possible by setting + zramSwap.swapDevices explicitly. + + + ZRAM algorithm can be changed now. + + + Changes to ZRAM algorithm are applied during nixos-rebuild + switch, so make sure you have enough swap space on disk to + survive ZRAM device rebuild. Alternatively, use nixos-rebuild + boot; reboot. + - Flat volumes are now disabled by default in hardware.pulseaudio. - This has been done to prevent applications, which are unaware of this feature, setting - their volumes to 100% on startup causing harm to your audio hardware and potentially your ears. + Flat volumes are now disabled by default in + hardware.pulseaudio. This has been done to prevent + applications, which are unaware of this feature, setting their volumes to + 100% on startup causing harm to your audio hardware and potentially your + ears. - With this change application specific volumes are relative to the master volume which can be - adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the - device-volume with the volume of the loudest application. + With this change application specific volumes are relative to the master + volume which can be adjusted independently, whereas before they were + absolute; meaning that in effect, it scaled the device-volume with the + volume of the loudest application. - 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. + 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. - 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. + 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. - The Grafana module now supports declarative - datasource and dashboard - provisioning. + The Grafana module now + supports declarative + datasource + and dashboard provisioning. - - The use of insecure ports on kubernetes has been deprecated. - Thus options: - services.kubernetes.apiserver.port and - services.kubernetes.controllerManager.port - has been renamed to .insecurePort, - and default of both options has changed to 0 (disabled). - - - - - Note that the default value of - services.kubernetes.apiserver.bindAddress - has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be - accessible from outside the master node itself. - If the apiserver insecurePort is enabled, - it is strongly recommended to only bind on the loopback interface. See: - services.kubernetes.apiserver.insecurebindAddress. - - - - - The option services.kubernetes.apiserver.allowPrivileged - and services.kubernetes.kubelet.allowPrivileged now - defaults to false. Disallowing privileged containers on the cluster. - - - - - The kubernetes module does no longer add the kubernetes package to - environment.systemPackages implicitly. - - - - - The intel driver has been removed from the default list of - X.org video drivers. - The modesetting driver should take over automatically, - it is better maintained upstream and has less problems with advanced X11 features. - This can lead to a change in the output names used by xrandr. - Some performance regressions on some GPU models might happen. - Some OpenCL and VA-API applications might also break - (Beignet seems to provide OpenCL support with - modesetting driver, too). - Kernel mode setting API does not support backlight control, - so xbacklight tool will not work; - backlight level can be controlled directly via /sys/ - or with brightnessctl. - Users who need this functionality more than multi-output XRandR are advised - to add `intel` to `videoDrivers` and report an issue (or provide additional - details in an existing one) - + + The use of insecure ports on kubernetes has been deprecated. Thus options: + services.kubernetes.apiserver.port and + services.kubernetes.controllerManager.port has been + renamed to .insecurePort, and default of both options + has changed to 0 (disabled). + - - Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols. - This may break some older applications that still rely on those symbols. - An upgrade guide can be found here. - - The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by default. You can set the protocols used by the nginx service using . + Note that the default value of + services.kubernetes.apiserver.bindAddress has changed + from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from + outside the master node itself. If the apiserver insecurePort is enabled, + it is strongly recommended to only bind on the loopback interface. See: + services.kubernetes.apiserver.insecurebindAddress. - - A new subcommand nixos-rebuild edit was added. - + + The option + services.kubernetes.apiserver.allowPrivileged and + services.kubernetes.kubelet.allowPrivileged now + defaults to false. Disallowing privileged containers on the cluster. + + + + + The kubernetes module does no longer add the kubernetes package to + environment.systemPackages implicitly. + + + + + The intel driver has been removed from the default list + of X.org video + drivers. The modesetting driver should take over + automatically, it is better maintained upstream and has less problems with + advanced X11 features. This can lead to a change in the output names used + by xrandr. Some performance regressions on some GPU + models might happen. Some OpenCL and VA-API applications might also break + (Beignet seems to provide OpenCL support with + modesetting driver, too). Kernel mode setting API does + not support backlight control, so xbacklight tool will + not work; backlight level can be controlled directly via + /sys/ or with brightnessctl. Users + who need this functionality more than multi-output XRandR are advised to + add `intel` to `videoDrivers` and report an issue (or provide additional + details in an existing one) + + + + + Openmpi has been updated to version 4.0.0, which removes some deprecated + MPI-1 symbols. This may break some older applications that still rely on + those symbols. An upgrade guide can be found + here. + + + The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by + default. You can set the protocols used by the nginx service using + . + + + + + A new subcommand nixos-rebuild edit was added. +
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index f54592b6bf6..cc0d97023f9 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -53,14 +53,17 @@ The module gained an option named - which makes the generated - configuration.nix - 5 manual page include all options from all NixOS modules - included in a given configuration.nix configuration file. Currently, it is - set to false by default as enabling it frequently prevents evaluation. But - the plan is to eventually have it set to true by default. Please set it to - true now in your configuration.nix and fix all the bugs - it uncovers. + which makes the + generated + configuration.nix + 5 manual page include all options + from all NixOS modules included in a given + configuration.nix configuration file. Currently, it is + set to false by default as enabling it frequently + prevents evaluation. But the plan is to eventually have it set to + true by default. Please set it to + true now in your configuration.nix + and fix all the bugs it uncovers. diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index b26980daf06..568c2de6557 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -87,9 +87,9 @@ Please keep in mind that this is not compatible with - programs.zsh.ohMyZsh.custom as it requires an immutable store - path while custom shall remain mutable! An evaluation - failure will be thrown if both custom and + programs.zsh.ohMyZsh.custom as it requires an immutable + store path while custom shall remain mutable! An + evaluation failure will be thrown if both custom and customPkgs are set.
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index 20d2de9f418..021a89be3f6 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -12,15 +12,15 @@ An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. -
Database Setup + You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: - + # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; CREATE DATABASE matomo; @@ -46,30 +46,32 @@ database is not on the same host.
-
Archive Processing + - This module comes with the systemd service matomo-archive-processing.service - and a timer that automatically triggers archive processing every hour. - This means that you can safely + This module comes with the systemd service + matomo-archive-processing.service and a timer that + automatically triggers archive processing every hour. This means that you + can safely - disable browser triggers for Matomo archiving - at Administration > System > General Settings. + disable browser triggers for Matomo archiving at + Administration > System > General Settings. + With automatic archive processing, you can now also enable to - delete old visitor logs - at Administration > System > Privacy, - but make sure that you run systemctl start matomo-archive-processing.service - at least once without errors if you have already collected data before, - so that the reports get archived before the source data gets deleted. + delete old visitor logs at Administration > System > + Privacy, but make sure that you run systemctl start + matomo-archive-processing.service at least once without errors if + you have already collected data before, so that the reports get archived + before the source data gets deleted.
-
Backup + You only need to take backups of your MySQL database and the /var/lib/matomo/config/config.ini.php file. Use a user @@ -78,9 +80,9 @@ .
-
Issues + @@ -97,7 +99,6 @@
-
Using other Web Servers than nginx diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 9600d1be7c8..098625aa02f 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -4,24 +4,26 @@ version="5.0" xml:id="module-services-nextcloud"> Nextcloud - - Nextcloud is an open-source, self-hostable cloud - platform. The server setup can be automated using - services.nextcloud. A desktop client is packaged - at pkgs.nextcloud-client. + Nextcloud is an open-source, + self-hostable cloud platform. The server setup can be automated using + services.nextcloud. A + desktop client is packaged at pkgs.nextcloud-client. -
Basic usage + Nextcloud is a PHP-based application which requires an HTTP server - (services.nextcloud optionally supports - services.nginx) and a database - (it's recommended to use services.postgresql). + (services.nextcloud + optionally supports + services.nginx) + and a database (it's recommended to use + services.postgresql). + - A very basic configuration may look like this: + A very basic configuration may look like this: { pkgs, ... }: { services.nextcloud = { @@ -55,45 +57,59 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; } + - The options hostName and nginx.enable are used internally to configure an - HTTP server using PHP-FPM and nginx. - The config attribute set is used for the config.php which is used - for the application's configuration. - Beware: this isn't entirely pure since the config is modified by the application's runtime! + The options hostName and nginx.enable + are used internally to configure an HTTP server using + PHP-FPM + and nginx. The config attribute set is + used for the config.php which is used for the + application's configuration. Beware: this isn't entirely pure + since the config is modified by the application's runtime! + - In case the application serves multiple hosts (those are checked with - $_SERVER['HTTP_HOST']) - those can be added using - services.nextcloud.config.extraTrustedDomains. + In case the application serves multiple hosts (those are checked with + $_SERVER['HTTP_HOST']) + those can be added using + services.nextcloud.config.extraTrustedDomains.
-
Pitfalls + - Unfortunately Nextcloud appears to be very stateful when it comes to managing its own configuration. The - config file lives in the home directory of the nextcloud user (by default - /var/lib/nextcloud/config/config.php) and is also used to track several - states of the application (e.g. whether installed or not). + Unfortunately Nextcloud appears to be very stateful when it comes to + managing its own configuration. The config file lives in the home directory + of the nextcloud user (by default + /var/lib/nextcloud/config/config.php) and is also used to + track several states of the application (e.g. whether installed or not). + - Right now changes to the services.nextcloud.config attribute set won't take effect - after the first install - (except services.nextcloud.config.extraTrustedDomains) since the actual configuration - file is generated by the NextCloud installer which also sets up critical parts such as the database - structure. + Right now changes to the services.nextcloud.config + attribute set won't take effect after the first install (except + services.nextcloud.config.extraTrustedDomains) + since the actual configuration file is generated by the NextCloud installer + which also sets up critical parts such as the database structure. + - Warning: don't delete config.php! This file tracks the application's state and a deletion can cause unwanted side-effects! + Warning: don't delete config.php! This file + tracks the application's state and a deletion can cause unwanted + side-effects! + - Warning: don't rerun nextcloud-occ maintenance:install! This command tries to install the application and can cause unwanted side-effects! + Warning: don't rerun nextcloud-occ + maintenance:install! This command tries to install the application + and can cause unwanted side-effects! + - The issues are known and reported in #49783, for now it's unfortunately necessary to manually work around these issues. + The issues are known and reported in + #49783, + for now it's unfortunately necessary to manually work around these issues.
- diff --git a/nixos/tests/common/webroot/news-rss.xml b/nixos/tests/common/webroot/news-rss.xml index 28e6fa7da1f..b8099bf0364 100644 --- a/nixos/tests/common/webroot/news-rss.xml +++ b/nixos/tests/common/webroot/news-rss.xml @@ -1,10 +1,18 @@ -NixOS Newshttps://nixos.orgNews for NixOS, the purely functional Linux distribution.NixOShttps://nixos.org/logo/nixos-logo-only-hires.pnghttps://nixos.org/ - NixOS 18.09 released - https://nixos.org/news.html - - 18.09 Jellyfish logo - + + + NixOS Newshttps://nixos.org + News for NixOS, the purely functional Linux distribution. + + NixOS + https://nixos.org/logo/nixos-logo-only-hires.pnghttps://nixos.org/ + + + NixOS 18.09 releasedhttps://nixos.org/news.html + + + 18.09 Jellyfish logo + NixOS 18.09 “Jellyfish” has been released, the tenth stable release branch. See the release notes for details. You can get NixOS 18.09 ISOs and VirtualBox appliances @@ -12,4 +20,8 @@ For information on how to upgrade from older release branches to 18.09, check out the manual section on upgrading. - Sat Oct 06 2018 00:00:00 GMT + + Sat Oct 06 2018 00:00:00 GMT + + + -- cgit 1.4.1 From 1ad3f34a999a3e12dc3b8d8c74c7925a661395bf Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 22 Mar 2019 14:47:47 +0100 Subject: nixos manual Makefile: improve purity And be quiet when building/downloading the required tools. --- nixos/doc/manual/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile index b251a1f5e2c..9ff599a0090 100644 --- a/nixos/doc/manual/Makefile +++ b/nixos/doc/manual/Makefile @@ -6,13 +6,14 @@ debug: generated manual-combined.xml manual-combined.xml: generated *.xml **/*.xml rm -f ./manual-combined.xml - nix-shell --packages xmloscopy \ + nix-shell --pure -Q --packages xmloscopy \ --run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml" .PHONY: format format: - find ../../ -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ - xmlformat --config-file "../xmlformat.conf" -i {} + nix-shell --pure -Q --packages xmlformat \ + --run "find ../../ -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file '../xmlformat.conf' -i {}" .PHONY: fix-misc-xml fix-misc-xml: -- cgit 1.4.1 From 7942c79c6912dbc4e34a9961443eb5e649922fb0 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 22 Mar 2019 15:50:17 +0900 Subject: Fix cudatoolkit building on non-sandboxed systems This fixes cudatoolkit building on non-sandboxed system. The cudatoolkit tests run each of the CUDA binaries as a small smoke test just to make sure they all can at least somewhat run. However, the `cuda-gdb` binary doesn't run correctly on non-sandboxed systems because it picks up versions of Python from /usr/lib. This PR disables the smoke tests for now. They should be re-enabled when we figure out how to make them work for cuda-gdb on non-sandboxed systems. This PR is for #57939. --- pkgs/development/compilers/cudatoolkit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 3a34d14f8ad..e2c3c8fe587 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -147,7 +147,11 @@ let done < <(find $out $lib $doc -type f -print0) ''; - doInstallCheck = true; + # cuda-gdb doesn't run correctly when not using sandboxing, so + # temporarily disabling the install check. This should be set to true + # when we figure out how to get `cuda-gdb --version` to run correctly + # when not using sandboxing. + doInstallCheck = false; postInstallCheck = let in '' # Smoke test binaries -- cgit 1.4.1 From ea34ad0e4307af7acda9078ed5795bec45f7cb84 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 21 Mar 2019 17:58:33 +0100 Subject: chromium: 73.0.3683.75 -> 73.0.3683.86 --- .../networking/browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index cc54db0a38a..b4da79a4983 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0z6m7l76qzqsf5d54k331cl7cx1f0lh4x13269mjk7664q382143"; - sha256bin64 = "0pv5aafwdwcp1ssijgx19ba1ap40j6ayv15ynxvv8fsh51ara1vp"; - version = "73.0.3683.75"; + sha256 = "18xzddqi8rgng5vksx23jaiv103prxc38pshwp702nfjfqap7fwy"; + sha256bin64 = "1r9nnc1xn319aqzxjh10n6nh714lghgskgdkpvw3hnvgb0v9jw4v"; + version = "73.0.3683.86"; }; dev = { - sha256 = "19fwzxnsd1parqghv4b2mif3cj1k1m5hzqnjsnglkgv6xnqny98g"; - sha256bin64 = "1aag76dgcnwga1q4jdgm3ziqvxs1qvrsyqfd7bbsi7axz6qi135v"; - version = "74.0.3724.8"; + sha256 = "0vdiaraw3jjr7ykdqbrhjzppvqs9d7jkkx1qyi50dyvrhipxdihz"; + sha256bin64 = "0c5mnb1zz1mjs7h18f1c15ygqxl1kcpm2s1imyprh80mapmsxdxk"; + version = "74.0.3729.22"; }; stable = { - sha256 = "0z6m7l76qzqsf5d54k331cl7cx1f0lh4x13269mjk7664q382143"; - sha256bin64 = "10j93186f3ipynyw6nb6bx4haav33gzvmc72sl9ybz6zljd88dpq"; - version = "73.0.3683.75"; + sha256 = "18xzddqi8rgng5vksx23jaiv103prxc38pshwp702nfjfqap7fwy"; + sha256bin64 = "1mmm4lxvcfvdj6jpqaas51lx1c9zky4zp374phs3cmh9v8l2ijkb"; + version = "73.0.3683.86"; }; } -- cgit 1.4.1 From 839c988dd0f7899e008c75ea21176254b305adeb Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 18 Mar 2019 02:59:57 +0100 Subject: riot-desktop: init at 1.0.4 --- .../riot/riot-desktop-package.json | 15 + .../riot/riot-desktop-yarndeps.nix | 1148 ++++++++++++++++++++ .../instant-messengers/riot/riot-desktop.nix | 77 ++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 1242 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json create mode 100644 pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix create mode 100644 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json new file mode 100644 index 00000000000..cb3c9092374 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -0,0 +1,15 @@ +{ + "name": "riot-web", + "productName": "Riot", + "main": "src/electron-main.js", + "version": "1.0.4", + "description": "A feature-rich client for Matrix.org", + "author": "New Vector Ltd.", + "dependencies": { + "auto-launch": "^5.0.1", + "electron-store": "^2.0.0", + "electron-window-state": "^4.1.0", + "minimist": "^1.2.0", + "png-to-ico": "^1.0.2" + } +} diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix new file mode 100644 index 00000000000..25cc694afcf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -0,0 +1,1148 @@ +{fetchurl, linkFarm}: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + + { + name = "node-9.6.45.tgz"; + path = fetchurl { + name = "node-9.6.45.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.45.tgz"; + sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; + }; + } + + { + name = "ajv-6.10.0.tgz"; + path = fetchurl { + name = "ajv-6.10.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz"; + sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; + }; + } + + { + name = "applescript-1.0.0.tgz"; + path = fetchurl { + name = "applescript-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz"; + sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; + }; + } + + { + name = "asn1-0.2.4.tgz"; + path = fetchurl { + name = "asn1-0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + + { + name = "assert-plus-1.0.0.tgz"; + path = fetchurl { + name = "assert-plus-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + + { + name = "asynckit-0.4.0.tgz"; + path = fetchurl { + name = "asynckit-0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + + { + name = "auto-launch-5.0.5.tgz"; + path = fetchurl { + name = "auto-launch-5.0.5.tgz"; + url = "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz"; + sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0"; + }; + } + + { + name = "aws-sign2-0.7.0.tgz"; + path = fetchurl { + name = "aws-sign2-0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + + { + name = "aws4-1.8.0.tgz"; + path = fetchurl { + name = "aws4-1.8.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; + sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + }; + } + + { + name = "bcrypt-pbkdf-1.0.2.tgz"; + path = fetchurl { + name = "bcrypt-pbkdf-1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + + { + name = "bignumber.js-2.4.0.tgz"; + path = fetchurl { + name = "bignumber.js-2.4.0.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz"; + sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; + }; + } + + { + name = "bmp-js-0.0.3.tgz"; + path = fetchurl { + name = "bmp-js-0.0.3.tgz"; + url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz"; + sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; + }; + } + + { + name = "buffer-equal-0.0.1.tgz"; + path = fetchurl { + name = "buffer-equal-0.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }; + } + + { + name = "caseless-0.12.0.tgz"; + path = fetchurl { + name = "caseless-0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + + { + name = "combined-stream-1.0.7.tgz"; + path = fetchurl { + name = "combined-stream-1.0.7.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; + sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; + }; + } + + { + name = "conf-2.2.0.tgz"; + path = fetchurl { + name = "conf-2.2.0.tgz"; + url = "https://registry.yarnpkg.com/conf/-/conf-2.2.0.tgz"; + sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; + }; + } + + { + name = "core-util-is-1.0.2.tgz"; + path = fetchurl { + name = "core-util-is-1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + + { + name = "dashdash-1.14.1.tgz"; + path = fetchurl { + name = "dashdash-1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + + { + name = "deep-equal-1.0.1.tgz"; + path = fetchurl { + name = "deep-equal-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + } + + { + name = "define-properties-1.1.3.tgz"; + path = fetchurl { + name = "define-properties-1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + + { + name = "delayed-stream-1.0.0.tgz"; + path = fetchurl { + name = "delayed-stream-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + + { + name = "dom-walk-0.1.1.tgz"; + path = fetchurl { + name = "dom-walk-0.1.1.tgz"; + url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + }; + } + + { + name = "dot-prop-4.2.0.tgz"; + path = fetchurl { + name = "dot-prop-4.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + }; + } + + { + name = "ecc-jsbn-0.1.2.tgz"; + path = fetchurl { + name = "ecc-jsbn-0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + + { + name = "electron-store-2.0.0.tgz"; + path = fetchurl { + name = "electron-store-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz"; + sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; + }; + } + + { + name = "electron-window-state-4.1.1.tgz"; + path = fetchurl { + name = "electron-window-state-4.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz"; + sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; + }; + } + + { + name = "env-paths-1.0.0.tgz"; + path = fetchurl { + name = "env-paths-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz"; + sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; + }; + } + + { + name = "es-abstract-1.13.0.tgz"; + path = fetchurl { + name = "es-abstract-1.13.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; + sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + }; + } + + { + name = "es-to-primitive-1.2.0.tgz"; + path = fetchurl { + name = "es-to-primitive-1.2.0.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + }; + } + + { + name = "es6-promise-3.3.1.tgz"; + path = fetchurl { + name = "es6-promise-3.3.1.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; + }; + } + + { + name = "exif-parser-0.1.12.tgz"; + path = fetchurl { + name = "exif-parser-0.1.12.tgz"; + url = "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz"; + sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; + }; + } + + { + name = "extend-3.0.2.tgz"; + path = fetchurl { + name = "extend-3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + + { + name = "extsprintf-1.3.0.tgz"; + path = fetchurl { + name = "extsprintf-1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + + { + name = "extsprintf-1.4.0.tgz"; + path = fetchurl { + name = "extsprintf-1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + + { + name = "fast-deep-equal-2.0.1.tgz"; + path = fetchurl { + name = "fast-deep-equal-2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + } + + { + name = "fast-json-stable-stringify-2.0.0.tgz"; + path = fetchurl { + name = "fast-json-stable-stringify-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + } + + { + name = "file-type-3.9.0.tgz"; + path = fetchurl { + name = "file-type-3.9.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + } + + { + name = "find-up-2.1.0.tgz"; + path = fetchurl { + name = "find-up-2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + + { + name = "for-each-0.3.3.tgz"; + path = fetchurl { + name = "for-each-0.3.3.tgz"; + url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; + sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; + }; + } + + { + name = "forever-agent-0.6.1.tgz"; + path = fetchurl { + name = "forever-agent-0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + + { + name = "form-data-2.3.3.tgz"; + path = fetchurl { + name = "form-data-2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + + { + name = "function-bind-1.1.1.tgz"; + path = fetchurl { + name = "function-bind-1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + + { + name = "getpass-0.1.7.tgz"; + path = fetchurl { + name = "getpass-0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + + { + name = "global-4.3.2.tgz"; + path = fetchurl { + name = "global-4.3.2.tgz"; + url = "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + }; + } + + { + name = "graceful-fs-4.1.15.tgz"; + path = fetchurl { + name = "graceful-fs-4.1.15.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + }; + } + + { + name = "har-schema-2.0.0.tgz"; + path = fetchurl { + name = "har-schema-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + + { + name = "har-validator-5.1.3.tgz"; + path = fetchurl { + name = "har-validator-5.1.3.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; + sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + }; + } + + { + name = "has-symbols-1.0.0.tgz"; + path = fetchurl { + name = "has-symbols-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + } + + { + name = "has-1.0.3.tgz"; + path = fetchurl { + name = "has-1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + + { + name = "http-signature-1.2.0.tgz"; + path = fetchurl { + name = "http-signature-1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + + { + name = "imurmurhash-0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash-0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + + { + name = "ip-regex-1.0.3.tgz"; + path = fetchurl { + name = "ip-regex-1.0.3.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz"; + sha1 = "dc589076f659f419c222039a33316f1c7387effd"; + }; + } + + { + name = "is-callable-1.1.4.tgz"; + path = fetchurl { + name = "is-callable-1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; + sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + }; + } + + { + name = "is-date-object-1.0.1.tgz"; + path = fetchurl { + name = "is-date-object-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + } + + { + name = "is-function-1.0.1.tgz"; + path = fetchurl { + name = "is-function-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + } + + { + name = "is-obj-1.0.1.tgz"; + path = fetchurl { + name = "is-obj-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + } + + { + name = "is-regex-1.0.4.tgz"; + path = fetchurl { + name = "is-regex-1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + } + + { + name = "is-symbol-1.0.2.tgz"; + path = fetchurl { + name = "is-symbol-1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; + sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + }; + } + + { + name = "is-typedarray-1.0.0.tgz"; + path = fetchurl { + name = "is-typedarray-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + + { + name = "isstream-0.1.2.tgz"; + path = fetchurl { + name = "isstream-0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + + { + name = "jimp-0.2.28.tgz"; + path = fetchurl { + name = "jimp-0.2.28.tgz"; + url = "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz"; + sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2"; + }; + } + + { + name = "jpeg-js-0.2.0.tgz"; + path = fetchurl { + name = "jpeg-js-0.2.0.tgz"; + url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz"; + sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; + }; + } + + { + name = "jsbn-0.1.1.tgz"; + path = fetchurl { + name = "jsbn-0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + + { + name = "json-schema-traverse-0.4.1.tgz"; + path = fetchurl { + name = "json-schema-traverse-0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + + { + name = "json-schema-0.2.3.tgz"; + path = fetchurl { + name = "json-schema-0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + + { + name = "json-stringify-safe-5.0.1.tgz"; + path = fetchurl { + name = "json-stringify-safe-5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + + { + name = "jsonfile-2.4.0.tgz"; + path = fetchurl { + name = "jsonfile-2.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + } + + { + name = "jsprim-1.4.1.tgz"; + path = fetchurl { + name = "jsprim-1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + + { + name = "load-bmfont-1.4.0.tgz"; + path = fetchurl { + name = "load-bmfont-1.4.0.tgz"; + url = "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz"; + sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; + }; + } + + { + name = "locate-path-2.0.0.tgz"; + path = fetchurl { + name = "locate-path-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + + { + name = "make-dir-1.3.0.tgz"; + path = fetchurl { + name = "make-dir-1.3.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; + sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; + }; + } + + { + name = "mime-db-1.38.0.tgz"; + path = fetchurl { + name = "mime-db-1.38.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz"; + sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; + }; + } + + { + name = "mime-types-2.1.22.tgz"; + path = fetchurl { + name = "mime-types-2.1.22.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz"; + sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; + }; + } + + { + name = "mime-1.6.0.tgz"; + path = fetchurl { + name = "mime-1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + + { + name = "min-document-2.19.0.tgz"; + path = fetchurl { + name = "min-document-2.19.0.tgz"; + url = "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + } + + { + name = "minimist-0.0.8.tgz"; + path = fetchurl { + name = "minimist-0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + + { + name = "minimist-1.2.0.tgz"; + path = fetchurl { + name = "minimist-1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + + { + name = "mkdirp-0.5.1.tgz"; + path = fetchurl { + name = "mkdirp-0.5.1.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + + { + name = "oauth-sign-0.9.0.tgz"; + path = fetchurl { + name = "oauth-sign-0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + + { + name = "object-keys-1.1.0.tgz"; + path = fetchurl { + name = "object-keys-1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz"; + sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; + }; + } + + { + name = "p-limit-1.3.0.tgz"; + path = fetchurl { + name = "p-limit-1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; + sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + }; + } + + { + name = "p-locate-2.0.0.tgz"; + path = fetchurl { + name = "p-locate-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + + { + name = "p-try-1.0.0.tgz"; + path = fetchurl { + name = "p-try-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + + { + name = "parse-bmfont-ascii-1.0.6.tgz"; + path = fetchurl { + name = "parse-bmfont-ascii-1.0.6.tgz"; + url = "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; + sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; + }; + } + + { + name = "parse-bmfont-binary-1.0.6.tgz"; + path = fetchurl { + name = "parse-bmfont-binary-1.0.6.tgz"; + url = "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; + sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; + }; + } + + { + name = "parse-bmfont-xml-1.1.4.tgz"; + path = fetchurl { + name = "parse-bmfont-xml-1.1.4.tgz"; + url = "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; + sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389"; + }; + } + + { + name = "parse-headers-2.0.2.tgz"; + path = fetchurl { + name = "parse-headers-2.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz"; + sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; + }; + } + + { + name = "path-exists-3.0.0.tgz"; + path = fetchurl { + name = "path-exists-3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + + { + name = "path-is-absolute-1.0.1.tgz"; + path = fetchurl { + name = "path-is-absolute-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + + { + name = "performance-now-2.1.0.tgz"; + path = fetchurl { + name = "performance-now-2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + + { + name = "phin-2.9.3.tgz"; + path = fetchurl { + name = "phin-2.9.3.tgz"; + url = "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz"; + sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; + }; + } + + { + name = "pify-3.0.0.tgz"; + path = fetchurl { + name = "pify-3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + + { + name = "pixelmatch-4.0.2.tgz"; + path = fetchurl { + name = "pixelmatch-4.0.2.tgz"; + url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz"; + sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; + }; + } + + { + name = "pkg-up-2.0.0.tgz"; + path = fetchurl { + name = "pkg-up-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + } + + { + name = "png-to-ico-1.0.7.tgz"; + path = fetchurl { + name = "png-to-ico-1.0.7.tgz"; + url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-1.0.7.tgz"; + sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"; + }; + } + + { + name = "pngjs-3.4.0.tgz"; + path = fetchurl { + name = "pngjs-3.4.0.tgz"; + url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz"; + sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f"; + }; + } + + { + name = "process-0.5.2.tgz"; + path = fetchurl { + name = "process-0.5.2.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }; + } + + { + name = "psl-1.1.31.tgz"; + path = fetchurl { + name = "psl-1.1.31.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz"; + sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; + }; + } + + { + name = "punycode-1.4.1.tgz"; + path = fetchurl { + name = "punycode-1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + + { + name = "punycode-2.1.1.tgz"; + path = fetchurl { + name = "punycode-2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + + { + name = "qs-6.5.2.tgz"; + path = fetchurl { + name = "qs-6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + + { + name = "read-chunk-1.0.1.tgz"; + path = fetchurl { + name = "read-chunk-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz"; + sha1 = "5f68cab307e663f19993527d9b589cace4661194"; + }; + } + + { + name = "request-2.88.0.tgz"; + path = fetchurl { + name = "request-2.88.0.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; + sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + }; + } + + { + name = "safe-buffer-5.1.2.tgz"; + path = fetchurl { + name = "safe-buffer-5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + + { + name = "safer-buffer-2.1.2.tgz"; + path = fetchurl { + name = "safer-buffer-2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + + { + name = "sax-1.2.4.tgz"; + path = fetchurl { + name = "sax-1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + + { + name = "signal-exit-3.0.2.tgz"; + path = fetchurl { + name = "signal-exit-3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + + { + name = "sshpk-1.16.1.tgz"; + path = fetchurl { + name = "sshpk-1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + + { + name = "stream-to-buffer-0.1.0.tgz"; + path = fetchurl { + name = "stream-to-buffer-0.1.0.tgz"; + url = "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz"; + sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9"; + }; + } + + { + name = "stream-to-0.2.2.tgz"; + path = fetchurl { + name = "stream-to-0.2.2.tgz"; + url = "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz"; + sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d"; + }; + } + + { + name = "string.prototype.trim-1.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trim-1.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; + sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + }; + } + + { + name = "tinycolor2-1.4.1.tgz"; + path = fetchurl { + name = "tinycolor2-1.4.1.tgz"; + url = "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz"; + sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; + }; + } + + { + name = "tough-cookie-2.4.3.tgz"; + path = fetchurl { + name = "tough-cookie-2.4.3.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; + }; + } + + { + name = "tunnel-agent-0.6.0.tgz"; + path = fetchurl { + name = "tunnel-agent-0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + + { + name = "tweetnacl-0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl-0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + + { + name = "untildify-3.0.3.tgz"; + path = fetchurl { + name = "untildify-3.0.3.tgz"; + url = "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz"; + sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; + }; + } + + { + name = "uri-js-4.2.2.tgz"; + path = fetchurl { + name = "uri-js-4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + + { + name = "url-regex-3.2.0.tgz"; + path = fetchurl { + name = "url-regex-3.2.0.tgz"; + url = "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz"; + sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; + }; + } + + { + name = "uuid-3.3.2.tgz"; + path = fetchurl { + name = "uuid-3.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz"; + sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; + }; + } + + { + name = "verror-1.10.0.tgz"; + path = fetchurl { + name = "verror-1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + + { + name = "winreg-1.2.4.tgz"; + path = fetchurl { + name = "winreg-1.2.4.tgz"; + url = "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz"; + sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; + }; + } + + { + name = "write-file-atomic-2.4.2.tgz"; + path = fetchurl { + name = "write-file-atomic-2.4.2.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; + sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; + }; + } + + { + name = "xhr-2.5.0.tgz"; + path = fetchurl { + name = "xhr-2.5.0.tgz"; + url = "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz"; + sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd"; + }; + } + + { + name = "xml-parse-from-string-1.0.1.tgz"; + path = fetchurl { + name = "xml-parse-from-string-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; + sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; + }; + } + + { + name = "xml2js-0.4.19.tgz"; + path = fetchurl { + name = "xml2js-0.4.19.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz"; + sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; + }; + } + + { + name = "xmlbuilder-9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder-9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + } + + { + name = "xtend-4.0.1.tgz"; + path = fetchurl { + name = "xtend-4.0.1.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + } + ]; +} diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix new file mode 100644 index 00000000000..03f1cc2471e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchFromGitHub, yarn2nix, makeWrapper, makeDesktopItem, electron, riot-web }: + +let + executableName = "riot-desktop"; + version = "1.0.4"; + riot-web-src = fetchFromGitHub { + owner = "vector-im"; + repo = "riot-web"; + rev = "v${version}"; + sha256 = "152mi81miams5a7l9rd12bnf6wkd1r0lyicgr35r5fq0p6z7a4dk"; + }; + +in yarn2nix.mkYarnPackage rec { + name = "riot-desktop-${version}"; + inherit version; + + src = "${riot-web-src}/electron_app"; + + # The package manifest should be copied on each update of this package. + # > cp ${riot-web-src}/electron_app/package.json riot-desktop-package.json + packageJSON = ./riot-desktop-package.json; + + # The dependency expression can be regenerated using nixos.yarn2nix with the following command: + # > yarn2nix --lockfile=${riot-web-src}/electron_app/yarn.lock > riot-desktop-yarndeps.nix + yarnNix = ./riot-desktop-yarndeps.nix; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + # resources + mkdir -p "$out/share/riot" + ln -s '${riot-web}' "$out/share/riot/webapp" + cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" + cp -r '.' "$out/share/riot/electron" + + # icons + for icon in $out/share/riot/electron/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/riot.png" + done + + # desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" + + # executable wrapper + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + --add-flags "$out/share/riot/electron" + ''; + + # The desktop item properties should be kept in sync with data from upstream: + # * productName and description from + # https://github.com/vector-im/riot-web/blob/develop/electron_app/package.json + # * category and StartupWMClass from the build.linux section of + # https://github.com/vector-im/riot-web/blob/develop/package.json + desktopItem = makeDesktopItem { + inherit name; + exec = executableName; + icon = "riot"; + desktopName = "Riot"; + genericName = "Matrix Client"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass="riot" + ''; + }; + + meta = with stdenv.lib; { + description = "A feature-rich client for Matrix.org"; + homepage = https://about.riot.im/; + license = licenses.asl20; + maintainers = with maintainers; [ pacien ]; + inherit (electron.meta) platforms; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7436ec0887..d77dac8082f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1678,6 +1678,8 @@ in ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; + riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; + riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { conf = config.riot-web.conf or null; }; -- cgit 1.4.1 From 48a16b3eacb81c5ab138815dc44e25b42ad9d721 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 23 Mar 2019 00:00:04 +0100 Subject: python3Packages.munkres: 1.0.12 -> 1.1.2 As of version 1.1.0, this munkres package no longer supports Python 2. --- pkgs/development/python-modules/munkres/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index a3d9e992cb3..5e83818a014 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -1,19 +1,19 @@ { stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, isPy3k , nose }: buildPythonPackage rec { pname = "munkres"; - version = "1.0.12"; + version = "1.1.2"; - # No sdist for 1.0.12, see https://github.com/bmc/munkres/issues/25 - src = fetchFromGitHub { - owner = "bmc"; - repo = pname; - rev = "release-${version}"; - sha256 = "0m3rkn0z3ialndxmyg26xn081znna34i5maa1i4nkhy6nf0ixdjm"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "81e9ced40c3d0ffc48be4b6da5cfdfaa49041faaaba8075b159974ec47926aea"; }; checkInputs = [ nose ]; -- cgit 1.4.1 From 3a5c92734dd0e93ea0f8c730465d30b6208241c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 Mar 2019 16:09:17 -0700 Subject: python37Packages.nbxmpp: 0.6.9 -> 0.6.10 (#57422) 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-nbxmpp/versions --- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 5da8257ac81..0b0220d3246 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ let pname = "nbxmpp"; - version = "0.6.9"; + version = "0.6.10"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "14xrq0r5k1dk7rwj4cxyxfapi6gbnqg70mz94g6hn9ij06284mi7"; + sha256 = "1w31a747mj9rvlp3n20z0fnvyvihphkgkyr22sk2kap3migw8vai"; }; propagatedBuildInputs = [ pyopenssl ]; -- cgit 1.4.1 From 19030473ba07f23483fc84db11b92131d0c03f39 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Mar 2019 18:15:05 -0500 Subject: pythonPackages.fonttools: 3.37.3 -> 3.39.0 (#57934) https://github.com/fonttools/fonttools/releases/tag/3.38.0 https://github.com/fonttools/fonttools/releases/tag/3.39.0 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 21780ccb9fc..2db42395186 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.37.3"; + version = "3.39.0"; src = fetchPypi { inherit pname version; - sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d"; + sha256 = "0hgv83b4nhk2bl33xa41x0xvsl2b138p974ywkglzckp1123a7z2"; extension = "zip"; }; -- cgit 1.4.1 From e716a952cd884679e76ba50346b528de25b53db0 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 23 Mar 2019 01:43:20 +0100 Subject: firefox: 66.0 -> 66.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index aea6c5ea1bb..684bf4fb676 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -10,10 +10,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "66.0"; + ffversion = "66.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1izxikivz0jb8kzq4cd040a70s3j83nw324yvvbmi7g808s7s6b8ljia5allbrkqcgrvrx3rq4w09kwffwmwd43jxgc1bfl8af3v8d9"; + sha512 = "3nh42a9s8hzs3823mddqdcrhjb2nrphaz9v94mmp4xx4vra18mhsyddszk6xg5mx33wamvlalicws6l9h1d4i4dnnpchh2l6ch8m9kc"; }; patches = [ -- cgit 1.4.1 From 3e7b029ab762c237e3359aee29dae24394ab2628 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 23 Mar 2019 01:43:39 +0100 Subject: firefox-esr-60: 60.6.0esr -> 60.6.1esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 684bf4fb676..2e5ecfe58fc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -62,10 +62,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.6.0esr"; + ffversion = "60.6.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "14vymgczx37q3yj8ndxq6wmmachaf08kx6n3wgjd0qqg5xr18abns999f7ng51abnfrribkrpzmn22vc061sm6wldszawwq6w5r2lg4"; + sha512 = "3nl3cisn1sw3y6dxnv0bm143dpp091h1s9j7g73qfx5s6sfxl832lan177ikm00ay7fsly251vi1xz17wwicch1himsmhjisnd3ws51"; }; patches = [ -- cgit 1.4.1 From bf0715aeb80b26ba7a672ea717cf598731ce70f4 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 23 Mar 2019 01:44:26 +0100 Subject: firefox-bin: 66.0 -> 66.0.1 --- .../browsers/firefox-bin/release_sources.nix | 794 ++++++++++----------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0796bee8580..3ce04e18505 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0"; + version = "66.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ach/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ach/firefox-66.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "26d7b82ca1287a547ecc8f0bba4b76e52704e3d4144c840088493fcf5ecc5a610dfe6a877f0afdf06c5ddf5f3c655dd33ddd0f233386748dfde496009fc6ba84"; + sha512 = "71dae8969de79a910a0a058e0a3b98ae7c4dbb96f11ff503b7818c0746ededf51eaeee5cf28178bae09a969aa2ce62e2cb65415b59b97bb828a26411a1dce26d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/af/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/af/firefox-66.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "04453ed81ee3de014d0dc05a89ad41d8fdb11fe45dd987728fd7fb77efda6a8b1772371c79a162bba263c4dda1aed3141ad0cac736a4078fa615a6e143574c0e"; + sha512 = "03009e8f5edfa4c67390dd0091eeade5bea5a59e358d67f31bd73c80a1d439b73d2dd02930cd53d89b893e271a6d2ac71e9a9b96ec4c239a4233e947b9b25ad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/an/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/an/firefox-66.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "081d435566c27240ae118b882541153bd39e12b6d064cf36ae93e6f24cc2013819f3f42a91c8bad3a7e15ea251243540077218fece98372508e1b2fc19418b73"; + sha512 = "8831213e8d1ef30e12905d99161bc6e24816bcbfe41b19d9dbd192ef777425abc383e4726e7744f961f701ca7b9ed708b45c7707799586635bd01e789c7c60c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ar/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ar/firefox-66.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "3bf68bc1b876ecdfcd9a996b5ebcb1a28eb4fe82e92cdae6c6a00489d7b19a9b107d4363a43114e2ee25fed107f6d41d8d81c4781cfa48fdce81a28761ab0d42"; + sha512 = "cfb77c98cc68de702dec4f3a3f87a15eef642b7c793c1d16be37105282c693a4f610299720e79dd1c77b32832463c319195ec7d4179b907c081f4e9ff2e78b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/as/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/as/firefox-66.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "ff2cb9a5258e6310ff6deff3ceb635467d22c83df9171bef369496f0c086f54d70d126ead02e23c5000387deebe9d9ec2074bdf75507524a05ca45d731229029"; + sha512 = "da99215fdb304c3df816d35d8e14106d71d777c292604961ca234028603da4cfdd3650306125b5a9ef6cd799b3b939cadbb410efb0bd78d344e48efc76d31512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ast/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ast/firefox-66.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f935d5ccb24b27295d9256dbefdaf3aec87ac4d3e3929ca2c330f79fb7026935b958ab306758de0bd1a8929766d7752cc3c80d6a834f60a08e17f3f4daedb9ef"; + sha512 = "6b5635ca0142d20411c8285adfef867204b948280cd1195b5ef8e0c5a0bd81633fbdcf8f3a28bf6df73267ea4f7f861d6cad6b52178261950dac6bbb4a596a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/az/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/az/firefox-66.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8675c7e95e8483aa6f48ddb29af5f0007aabf4f517724235102bbcef7d46e3ea5e05cc1c60321b7a441f8a4089a95b40271b38e5d876b7bf047a667387547efc"; + sha512 = "f91c6e4ed17028768acd4c5fe7b25b09b7547564ae98365c5b43610d02810417868088abf774e21d5d0195fa11dd6ac9a9a5e9837eb253dda95678dc469dc331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/be/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/be/firefox-66.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "79a4ad947e1943bd972a5586f3da5257c8ec4de5700da8af825605ed439ca2691fb7ad65b0d634d0c0c5a288965f683b203356b3edcca11bbc1f835681008cc4"; + sha512 = "17a40ea56fedf1ffa6e5d99543d47512b52d810593cbc05b16b8a5a310f55a680086bc309afd34e8068dac15d1c5bb47d52611b18a0e679e3e0a3a6fe7d0e147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bg/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bg/firefox-66.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7a2fff247f6f02514424f23c9a9022a2b43dd29822565e226976c6cc4a1857bb4b310f95ffc1c566730df07fe715436169f1627e3240f983041d759b52b00587"; + sha512 = "7a063f35275c5011dc6f14cfdac043f33218f2bec68282db38020610cb79c1cc5cd3e3dd34becaf4e56c84ad457d71b9eb0e60374836ad7c62346c94f06c9b03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bn-BD/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bn-BD/firefox-66.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a825dc9ed2016861eecc9add037316516e55a7b0f3bd6f3d76bad80db3d94b5199f55bab170d5736a06890ebc392be5793d828b4c9ff20e7073fff2109e6da63"; + sha512 = "c2676a7034704eb6ff7df573681c1881781825dcd0e2a19ff69cc2228719689c48ae06d5edc2a985bd217bae3cd7da519cf2e6305a60717037f66c7050cfe157"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bn-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bn-IN/firefox-66.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "618bf54d2e4a48388e33a952d13136b2752e72084c791f6df3b638a489a21d0b9435d943a9ba427815cfcfae04bec55ee393f39a04d126d9a18a4a1eeaa9c676"; + sha512 = "d89ab4a8070800d18e21be019937fef040345858058af71a33b240a62117e5968328d8ceefa7145664d5cae02e17b0ad6b1d0bd2f123559bd7a4e54c25d8fe18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/br/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/br/firefox-66.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "277d2931ff28e6336897b3d3aabf14c70d9ace5e3f65158773c66422c7bdb848afa5e5cf6e4545b13d4cdc7bba0f3b38abf83acd66aa5ee94d387134e0530ad7"; + sha512 = "13cc045c7bea3aa9efacef755a69272dde64e6724ce40b1d3fbfb1844a1dc5f3f2af8deb24d1547fcdbc1ef15b6264303a1b6ced13857a9573d268b64b2b5b8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bs/firefox-66.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "83ca0b6775d8e22341dcea6af8c87f11c43c4eef2b57d194aa5b1493dab480db44cb0498134d364b3d478f7a7807289950784bc40cc142d621928837812eeff3"; + sha512 = "68b06e9fc95a29e1b9ca576bef036e9965c7892dfd68bef6e8df3aea0df9879d246d4a00e720ebd9255553daa7c9fb43fe7a1f8f6b7521a54b84e22be2a343b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ca/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ca/firefox-66.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8992c2d60e907524b228e329a919f67ece92d345d4dba1cd3a0ddf7231c557cdae0127952d004b67fe171a5e45156e93f51a8a95aab56572c0b88132277da0ec"; + sha512 = "56766f1b05a5755a90cece9924f53429a99adc44c37b616511cf0bb8103478872ea72fdab3757c430cf4ee4f4f23498b9d8ccc9fba6d67e532d9ea08edba5675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/cak/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/cak/firefox-66.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "cc9ab038fa728c56ffdd05b65b2779db282c70d60d088cbad9405072a0fc5a4742d70a04b8f13e394e5ecbadf62b738f896a9385933f74046bfa14b677f50ed6"; + sha512 = "6066a3a3c12403ff0d88bfbab1bc28a29037b3843c8d78596ff0749a559494393c28d2961180d321c2579f545fa80c37d2243f66d63537d2aa4f7ebd08a99fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/cs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/cs/firefox-66.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "646eecfd8c389ac7a5004b3aa0a59a8f28cef4727654139466d5bb0df31ab0a4e73a2b09fe12e210187b464c446631eb4ba75242ca6f5985f6ddc67f12277ae4"; + sha512 = "43a9df354525c665eec2976ed4269e195daaabaf44e2e84f28a43fe0f4fabb6f934d90f797b2746049a1a6fa275a251896f40cf9cb0db9e77c9082b116924c0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/cy/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/cy/firefox-66.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "eefeed94cac6aae5f8047ef51becaf778c344c2423220484426fad4190225c056d2a48c07280906fa85f645524a9dfd97105bb8313c0739fff6a683ad4e87bbb"; + sha512 = "c839c90bef23661f5cc08b1c7aeda9a24c8e5d99117aabe56492d5bb536ddeac92deae2fa7671a2b92d8925bbfb44d89eecd78c9553dff8b2396010f9162dc9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/da/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/da/firefox-66.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "28a525f3e65c56c8c19881f0ca1d1549082bf0ef609f5627258f77a67a5f4fe92866fb2ec474540e28c8523a931a76c1f3fb00309a0e0c19d2fa9fa2876266ad"; + sha512 = "605d674016fdd0724a1305ac1bab2d8070beaf51cffb09c06fd26d464e36fc4a97206746a835bd55d4f80c8f5c8c1f271343598000e77c6036105db65ba064d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/de/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/de/firefox-66.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5921cfd02fe91167a3f723a6ef82cb165a28df488672bcf95c70dde93cba69de66821ac1590b547b03700ba6071086d0b641bf440e73a21ba14c43d52e242528"; + sha512 = "1c1ba73482b994d696bd7a37e52e999add6f9bb884e968730ba18b98e1c0f1067bc58fabe90223dbbf4145806939ba113abdd1e2203678cd5c3c4a938d7e3df9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/dsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/dsb/firefox-66.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8da41c8e9246459b95a4967e6a34740ca1088432db0c8af5180165fecdfcb33ca4893209f276f73032f74bc1d25bb7a4beaffe2b85de1c7226305420d6c76482"; + sha512 = "df2d9ea94b7cc8f2e0097d2cda51c1446b7574e0ba2d915cb86201bb75f91f6cd736e28fc136202883a56f835ccc3450077d1ef3a0039b1d26826d66e4408e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/el/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/el/firefox-66.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cfb985dd8f2eb3042b55c048d9c45c7f0531fc22237cddc2c80cf54bf909cd1881e402a33a6fc332878260619a255c32ff60c0f036ba45d73c369e117df47bbb"; + sha512 = "563a3af598c733d758e593a31b11382352704eeeb649ec9bc98e7e66acebe11c37600b25dc55a8fa5dc0e5993ac97d2967af3d0a87acbe54f898d4e2462affde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-CA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-CA/firefox-66.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "15cfcd53a7d8be85c19c3c374e78771f39b6d66ee764f5a649b54753d19d93f460a351497cf9890bc6d0665ffe46b4d63975a1b75401f398a7ff7c92a5a3709d"; + sha512 = "a8a1fae65e41d30b78488cbf2dce60fe6f4070abf6ad2066e72d6d123bd69b80939d2d9a50759a07236633e0e66199d568b4690c041013770ae1d3a0eb10f230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-GB/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-GB/firefox-66.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "da42b99056c07ecbd3dbbb3005977c7574596acf431dae40c903e4d117b0f94b1a5a0239952b5f069805e1a9d2ac3578cbee7e7e7e1db3debf5be991a6d64367"; + sha512 = "5a78853680bacb1769076117c5db0760cd714802f4d69fa571b52743bf5cfb66f2a22c344b71c6cde90df5f3a9ba7ae9a68e0ade747ab90ed4cb06541388353b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-US/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-US/firefox-66.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6cb8ff86518b89111c3a16a78f1acd7888002be8956076c61370e52e7bfe72f3260816620c1947ba77a6af3d3bd511bbb97dd8461c50d3da782a5beddb7ca8fe"; + sha512 = "cc49ba1ac399dfb573bf691184d49f080b475b29473657989df35b1220f0bc66c4146d6fef6088f924cf58fa8cb22908a041e15fb027cea88f3e38b6f9fb3e3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-ZA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-ZA/firefox-66.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3ef0091bda2e35ae44148fb75f52ac45efcbab328441b711d79f6d2ff1b079f366a94436d9fe8ba9c075e86392d8512a15e9aedcb73aec498783899b7fa9ddcb"; + sha512 = "88a7b7003d6896cde106befb505c54e1c652e32432f4aede6d325f9580e613728b1a9522a86149f31aa027c8e639bca5baacdacb49b12c852b6c024b95778851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/eo/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/eo/firefox-66.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "062239ecbb4df13d616a53c6806dcfd69aff8a34bdaf19dfe3f1ab3e6c4a07ecce4198a9f876060d633ab4b15569bd96f78868f966dfd3bb4a23d5d66500eaed"; + sha512 = "d8b2d0600660efecd59b208d5872d450e66227b50510e67247715b47969ae9999f74813a4142aabfa7d51e725eb5ec5e043f151fd48a925466fdf708b259b3cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-AR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-AR/firefox-66.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ed98fa585e45ef508735c87d66f140c0aa90aa0228af0f6082192214a15057b7b18d98f8949f9d7dda12fb71fe225884202bd25a52f11ff32c6de410e2012654"; + sha512 = "22362e1bfd29febced992d431bae2a1f9ae929d296d13a44b2fed70040776f89ab651b522eb3171a71d87947f9eea3a13dfabf0cbf35bc44ec346e9c0e9903b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-CL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-CL/firefox-66.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "788e8252611653aabbe90b668d9b3d3ccf659e5994e5ec27cb06ab55176ea169ede2e9e387bfb34c9f2bdc719f6f06cedebe26891970783a37cdbcacdd44dd0b"; + sha512 = "9edb4071302ea0b8fe7b669fe39c305257ff8d70c3483a8ddfa7f104df33fd68522d993b2d61511649f8c10c7c65270d81e50e2b78b0f5313a232725c5e63876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-ES/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-ES/firefox-66.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7326551139c749c80dc8c6e1f83e94efa5dea148e0d8decfeb8b7c4aacea87c5b08009bfff372f32545e92f6972ba62c491ab898f1469da0661cf633680ab775"; + sha512 = "58b7bd746c99df977813547aa40dd0e762fd509c0c5d279620cbc3eecd133e647c451bdde75b3ee588d08247054a6eb7aaaca62520b4a319bd893ee50d82814f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-MX/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-MX/firefox-66.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3d759f48bc4408ff29d389f0d2d85be8094c987aa7ea2353137ca1eb9c25e6bd27324606afe1b6936919c4fba828400921604284c2009eb116d7463a184ba12e"; + sha512 = "99d935a84faef492ff90916df69ce3873c34d3bf52eae3070b5aaf6faec3ca21b7d1368a7eca0e3749abd6716fdbe668ba9b3d0411330c1ffcbb384e8eecb153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/et/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/et/firefox-66.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "39263040a02198e0f947cd473b00d5d9836103d2d5cd773a6cfac92ea00862003ddd972a2203176ce2df86b3542d6a23274d6ab4803e61210bda1ca68d496d69"; + sha512 = "f254877741061e688dcd20d2af8ad28e4bf055de203da5b4bd2f339b6fd076adc43610c359023b2bbc977bec79b431884e377dd671fbc3fca64db41d90137e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/eu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/eu/firefox-66.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "138eb7dd9642b5c878056a853a7eb326f33960229e0275d18c8d516f491ac4abed319a4bd1b4ddfb19495c5eac08c0736fd0a0f6dac7b535bd22655df9e4cb96"; + sha512 = "87cd272e8985f1cf09452488bf66e3abd8d6a34be327a2fcc9f6a43a3aac82637eab2f3f4ffefe8c04f4ecdb6b6fae751201ab81c7a69ee9fc5e0cb876c1988d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fa/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fa/firefox-66.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7a24a8293f6d0ae1e27efd3d295b56ad10f7af337ddd5852277427f574cf9684a8fa072114b75b83a9141441b096128b505fde34ae23884d5caf592864ec94c9"; + sha512 = "7db6fa0900c79051463cdfc88ef9b6983751c5e3709b5980204beac82418099e41226e6b56020f6c04680b44dcab0a384e17a99e9bc7b9aa052c020152f8fb4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ff/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ff/firefox-66.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "3a2fc784c2a9415f4373239ca786a98212361d8783eedf315371baa29211366499fa4fe0b52c8050228d6cc0abf57329381ef220b6eb5936df64ea016f6d28c9"; + sha512 = "3907e1b8561e6347190c8ff142467c936e03466eaeabb94bafcbe7cb36b087ceb7031228e6145bffe805f60ac0e91e8afbb02e4074e1f41dcf6811c7369114d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fi/firefox-66.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ae78203f8d0251562e01f8accd1a1a119becde11928dc325d91e3c6f66fc1fb996d917cc4b2eb94d5761ae9484aeb44f0282b888bae6376b635bc171faee00c5"; + sha512 = "d23444590edd8b601468c2e85af06e0a86e1b2b582509b6acc4326b4d50140b6ab999d8882b9d7d85625cb465d05d0dd1a8a9be441ac0ca8bf43615fe65649f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fr/firefox-66.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "f235f4cff178291b14f2e2c5b55e4c37deb9f11f7838411a77813c9d0c358cc01d42947511d1b91800b894436202219adc068562de6b524f4e2d9432ac4e41dd"; + sha512 = "04bbea906fcf4412b07bb6d3d5921b69e12de1da3e5578a0e79df123cb37a3711a765c63ee5666f2e88ea1e2af0d478c9d5e3645f42f40382fdf8d83e92591ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fy-NL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fy-NL/firefox-66.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "05f90317a77984d3eb71c45c6e72d8a3c3630c98f98f129d3f4ef0b3f1598b4b49060ddc8c420fcdbfcab59f739056f78234f5c764265f03b140dee384d87a75"; + sha512 = "cbc5c6c0d71fcde09d2840d27cd431314c3c08673006fd49180d0541816916322109ed164fb2e2184175671db6a6119ef5bfd5f412f7d84f6b878cb6bc3c07aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ga-IE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ga-IE/firefox-66.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "37397f5bdb3f36464af9e8675ef0bdfe9d778de42ad75a5043e890db9c4dc96d72001a001030a7db895a92630ff9fc734a335c1644546f675a78efd74c9115c3"; + sha512 = "92054f32b778ce5314d7bc42c2adb07a7a022b65fb2bc3d6134d8d67506bdb1c021de8754b6694ab062b7c502dcd0b602c82573d4ab885d3c69f8281aca0d0ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gd/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gd/firefox-66.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "3a679287bac794390e0a39a980507717d72633112e7a51c43097a647b8ffa88a6f93ae5cfc1a0f99e668984bdb59b38f72f8d74fcb733888dbbe7ccc9cef731a"; + sha512 = "c802e33554d8c2fac9ba30f161ade9d1b6ecf9fe5eef98d493db16a7dcb2e853e83d8d49a42b30dcbf8fa6f2690bd21f057b48dde8ddc4cdad6c0578b02680aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gl/firefox-66.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "9f1086387e08446fc8ba49051a992b1f508e0b830888f10b366bdd5ec03a366fc805b1477dfb70bd52af7e0fbe49d2232919aecf32755a870561e4c99e989df3"; + sha512 = "6abad8c99f7d92b01675bcb401e47d9891702b9684991f174fd93a444729f36305feb529069c5c8ef6e118a076758ad413bb30e921ebfae8358c6646a65dd633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gn/firefox-66.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1938a8b3e53a4d11247407fe74aa7ec9d5aef4dfb83fe21b3792e0c043065025feee6248efe70419c8f521fbf0f442bc4f38d10a9a4222659881a65d2c450b3c"; + sha512 = "27778127fad911b707567f8e1d7f50d16ba56a0287641551aec7d2692b4754be26e0f2592f4a805dc83cf91fd314f0481f5db3c23c682f6dda3fcce8fbcd6fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gu-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gu-IN/firefox-66.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "70a0c478a84118e6970e931607dc631ab345ecea70e0936975bf196dcddb5012d39f770749744f7742ed20f1b283488cdf594e32e8915de88be51293574e3670"; + sha512 = "6dbea6ab774b16ee9e07442fa50f32ceb2f9828596c8c523a2f47289fbbbbc30546ddb208128163c9de9800d8cd89c598a321454d8d5f58773ea896688459e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/he/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/he/firefox-66.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4d9003ddb9836746c54c6b74ade3787f108fd71b2479e198243c8059601838ccdc5a5d107ae4a41a7014c12edefafacb6f6f82cbf744427f9e59e5cc3acb33d7"; + sha512 = "4a9a836b6dc45ecd69e7b9868f7bcf50c7e9c0d06d2cb2ffaf68cd89a78dee35deb70ad6668dc584ab8cddb05bad421129b525294ec880b4b8b5cc1bed19ea92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hi-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hi-IN/firefox-66.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7c42a9e5ca1fc6cad9268837707cd802c2c1f796819756ec5798b40e2c14b774967335da52a99d4abd9cbb197c78fadf306bc0460d6b8182f895e4d8987bd84d"; + sha512 = "7a76a3190102d36ca570131b6e480b5c3e5bb5f4c0fa794db04aebae6fc5d85f6cde9ffec3242f5e87c5d5e3c3ed0d0eea1083593f4cbef286cea708da9b0ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hr/firefox-66.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "979720d0480786c8d6336237da65813635f04286f60da0fbb8222d1821548da40d2a78bea98ce5baa62298d4b2c4a03c99455c5285bf73d44e21c1b5f497e56a"; + sha512 = "0b959d874a690a1cb77fb9d06f797a1b6b51b4b76e0506da310e77427f3bc47f33b3738c24a2576fe381b8bad3c95861e1c5456395f9b77317764ab81c40fbc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hsb/firefox-66.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8c9c876974441ab9bf7678c1aabb4c068ff61d2e23e69ed1c048a5d83801341cb7b2c3da3146d6c04fcaf9ecb2dcbe83bb2578aa50a168b21aca0ea6b95a539e"; + sha512 = "48a9225e25668779ff7f56c4292166464c702c7316d255d8060143e9902050472b617762852e2faf7b1e405e097c65cb8bf85c1fceda876082766b6443b5911e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hu/firefox-66.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "748b53186b901ce526b19c6995de78b6bbcc7e99f88b146de6f24ad3c9854d1251b3259ff61ed80184d20db46ff015bbfbf499a643626e8b733ab6b82e2bd08d"; + sha512 = "8115eb6cffb227930c3e42955f4f705ef5898485d568e064058372ddafae7005fd13d5a591f974f01b6ace7deb3196d52e8d2214d57db59ab69ff792df51c9e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hy-AM/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hy-AM/firefox-66.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8730ea2e7fe5c2718f8e1d3d3b9ddab49932b05b121bf46cfd3a1d31361a61116f6f6ee64cbc74da19ebf4b147c1cc6223b5500880c627926ce1201fe1511ed3"; + sha512 = "39984fc44453d1ff2d430d33401ec76c6272d25aaf5026236a2053393a63fd467ead1a3af1fc5e59fdbafb56314cb16b46aa601e1a9843fe62bbf5a060558e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ia/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ia/firefox-66.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a72b3065f5994dc2a035f0f6194a8345f308c97ba1718989b0f01291ef9f6d90d7e83ec88f8f37d43ceaca548e7d37ae3d703803a67cab5df08c00c6344ec710"; + sha512 = "93c248257b11bd9f06fa9125366dda8d7b11929e53935b7eb522f9ea26f3315bbe36482cfdda7f4d5af9d8c6276f14fbea1650168e54e82ebb030c7f7959cc25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/id/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/id/firefox-66.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "33b12474f8d66df94c06132b2c8a09ddaf60038b61cd06fe24109e52c8c81b750d4f4d7e65ce78f46edae4a062ac72e7c7176e8038f5f2b934784e3ebaed75c5"; + sha512 = "89944b1e65f3a2e88629c4ca27112a78e1e3e597eb67ff7dd1bad9359177f6a59b47ab8eb3846a4abd1f22a0675f6915ef95af580c27a19b57a69757c8da9ae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/is/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/is/firefox-66.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "4801bac4c8b00b581feed2de9486f05bb7cdc8c6cc49ef2318e8353fa9a0add7292c36045cd89c384dec08d3a87fbf1b820d8593d7e44367606f08413d939e01"; + sha512 = "e1eb5f27ec01e8404056faede53f691cd9159cfbec6e41aae3914d07c31925f24659b0a4f086223beb4d294fcc9fa6a7587fa71677f46fea60c696a541b502be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/it/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/it/firefox-66.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "1fef11b6e4c2b92e7f0a71bbde1178aba75843a8e451d9514ffa7502df5e93948df781a932f8e9cea58a7f244dca044dd321d0a7c9ef43d628f4da6b96fb77c9"; + sha512 = "c8cf1e4e60df22cfe20fbb549dd7830622cd183ac09bfc3123aa48f0079805d17c2210a0680d4722e7daa322dcad11ef06d2098cd51d5eca5060d8cbbc78b5b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ja/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ja/firefox-66.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ae703a6710b7f32ecb5e5380ae0a1c7fa18800a734932be0a97a225e21f98b62aab14b5d5189036120589005e64265cf46db9083d9a0d205f9403bd431efb582"; + sha512 = "7c884be074ebddc9e8a1540006726a620eaf3533331a18cf40847cf86c270b009a89b976d57f3b7e6bd450b3a1fc5cde86f72ce94069b4199fb1aafa953bde65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ka/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ka/firefox-66.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "adf78cf231af749f5c365f49eff2d18b28a12c865f6b8e61bf363df9079ab6e6d3ad2fd6986c9cbb70e97e725d8f0b1e38fd11cd7668f6d513bab96bc12d0c98"; + sha512 = "30c4bcf5c087b09338358d0bf92a990d6637307dafbdfbda8a72290b1851a3eeba595f66d2b245a47e2e789b7b27c3631ecb337847c3b4e9ad28f34549dc9115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/kab/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/kab/firefox-66.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "50d76f0f91ee648a5b16ce1ae2220458258258245a5aa77d9ba72d6cc1a9a7ea5404ac47206a3d60a66da79cc333f6fa01d63add7ee6d2f7e003536fc221246e"; + sha512 = "2da34bd09264883010a038d975a4d09a63a530460c2b94034e16eee3912e9f014253f88273c395a5a59c33e4d058b08165ac8ffec6c92bd4fbc6b368d283dd74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/kk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/kk/firefox-66.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "0522a872bfcbc7df7e1efdb0f6583a799ec117d884971a4fb870d8d7c693a09659b7f8b7ff3b7f1903822f1a68575667175e42dd6701e740e339deeca196e56e"; + sha512 = "3ea8a42ca879af580659f796fcc6ccbb23de9a66c26f8e37e207aee22de7090a8d68a33671a8d1429e35026be14d099d9fbc33aafb74ea6d31c2d213b01353f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/km/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/km/firefox-66.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "33bda0e594b1dc41e33dd414bd74fe177bd8d18610fa2705a088b7e92d65e6c4f6fc1cc8169c302676e2b726f5d95e335cd3ed83706b8b145adf65e3778d7aed"; + sha512 = "d150a56fbe7f7bcc7e5a28d13c0ce1e1ed6ad832ca9c1c07a9ee160482ff91f3ced62d6c78dda587e13020706fb5ea9d269393dada2a47412e95fae69347f24f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/kn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/kn/firefox-66.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "52723a2f98b452aec9a47a545f224262dd819eacbeb4a76ef628875625d801dcfb2eef2ef607b9ae3bcd477dd5f8484119117c3129100d1fed8599ee0887913f"; + sha512 = "f75b51e80863b44773cd4b31d8c75045635f019c907283c765d891dcb9c6867f6c6d25a3ca00a7645128adaa73545b20c0e31bfd1779b099c59d9448ef3f61e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ko/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ko/firefox-66.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a10ca925d7126a6f524e8b20abfbcc1ddb2e28d2e69453d7234e9353dc609281e3de69a3f5bdaaf33591a1da493bf54ba15ff0a03b980af44075ef7cf0e46b99"; + sha512 = "db9be13d844555eb6ceb746f5e75a76ec93e84de5f357819a0b999a1132239ef0cf3e4977cf6ad327b6a1989b9fd62460dd46d64bb6965b9808cf4f5712cd1f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/lij/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/lij/firefox-66.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a8778e8422502386116c6d77aa624261a2098d4d3d77d95204d47b3c3f6dcd3e8575ca3b5f9695e7ef6e37101a4864790410d78a805701083255e39216a21dbd"; + sha512 = "8a56eaaaf84bd81df323490673add48b69132d6fa1c0ffbb3b3d39bc9a0269630f2e825332566446135356ed0ca9a456e05183e3d3330b8103ea622c2c66a1cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/lt/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/lt/firefox-66.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3ed9069c44377c8b6dff86624b7ffe29a3b10178dedce24d0684495c1b731c243d1516adf17bf6d23bdb8a472be28c8265b3f6523bf9d09f68d25695a7d6ef2c"; + sha512 = "b84fe666bde98a53feaa0475d31351f792b9e470b3486749d8fe261e86993b4fcf782049503542ec0ae9a980a458044b86ffe16c0dbdaa43c67a9cd267219dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/lv/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/lv/firefox-66.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a0969d6650403541a28203432134847279d0ed067973e4efe4460010b2e5eca633b11fcef5080f3fa1b8c8cdc8a1c7cd20001d924e672d261ae435e34baf38f3"; + sha512 = "ac0257115ea022c29098747337839fdf9cbec003bb0eebf56ab9b20ef0dbe25f0215bad4c9d55cc0178b0ec6f062d6578305d866f4eaaccf31557a23e336474a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/mai/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/mai/firefox-66.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8a739840c2ada4aa9de4262a4f3048a197e19a1900622c066ae698e2665ea758a831b3eb09450fcf5d8af547681985e1698af6a00cd9b046f5493893f94a2e3f"; + sha512 = "8299cabbbf37683afe6c5b085b9ec86277f2242beb42abf152872a738c9acfb6a43dd9876781567c4d9d4aa5168611c30feceb80a732daaf51564af4b689530c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/mk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/mk/firefox-66.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "cf432e12b0222c2a3d9f52fca83539772b27c3928a210510709e30f058d2a96b67f829d7154cb31c2a916f45c16cc50b7c425d8afe170853bf3851e44e9fbe36"; + sha512 = "e66020b52a450bc9afec362e77b12a1e718eb3bc709fe1b903919bb5a3d0644cd6b4c6e024c059308adbc123a034d26e72d9ddcd6e2ded47d3dfa66abe05d297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ml/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ml/firefox-66.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7174c595765d1ff727f4d1845bfb5c01eeff9e4e1ba760188dad3be59744c915f8b7af669bcde0bb66d1ef301022386120c11249d291cbc9343ecdd607a4d52f"; + sha512 = "79458132dccec478d2eeec5b0824a46ebd715f010a7aca412c7cde67dd4f42d374f503858f3548eba839f2cdb7b37343a3466621a4e0c6dad4f10c65c237cca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/mr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/mr/firefox-66.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "997e63a30a55792f2995d06a54cc198859207a35154ac481e806955728bf916d06456d6e27df8142335d743d468adf2e521b120da03f7386e592def6123cc9cf"; + sha512 = "be68b4e0148faea1b9f4d20cdd3e6f8ca638a0988d31bdd8150ce5f6c2d436e2616dbdd196a900ec218e93dbaf657c0ec984da01bbe6ee7ec620f0fc149e1aad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ms/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ms/firefox-66.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3c14275661d84aeacc653c8b4c122b04b60b1669907a4b18ea32a7ef6b36ddb249b5a7c10e5c4eb3453a662d4b8ac4f2b94a304f3dc4c1abc0661c9bbfe8f035"; + sha512 = "101031f8ad298b3e09a905e66a6e61334081f97ac703c1b93e38431be5acd0f667e8a6906663dda2f671db998ee4c180bf749b685fd204b03b4575223e02852b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/my/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/my/firefox-66.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3268b3044a98c87a1302aa7a68cf14b18666c60778e86f039b445739c86074f6572218586b1f14e71f27376df4af9be12307b6877e1336d1047c4330421165d0"; + sha512 = "c63150470385ea9ea7957fec28f06069a2f5683de2fcedbae8550d3efb9a78aa60e78932960c820774f65e6bf0a99ab770465fe4c34c837983601aa4a4f1abaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/nb-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/nb-NO/firefox-66.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "41311c4fa3da459eefc3fb328f6f0076b2d4d6b9ce2e6c4f707489c236521f30effaa76a2f8831954d5d1f39f948b068cce3cabdcb8f114d9a4119ca319a43cf"; + sha512 = "7f06bcd3f3d3f410bdd89ae750d4951d4d464d71846b46e25cebc5c256196582844863ff6126784628b6f00bd9e49ddc64b88f8a8caec42746c09a15e898970b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ne-NP/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ne-NP/firefox-66.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "511244eee5cdda8654bb1c274fe61e8a74127d2b488659cfeb6065cde6df9f4f4bc139d84e3271623bb917b6796d9b5473fc1280d311e9f0a6a1104410080af0"; + sha512 = "e68b0d57bee14ee3ee73a29215bdad547ee77b506e3bf2bab4b1691ea0bb02e1fa9002c9aae07a139df4bd1a454e506cc2f98cb81f7d58969fc1d57123f81c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/nl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/nl/firefox-66.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3238a01998a0a1deb9634d7d731e6bcf7a155d62d7fe5d443dffa15a6cf3913065da1b437a481b58df204abbe7528802a7193f931961714b3a36754855d4d539"; + sha512 = "09828f604f72821d0ac109f05d17cd5119045ff40adf9cf5d2c4a29da707e83b8628dabc3b4e75eda40494b386c60eb20fbcaf9686eda2edab874ac298636848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/nn-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/nn-NO/firefox-66.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e00f7f0384f1fdad8f43e2123b46ff789d68011bf5abec709237b709481256e17305482dae4e2c9ef60702dccd3dbd8f984dfa1ddfd444c2565f8f2a4f73e67e"; + sha512 = "ebbbe599e2331a0f0016cfbf598cc3b7deaa9a377dcc4ed00dd6b92adb74b264eff35d9d110362bfc4c290a2a4193915d5e863bda8f5799c0ea502418814faef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/oc/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/oc/firefox-66.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d8d11e009926bf5c55c57d51914d96e7771dfd7184f6eef958860907e73274a83e457e734ebfa093b35dad3b6c1f8d4927b244eeb8e4cdce20c833289045dbd2"; + sha512 = "36f75eaf0bca5a298aa0cbb641d3da21a772f543a9f7ef4646f2cbfc64fdae0d9495402d6cdad326a1e5628dea3b6b36632a431acf2736a558b3c191cd5f6dda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/or/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/or/firefox-66.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2f3400fd9b53be32463a9ec9455e7b7bad61ec0d4e4efb8b116f5337f68e3262a8a01b06051e7b75be1c99698ed8fec7f730dd0eac839e1b643da730af4abb23"; + sha512 = "2306c620846dca4dc23f004d1504f305897cc35d6cc43dff9e9e56fb51006ae29acba257a4c2d580903d65366838a3f5d1138b99be9e305e350577079c4d4e49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pa-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pa-IN/firefox-66.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "331a0bdf3aa9995b0b079fb753393d3f2fb6bde56f6fdb81a73ad3cfffe1e3ef0b456a2ab6ca795fee7b3561f4e253d4f05fe6f297646f450ac32a82891b71b7"; + sha512 = "b308ed0b2176ed89b4c42221096161ff9c2e445312924b3b192e41dd96cf47c7a51273be6772e1eac75f3cd0b26c0ee10d56d6148f4e1c09a40ca1a3bdcf279b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pl/firefox-66.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "b191fe57c47d9a363a81381a2a40452fbcc8f29df09a6dba1405d1bf47f16e989d3b8c870b04566107d88d830b5cbf315fea6dfbcb420d8bcadf522c6024ab22"; + sha512 = "e4484053fb90cafe00134ee7cf348afbab2d0a2373d93afc7532b054b029bfdf97c79147d2252f8fb88f914c2218aef6042ecb81615c4e495112d1705b4fb4f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pt-BR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pt-BR/firefox-66.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3dbfe79e86ea5d3a34c83981a5f8824ed2e72ac38fef6fa3a50e688152111576d4fbf8c267ab0ce46e3685520ed68281e5924a4aad0d4cb87eae97c0df48d7d4"; + sha512 = "5799eb14edb50b40755b79724edfc5e59fbb9f458ea50ef467798f49fc6bb128eb41f1aca6e402c1e8b3fc93a3d588a7ab845cb262db883373538442a8a363f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pt-PT/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pt-PT/firefox-66.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c656a63a06c18ff35e250bbc0f29536eca725c4deab6f125a6c7f7cb69f36315169b050d64dfcc23c5f8beb2bc030025eb259153e7272ebcd35ec9bf9d2a7649"; + sha512 = "853d7fca6ec8cc49911a36eddb7500c03d6da1487a2116a1371184a2d17d6e22f8b28c4079eade46ec90cb42ac6be68d5cad9015d5b458f635a88d7272124105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/rm/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/rm/firefox-66.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cd1bfb416de16ab4c800e868f78046247c8e0ab8bd5b4e338e77b5a0cd045f86552ed48bb7b6b000ed3e82a96d78cd35d8213f8f16b896c7600d57f73574f2ca"; + sha512 = "97a5438562da5de2b212890cd447227e5bb68caeb7d149941eb6064e5f89a15e17f8455134d0b441b6efa63c369452431ac211664d684870c90e416ddc4b2ac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ro/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ro/firefox-66.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9206d173852cc0203f6707eb5935a1f627142c093c965081c87990ea6fb7032d1d2d877db0c3db18323bc1a8ea03f477de539cf6deea5b4e16f60826cd5e5ff4"; + sha512 = "aa7a2838a893a968c04765f240bb423cf53e7e05e1f2271f25310e3ce456f40e170d580db78835a45f25a85008da1b9446191871e5345c6091e1be11004fb3ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ru/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ru/firefox-66.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "deda3aff41c9b82bedd4d4fe1225cc424bd8eede7253bcfb5a5773b41e30e9fa18e35dc859863504db190ead420b32547fc3f345ff1f6301438d9368f39e33f8"; + sha512 = "bb6e0d8ea567b685a43a3a15a592708ef7f42c97cef0da0673c8e466aa67a6b7d254d2916fa205fa44a88fccf4016a37749a1e56b62e7f4ee8558a662878242a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/si/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/si/firefox-66.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d559ebfe3baf3908d68e60ce3f46f2e050f6634a081fca6fe2c27a522c79b429fdedf181291a93af4177023b1030bbf92a1f3221fcdcb74bcc75dc98e53a8330"; + sha512 = "32a9c6c8af556ec052711c09d9b52ecfe9156556f4ec5afff65019f50f9dc108af9505fa6c67208034b90bc73b997749f829de913de901265f352778619886ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sk/firefox-66.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6b0c1bd8313f75532f57d49a32bc088079e1d1031b0fd5a60d7fcfe4ee37d93d89fc46c81d042335d613f0fd739b5f0995f04762f9d019b40680296595349b0b"; + sha512 = "adcbeaf8216a056948f74ccf970b6ba1effa127efb0f9b024757ce313f047293feacf96418e1078082a7cd8ca769515f5e59fcf2b3195b762869d4563e8ef3ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sl/firefox-66.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "29eb0aa43f1d71ad13e5ac41b16f1839f8249b94d673dff48cc67bbc42fa618031d27b80b996a98a393893720562b5c9aa2445195922b435e69e9acebdd8320d"; + sha512 = "3a57061b607496fbc74305afd1dc531ec33d02f6486582faa6718b7b8d8f7feaa6f909c9f666da1276073ebeb44d550fd100389a9ab5acc8c5836395c36249b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/son/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/son/firefox-66.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "baf9f64912376bf00997da2c1a4e6f08408677d9b0f98420d262810f24a238cf1ea0dd2673cabf9f0a770dba76b7eb09801dcfc9efe0833a9711cc0d52bb9f2f"; + sha512 = "2f13498703df28fc45eeb072edf2432099501a14ce4f4b2066b12b791ecc2585d965da79152c631dee0d29158135ccec1d302494683172aace10949b08b5506e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sq/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sq/firefox-66.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3620eb66ef5c6b81c1a4206b04d8c385e966d807b163736641054083baa924d259d5e0bc83ec6cbdde002cfacc56c42e60b7bdad8099f857c9508ff86a5e884b"; + sha512 = "3b64ca5c46299cc324e3d75d5d76e111a3851048c98a1705647b853514c7e891977bef5388ec88098248d582446d01515685ba66e9edc4d9d20dc7e103f8996c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sr/firefox-66.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "49426038b933ec8ee0a3f1222f3aab1ca842e65a23a3699a13e9012415fc7faa156fe1be9991f4dd1528b011bd381758541086e8148224a5f0e8e9328731885b"; + sha512 = "b3645ab35a9953c90593fa2d1ec1eac57eb539e856b68061f68aca42d5b872506a188186fa227d3059cd5ab023124bd47679451e231009d863496420e4914b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sv-SE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sv-SE/firefox-66.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "eed125ee751f2b4aa03197a697f50e22a63535d2fec17983e8d9af533f7a625583a0b856f3b37ac92e82b1c67f5c11d3dc9f485fc0236bb8e36c9b3a30bb5eec"; + sha512 = "ec46567d475bed5cd26eb4011196b4a14f234ba6b260a8389d7709d637bb445e2dafd99f5fe93213a8a19055f11d565196879e006cb132c8b9f41631e6783573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ta/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ta/firefox-66.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "993459f0188ab45e172340c9a6e93727c424e9e1ae629abce5028f805781dbabbc26fe2dff87f988c0abbb04c80682c34ac6f69df3768f24a116e6ac7fbae636"; + sha512 = "203233bf73aed33693654a8318126c60fe8693d209a0892def59ff7cc3f67e0d1c3ab4433f030f7ddfd844137fb260b0f49e4b20016bfed9f76fbfe2fac2f088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/te/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/te/firefox-66.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ef0e9519134bf9cf4d148cfa51790613ec5a225a0522385dc8f689e256e0c91a7d39eddffea81a6d08e319cfebd9c447515eae42a7d1813554ec310f68e44fde"; + sha512 = "ae3c3e5aa9af5a99ef9964b5c901b8433aa8ede65941492855cb4bcf15471c8214c25cf4a4962db8abe91523ff108fe8da9601a8f535a00446104b6612071703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/th/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/th/firefox-66.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ff74f294fea1998555434a8802240abd5c3232097ce7d5968ed3636afd13d80b03ba0380e45e0e5b5f1017ad2337bcc4983836b233f1bb879beca4495c63aebf"; + sha512 = "e35ee9c0a26259f04c21fa31a8ebb6ba61a8c2e5a8f22e73f93415f96061ef2b2484eec83a81be5a88a40f47ad90623407b29890c0527b88f718a48fad4f8e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/tr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/tr/firefox-66.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "094a9db1217c094ea317facddd298e8bb5e0d856888db183430ca7303125d6c0762b616e748c26f9fdae122b2c82719f9efd2607410c11fc428ddabc4b561e1c"; + sha512 = "4ccdd702a835b63561aa16c9921543d5e1639a57e7f54385e7bde01106e77599e343fdb94c387290fe06684b8daba9a0ea8146da0b71b108c44bb8e7bc4e58ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/uk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/uk/firefox-66.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "42524cfa7f7adc5c1bb68d1bd695f58ad9bb062499540449b9d83664086f595142cb54fd261ba52b325ffc1d79389a8e2671c52553f1c13ffeeb06cb23e2a40f"; + sha512 = "55382add864881c1102eafb37a645b8ea00e068db41085a677e02476aad5925e64f6f1a6617e3e40c5bf58c131dd074759cad317ec0ad5c6fd3c5095908b01f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ur/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ur/firefox-66.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "aac59bac539fab1682ef42cb6c37e3f61a5eac1c3d3b9daaf960ceb8e5bbcd99ae6e7fce3d1ebc36a72a69cc900b770e3d60fbdc21d2d53d24217c0939b3c7bc"; + sha512 = "c9b8fb563a85cc7d054c50e1d1b4b2f478ab6800c87fe345013591a94fe5ce9d0def2c7237a6497d757615e7f429f02701709b226cc8a0e2bc8bc645236ed1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/uz/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/uz/firefox-66.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "560e806bf5786307b3d68a16136af71876071e4fd57de974a0f1573cd67df54f56962137b80641900cca2951be95835ba7420cd7a8fde549f6368da7d362c993"; + sha512 = "89901a1bdca4586c21a8d5cbd508b404c22328833cbea5aae92d0a503a603e069f612e61ed15edec607c12517f75b7c2a4c5a6b0c7140f1cdbcb5795430ff01d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/vi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/vi/firefox-66.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "69bd8d24aea9d4e7ff0dbcc628acccb705f1fc6bc09faf1e02f7e7a4fe821fda1c8375f5029b44cac28130484cd87dae1cfee3e6ad92aa54f5e94b18d9c6f62c"; + sha512 = "dc8a0241cfed23c449392b54fbf99a12025cb07d834505dbd712ceacc080aff52e0c139c89a5166aaaabd576fd9977acdf5d433022742047ab48c6a32ec344f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/xh/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/xh/firefox-66.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "061f38f6cdb3ea324015dee38fa9ef5f61217b2b8d7873655bdc44fce5d0064a40149d987e62f7f49730c38745d1618f0050379e51639efdea133ad510a3a6c9"; + sha512 = "c5e3c29594c2e1fd29d30aa8b98625968330f010677515e41587fff401d0b2aecda31d55e1a3071602e736631d357accc62faf2d50177ba10692476c024dcd36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/zh-CN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/zh-CN/firefox-66.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "32ddf5349b99cdae0a0fca1d1d17373797e643dedbcaf523e26c7c576b3bc6d51595c7f49b449cd79e14353d3d7ec4497b43a30c26853a9513679ed78b87ffaa"; + sha512 = "58516ff9de05ffc315ff45332122e78010d4362d8e079e8679c5f56851b92d488399840f35469e9920a6c491ec7bec0854f275368fabe61bb4be68d6dc3a2d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/zh-TW/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/zh-TW/firefox-66.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "1f57a17c1b070751a0212cb7b74e9840e012f540b6dbff22a5983607539a49e65ddf6388808e82d268f403eb9babdf6760671671335a2df5d2c7ac1147e50399"; + sha512 = "fbc313943d6640e74619110fbda3432d77a4de43814cf1d19b69132236ba6af86810d6618b71867b03c00e85a01fac26b8a104e2954d79eda8dccdc9e43a4dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ach/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ach/firefox-66.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b859d67092ec6aed8681d95c796dd8d843929f22030a43d52c2480762964378b01fa166b4500afadd9d23bf5f57a2f78b41b1cb84ed10f1eaa183bd45990218f"; + sha512 = "7bdbde365b86a33690e0eb44bebf479eaf3f4f226c23aba210569c0d0ccfa3f3cacdf3287ffe96f1799c84f9f1a91274fef4bcf6fafa472897a672f478160a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/af/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/af/firefox-66.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e1cf74ecce528cbe51d7690cc3c2417b0d0050cd1067b0f1320d7d73c1e28e921979842f1213b235b19415aae4468776b12d78fc26205c849701bcb155e7f0e0"; + sha512 = "02bc8c607a10d34868e9564e1e07a60460ef8f07b2493e303bf051e7bf93fdbec31b65c9d4fd54666aa84a8dc0ae9cc87574b88b09f88b8dbc47d0c75822d5b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/an/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/an/firefox-66.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7360a37cc763c3152f5f6752985a5676f284346968edae3129f3e944f0599213fff7ca8b6e79d5ef9f2fdc6f744aafb2913f0a14deddb98e7c7f5ead67cf1878"; + sha512 = "c18a015c159fb1a93471246556ada44098f696cbab2ec4a6d46ebe34590af4ede6649093a8435643052ccaa258e578e232b07a290520dc9b398c167e57eb8bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ar/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ar/firefox-66.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ac80c54b771c8b0ea8ce93cb8a5a7f21740e5de81388708df7c3114e1864dab2a67574474f5386d6f2f94563323219f8c0f9126bc689b7a784a92f9bf5bf6536"; + sha512 = "91bfd2d01fff9a906f433f3611d985fe2951f2e179a9b2f00847f99d3889f3ebe2ab207a6f05f0c53379c21cf723ee8c447213f50ee23461ae9d1f01c3d2d77e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/as/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/as/firefox-66.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "3cbb8869e8844ab54dd780c5674663a1b9c3dac6270de9c0be72d526c4f349647f71dcd73f71cbac6ccf4fdaee699f129ef1df0ab9155ea52446a0e8a0547fc7"; + sha512 = "3006a90c9fd343797d9768f4922526089930063a78b999cce9b751ee2ebea11f8a1acf83bec3787b19403b968e7978f51a3e894e098805c90c02fe0786b7e61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ast/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ast/firefox-66.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "884cbb70775fca488d90ef1ddb2cc4e976ea22f2879a8a4b953c4add0ccc05d80594c99a0bbd56a4cc5f8f463caf1f38af7559012f499d145b998b2e7a27528c"; + sha512 = "df3b69f26544876ff440dc138a60e29971278df8913c27408c53fc8c2510374ba390a4a4feaedfd30e72121ae079584c34948eb61804d105ee37412fb795be58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/az/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/az/firefox-66.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "cff6e4986a14ea789e3a09fa4224b405a98b6e93cc8c106f76acdcbdcd7bd6013f77cff16c8057c8ced232901272b36ab8a3519a5c60c92d16a6b447735e92ef"; + sha512 = "922866837ee79c614c37abf6b1351f186ca61a05506d891fb51021e6366f1317665e015bf3c0b846b38e6c209b80cf71f5cd6379528cd5064bebb6fe78dcc98d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/be/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/be/firefox-66.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6d0121e0329539c4f8587e24455fd44b2847c8b3e2ef2758174e640f1aa2d45ea918512342f612cf5456b47665978f9ba7f588ae329b10c9e32aa29450586618"; + sha512 = "9715983648ed356e8f929301daffa6850439edc7186feefdf0146dbfd5e29840075ad3b3d083aa48f5fdb82a387d39c39bb8fb92c8b286086a2ff8486313ba3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bg/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bg/firefox-66.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a9364f8ec3fa4c129172f43a901e74281217fa586e75464b7dc461ec58178a5aac5eac8f9a6a93f745c4fe75135e427bd2427e084146d5c27821ebb3db06d844"; + sha512 = "521ba5736720ada48afbf5a912f87f207a54f30e525853649a1a2ec1b384addeb2badb3ea5cc2ceeee9a0942d6e998155ea02ede81dbd61db41df2e400605aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bn-BD/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bn-BD/firefox-66.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8fc2eeac47af9eb77422f14daf46746e44ce0f3f6463f929b3c1ad167bf3ef9116c38906804c4cdbc31ceac8c1a33e52916b6a14e2fbfe70231c0ef452798b5c"; + sha512 = "87deffea882319d565413d6f17e97474fa7b1c8f6eb6a8a254c6ec0937e00e86db54f832c3480729fc934639be1ae214b4c630c7228864ef2f121692c88b1e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bn-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bn-IN/firefox-66.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "819bf16a7d3bd83a5d8919974acd6f84ec41798858beac53a3df0ab66d483eef0dd5c02719a0ced894497d6fd2f5f43979e9d6a24a03e50b4817000c3ccc64c4"; + sha512 = "2b44479f6af89e42446c5bb7d48350bb4f74be5be58405e85588872e777565b1d0f65af72cffdbe04f9254320f9d5fd6e02915fe5089fb12bf54088547716317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/br/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/br/firefox-66.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cd469af1d65c2273e3d048b647663b14a27a249b0dcc511ad39f40abaff6c56d6c4b258af0cb078083d3580a3ba8f88182bb26cbca0581fd90a91e13ab972588"; + sha512 = "b914e9e7c296f390404cc6354f2245350c26febc10961774c5b779fd50dfc508e9999669ac9f9d51d57c1878cc07000c5694594921c2cf1111a355b78fe56f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bs/firefox-66.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "9f584c6c12401a2d720b7325e24891852a3dc002261e6c4be191d26a8c2ce4252d333ae53fab6c1d840e881806a030bdc34106ea81c06d196112807600faa94b"; + sha512 = "883337946935371223ecf64fd7b9e342b09c32601c8ae9aa76a22b922ae91b711424b59a65da41c8e71a78caa5e2e08db873d2aa34d7a1caa7c5dccddd1cd787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ca/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ca/firefox-66.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a2d7c8efd908dd68944ffdc81cfe343224ec91e90c461be9adbb6287a775029521f755a59ab273a2d19ea22324954e6a51b202dbe1b8be75a06277cb240a2681"; + sha512 = "84148fda78e1bf7ebf53bd27686e119bdc601a07e2aeb88564f795484fe0abc4545ce009b76b76ad1f21cb76912ed974c9362dd08b471379271fb39a0d8ed2a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/cak/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/cak/firefox-66.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2330a8049b8aa5139d8ac53198eece399914de39ac2e1e031b65db8798c8ab8b1cdab9437999991435739b3513a87f4eb627e5f309bc41c84c71ee8d22715c63"; + sha512 = "279c01a6223fb8c96f05cdcac24fbbebb93157b1f47c2885e25e0bfe3f42eba77edd143992abace5815f8e399bf668ea705c3e55bb6915e113dd13acd602ca78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/cs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/cs/firefox-66.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8afaca3fde6c2f5e8b642029a16aeb565b4d0982ae847c1c74368b237e7368027a63a7729e03ae7410e48aa2dfec5381b7ac7ca507401ab2109844b8f6a44e20"; + sha512 = "48dcca86c1f3927a2ea223c8c5f9ed26d9e35b9070cdcb79c13cdb0e3c60e054c1a4070bc4b059509333dab78cfecad6b0e17daf461e695da7b8f472f71e4807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/cy/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/cy/firefox-66.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "dda113e382b74d9d0cd5c57cd14c9f82518361294e15d717b4e5cc99b89f6fabc48c3a112c843e9e64391b3a230815b38e7cd76e641cc3d9ea6434f282ba74f6"; + sha512 = "107570a323480565829d6f393c5d396105a0df2898f3cb7e3a0087062a80834facf7c7461f45138781f5a9b6f7e8a17360b0db022da1aa62004057efa543456a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/da/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/da/firefox-66.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6b87f1dcb4a452585356245fa5af9acd1df4e3fce3faf9acdbd611027e48fc54d393f7be22a435208a4c8e47f294f9f1d1ae3844fb2081ffd6bcce55ee78bdbf"; + sha512 = "380cc253b1300e95fd938a80f85d6ab2dcde0a7a667879b102cf217838ec7abdb0aac89eb399c882f4095d2e8c93860e9d20f28d870a2c8b80151bf4d73481be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/de/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/de/firefox-66.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6fac7b55b4ee01476796b7c8df56593501544fd924622b5735c7773bcc605d373b622ae17ec14118f4567018d0541d3e4639d826b99dcbe1d521912fa039e51a"; + sha512 = "519257991f438d47e6aa52f07ef50dcf19107dc3c4bbb689dc4b02b0e5de013ee7a0708076264637c4d496b0a358bc940d11ae58d971ab013aeea0c05245a2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/dsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/dsb/firefox-66.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "53b5405363fcfe5131341fd712de0f65e3cd6d0fc06dfc297470e8afebbad699bb405351a9523b1c391bb5c158944d9edf825c338daec913feb5399c4a222076"; + sha512 = "dc770c4b40684b3d54df64f871b8121b57bf0cab931ded91e11dd909e408744a025f5b27b882b3e8f7c14c5ddd8430b5bdab809ae58ce5c0c748bfd6b315f838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/el/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/el/firefox-66.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "dded0705229e8323fba35e40bc2ccaa807550b15f367cd230bebaddc981ad983983b9a4185389d2d5d0ae240e86460934f0b96f9b1a307765743ff1a44cae09d"; + sha512 = "517c5aa0fc3dd904f4f66a2ea56dd83d2bb027e1745b35bbff64399548eb321a1d1a019a0821306f483acfba121dea1f52f9a5eea74341766f7e6830ef08ed71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-CA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-CA/firefox-66.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "34146bcbbc5284ea25f0235ddbc93478d3d09ccafc1522d6ae2c76a56873ed19184d390dffcbf4e3fac406b886c848dbfb5b4cd6c1febb59f7371b5042a32873"; + sha512 = "45db4c4042bfc2bd1886561962dfbfbb6c71488d138d58f942947463f0c2c82e2f2b13f1113d031f19b0b619437017c0db022b6393077d6b529b8390cc44ab53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-GB/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-GB/firefox-66.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "968e0b90079774c36d460f861c6d2cea96c0e8b82173f11eea1e712fd93c3491d85af898df1ef2a8d324baeb04b220c46aaa07e8dc93b9b3c4a0fff394c24be3"; + sha512 = "51a02e9b02b09fc49bf7e2f962599873b9533d465fc7c9f7b5900586741e109812066bf67b6ec422c95a66781cc60d4ee65da139e043d8a8d9648cf8c83a48c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-US/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-US/firefox-66.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4a1c3fdd39bc38e11c69925f61ad7334376174f389053f850bf6f83b5d572e7132f5f80def2ac6531f688b66fb6d789bdb8f456df1990f6fb8e32dd693c940c7"; + sha512 = "bf028f300e912e4aae0da38064f684a1fb0b21686507363c6dad4bed7e725ae68ffe0bdcf055f32106844484dd855716ca60cd42edd0c75166b6015250d3885f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-ZA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-ZA/firefox-66.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "562748c8932ed587527147d7797a9a11d57d4051cf269e7fed07e5ec794de68d8acfe5cd5b7c5e30cf1f3dc5aa340df81169073c67b3cf3243570ff1733552e3"; + sha512 = "50b4017bd2bb74463248695b7ce2eae569eb47dd8dc7236b5c6bd9cdf88c386ef6847aa84c0883ca21e5a4abeb0b86f1fc44d30708d5ba338632f169979b1289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/eo/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/eo/firefox-66.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a2da43ec4e6fc4ab383ac1e4a160b5fb220cec68894b126becef4760ea405cb9e9d3e7fdd980a0624dd34824da528de4c14a9e0acee478021f6861ca6dd35b04"; + sha512 = "e4b9654cc3cb461fe7bb12e44807da92ecbf299964a5c1845d4f73239724e67945c91d10570be70e57d3f3db643543d6b5d4bc625fb4098947d5a06b6ebf7fdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-AR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-AR/firefox-66.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "08f2cabccc7ed0a41c7f6b4eb29ba6cf3562a6b397d60156aa7e8dc967aafaa0cb85d16575bf8b7cd95837207c7aa9ec23c7e821be59ee037a37f3df8655cc66"; + sha512 = "0075ce52d770da93b3d1c61156124f483f5a52c445af874d2ae7122666590338c6537ec5f101ca9e998835cdead0104025bc29de8619fc893867388f961ca048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-CL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-CL/firefox-66.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "6e48b7d451ea55a778050e43c53a53cb00b339c9de3046512bd89db3bfe8a2a3f36a3b567d4e40a9ab9731fe95e52fc6232fc69e76d950c86b779ad4c3085879"; + sha512 = "7707eb290e9ecff0ca8876b72d9803c01b2127f00000d030c3f84c4d3e6720e27c9b3460bfd001e6017ea122d9ad274b7950509835922cb7e7787748531f28d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-ES/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-ES/firefox-66.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6bfb3283e12658f5bf7d4547f8d6ed7bb0f5f8a8148bc9bed7474697dc73b87cb17649f26a100fd6f6717d9f0dd4a0795071e432300c57c7f3a2626149275ed1"; + sha512 = "24cb5aa7cb7ab27bad12315611a0a355421d4d19b482473a7627afdb5e80579bd2061671c394f29e54b71699e53364d47b38cde450da11a090da6da1409723ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-MX/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-MX/firefox-66.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "40833a6228af9d8aa4071d9acda505315e573fa256879ec65caa780342e822ea5cbc5406b1a118b42bcc65075af9bffb2eeb416611276e9f981927e3b69f6e04"; + sha512 = "8aac2eae10062085b466d2e78b78e2366182b54d756cd397b45f075346350702e216a16d78205e3a2c7cd6b9b4f6274239e9001cc39ada4e74ca1beab025a503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/et/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/et/firefox-66.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "88fb3c3cd75d9a1b48bad3a368e52657f2d6e3304c339371d748a2909193f87ee5f017d496027741bc7d274067ba2f659f6a608aa2f961552f599a730ee99097"; + sha512 = "11418bd05482f0c6a7c732a372240c2a8e8d500a4297733121d2a4e3ab4235730abda3c87790d178b8e497d651a43c24dc903a89390939334d32564b9d83db0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/eu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/eu/firefox-66.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f0c04bc08d58954a0a2aba21a4adbcfd87112433fa1c77c3b79ae2ea1a71ce045c0ae606d27c88959a1fe8c6274e4376f73177d1eb69bee5dedfba66082d5a90"; + sha512 = "f39983f48a6536e8ffbd6240080e525ff3922d943672a932cf1052b716fbaa5834a0330087b9e31c2fb39ae190162e799875a824d3287b9bd6a6b29f41a4b75f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fa/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fa/firefox-66.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "14fcb0714fe094ede4938fe03799b796c4778baf6d23036a25983a9cf831714ca367c85315f81367a9ad49fe880f6baab84c9b84c45257aa11a3001d5bcc3493"; + sha512 = "a592c822f244506c3ed1b285ccbb83998c02a450b36858930c4472750ce36ec94a3b6c517ab673e0f6cb7e419681940d48f3b85ee4a57a3b8ccbd1126c692918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ff/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ff/firefox-66.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "253ade7a299e032fa8fb5a1fc40c19b07789f1fee88cab2531c2db949ef25849c4c7a1e1daa96d4e2be677af8b1d4b66fb36b15cf8ae7da136b9cb7d16483ee1"; + sha512 = "05ed44fa04def5c68757c110b06362693395321247a9c259141a7d2d213b7b8d65f36b40f6cda00f688b648962dcaa79bfda18ab65610fb2e3d60f5e952f8eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fi/firefox-66.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "fcef2476774d9651bb999582aba326d670e2cb2504eb7a993d71866badd2d05bdf4715cb0a9c17e323b59234c2a69b18d31464afdd98ad1b8fc4e305985035a5"; + sha512 = "50e94bd764a9a779ad9562224fe7483732b23cac9ed5ad661069edadf7217aea4fb3d1040d59233f6143a11b7581d2781f7d1f226353e28103cc50505518ac59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fr/firefox-66.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b9ae06ba6a15388fae18868d1acd876af821bea32a5c55493fc5a2ec66f16f3cc9f1517a6d3a3634bfb0d1ef2bc92606ae716d6f006020b2acf1f790c48d15e6"; + sha512 = "37ca249c1d4a1a7601706c36d3e1f17f2f9da0ad192eb4d0d1700d0b6094f4ff1567a84adad5b03b048b2e84138c9120d32efe07dae25db1ae23513907bb3188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fy-NL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fy-NL/firefox-66.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "51a6e9580dc2c02d6e8c2aeb4691c469b8fa3ebd87c7ee576d6ee92ea6f457de658ad1e80da27a57b82496031bfcb24b76aafe065f2700ff6daaba16729b35a2"; + sha512 = "777819bcc97c694c24f1980518af16a817ae2d8e3bb9615fc68dc2a638ae28135faab1921d91c4bd3aaf9d7427badbc01b2680847abdb600dc807aad04fa6fdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ga-IE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ga-IE/firefox-66.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "76726e012d32f8502095823c27663be484aec67fd267924a80605285c306fd49be911c3fb3f50ded984b7c5441437415c9637ace39f3688789bbc3d9f23c1071"; + sha512 = "72f5dfbe99b38eb0b16a67d1e4621cadf7f899aa307e698747a123eb1b7cf88781209a21a8fe6d360f73e6c57b59778e5ff0deb2cc5ae63bf85a5d965aa0059a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gd/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gd/firefox-66.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3b478aa67a9704b15ce0bba6ed62f3cfdada73d025d65b9d13beb15ee7ba27ba976a364f5cad9bddb345da6ba5ec097f4847fc3e0f0d7d61a45672eb95a0f6b0"; + sha512 = "cf9746cca0b3266b40bf14d281a21f0b5a1da0f991c943c456323b6d2a68adc19ef17ff900d24b10503030a26807149d29d2c9f6776ac584c9d7e851ccb20ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gl/firefox-66.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b854233abccebc0158b06d9dccce06d3b1f030bea5dd90a0fa1d7810461560cc139adeebe12cdec8aab8aa1e8a19796d8928c59c87f15e3793cb27825c5d07c6"; + sha512 = "5d6e0d4278163d8589e54fddbbfbf05281330003146b67fd71c009e39998194cf7b5a8ecca0851b1fb4cbc87c530c1ca3a97e79b0526e6ea3ecfed54a547258f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gn/firefox-66.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "b78aa95097cfe92b1ed883c56cfbd4a921b2550ce75d76e8fe0938e67d88dbab2c1e27f1a977689c79a1763111ef52f2246c7918e0567000b856a1fbd1554b09"; + sha512 = "6510b6ffe2142c31cbd97eb2e8fbf48bc9ef7b8d7c3ee7c9a4515f09ae94b056bebb6b76998056d3971f8b813b1f2a050176c85532f0ccf10b25a1b6e8bd8ac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gu-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gu-IN/firefox-66.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ef4575bd214729c0c08e14d93a07c259577430b9ebf6680c90c5e3d8fe191c7f58f3d7f44819417247bf9a4edb738bd1aedec58167ec5829563ad452b3b83891"; + sha512 = "0d6759d51d81406c3e06fefb11e88af5bc3bd452200ae56cd802f3fe070697ebcf3b2bd101266c36be5c4fbc95d5a4e9d97aefd6d97149eb59c58f73c2b41237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/he/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/he/firefox-66.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b4815c1b409740c74faef621ea2a0ced33569bd8daaa966876f60cc1edee5d65303af62ad1631ddc7f876455ec9b8a91106538c5dc79e6047b9ee80446a8a73a"; + sha512 = "5c66288f468f430c6bbd13a8dc55865d4822cd76c32bc6b28fd6d8f457e369bb24e97e68e9508ad7d80cc3a4dc111b4e3a18574279fbeaf1c0cc80c6e144f66e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hi-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hi-IN/firefox-66.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "82bd95fb958d143a8ac63937cb5d39e8d31c53ffdb62b6bc5019e33ef5ff9822d0cd5e34966e99587936084992dc26af88c1b11ac0c7ab74800b6d0bec797c46"; + sha512 = "c9b93433b10d01c159c44d4fd34bae60f8c67ca4758b6d41e5f76588e2b636ec06d2739c3c8df09bd2799dc5a46e66c47684198deadf27762aad1ca141b8a217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hr/firefox-66.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a655e42c3bffb558a604611d43f92a809c3aff68df556daf08c932148d58a7a21099bfbda5abcbfd1d3fb9258837e5ed0637c2c82cd9a7a7b468c12b9062ad56"; + sha512 = "51f3c3a6efeff7b195ec1cfcfaaf98f7c0601ed815e143d9a3d4d7523324812f81b05a84ec4b28e475c76994d4547a4a0282e08d9f3c0b3259c9d58e503e03fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hsb/firefox-66.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7564349b272a2b5a26332514826f134b83bb9971aaaa990525797c4c9798e645772653a96aee684a4d40762435035c173bba8ee2d1e4d591dc79b3a5a6ac2d49"; + sha512 = "5cf0d71159709d4699102a6703f3161651a7d9b91a620e59843d8f519010da0013a508aaae515041c42a41a7c406df6234ff5bf4df8d9a97f0887dc77efc3a3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hu/firefox-66.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9ec92a81fd3c2fd4f01ccdf37190f8f50419a257997d793abb609e9a4f21166f7b90d26755a59238cc197e4276f71b2f23e6f550b596b96984e2dfd0bd77a48f"; + sha512 = "a34cefa5e301450f670f5db22a87d0a3209304abbb973210cf646d0e27d36d32bb1fd8df608a6ce3ab1bf025211fd126c27279627f7f6fe22898c2a25302932d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hy-AM/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hy-AM/firefox-66.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "60710cf9808ce45c736bacd2368d4a7db93ec78d43ab486bf3640cd5d3e747649060f6fdc2443151387b15284ea12268520fd3c9b4c8d291035b2b46adbc67f5"; + sha512 = "521809c9b00eb31a5b7bc06f57de93a199a16dd1149d054a98ff7a0cc1591e44d048b7169d4642127bd07ca4e87a56cdb0967aeacda551ea407ee9c9345b7b43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ia/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ia/firefox-66.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "dd55d54f5f39321fe9f23b95824dbdffe6a57b100001a0df13fd7500de14d3f7dad028c957d8dec9a8b5a57798b278b27fe6f53005eaab8aefe5f22b67589a0c"; + sha512 = "e37239b6f31413ac5f1f306cf835adf403fc326e03692b946007efeb09c915a24c0f1f696566269b444d5770eb4e170e484994920bc7c095b51805361d711f5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/id/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/id/firefox-66.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "14fdcbd0aab6244bc5a31120801c47c31e14528af6411eec54d61bec340683931a532ad42718d69069500008ab79e2271887303f6dbc51454365e51893b8d89c"; + sha512 = "08149319789476ac435eae240dccc258045e7e45e63bd59f7df1c0feacf08ec705ad55338b3fb4ac167ee724a0a67e9e2ba78d7ac2ed7d708872ba03fbe3fad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/is/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/is/firefox-66.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ed65e4796929ce84e790e68301166576e56d9f595abef74a77fbe34d26f8ebb2c040a382434158cf860dc3a187e0de1216b61308a25a8cbabffb2214115e68e8"; + sha512 = "bb6cb1368bece799dbcf5aa3347d44c8cc14e87594e97b84986b4cd794f88dad0c758dee0b556cbf825808aa090f36d4d57d1bc195c20085de02d71e2b955990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/it/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/it/firefox-66.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6d4b5f415a6c66fc6348da794806e85f2a9ad935baf112524ff72126a0b3757970a9034448873ad91615d109613c537eb999ba570a1fb7e323522fb6fb7a292b"; + sha512 = "ec637cfc94e72e34e46d8c4ad07c84c76299c26cb2a10321cf106cac0fa8a52cb95ecae1265262a80369d00080f457600e67fea9adb257dc570adfb167ffdfe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ja/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ja/firefox-66.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "33bbf9c30d23a4d3041c1c654bf91702aea62beb97bbb662bdf04bb234be40ab7a9d8e5b099e9d4a2f450a99c3d8ba57db713f19ba0436204e35fec0895ad2b1"; + sha512 = "5208a18f7b72faa8a33b3fc7bfc0a76c9dcd1bf2c1ce5d440b0e14a6898b83970a1fdcc3c1339c06b9fe18c61e0786f882e5e3cd527f8ef0f361ed49727676ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ka/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ka/firefox-66.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c5556081cd31c9750d75e11dd1014ef43573932d4c380bf2bedb256bde91cf88c0857732760a19d507c201f0d75a81601690d052c6f4d635946d988c4bb1d2ca"; + sha512 = "2fb1dc95ef4df0b0c8f2297d8cc9cbf4a404c14b795a04cc135b314f48fd2affe351aff05447738c7a65a5bee6fae78513413ff548e83612270cc353dad07331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/kab/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/kab/firefox-66.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "aaff95e7c94963b2ccf0bc55cfe840b4c07d5f5d490e1e866897feb6a7fb9eacd6a7eccd54847e79e179c249e053df71c96ebcb5fcc2658b7a240a774bd884e1"; + sha512 = "4270a904126485cd404341ece8e4f0e526b1dc5bc9c04c73236df5cafd23ce3b97c0cd4fbf860b6abb940893041cfc5b9311294468181c7cc0335bd248d8a086"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/kk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/kk/firefox-66.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "015f155b3bda0f3fbc9225abad1fd8c67f7f008f0b14e341691783d46d222f0c6e56558191b8d8e8253ccb3ab0903fca0c0c536cbf46072b873765b38ef23003"; + sha512 = "4f4e9eed0dddb80ae04e01eee3c764474ad07c20be00005bc095ec763133c5b634235f88d2b64742d29eb49bcd6cde8a2587ad9d270a441d8225e1aa76d273a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/km/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/km/firefox-66.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "d42d50e475c3e558679ff6c254c9f8a17557114f9fe6d68d3d708c26d559a9dc072965241b121d2fa0b89a2ef314a6ad098b119df5a3560e88658074a595892d"; + sha512 = "5698cf9764c8df917f1b302fd44f58e258e78447e0f6dc8f4246aaf7cc3bace595efc35812ffeaa7bcc249c6aae1d62e7f254dddfd86405e34c7e3b4a95b3229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/kn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/kn/firefox-66.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2bde522cd206cd0c826490aa48caf26433e93832adb4de8e0ad95894bdd48186e2f2b9049b37cee99dd4abc751922895e7e0905e253829b644e57bfa684beb43"; + sha512 = "5c3d3b2a7c614b1484c2d143a04c6fee7af8b23cec5afe5b8e9a620a2d32bb65873b3b8a158a06240d93eedd6d5a380df3bf200218630aea87510a26d3881890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ko/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ko/firefox-66.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2606dd33e8122560cc0dbe360783f8e0b5a68e492a2e8e15f2ff1620b853557f841adc0232a8c714997485ce60ca89890b9b77e256a8da6adbce81eeb8a0b1d1"; + sha512 = "604d52890adf0041789ff4f9b9b64362745db504844482b949dd0d75622e2d45cc097e72c11195966c29cd2178304ee87a98299fe9e64f02009b27e8de6f2892"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/lij/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/lij/firefox-66.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "852cec92ac0bb14af07a0d968d265bdd4e2513ca9c1ebeb86ce102ea6c8648bff9946de5f520cb81af99be772145776596893fe6c15dd487409b77814481c504"; + sha512 = "3959d231d3486086b3fe8b28eb0d8650b2582a603236ac938ad473bd96103378cb395c0a7ab375e587bb1de67d567bdaf4ce03749049501a22e8a7d7f67b5f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/lt/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/lt/firefox-66.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ffc4001e79148edaab5be9ad6925788e6bc17054641174ddd37b4a54a8ef2444ea698333492fcc545c4450f9fabb5146bca4c79cfcfbca95fdffde9823292187"; + sha512 = "ca8b8edd741ca6d0c2960b9aaf40df4bce62df81d44269d19202327436eedd3a329a721288199004015df9bc06953e8defbf577c2c2f98248e583fa1ad75548f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/lv/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/lv/firefox-66.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a95d1db28f93a9a6c67919bf1bb1870f269ad835e88ea2e04b4b3c42d9b893409cfef476654acd1547f6758f2e39f83df19ef4f399d48c7ebd2cfad26b645aa9"; + sha512 = "a13b02ab06c7b1b813518a1738a9a2a718b3ca249a29c6de569ecc3621534743c003acca4b0fc748b34c5e802d2a0e47034e7c14a6280f2acf91289fe8f172cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/mai/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/mai/firefox-66.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f097f29a0664cc86a883e0a85fe8ae72dfc944a3b9244809918c88d9482ef5a421017928d19b5a8993dc6a1986a874425480eccec99d7f524d347820414e7f11"; + sha512 = "f7e9ced2cf6e8d832f92b515821d11b3fde29a4d47fd1dd912800352b735b6020b668c8dacc8870867c1eff4f89e491d2e7dfab6c5051aa28a7633038c125cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/mk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/mk/firefox-66.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "fa6fa0b318d891de341103b845cff034e77fde3f0283376ed80ae3a1df2231818356073dd94baaa4f4a8404e79905b621aead1def237e0cf8912078ae569a3b8"; + sha512 = "8595fa93d3897a6ebfcf2dacb9104fc691e573257f7a9d79e16e78db2c00bda60b05546a057f2867fd3a6ba6b44ae3cd34b9ffe5b22a5b3a7ebefb7ffc1891c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ml/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ml/firefox-66.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "513e0263a90d89ca92b95f6549dea42a328c3cd719a7b76d3397642c554aec9f7035b2287dbb3fb4ecf92133d262f5e2f2cd2c760a6dca1e34c1012b6b9449af"; + sha512 = "dbf33d9aca1155b69c312508c8dcea86d97d72b44477de02b7a94d1e63b7ba7bef401f2bbabb69adb192093dbeb9e7e578c69a250630f3749005738b1f67315c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/mr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/mr/firefox-66.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c31cdbd9b69f9785eede4693ab1624c625bb1eac67af1e613854b7979a593e0833a1928db6258c5206c499799e0fded4bff167bca3aff314752daf17663f75f4"; + sha512 = "56e01bb0c39023630bbef1e6872e67e7c2f5b963c5876a93ec3cc1898e3b48bce0a07e2d5aee537dc38fcdb317737bf21a6c389a019f55798e6b7c571e7f6bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ms/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ms/firefox-66.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "05c239c686a31d61e4efa5595b31b95cbaad4e40fa7d065c4f91696881a91851cca88b005488db5ede88ed1d84532d57b47c939d8cc6aac48606e52dd0ebd20e"; + sha512 = "cecd972c19be690998ade7ac8634739aa1eb9c0b53b2c81ab701f7c39c96ba2729f7eb440e6b703bb5e084cb19f0bec81ed2e81bc17179ef2f72d64625866cfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/my/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/my/firefox-66.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "609b9f8354b41ee4cf5b70281b0d482ccf1f7bedc9438adeccf277c249e5a16924819fb6aaea3cb6b7e0a389590977662178d425d75bd1b1f5aa336db995a4d9"; + sha512 = "597592eda22db07bf4c6fe2a2b875aca8f8ed7bf65c51b92eb62f76489b4c75d042f48c5d8a4e91f9052eb939839ac03e948c479d7573aef8c0d1516fff57a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/nb-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/nb-NO/firefox-66.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4cf408e264ba160ab0377aa4e54c44b4e4e6f561b000ab1a43e33389a269c69008a88f4de35c9c704ea613c1390f4682cfea11a95184fcc3f8104614ebb67715"; + sha512 = "8a88590ffe841f672c01ab555bdad7ff4da0ba0e8b62273c0a4279231f6dd7e46bcae863ccf12291607309db161da81ef8c3fbe69fce532976530ba2262a07c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ne-NP/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ne-NP/firefox-66.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9a15fe0c668d46fc87bac7ba49e380b5c99cc5f0bf6a0f077d88a1d32f715fecb3da2e0beedd86803d70a2f66c163d391dd0470b594546873c7fa8928a883365"; + sha512 = "166461500759c099006b93bc724f4e2c1d4916a34cb4476d95f5245e150dd4dbdcb4591ad3073cac418f0c35e54dab3c1f8767c468d7bbb548b255e60baf982d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/nl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/nl/firefox-66.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "12dc7c65ccc5681b5e1cbbf7641d5799c2f87a8ec9e42ce877f669d1beb992d5d24f774bafab858ea0beb3ad80b17bb5eac74d808548c5fdd1b842f1d487b571"; + sha512 = "41bbd77853e0dd1487a484cba0ce6c58bb4303ca2b071e5b68c53452ef625263d8153de7b8368906fe91e5f77644c5ffc7b3933ec4812fc96bacf053744b8b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/nn-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/nn-NO/firefox-66.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0df3bafc3b4c9dfa3c5c79da4f776bd4daf8c656336bcfa9033b8d439836472fbd3caf57063a450c8b30825d6e7ffab91138b3d4113515e2afed2633fb59b4b5"; + sha512 = "d744b012829e3269adc91546dceabd122608a564454de64286dfe60686581a5a22c7d36ad6dc6f8f9b43e2d2208dd584aaedab2b3baaece4d75e986f6d1c51c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/oc/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/oc/firefox-66.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "306ca3beb0862fdbc17d72f5d1aba6d2fcb5df9645a4b453a01399c0b4ceb0ffc5fa5c3cec281a514dcf4f3cf0600473f8034fe9fc7227c26e962488c946f7e2"; + sha512 = "63c042f19439ee55ce0e3e2952f277bda0870f6241b4a1f0c26e237e3df684ffbabe33f221a421d3a9f036fe0fcb57d6dde91b603a004e84f0662f77db5c6f55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/or/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/or/firefox-66.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c915378e137c4f1161283b2585bb0a45dc389ccef1cfeff68d570c7f5e7e039e3a53bf6ba186f7fe036f2c598adbf8746a5c01187464034024be95a2aa1cd58a"; + sha512 = "c53d5e735452f52d81e21a8fb6410e56953bd2ebe5bb592836dcd267f85d93fafd429daa945add2b16ba6c0fa0502e93dc857a3a2ff91aed29c379773c0b695e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pa-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pa-IN/firefox-66.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "53d3037bd46747b2dbd6959934e7d240807f6cfac674da83f99bace5ae4f29668a55014a3a196659784543633e132e72d1063542096cde5ca8dd87d7c741ff04"; + sha512 = "832d97cbf36142d6214967ef5c2759108a151f7c4bb549f6d2c4fe0f9b9659f883407e30d52ce548a050981190a61623db9b9ba8945dd6fcf22b2debb3e12b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pl/firefox-66.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "85e62ff828ec6942db8e87179a18f319f71234c1887c7a0114a56f7e57da2064873bb2da5c9a9de67438e9be4cdb09b8eedc9ba45b5fb5ecae6c6a19cd5991df"; + sha512 = "b4106df86061a1e13c72a8a68d2a0667a79b513f1bca9a6e6a625172f3721035f9522ed02148dd0fcfbde35457f4c4ee86d2120cf3321df1d6952c40d5af5297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pt-BR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pt-BR/firefox-66.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b33c5150958f8e6b7e6e7a497cb27c928096453a6b795a9426b6ee636a01ad594d5330ad797aa5ae9cb807672b1411ad02294ce43a975dc4142b0ca52bc9fb76"; + sha512 = "b34681439be91184a6884388a536c7b7be98378138fea7c1aa9d5e5768465c52522818468eaf71458d8959a329565e217e59f95c0b433ce7a4b70059c373f4c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pt-PT/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pt-PT/firefox-66.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "729336b27f781bab8f81abc95bb8ce5f8f10fe12b060aa9461d9abd0d33dbff7415b4fe401a068bfcc1f0f559d748d68e126ee8ee245855ad00721045f77bdaa"; + sha512 = "cb7ca8c8b63d5f961c69c665149e88fbf61d307de2f4a0bce0b0d2d2faf40116ef76779b1660f238346f57a883c18a0376aa504c5340c5b93574406f969b1800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/rm/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/rm/firefox-66.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "613768588a795d6849c761b4500091f6653ed2d53ab18cdd5fce69dcd0560f8da4d91c6a9f01dd17401acc0626445b0d8a53a6b78e2801a89a95624d9a4da68a"; + sha512 = "97a8f3070bd5f1a2014433ba52a07a9ca4d25471a93243fb1bb64569f1fb241b013ee348acf422ed61c083ee170f011f9b25f6ce688135cbe05216871aef9adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ro/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ro/firefox-66.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "49c00fbf2fc04dfd553f8b117b609e904917d1c6be8c781af52cf5281db4c741c6203b323fe401b46618eaeaacba8fbf4c8303856cedbb9fcc66fc67938b2a6f"; + sha512 = "40488a2621dfb609c1063027905694dbd01950969d3c2de7f256f12426fcf960ed9096c32898f9454e2bd457900b6460fabe51453ca632c7b2953c9838132b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ru/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ru/firefox-66.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c7807bb29ba57ca984767de0f8d1eafc38e1596be14d53deac118b6bd5c78387b60e2a5f89e3fd02f7b2db7a98caf45f210b4f9b55a28b9c8692f3ff85e13f41"; + sha512 = "fdcbee693014a253a5a35a4468d30b48e1067ab2463516d0c21bcca2dd049087890bce634eb028dd18dbfb757684f594c75b7046b68be2e95d4e1e6c5040ac03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/si/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/si/firefox-66.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c6f200e5b85e11662536dcc842fa36cf8f308be41e40b93716457255bd72123d6b09d9619ddc736aa81619cd8c291e48b899973185fb9ae21439499f15a405e1"; + sha512 = "e97eff54787e85d616067d398bb0e34bb322ea6b2fbe98852acfb24a0e08c2694ec46937634123c16d0024b4cb9ca511317166dcc0581cc92286c4ab17fd8ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sk/firefox-66.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f733bd13e30f9e0026f4cc7cf4e5bc3a806cc6b573cdbc44258000f42bfc2157f6d78fae2f61cda9f7a635c79b957f92cfecf566b4b298b2582d6256c8701d2f"; + sha512 = "2bfcdb4f6e6bbda6d8e74721885b16cf32823459436bfe646fa1a9f473967e3f67edbfef53a32a36d40522fd188416adb122c79ec72703c19d3041ff62bddbc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sl/firefox-66.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "21aafdfede4cfd1e9f97567870b4197107776f01f5271ef28fa4e4b584250c4850a4a71a5dfbefe0f6ed7609e5c5c7260c2e6a92d3f4ab2876a6bbe6d7a6d319"; + sha512 = "a02f9f1e55e6c29499873ff53a7fed1e8ebb31efc2b7d35eb771598f724ac4bf01c50f71c8c6bd632f47bf98fe00a8352ea22a155089d9cfb046f5c5fb886719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/son/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/son/firefox-66.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7bcc839215d28a8ef5d04e1e623afee3097d2618d248c158078975c62f6743e49185e6ae006820d2e14305cf3bf6f3e02fa358c366389389595bc28e26376afe"; + sha512 = "9d42a89812f50ecc13134eab1377f7a3fddb2bf57a39aa3673ac0a6ab0154870965520e367498abb036844c24d6dd00a3299faeeb126805a990482a36ea78a6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sq/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sq/firefox-66.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "db07ce91bb91e102ae6f244dd39aa41b5adf2862291808aa2cd2051e75ce4ed781601ca77ad61615037997f6b14bc690387f1dcdcf1af86691f82cb23c881828"; + sha512 = "296edc5903edd69a8ca727e44e4d13409bcefe81972e626c0f1b58749c6511e1504f7fc7869724aca7725c2ca1ca7044465d6308821ae6aa6c833d56a57c4a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sr/firefox-66.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "f011fef6b5be9ef595ad0856625aa33c7c553ae5a24534326b32da9c535a72fd1646fbd0e4e0e8b181e7b284a8b73c4c6beef39895e06e1cacfe388f56dc4e9d"; + sha512 = "7ce8e3fc3cd3c402aba07e34b647c05de38879c7dca2b971f3883b0c833a3afb7f3403403c4993eba62279f5bea95562708fb4cb9452c3ae76cbf59b227ba830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sv-SE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sv-SE/firefox-66.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "53cfef65bddfab983aec05182a2f4b2a3b8c913ec558d44644a8e39534ddf969b877a4d7ae4513f6c3758d7c0f8899aab0c6a017fce24cbbef8aa65e21dce1dc"; + sha512 = "942286bb1ddfec2cd4d8dea7012d1bfa98e0c59692cbd0b45dc7a0dad0e6872cd6ffa36dfcdadf5591894172f81aacec2b0c39c7d6be8fe2810666974b3b5364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ta/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ta/firefox-66.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "847ef028665801f77cb1984506b61329098c9cb82562442ccf9a572aae9c9235e9a12cafabd762f4dcb12a3c137d2eb5a35c5cf509d6c7afbecd3abf9f7bdd21"; + sha512 = "7fe7c079cab423280744b03a55b1807ff7a8bf495a1c95ad7963b303ceaf1045711c33f9a4dc1b23f75bee0016448e54d9067c0d9eb692cf7b8a820375605c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/te/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/te/firefox-66.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "659c3840ba4b8cec8d4a55d9ef46c4998911cdc631562572f2b42b855bface596b0d148207be2339ecfc47af5fcf3d377911563cbcc75bac70a2008da4361234"; + sha512 = "35eea8679205d526b1f9a665c14fbc2b0570866ae7a1003429e01e109fd5ba5b0a63cff2adf4c88eac28b22b346fd3612a1a40f09d11f42649bc3ef98f34c6ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/th/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/th/firefox-66.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0dc1e021c72960a36ab38945e98552a3e6d7f8cac466fdd0f163f8dcc5b5322032cd348201fbaf09d91a1c7bd19c357de72c86f77e90178fa6f009fad0eb27cb"; + sha512 = "4db51c9f6b47fd30d5bfb4510f93b8032edcd06ec4f3dc76202d65732ab6cd4ef8eed4b7a500e51a9471d79a2d7752229e1cee2615c167b2419a84f5a039d36f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/tr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/tr/firefox-66.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6beec8ecd2238f26f9d149d7f582908007dff7ad9ee5ee54189ec6287297ea9fbc7b4a48e3bf266272da9fe9a5614ce1c7bcb475a321f47c8ecd43c0e8e07002"; + sha512 = "1be513d36bc5c92666f855efb3d556ac947be0891cb3761151f7da7d77b185819718450144ef6d2edf7228c42952e7dd968688ca00b8fd72ea947d8ebcba37bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/uk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/uk/firefox-66.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "85948afdf08109e94674c5d2c3bfb8308d821686e83d5921800adbd79b2e87728717f8256fa127ad26c5d8a399b69cfe5145916b11bd7ac3f1f345f9df01bfc8"; + sha512 = "2e70a372e54bc6b5e620294ee9cbf13000077ca8565f144bf43d3ffd09cfc57a5189aa5b23d6532897b28e7d9a724f4b21ddff869e02af405879c0ec740a0946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ur/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ur/firefox-66.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "46d59602130865f769dd3f4c040a00a443101fe42f8cb8e4995be33c03ba629aea235d26a3c6653a233c5cd68c42928f75ccd807a125859931a1a2a62f58aa9c"; + sha512 = "21203b3ecaeb6504b940b22b70297c9890befafc3bf6eb1aeca5d3b8de93657ef50fcc953ac560d72ecf1a74f908740e0f9e4e581bf78ab302ca6ee0595c7f11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/uz/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/uz/firefox-66.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "210ff33ca066df4617b3781fba35497b9a5efe6a682aba08a30638313f349ecef31bdcbc05bb5d132c4b81d87eb7f5bfb9f029c749d07d9b7654187389467886"; + sha512 = "d5e555907a5ff04ff109d38928cf41c87d2be748319bac6b64b1c70ca440315eccdd630e8a806b5ffc9facc12d969f3739a8917a01b01b05609268ed993e8b72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/vi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/vi/firefox-66.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5c072fe63f0416e2dbc111c87251fbff6e532c86d5619245864287492805a9fd5afd1f8e0bdbe50faa7b9432533906c4d33f6d70b879a94815a70f603708f164"; + sha512 = "0db81ab14f46cf76b3ffdbe0425f6ff2428dd214f4ffa9c3a623f218bda7483f78d91accce28004e3afc79475a326597bd9d4f1ac2150592ddbab7251a654aaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/xh/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/xh/firefox-66.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2e053262d94f580d51cd90ddcd1794fef4780541a541d89984b516695ddd3b3937ae2ac66962edaa716964f2217be070cc9787e8500977dc1835f61e5c63dafe"; + sha512 = "14ec22f2b54f1f01bdab932b9ee344275bd89c36b755252629354e9440e6cac1509b18519519322920b96f043ad2a64fc3477c68364787db7ba95ae9af0fff9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/zh-CN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/zh-CN/firefox-66.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0e4e0ddb9e9290d6813439e3213c3802ec799acfec8b9ba0d788c81cefe742b5fab3a19e9bbfd28114c6aa89619974920e918adf6ad7002a8ddbf213cdb00857"; + sha512 = "5af1cbe3ede86f3d848e9522ef5b29b269a19602973f961f5fe502643757187e91c1a74ec83ff270da7e37a3e86280e42f8ceaf8233c71cf75c8532f619c4d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/zh-TW/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/zh-TW/firefox-66.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "1b7e986275483b016f86e092e4c8325746c76cdd610b94498168c35697c3a828cfb3813978b0244c7a9750b4dee98c92d724cb60c04c228096962e6744f43528"; + sha512 = "69a449be2defc350fd719ce907ba61f9b58fd90c190c9f1225f4f3385b144bce48cd063ce3d0432eac32af82b072d3105fccaa88cd2e3894c3790280e1bf1a9b"; } ]; } -- cgit 1.4.1 From 1e86c0a7df5c30fbfbdfdd74c88b18baa3f7216d Mon Sep 17 00:00:00 2001 From: Felix Biggs <8948653+biggs@users.noreply.github.com> Date: Mon, 18 Mar 2019 20:01:54 -0400 Subject: doc/python: remove unnecessary let statement --- doc/languages-frameworks/python.section.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 1c9f9fdebe4..e1630c8cb03 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -188,25 +188,24 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th ```nix { lib, buildPythonPackage, fetchPypi }: - toolz = buildPythonPackage rec { - pname = "toolz"; - version = "0.7.4"; +buildPythonPackage rec { + pname = "toolz"; + version = "0.7.4"; - src = fetchPypi { - inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; - doCheck = false; + doCheck = false; - meta = with lib; { - homepage = https://github.com/pytoolz/toolz; - description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + homepage = https://github.com/pytoolz/toolz; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; -} +}; ``` What happens here? The function `buildPythonPackage` is called and as argument -- cgit 1.4.1 From 2cc644411361fcdde9c9b3b84d1ddd8d87c435af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Mar 2019 08:42:38 +0100 Subject: python35 -> 3.5.6 -> 3.5.7 --- pkgs/development/interpreters/python/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f1461d784be..ea755b234cf 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -63,10 +63,10 @@ in { sourceVersion = { major = "3"; minor = "5"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; + sha256 = "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -153,4 +153,4 @@ in { ncurses = ncurses5; }; -}) \ No newline at end of file +}) -- cgit 1.4.1