From 869336d6233ec48234278c654f1a39b3746b9bc6 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:42 +0300 Subject: [PATCH 001/181] parity: 1.8.11 -> 1.9.5 --- pkgs/applications/altcoins/parity/default.nix | 8 +- .../parity/patches/vendored-sources-1.8.patch | 100 ------------------ .../parity/patches/vendored-sources-1.9.patch | 16 +-- 3 files changed, 12 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index fe2c2c62827..99179932109 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.8.11"; - sha256 = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k"; - cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi"; - patches = [ ./patches/vendored-sources-1.8.patch ]; + version = "1.9.5"; + sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; + cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch deleted file mode 100644 index 3239df63de3..00000000000 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 000000000..8dddda426 ---- /dev/null -+++ b/.cargo/config -@@ -0,0 +1,94 @@ -+[source."https://github.com/alexcrichton/mio-named-pipes"] -+git = "https://github.com/alexcrichton/mio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/parity-tokio-ipc"] -+git = "https://github.com/nikvolf/parity-tokio-ipc" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/tokio-named-pipes"] -+git = "https://github.com/nikvolf/tokio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/bn"] -+git = "https://github.com/paritytech/bn" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/js-precompiled.git"] -+git = "https://github.com/paritytech/js-precompiled.git" -+branch = "stable" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/jsonrpc.git"] -+git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.8" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-rs"] -+git = "https://github.com/paritytech/libusb-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-sys"] -+git = "https://github.com/paritytech/libusb-sys" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/nanomsg.rs.git"] -+git = "https://github.com/paritytech/nanomsg.rs.git" -+branch = "parity-1.7" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-ctrlc.git"] -+git = "https://github.com/paritytech/rust-ctrlc.git" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-rocksdb"] -+git = "https://github.com/paritytech/rust-rocksdb" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-secp256k1"] -+git = "https://github.com/paritytech/rust-secp256k1" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-snappy"] -+git = "https://github.com/paritytech/rust-snappy" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/trezor-sys"] -+git = "https://github.com/paritytech/trezor-sys" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tomusdrw/ws-rs"] -+git = "https://github.com/tomusdrw/ws-rs" -+branch = "master" -+replace-with = "vendored-sources" diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d1f6520d706..31c12d83faf 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,22 +1,22 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- /dev/null +--- a/.cargo/config +++ b/.cargo/config -@@ -0,0 +1,100 @@ +@@ -0,0 +4,104 @@ + +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"] -+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git" ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"] -+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git" ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git" +branch = "master" +replace-with = "vendored-sources" + @@ -90,8 +90,8 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/pepyakin/wasmi"] -+git = "https://github.com/pepyakin/wasmi" ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" +branch = "master" +replace-with = "vendored-sources" + From 1310e23e38a38dbfb8dcab99b04d0cac6a3f31ff Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:59 +0300 Subject: [PATCH 002/181] parity-beta: 1.9.4 -> 1.10.0 --- pkgs/applications/altcoins/parity/beta.nix | 8 +- .../patches/vendored-sources-1.10.patch | 118 ++++++++++++++++++ 2 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ee4203fa88c..ed78133a759 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.9.4"; - sha256 = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f"; - cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3"; - patches = [ ./patches/vendored-sources-1.9.patch ]; + version = "1.10.0"; + sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; + cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch new file mode 100644 index 00000000000..3e8e032f30c --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -0,0 +1,118 @@ +diff --git a/.cargo/config b/.cargo/config +index 72652ad2f..b21c6aa7b 100644 +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,3 +1,113 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] ++ ++[source."https://github.com/alexcrichton/mio-named-pipes"] ++git = "https://github.com/alexcrichton/mio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git" ++rev = "bd25b41cd642c6b822d820dded3aa601a29aa079" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git" ++rev = "4b6f112412716cd05123d32eeb7fda448288a6c6" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/parity-tokio-ipc"] ++git = "https://github.com/nikvolf/parity-tokio-ipc" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/tokio-named-pipes"] ++git = "https://github.com/nikvolf/tokio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/dapp-wallet.git"] ++git = "https://github.com/parity-js/dapp-wallet.git" ++rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/shell.git"] ++git = "https://github.com/parity-js/shell.git" ++rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/bn"] ++git = "https://github.com/paritytech/bn" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hyper"] ++git = "https://github.com/paritytech/hyper" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/jsonrpc.git"] ++git = "https://github.com/paritytech/jsonrpc.git" ++branch = "parity-1.10" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-rs"] ++git = "https://github.com/paritytech/libusb-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-sys"] ++git = "https://github.com/paritytech/libusb-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-ctrlc.git"] ++git = "https://github.com/paritytech/rust-ctrlc.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-rocksdb"] ++git = "https://github.com/paritytech/rust-rocksdb" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-secp256k1"] ++git = "https://github.com/paritytech/rust-secp256k1" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-snappy"] ++git = "https://github.com/paritytech/rust-snappy" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/trezor-sys"] ++git = "https://github.com/paritytech/trezor-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasm-utils"] ++git = "https://github.com/paritytech/wasm-utils" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tailhook/rotor"] ++git = "https://github.com/tailhook/rotor" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tomusdrw/ws-rs"] ++git = "https://github.com/tomusdrw/ws-rs" ++branch = "master" ++replace-with = "vendored-sources" From cac10651ea9e96c828d0f032f6ad462a9b088ac1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 17:15:13 +0300 Subject: [PATCH 003/181] parity: patch fixes --- .../altcoins/parity/patches/vendored-sources-1.9.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index 31c12d83faf..d91b103c6ce 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,9 +1,9 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- a/.cargo/config +--- /dev/null +++ b/.cargo/config -@@ -0,0 +4,104 @@ +@@ -0,0 +1,100 @@ + +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" From a683d2cd00780cf7d20caeeef44deb4cc60d2add Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Thu, 5 Apr 2018 09:18:20 +1000 Subject: [PATCH 004/181] Modified .editorconfig to apply indentation style to docbook files --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7b40ff1ff56..f272739f240 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,8 +13,8 @@ charset = utf-8 # see https://nixos.org/nixpkgs/manual/#chap-conventions -# Match nix/ruby files, set indent to spaces with width of two -[*.{nix,rb}] +# Match nix/ruby/docbook files, set indent to spaces with width of two +[*.{nix,rb,xml}] indent_style = space indent_size = 2 From a45dad98119c69644d61e77e3c011e975aa7f4cb Mon Sep 17 00:00:00 2001 From: davidak Date: Wed, 11 Apr 2018 14:12:47 +0200 Subject: [PATCH 005/181] tealdeer: init at 1.0.0 --- pkgs/tools/misc/tealdeer/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/tealdeer/default.nix diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix new file mode 100644 index 00000000000..fe0aa6cc308 --- /dev/null +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -0,0 +1,34 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }: + +rustPlatform.buildRustPackage rec { + name = "tealdeer-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "dbrgn"; + repo = "tealdeer"; + rev = "v${version}"; + sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v"; + }; + + cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq"; + + buildInputs = [ openssl cacert curl ]; + + nativeBuildInputs = [ pkgconfig ]; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # disable tests for now since one needs network + # what is unavailable in sandbox build + # and i can't disable just this one + doCheck = false; + + meta = with stdenv.lib; { + description = "An implementation of tldr in Rust"; + homepage = "https://github.com/dbrgn/tealdeer"; + maintainers = with maintainers; [ davidak ]; + license = with licenses; [ asl20 mit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c..2ebd27c93f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2089,6 +2089,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { From 42a84598fb7baacc991c03e228a07a536bc0624a Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Thu, 5 Apr 2018 18:43:56 +1000 Subject: [PATCH 006/181] Added cross-references to NixOS manual --- .../manual/administration/cleaning-store.xml | 4 +- .../administration/container-networking.xml | 6 +- .../manual/administration/control-groups.xml | 4 +- .../administration/declarative-containers.xml | 14 +-- .../administration/imperative-containers.xml | 10 +-- .../doc/manual/configuration/abstractions.xml | 12 +-- .../configuration/ad-hoc-network-config.xml | 4 +- .../configuration/adding-custom-packages.xml | 6 +- .../doc/manual/configuration/config-file.xml | 26 +++--- .../configuration/customizing-packages.xml | 6 +- .../configuration/declarative-packages.xml | 6 +- .../doc/manual/configuration/file-systems.xml | 8 +- nixos/doc/manual/configuration/firewall.xml | 14 +-- .../doc/manual/configuration/ipv4-config.xml | 10 +-- .../doc/manual/configuration/ipv6-config.xml | 8 +- .../doc/manual/configuration/linux-kernel.xml | 14 +-- .../configuration/luks-file-systems.xml | 6 +- nixos/doc/manual/configuration/modularity.xml | 36 ++++---- .../manual/configuration/network-manager.xml | 4 +- nixos/doc/manual/configuration/ssh.xml | 6 +- nixos/doc/manual/configuration/user-mgmt.xml | 26 +++--- nixos/doc/manual/configuration/wireless.xml | 4 +- nixos/doc/manual/configuration/x-windows.xml | 46 +++++----- nixos/doc/manual/configuration/xfce.xml | 24 +++--- .../manual/installation/changing-config.xml | 2 +- .../installing-from-other-distro.xml | 4 +- .../installing-virtualbox-guest.xml | 4 +- nixos/doc/manual/installation/installing.xml | 85 ++++++++++--------- nixos/doc/manual/installation/upgrading.xml | 4 +- nixos/modules/i18n/input-method/default.xml | 78 ++++++++--------- nixos/modules/programs/digitalbitbox/doc.xml | 38 ++++----- nixos/modules/programs/plotinus.xml | 2 +- nixos/modules/security/acme.xml | 22 ++--- nixos/modules/security/hidepid.xml | 12 +-- .../modules/services/databases/postgresql.xml | 12 +-- nixos/modules/services/editors/emacs.xml | 20 ++--- nixos/modules/services/misc/gitlab.xml | 59 +++++++------ .../modules/services/misc/taskserver/doc.xml | 12 +-- .../services/networking/dnscrypt-proxy.xml | 20 ++--- 39 files changed, 340 insertions(+), 338 deletions(-) diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index 4cf62947f52..52512b8f127 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -29,8 +29,8 @@ this unit automatically at certain points in time, for instance, every night at 03:15: -nix.gc.automatic = true; -nix.gc.dates = "03:15"; + = true; + = "03:15"; diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index d89d262eff4..2fc353059df 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -39,9 +39,9 @@ IP address. This can be accomplished using the following configuration on the host: -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; + = true; + = ["ve-+"]; + = "eth0"; where eth0 should be replaced with the desired external interface. Note that ve-+ is a wildcard diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index 0d7b8ae910a..03db40a3bc5 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -47,7 +47,7 @@ would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in configuration.nix: -systemd.services.httpd.serviceConfig.CPUShares = 512; +systemd.services.httpd.serviceConfig.CPUShares = 512; By default, every cgroup has 1024 CPU shares, so this will halve the @@ -61,7 +61,7 @@ available memory. Per-cgroup memory limits can be specified in httpd.service to 512 MiB of RAM (excluding swap): -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 94f03a2ee11..79b230e5fc7 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -15,8 +15,8 @@ following specifies that there shall be a container named containers.database = { config = { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql96; + { = true; + = pkgs.postgresql96; }; }; @@ -33,11 +33,11 @@ ports. However, they cannot change the network configuration. You can give a container its own network as follows: -containers.database = - { privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - }; +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; This gives the container a private virtual Ethernet interface with IP diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index d5d8140e076..d39ac7f8bef 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -30,8 +30,8 @@ line. For instance, to create a container that has # nixos-container create foo --config ' - services.openssh.enable = true; - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; + = true; + users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' @@ -100,9 +100,9 @@ specify a new configuration on the command line: # nixos-container update foo --config ' - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; + = true; + = "foo@example.org"; + = [ 80 ]; ' # curl http://$(nixos-container show-ip foo)/ diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml index cbd54bca62f..f794085295c 100644 --- a/nixos/doc/manual/configuration/abstractions.xml +++ b/nixos/doc/manual/configuration/abstractions.xml @@ -11,7 +11,7 @@ to abstract. Take, for instance, this Apache HTTP Server configuration: { - services.httpd.virtualHosts = + = [ { hostName = "example.org"; documentRoot = "/webroot"; adminAddr = "alice@example.org"; @@ -43,7 +43,7 @@ let }; in { - services.httpd.virtualHosts = + = [ exampleOrgCommon (exampleOrgCommon // { enableSSL = true; @@ -66,7 +66,7 @@ allowed. Thus, you also could have written: { - services.httpd.virtualHosts = + = let exampleOrgCommon = ...; in [ exampleOrgCommon (exampleOrgCommon // { ... }) @@ -86,7 +86,7 @@ the host name. This can be done as follows: { - services.httpd.virtualHosts = + = let makeVirtualHost = name: { hostName = name; @@ -113,7 +113,7 @@ element in a list: { - services.httpd.virtualHosts = + = let makeVirtualHost = ...; in map makeVirtualHost @@ -132,7 +132,7 @@ function that takes a set as its argument, like this: { - services.httpd.virtualHosts = + = let makeVirtualHost = { name, root }: { hostName = name; diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml index 26a572ba1fb..c53b9598109 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml @@ -6,14 +6,14 @@ Ad-Hoc Configuration -You can use to specify +You can use to specify shell commands to be run at the end of network-setup.service. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: -networking.localCommands = + = '' ip -6 addr add 2001:610:685:1::1/64 dev eth0 ''; diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index ab3665bae50..ae58f61d73e 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -24,7 +24,7 @@ manual. Finally, you add it to environment.systemPackages, e.g. -environment.systemPackages = [ pkgs.my-package ]; + = [ pkgs.my-package ]; and you run nixos-rebuild, specifying your own @@ -41,7 +41,7 @@ Nixpkgs tree. For instance, here is how you specify a build of the package directly in configuration.nix: -environment.systemPackages = + = let my-hello = with pkgs; stdenv.mkDerivation rec { name = "hello-2.8"; @@ -57,7 +57,7 @@ environment.systemPackages = Of course, you can also move the definition of my-hello into a separate Nix expression, e.g. -environment.systemPackages = [ (import ./my-hello.nix) ]; + = [ (import ./my-hello.nix) ]; where my-hello.nix contains: diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 3d1cdaf4c4a..60a4dac97d5 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -28,9 +28,9 @@ form name = { config, pkgs, ... }: -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.documentRoot = "/webroot"; +{ = true; + = "alice@example.org"; + = "/webroot"; } @@ -40,7 +40,7 @@ the document root. Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, - defines a set named + defines a set named services that contains a set named httpd, which in turn contains an option definition named enable with value true. @@ -89,7 +89,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no Strings are enclosed in double quotes, e.g. -networking.hostName = "dexter"; + = "dexter"; Special characters can be escaped by prefixing them with a @@ -99,7 +99,7 @@ networking.hostName = "dexter"; single quotes, e.g. -networking.extraHosts = + = '' 127.0.0.2 other-localhost 10.0.0.1 server @@ -125,8 +125,8 @@ networking.extraHosts = false, e.g. -networking.firewall.enable = true; -networking.firewall.allowPing = false; + = true; + = false; @@ -138,7 +138,7 @@ networking.firewall.allowPing = false; For example, -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; +."net.ipv4.tcp_keepalive_time" = 60; (Note that here the attribute name @@ -158,7 +158,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; enclosed in braces, as in the option definition -fileSystems."/boot" = +."/boot" = { device = "/dev/sda1"; fsType = "ext4"; options = [ "rw" "data=ordered" "relatime" ]; @@ -175,7 +175,7 @@ fileSystems."/boot" = elements are separated by whitespace, like this: -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; List elements can be any other type, e.g. sets: @@ -195,12 +195,12 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; the function argument pkgs. Typical uses: -environment.systemPackages = + = [ pkgs.thunderbird pkgs.emacs ]; -postgresql.package = pkgs.postgresql90; + = pkgs.postgresql90; The latter option definition changes the default PostgreSQL diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 8aa01fb57a0..8b7654e9b42 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -28,7 +28,7 @@ has a dependency on GTK+ 2. If you want to build it against GTK+ 3, you can specify that as follows: -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; The function override performs the call to the Nix @@ -38,7 +38,7 @@ the set of arguments specified by you. So here the function argument causing Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, -environment.systemPackages would be a list with two + would be a list with two elements.) Even greater customisation is possible using the function @@ -51,7 +51,7 @@ For instance, if you want to override the source code of Emacs, you can say: -environment.systemPackages = [ + = [ (pkgs.emacs.overrideAttrs (oldAttrs: { name = "emacs-25.0-pre"; src = /path/to/my/emacs/tree; diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index dc2fa715097..4c875e6f037 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -8,12 +8,12 @@ With declarative package management, you specify which packages you want on your system by setting the option -. For instance, adding the +. For instance, adding the following line to configuration.nix enables the Mozilla Thunderbird email application: -environment.systemPackages = [ pkgs.thunderbird ]; + = [ pkgs.thunderbird ]; The effect of this specification is that the Thunderbird package from @@ -34,7 +34,7 @@ name, such as different channels that you might have.) To “uninstall” a package, simply remove it from - and run + and run nixos-rebuild switch. diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index ae3d124cd6b..0ff37c38d8b 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -13,21 +13,21 @@ device /dev/disk/by-label/data onto the mount point /data: -fileSystems."/data" = +."/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; }; Mount points are created automatically if they don’t already exist. -For , it’s best to use the topology-independent +For , it’s best to use the topology-independent device aliases in /dev/disk/by-label and /dev/disk/by-uuid, as these don’t change if the topology changes (e.g. if a disk is moved to another IDE controller). You can usually omit the file system type -(), since mount can usually +(), since mount can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not ext2, ext3 @@ -38,7 +38,7 @@ available. System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding -options = [ "nofail" ];. +options = [ "nofail" ];. diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index 75cccef95b3..ecc21a3bdf5 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -12,37 +12,37 @@ both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows: -networking.firewall.enable = false; + = false; If the firewall is enabled, you can open specific TCP ports to the outside world: -networking.firewall.allowedTCPPorts = [ 80 443 ]; + = [ 80 443 ]; Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP +is enabled (). UDP ports can be opened through -. +. To open ranges of TCP ports: -networking.firewall.allowedTCPPortRanges = [ + = [ { from = 4000; to = 4007; } { from = 8000; to = 8010; } ]; Similarly, UDP port ranges can be opened through -. +. Also of interest is -networking.firewall.allowPing = true; + = true; to allow the machine to respond to ping requests. (ICMPv6 pings are diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 68238b547d6..f3ce4af39b9 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,15 +12,15 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; Typically you’ll also want to set a default gateway and set of name servers: -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; + = "192.168.1.1"; + = [ "8.8.8.8" ]; @@ -31,10 +31,10 @@ service The default gateway and name server configuration is performed by network-setup.service. -The host name is set using : +The host name is set using : -networking.hostName = "cartman"; + = "cartman"; The default host name is nixos. Set it to the diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 74a21e18ec3..6b0ba0d48f0 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -11,14 +11,14 @@ is used to automatically assign IPv6 addresses to all interfaces. You can disable IPv6 support globally by setting: -networking.enableIPv6 = false; + = false; You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface eth0): -boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +."net.ipv6.conf.eth0.disable_ipv6" = true; @@ -26,14 +26,14 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; For configuring a gateway, optionally with explicitly specified interface: -networking.defaultGateway6 = { + = { address = "fe00::1"; interface = "enp0s3"; } diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 52be26d6024..b9325629256 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -10,7 +10,7 @@ the option . For instance, this selects the Linux 3.10 kernel: -boot.kernelPackages = pkgs.linuxPackages_3_10; + = pkgs.linuxPackages_3_10; Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. @@ -45,23 +45,23 @@ is typically y, n or Kernel modules for hardware devices are generally loaded automatically by udev. You can force a module to -be loaded via , e.g. +be loaded via , e.g. -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; If the module is required early during the boot (e.g. to mount the root file system), you can use -: +: -boot.initrd.extraKernelModules = [ "cifs" ]; + = [ "cifs" ]; This causes the specified modules and their dependencies to be added to the initial ramdisk. Kernel runtime parameters can be set through -, e.g. +, e.g. -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +."net.ipv4.tcp_keepalive_time" = 120; sets the kernel’s TCP keepalive time to 120 seconds. To see the available parameters, run sysctl -a. diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 00c795cd089..6c2b4cc60b5 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -33,13 +33,13 @@ as /, add the following to configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -fileSystems."/".device = "/dev/mapper/crypted"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +."/".device = "/dev/mapper/crypted"; Should grub be used as bootloader, and /boot is located on an encrypted partition, it is necessary to add the following grub option: -boot.loader.grub.enableCryptodisk = true; + = true; diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 5420c7f8838..2f76459a24e 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -22,8 +22,8 @@ use other modules by including them from { config, pkgs, ... }: { imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; + = true; + = [ pkgs.emacs ]; ... } @@ -35,25 +35,25 @@ latter might look like this: { config, pkgs, ... }: -{ services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; +{ = true; + = true; + = true; } Note that both configuration.nix and kde.nix define the option -. When multiple modules +. When multiple modules define an option, NixOS will try to merge the definitions. In the case of -, that’s easy: the lists of +, that’s easy: the lists of packages can simply be concatenated. The value in configuration.nix is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use mkBefore: -boot.kernelModules = mkBefore [ "kvm-intel" ]; + = mkBefore [ "kvm-intel" ]; This causes the kvm-intel kernel module to be @@ -61,7 +61,7 @@ loaded before any other kernel modules. For other types of options, a merge may not be possible. For instance, if two modules define -, +, nixos-rebuild will give an error: @@ -72,7 +72,7 @@ When that happens, it’s possible to force one definition take precedence over the others: -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; + = pkgs.lib.mkForce "bob@example.org"; @@ -89,15 +89,15 @@ wondering how it’s possible that the (indirect) is a “lazy” language — it only computes values when they are needed. This works as long as no individual configuration value depends on itself.. For example, here is a module that adds -some packages to only if - is set to +some packages to only if + is set to true somewhere else: { config, pkgs, ... }: -{ environment.systemPackages = - if config.services.xserver.enable then +{ = + if config. then [ pkgs.firefox pkgs.thunderbird ] @@ -113,10 +113,10 @@ value of a configuration option is. The command allows you to find out: -$ nixos-option services.xserver.enable +$ nixos-option true -$ nixos-option boot.kernelModules +$ nixos-option [ "tun" "ipv6" "loop" ... ] @@ -130,10 +130,10 @@ typical use: $ nix-repl '<nixpkgs/nixos>' -nix-repl> config.networking.hostName +nix-repl> config. "mandark" -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +nix-repl> map (x: x.hostName) config. [ "example.org" "example.gov" ] diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index b4808e74ff9..bbbee3a52ed 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -10,7 +10,7 @@ use NetworkManager. You can enable NetworkManager by setting: -networking.networkmanager.enable = true; + = true; some desktop managers (e.g., GNOME) enable NetworkManager @@ -20,7 +20,7 @@ automatically for you. belong to the networkmanager group: -users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; +users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index 7c928baaf89..7dbe598cffe 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -10,12 +10,12 @@ setting: -services.openssh.enable = true; + = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting -services.openssh.permitRootLogin to + to "no". You can declaratively specify authorised RSA/DSA public keys for @@ -23,7 +23,7 @@ a user as follows: -users.extraUsers.alice.openssh.authorizedKeys.keys = +users.extraUsers.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index c6656edff6c..848b221baa7 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,12 +12,12 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -users.users.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +.alice = + { isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; @@ -32,13 +32,13 @@ a password. However, you can use the passwd program to set a password, which is retained across invocations of nixos-rebuild. -If you set users.mutableUsers to false, then the contents of /etc/passwd -and /etc/group will be congruent to your NixOS configuration. For instance, -if you remove a user from users.users and run nixos-rebuild, the user -account will cease to exist. Also, imperative commands for managing users +If you set to false, then the contents of +/etc/passwd and /etc/group will be congruent to +your NixOS configuration. For instance, if you remove a user from +and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be -assigned by setting the user's hashedPassword option. A -hashed password can be generated using mkpasswd -m sha-512 +assigned by setting the user's hashedPassword +option. A hashed password can be generated using mkpasswd -m sha-512 after installing the mkpasswd package. A user ID (uid) is assigned automatically. You can also specify @@ -54,7 +54,7 @@ to the user specification. group named students shall exist: -users.groups.students.gid = 1000; +.students.gid = 1000; As with users, the group ID (gid) is optional and will be assigned diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 1868380dcbf..6ce43a43700 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -15,12 +15,12 @@ section on wireless networks. NixOS will start wpa_supplicant for you if you enable this setting: -networking.wireless.enable = true; + = true; NixOS lets you specify networks for wpa_supplicant declaratively: -networking.wireless.networks = { + = { echelon = { psk = "abcdefgh"; }; diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 9c2c59006f1..fd0daf6c6e5 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -9,14 +9,14 @@ The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows: -services.xserver.enable = true; + = true; The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as vesa and intel). You can also specify a driver manually, e.g. -services.xserver.videoDrivers = [ "r128" ]; + = [ "r128" ]; to enable X.org’s xf86-video-r128 driver. @@ -25,13 +25,13 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.plasma5.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.desktopManager.gnome3.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; -services.xserver.windowManager.i3.enable = true; + = true; + = true; + = true; + = true; + = true; + = true; + = true; @@ -40,22 +40,22 @@ program that provides a graphical login prompt and manages the X server) is SLiM. You can select an alternative one by picking one of the following lines: -services.xserver.displayManager.sddm.enable = true; -services.xserver.displayManager.lightdm.enable = true; + = true; + = true; You can set the keyboard layout (and optionally the layout variant): -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; + = "de"; + = "neo"; The X server is started automatically at boot time. If you don’t want this to happen, you can set: -services.xserver.autorun = false; + = false; The X server can then be started manually: @@ -70,13 +70,13 @@ The X server can then be started manually: has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "nvidia" ]; + = [ "nvidia" ]; Or if you have an older card, you may have to use one of the legacy drivers: -services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy173" ]; + = [ "nvidiaLegacy340" ]; + = [ "nvidiaLegacy304" ]; + = [ "nvidiaLegacy173" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -84,7 +84,7 @@ 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: -hardware.opengl.driSupport32Bit = true; + = true; @@ -96,7 +96,7 @@ hardware.opengl.driSupport32Bit = true; has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "ati_unfree" ]; + = [ "ati_unfree" ]; You will need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -104,7 +104,7 @@ 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: -hardware.opengl.driSupport32Bit = true; + = true; @@ -115,12 +115,12 @@ hardware.opengl.driSupport32Bit = true; Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: -services.xserver.libinput.enable = true; + = true; The driver has many options (see ). For instance, the following disables tap-to-click behavior: -services.xserver.libinput.tapping = false; + = false; Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 18804d2c08b..8cb592faed5 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -9,9 +9,9 @@ To enable the Xfce Desktop Environment, set -services.xserver.desktopManager = { - xfce.enable = true; - default = "xfce"; +services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; }; @@ -20,12 +20,12 @@ services.xserver.desktopManager = { Optionally, compton can be enabled for nice graphical effects, some example settings: -services.compton = { - enable = true; - fade = true; - inactiveOpacity = "0.9"; - shadow = true; - fadeDelta = 4; +services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; }; @@ -33,9 +33,9 @@ services.compton = { Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your - environment.systemPackages. + . - + Thunar Volume Support @@ -44,7 +44,7 @@ services.compton = { Thunar volume support, put -services.xserver.desktopManager.xfce.enable = true; + = true; into your configuration.nix. diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 4db9020b960..52d8a292f8b 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -75,7 +75,7 @@ have set mutableUsers = false. Another way is to temporarily add the following to your configuration: -users.extraUsers.your-user.initialPassword = "test" +users.extraUsers.your-user.initialHashedPassword = "test"; Important: delete the $hostname.qcow2 file if you diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index ecd020a067a..11fcb43732a 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -111,7 +111,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-versionconfiguration.nix: -boot.loader.grub.extraEntries = '' + = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e configfile "($ubuntu)/boot/grub/grub.cfg" @@ -183,7 +183,7 @@ $ sudo groupdel nixbld account with sudo passwd -l root if you use sudo) - users.extraUsers.root.initialHashedPassword = ""; + users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 7fcd22a112c..2b31b7ed315 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -42,7 +42,7 @@ -boot.loader.grub.device = "/dev/sda"; + = "/dev/sda"; @@ -51,7 +51,7 @@ boot.loader.grub.device = "/dev/sda"; -boot.initrd.checkJournalingFS = false; + = false; diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e20b6574b72..f967a7fe268 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -208,26 +208,29 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif BIOS systems - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot + boot. UEFI systems - You must set the option - to true. - nixos-generate-config should do this automatically for new - configurations when booted in - UEFI mode. - You may want to look at the options starting with - and - as well. + You must set the option + to true. + nixos-generate-config should do this automatically for new + configurations when booted in + UEFI mode. + You may want to look at the options starting with + and + as well. + + + If there are other operating systems running on the machine before installing NixOS, the - option can be set to + option can be set to true to automatically add them to the grub menu. Another critical option is , @@ -269,15 +272,15 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif As the last step, nixos-install will ask you to set the password for the root user, e.g. - -setting root password... -Enter new UNIX password: *** -Retype new UNIX password: *** - + + setting root password... + Enter new UNIX password: *** + Retype new UNIX password: *** + - To prevent the password prompt, set users.mutableUsers = false; in + To prevent the password prompt, set = false; in configuration.nix, which allows unattended installation necessary in automation. @@ -290,20 +293,20 @@ Retype new UNIX password: *** If everything went well: - -# reboot + + # reboot You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see Changing Configuration ), a - new item is added to the menu. This allows you to easily roll back - to a previous configuration if something goes wrong. + GRUB boot menu shows a list of available + configurations (initially just one). Every time you + change the NixOS configuration (see Changing Configuration ), a + new item is added to the menu. This allows you to easily roll back + to a previous configuration if something goes wrong. You should log in and change the root password with passwd. @@ -376,26 +379,26 @@ drive (here /dev/sda). NixOS Configuration - -{ config, pkgs, ... }: + + { config, pkgs, ... }: -{ - imports = + { + imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware-configuration.nix ]; - boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) - boot.loader.systemd-boot.enable = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; -} + # Enable the OpenSSH server. + services.sshd.enable = true; + } diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index aee6523345c..24881c8fec0 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -119,7 +119,7 @@ able to go back to your original channel. the following to configuration.nix: -system.autoUpgrade.enable = true; + = true; This enables a periodically executed systemd service named @@ -130,7 +130,7 @@ runs, see systemctl list-timers.) You can also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03; + = https://nixos.org/channels/nixos-17.03; diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 45d6daf068b..76ffa8cb7e3 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -6,56 +6,56 @@ Input Methods -Input methods are an operating system component that allows any data, such - as keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. Using - an input method is obligatory for any language that has more graphemes than +Input methods are an operating system component that allows any data, such + as keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. Using + an input method is obligatory for any language that has more graphemes than there are keys on the keyboard. The following input methods are available in NixOS: IBus: The intelligent input bus. - Fcitx: A customizable lightweight input + Fcitx: A customizable lightweight input method. Nabi: A Korean input method based on XIM. - Uim: The universal input method, is a library with a XIM + Uim: The universal input method, is a library with a XIM bridge.
IBus -IBus is an Intelligent Input Bus. It provides full featured and user +IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface. The following snippet can be used to configure IBus: i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; }; -i18n.inputMethod.ibus.engines is optional and can be +i18n.inputMethod.ibus.engines is optional and can be used to add extra IBus engines. Available extra IBus engines are: - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (ibus-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Hangul (ibus-engines.hangul): Korean input + Hangul (ibus-engines.hangul): Korean input method. - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (ibus-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (ibus-engines.mozc): A Japanese input + mozc (ibus-engines.mozc): A Japanese input method from Google. - Table (ibus-engines.table): An input method + Table (ibus-engines.table): An input method that load tables of input methods. - table-others (ibus-engines.table-others): + table-others (ibus-engines.table-others): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with table. For example: @@ -72,71 +72,71 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
Fcitx -Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input +Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. The following snippet can be used to configure Fcitx: i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; + enabled = "fcitx"; + fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; }; -i18n.inputMethod.fcitx.engines is optional and can be +i18n.inputMethod.fcitx.engines is optional and can be used to add extra Fcitx engines. Available extra Fcitx engines are: - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (fcitx-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most popular input + Chewing (fcitx-engines.chewing): Chewing is + an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users. - Hangul (fcitx-engines.hangul): Korean input + Hangul (fcitx-engines.hangul): Korean input method. - Unikey (fcitx-engines.unikey): Vietnamese input + Unikey (fcitx-engines.unikey): Vietnamese input method. - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (fcitx-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (fcitx-engines.mozc): A Japanese input + mozc (fcitx-engines.mozc): A Japanese input method from Google. - table-others (fcitx-engines.table-others): + table-others (fcitx-engines.table-others): Various table-based input methods.
Nabi -Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters +Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters (hanja). The following snippet can be used to configure Nabi: i18n.inputMethod = { - enabled = "nabi"; + enabled = "nabi"; };
Uim -Uim (short for "universal input method") is a multilingual input method +Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges. The following snippet can be used to configure uim: i18n.inputMethod = { - enabled = "uim"; + enabled = "uim"; }; -Note: The i18n.inputMethod.uim.toolbar option can be +Note: The option can be used to choose uim toolbar.
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index 7acbc2fc4dd..a26653dda53 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -15,9 +15,9 @@ installed by setting programs.digitalbitbox to true in a manner similar to - - programs.digitalbitbox.enable = true; - + + = true; + and bundles the digitalbitbox package (see ), which contains the @@ -46,11 +46,11 @@ digitalbitbox package which could be installed as follows: - - environment.systemPackages = [ - pkgs.digitalbitbox - ]; - + + = [ + pkgs.digitalbitbox +]; +
@@ -62,9 +62,9 @@ The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows: - - hardware.digitalbitbox.enable = true; - + + = true; + @@ -72,14 +72,14 @@ the udevRule51 and udevRule52 attributes by means of overriding as follows: - - programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; - }; - + +programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; +}; + diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index 85b0e023e6c..91740ee16ec 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -17,7 +17,7 @@ To enable Plotinus, add the following to your configuration.nix: -programs.plotinus.enable = true; + = true; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 6130ed82ed3..7cdc554989e 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -48,9 +48,9 @@ http { configuration.nix: -security.acme.certs."foo.example.com" = { - webroot = "/var/www/challenges"; - email = "foo@example.com"; +."foo.example.com" = { + webroot = "/var/www/challenges"; + email = "foo@example.com"; }; @@ -58,17 +58,17 @@ security.acme.certs."foo.example.com" = { The private key key.pem and certificate fullchain.pem will be put into /var/lib/acme/foo.example.com. The target directory can -be configured with the option security.acme.directory. +be configured with the option . Refer to for all available configuration -options for the security.acme module. +options for the security.acme module.
Using ACME certificates in Nginx NixOS supports fetching ACME certificates for you by setting -enableACME = true; in a virtualHost config. We + enableACME = true; in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For foo.example.com the config would @@ -77,13 +77,13 @@ look like. services.nginx = { - enable = true; - virtualHosts = { + enable = true; + virtualHosts = { "foo.example.com" = { - forceSSL = true; - enableACME = true; + forceSSL = true; + enableACME = true; locations."/" = { - root = "/var/www"; + root = "/var/www"; }; }; }; diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index 5715ee7ac16..d69341eb3cd 100644 --- a/nixos/modules/security/hidepid.xml +++ b/nixos/modules/security/hidepid.xml @@ -8,9 +8,9 @@ Setting - - security.hideProcessInformation = true; - + + = true; + ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged @@ -25,9 +25,9 @@ To allow a service foo to run without process information hiding, set - - systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; - + +systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; + diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index a9802694295..98a631c0cd3 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -23,15 +23,15 @@ configuration.nix: -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql94; + = true; + = pkgs.postgresql94; Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for - such as the most recent + such as the most recent release of PostgreSQL. - If services.emacs.defaultEditor is + If is true, the EDITOR variable will be set to a wrapper script which launches emacsclient. @@ -497,10 +497,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it: - + + = false; + = true; + @@ -582,7 +582,7 @@ services.emacs.install = true; To install the DocBook 5.0 schemas, either add pkgs.docbook5 to - environment.systemPackages ( (NixOS), or run nix-env -i pkgs.docbook5 (Nix). diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 4b00f50abd6..3306ba8e9b1 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -18,19 +18,18 @@ webserver to proxy HTTP requests to the socket. frontend proxy: - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; - }; -''; +services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."git.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; +}; @@ -49,24 +48,24 @@ all data like the repositories and uploads will be stored. services.gitlab = { - enable = true; - databasePassword = "eXaMpl3"; - initialRootPassword = "UseNixOS!"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; + enable = true; + databasePassword = "eXaMpl3"; + initialRootPassword = "UseNixOS!"; + https = true; + host = "git.example.com"; + port = 443; + user = "git"; + group = "git"; smtp = { - enable = true; - address = "localhost"; - port = 25; + enable = true; + address = "localhost"; + port = 25; }; secrets = { - db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; - secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; - otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; - jws = '' + db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; + secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; + otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + jws = '' -----BEGIN RSA PRIVATE KEY----- MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm @@ -96,7 +95,7 @@ services.gitlab = { -----END RSA PRIVATE KEY----- ''; }; - extraConfig = { + extraConfig = { gitlab = { email_from = "gitlab-no-reply@example.com"; email_display_name = "Example GitLab"; @@ -116,7 +115,7 @@ secret from config/secrets.yml located in your Gitlab state folder. Refer to for all available configuration -options for the services.gitlab module. +options for the services.gitlab module.
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 6d4d2a9b488..75493ac1394 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -55,7 +55,7 @@ Because Taskserver by default only provides scripts to setup users imperatively, the nixos-taskserver tool is used for addition and deletion of organisations along with users and groups defined - by and as well for + by and as well for imperative set up. @@ -99,10 +99,10 @@ For example, let's say you have the following configuration: { - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; + = true; + = "server"; + = "::"; + services.taskserver.organisations.my-company.users = [ "alice" ]; } This creates an organisation called my-company with the @@ -136,7 +136,7 @@ $ ssh server nixos-taskserver user export my-company alice | sh If you set any options within - , + service.taskserver.pki.manual.*, nixos-taskserver won't issue certificates, but you can still use it for adding or removing user accounts. diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml index 555c6df4d55..ff108869858 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.xml +++ b/nixos/modules/services/networking/dnscrypt-proxy.xml @@ -19,7 +19,7 @@ To enable the client proxy, set - services.dnscrypt-proxy.enable = true; + = true; @@ -38,17 +38,17 @@ DNS client, change the default proxy listening port to a non-standard value and point the other client to it: - services.dnscrypt-proxy.localPort = 43; + = 43; dnsmasq - { - services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#43" ]; - } +{ + = true; + = [ "127.0.0.1#43" ]; +} @@ -56,10 +56,10 @@ unbound - { - services.unbound.enable = true; - services.unbound.forwardAddresses = [ "127.0.0.1@43" ]; - } +{ + = true; + = [ "127.0.0.1@43" ]; +} From 7292c5a5701bacc4188a00e0399a92aa748ec6a5 Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Tue, 17 Apr 2018 09:19:55 +1000 Subject: [PATCH 007/181] Fixed indentation --- .../doc/manual/configuration/config-file.xml | 4 +-- .../doc/manual/configuration/ipv4-config.xml | 5 ++- .../doc/manual/configuration/ipv6-config.xml | 5 ++- nixos/doc/manual/configuration/user-mgmt.xml | 14 ++++---- .../installing-from-other-distro.xml | 10 ++++-- nixos/doc/manual/installation/installing.xml | 35 +++++++++---------- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 60a4dac97d5..d4ca15bb3e7 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -29,8 +29,8 @@ form name = { config, pkgs, ... }: { = true; - = "alice@example.org"; - = "/webroot"; + = "alice@example.org"; + = "/webroot"; } diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index f3ce4af39b9..fbc9695c601 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,7 +12,10 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; Typically you’ll also want to set a default gateway and set of name diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 6b0ba0d48f0..e8960dc8930 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,10 @@ example, we use interface eth0): DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 848b221baa7..1456a589411 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,13 +12,13 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; - }; +.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; Note that alice is a member of the diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 11fcb43732a..7e6ddb05cd6 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -183,7 +183,9 @@ $ sudo groupdel nixbld account with sudo passwd -l root if you use sudo) - users.extraUsers.root.initialHashedPassword = ""; + +users.extraUsers.root.initialHashedPassword = ""; + @@ -243,13 +245,15 @@ $ sudo groupdel nixbld $ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE +$ sudo touch /etc/NIXOS_LUSTRATE + Let's also make sure the NixOS configuration files are kept once we reboot on NixOS: -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f967a7fe268..ba6098d917d 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -273,9 +273,9 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif you to set the password for the root user, e.g. - setting root password... - Enter new UNIX password: *** - Retype new UNIX password: *** +setting root password... +Enter new UNIX password: *** +Retype new UNIX password: *** @@ -380,25 +380,24 @@ drive (here /dev/sda). NixOS Configuration - { config, pkgs, ... }: - - { - imports = - [ # Include the results of the hardware scan. +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix - ]; + ]; - = "/dev/sda"; # (for BIOS systems only) - = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; - } + # Enable the OpenSSH server. + services.sshd.enable = true; +} + From d1f7c51d179ac2ebcb7649ca8b7606ec098a0ea2 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 17 Apr 2018 18:34:45 -0700 Subject: [PATCH 008/181] vulkan-loader: fix broken symlink in output --- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 2b0d765efc8..8345786d3e8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin mkdir -p $out/lib $out/share/vulkan/explicit_layer.d - cp -d layers/*.so $out/lib/ - cp -d layers/*.json $out/share/vulkan/explicit_layer.d/ + cp -L layers/*.so $out/lib/ + cp -L layers/*.json $out/share/vulkan/explicit_layer.d/ sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ From efe25f416c7a594c33b8239935a843a6941077b1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:48 +0300 Subject: [PATCH 009/181] parity: 1.9.5 -> 1.9.6 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 99179932109..71485551ef6 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.5"; - sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; - cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + version = "1.9.6"; + sha256 = "17h7c93c95pj71nbw152rl4ka240zzd8w0yf8k4l4rimcsbra92g"; + cargoSha256 = "0gk26yncahrlnx6xz13x775wrwh7xsfqiifspjislmgk7xknqjm0"; patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } From 44342f139ec014442c0b1538099868696e641cb2 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:57 +0300 Subject: [PATCH 010/181] parity-beta: 1.10.0 -> 1.10.1 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ed78133a759..b1bf38427a8 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.10.0"; - sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; - cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + version = "1.10.1"; + sha256 = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b"; + cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7"; patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } From b95a24fdf1f751c44282f6c38b84b763a85eee19 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 20 Apr 2018 11:07:07 +0800 Subject: [PATCH 011/181] nixos-container: support restarts --- .../nixos-container/nixos-container.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 2cb723a7b71..a210a65f431 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -242,11 +242,21 @@ sub terminateContainer { while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) } } +sub startContainer { + system("systemctl", "start", "container\@$containerName") == 0 + or die "$0: failed to start container\n"; +} + sub stopContainer { system("systemctl", "stop", "container\@$containerName") == 0 or die "$0: failed to stop container\n"; } +sub restartContainer { + stopContainer; + startContainer; +} + # Run a command in the container. sub runInContainer { my @args = @_; @@ -285,9 +295,12 @@ if ($action eq "destroy") { unlink($confFile) or die; } +elsif ($action eq "restart") { + restartContainer; +} + elsif ($action eq "start") { - system("systemctl", "start", "container\@$containerName") == 0 - or die "$0: failed to start container\n"; + startContainer; } elsif ($action eq "stop") { From d71a8533ff24c510be9692c24df64d8675d7d8b5 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sun, 22 Apr 2018 12:23:19 +0900 Subject: [PATCH 012/181] ffmpeg library clash fix --- pkgs/tools/misc/sweep-visualizer/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index c1f3fbea8e5..cbf849494b7 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -24,10 +24,9 @@ buildPhase = ":"; installPhase = '' - mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mkdir -p $out/bin $out/share/sweep-visualizer mv usr/share/* $out/share mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ - mv $out/share/sweep-visualizer/*.so $out/lib/ ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer ''; @@ -40,12 +39,12 @@ ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; in '' - for lib in $out/lib/*.so; do - patchelf --set-rpath "$out/lib:${libPath}" $lib + for lib in $out/share/sweep-visualizer/*.so; do + patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib done patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" \ + --set-rpath "$out/share/sweep-visualizer:${libPath}" \ $out/share/sweep-visualizer/sweep_visualizer wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; From 8647df2fb6be8d586376c2cb76ca5f2518dcbb81 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 20:37:03 +0200 Subject: [PATCH 013/181] goocanvas_2: support gobjectIntrospection --- pkgs/development/libraries/goocanvas/2.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 026f58079f6..ef36a9c076f 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -13,11 +13,13 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; - buildInputs = [ gtk3 cairo glib ]; + buildInputs = [ gtk3 cairo glib gobjectIntrospection ]; configureFlags = [ "--disable-python" ]; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; meta = with stdenv.lib; { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; From 0e5f82b847632cfd01122915ad9c57b2c65a2026 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 20:37:27 +0200 Subject: [PATCH 014/181] pdf-quench: init at 1.0.5 --- pkgs/applications/misc/pdf-quench/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/pdf-quench/default.nix diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix new file mode 100644 index 00000000000..5b80fb16122 --- /dev/null +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: + +pythonPackages.buildPythonApplication rec { + name = "pdf-quench-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "linuxerwang"; + repo = "pdf-quench"; + rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6"; + sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + + dontBuild = true; + doCheck = false; + + postPatch = '' + substituteInPlace src/pdf_quench.py \ + --replace /usr/bin/python "${pythonPackages.python}/bin/python" + ''; + + installPhase = '' + install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/linuxerwang/pdf-quench; + description = "A visual tool for cropping pdf files"; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31f..a45a6f2d04a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4276,6 +4276,8 @@ with pkgs; pdfmod = callPackage ../applications/misc/pdfmod { }; + pdf-quench = callPackage ../applications/misc/pdf-quench { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; pdfread = callPackage ../tools/graphics/pdfread { From 94a420b92159ad979b97859a3db4779f91826a9f Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Mon, 23 Apr 2018 21:27:42 +0200 Subject: [PATCH 015/181] fetchFromGitLab: Use API archive download endpoint. According to https://gitlab.com/gitlab-org/gitlab-ce/issues/45586#note_69828451 this URL is something with guaranteed stability. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67a5390aa6a..7928f08f458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -288,7 +288,7 @@ with pkgs; ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://gitlab.com/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.tar.gz"; + url = "https://gitlab.com/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; meta.homepage = "https://gitlab.com/${owner}/${repo}/"; } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; From e05099fdde718fef86bb7991fa89c69815b7362f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 12:14:08 -0700 Subject: [PATCH 016/181] libfm-extra: 1.2.5 -> 1.3.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/libfm-extra/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.3.0 with grep in /nix/store/jfppsgl453gipb6vx66y4pcssxd7fq54-libfm-extra-1.3.0 - directory tree listing: https://gist.github.com/74991e480da532d6ef49f6fb5727d564 --- pkgs/development/libraries/libfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 851ee7f326b..01bfe1653fe 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; + sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb"; }; nativeBuildInputs = [ pkgconfig ]; From 82a9df76cce9f46ccf76aeab2a5f98fc38ea81ae Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 24 Apr 2018 21:25:13 +0200 Subject: [PATCH 017/181] tuxpaint: init at 0.9.22 --- pkgs/games/tuxpaint/default.nix | 46 ++++++++++++++++++++ pkgs/games/tuxpaint/tuxpaint-completion.diff | 16 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/games/tuxpaint/default.nix create mode 100644 pkgs/games/tuxpaint/tuxpaint-completion.diff diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix new file mode 100644 index 00000000000..ddf0782b210 --- /dev/null +++ b/pkgs/games/tuxpaint/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, + cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }: + +stdenv.mkDerivation rec { + version = "0.9.22"; + name = "tuxpaint-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz"; + sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; + }; + + nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo + librsvg gettext libpaper fribidi pkgconfig gperf ]; + hardeningDisable = [ "format" ]; + makeFlags = [ "GPERF=${gperf}/bin/gperf" + "PREFIX=$$out" + "COMPLETIONDIR=$$out/share/bash-completion/completions" + ]; + + patches = [ ./tuxpaint-completion.diff ]; + postPatch = '' + grep -Zlr include.*SDL . | xargs -0 sed -i -e 's,"SDL,"SDL/SDL,' + ''; + + # stamps + stamps = fetchurl { + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz"; + sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q"; + }; + + postInstall = '' + tar xzf $stamps + cd tuxpaint-stamps-2014.08.23 + make install-all PREFIX=$out + rm -rf $out/share/tuxpaint/stamps/military + ''; + + meta = { + description = "Open Source Drawing Software for Children"; + homepage = http://www.tuxpaint.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/games/tuxpaint/tuxpaint-completion.diff new file mode 100644 index 00000000000..0824b2becf4 --- /dev/null +++ b/pkgs/games/tuxpaint/tuxpaint-completion.diff @@ -0,0 +1,16 @@ +--- tuxpaint-0.9.22/src/tuxpaint-completion.bash~ 1970-01-01 01:00:01.000000000 +0100 ++++ tuxpaint-0.9.22/src/tuxpaint-completion.bash 2018-03-06 10:54:03.437560921 +0100 +@@ -8,7 +8,6 @@ + # FIXME: See http://www.debian-administration.org/articles/316 for an intro + # to how we should be doing this... -bjk 2009.09.09 + +-have tuxpaint && + _tuxpaint() + { + local cur +@@ -96,4 +95,4 @@ + fi + + } +-[ "${have:-}" ] && complete -F _tuxpaint $filenames tuxpaint ++complete -F _tuxpaint $filenames tuxpaint diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a4ebec0480..6611baa9fe1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19442,6 +19442,8 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; + tuxpaint = callPackage ../games/tuxpaint { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC From f827bd40072c7f275a09ccc57d36a468941c618e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 13:23:53 -0700 Subject: [PATCH 018/181] grib-api: 1.26.0 -> 1.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grib-api/versions. These checks were done: - built on NixOS - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_histogram -h’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_histogram --help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_info -v’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_filter -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_ls -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_dump -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib2ppm -h’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib2ppm --help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_set -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_get -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_get_data -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_copy -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_packing help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_compare -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_index_build help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_index_build -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_to_netcdf -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -v’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys --version’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys version’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -h’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys --help’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys help’ and found version 1.26.1 - found 1.26.1 with grep in /nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1 - directory tree listing: https://gist.github.com/e201ebaf6d3662af211ceca919f68df1 --- pkgs/development/libraries/grib-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 61409279ded..9113b671664 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "00cmmj44bhdlzhqbvwb3bb4xks3bpva669m6g3g6ffjaqm25b90c"; + sha256 = "1v1apx9421m8zkjmych5yr66mvqjrrygc98bvyl4miasmsb4ndfs"; }; preConfigure = '' From 40bb3374e91cbdbace29594a0f620d4402bc703c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Apr 2018 23:12:40 +0200 Subject: [PATCH 019/181] source-and-tags: fix default.nix Tested by observing that the following command produces a correctly looking TAGS file: $ nix-shell -E 'let pkgs = import ./. {}; in pkgs.myEnvFun {name = "myEnvFun-htags-test"; buildInputs = [(pkgs.sourceAndTags.sourceWithTagsDerivation (pkgs.sourceAndTags.addHasktagsTaggingInfo pkgs.haskellPackages.scientific).passthru.sourceWithTags)];}' --run 'cat $TAG_FILES' --- pkgs/misc/source-and-tags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 981c01e2b4a..7c082cbbbb0 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -1,4 +1,4 @@ -args: with args; { +{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { # optional srcDir annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags || x ? meta && x.meta ? sourceWithTags ); @@ -59,8 +59,8 @@ args: with args; { # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""} - + ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""} + ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE }"; From 72ec248eda744ccdf1233cebbeeb176355f4b0d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Apr 2018 06:27:21 +0000 Subject: [PATCH 020/181] coqPackages.contribs.containers: make available for Coq 8.8 --- pkgs/development/coq-modules/contribs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 82d1f7a4746..7b274812737 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -189,7 +189,7 @@ let mkContrib = repo: revs: param: sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33"; }; - containers = mkContrib "containers" [ "8.6" "8.7" ] { + containers = mkContrib "containers" [ "8.6" "8.7" "8.8" ] { "8.6" = { version = "8.6.0"; rev = "fa1fec7"; @@ -200,6 +200,11 @@ let mkContrib = repo: revs: param: rev = "77ac16366529c9e558f70ba86f0168a76ca76b8f"; sha256 = "01gp8injb0knaxgqsdc4x9h8714k7qxg7j5w7y6i45dnpd81ndr4"; }; + "8.8" = { + version = "20180330"; + rev = "52b86bed1671321b25fe4d7495558f9f221b12aa"; + sha256 = "0hbnrwdgryr52170cfrlbiymr88jsyxilnpr343vnprqq3zk1xz0"; + }; }."${coq.coq-version}"; continuations = mkContrib "continuations" [ ] { From b9acfb4ecfbbdac123fed170f5b2806fe4e846d0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Mar 2018 22:41:06 -0400 Subject: [PATCH 021/181] treewide: isArm -> isAarch32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile (cherry picked from commit ba52ae50488de85a9cf60a3a04f1c9ca7122ec74) --- lib/systems/doubles.nix | 2 +- lib/systems/for-meta.nix | 2 +- lib/systems/inspect.nix | 7 +++++-- lib/systems/parse.nix | 2 +- nixos/lib/qemu-flags.nix | 2 +- nixos/modules/config/gnu.nix | 4 ++-- pkgs/applications/audio/sunvox/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- .../applications/virtualization/qemu/default.nix | 6 +++--- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- .../compilers/gcc/snapshot/default.nix | 2 +- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 6 +++--- pkgs/development/compilers/ghc/8.4.1.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/go/1.10.nix | 4 ++-- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 4 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/generic.nix | 4 ++-- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/generic-builder.nix | 2 +- pkgs/development/interpreters/perl/default.nix | 2 +- .../interpreters/picolisp/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 8 ++++---- pkgs/development/libraries/ffmpeg/generic.nix | 14 +++++++------- pkgs/development/libraries/freetype/default.nix | 2 +- pkgs/development/libraries/glibc/common-2.27.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnu-efi/default.nix | 2 +- pkgs/development/libraries/icu/base.nix | 2 +- pkgs/development/libraries/jemalloc/default.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- .../development/libraries/libtoxcore/default.nix | 2 +- .../development/libraries/libtoxcore/new-api.nix | 4 ++-- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libvpx/git.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 6 +++--- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/pth/default.nix | 2 +- pkgs/development/libraries/v8/3.16.14.nix | 4 ++-- pkgs/development/libraries/v8/6_x.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- .../webrtc-audio-processing/default.nix | 2 +- .../python-modules/Cython/default.nix | 2 +- pkgs/development/tools/misc/binutils/2.30.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/system/storebrowse/default.nix | 2 +- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 69 files changed, 109 insertions(+), 106 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 012a1786a3c..c6618083ce7 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { none = []; - arm = filterDoubles predicates.isArm; + arm = filterDoubles predicates.isAarch32; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index fa713b1e613..68c68c2cd36 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -7,7 +7,7 @@ in rec { inherit (lib.systems.doubles) all mesaPlatforms; none = []; - arm = [ patterns.isArm ]; + arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; x86 = [ patterns.isx86 ]; i686 = [ patterns.isi686 ]; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a7bd17f68a4..91ae2cd2557 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,8 +9,8 @@ rec { isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; isx86 = { cpu = { family = "x86"; }; }; - isArm = { cpu = { family = "arm"; }; }; - isAarch64 = { cpu = { family = "aarch64"; }; }; + isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isWasm = { cpu = { family = "wasm"; }; }; @@ -43,6 +43,9 @@ rec { [ "x86" "arm" "aarch64" ]; isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) [ "x86" "arm" "aarch64" "mips" ]; + + # Deprecated after 18.03 + isArm = isAarch32; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 03d052f5f19..8a6c951d5e5 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -72,7 +72,7 @@ rec { armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fcdcbf1b007..e4c95ebdfb0 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -9,7 +9,7 @@ ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index ef48ccb7b4f..93d13097019 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -26,11 +26,11 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isArm) grub2; + ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isArm; + boot.loader.grub.enable = !pkgs.stdenv.isAarch32; boot.loader.grub.version = 2; # GNU lsh. diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2..47b0bf2e736 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f2..4934a737405 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00303be12da..c3d8d05eea9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL @@ -26,7 +26,7 @@ let hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 8e94ccfa49b..a5084808c3b 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -55,7 +55,7 @@ let else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" @@ -174,7 +174,7 @@ stdenv.mkDerivation { sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" - else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" else if targetPlatform.isMips then { diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index c63867a1d2d..8cee08c0926 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 36adfd075df..c798a67de84 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -300,7 +300,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index c436da678fd..c729bbeb66f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -309,7 +309,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index b9ca8696d4e..f2a091e34dc 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index df0c1578dae..3de5b4dd270 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -333,7 +333,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e8997b1efb0..888e455488c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index c1306d374d5..3c98b7a58f7 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index c56798e31ae..cb9f78aa081 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 8a08ab4b986..c0bc2a9dd73 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 1c3f260da1c..b2a1aafe613 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -25,7 +25,7 @@ enableShared ? !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported - && (targetPlatform.isAarch64 || targetPlatform.isArm)) + && (targetPlatform.isAarch64 || targetPlatform.isAarch32)) , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 8f7cdc9568e..f232e0b4728 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bc3ccbdcdf5..51497e0d9ce 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978..b22bfb2bd10 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b8c283fef07..32eb0d98d18 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c..955d9029d38 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c69554e633a..8cfe2bb7bcf 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 648ef0d91f9..8bad5494e8b 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 03ae6e518d0..54e9ae671af 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -7,7 +7,7 @@ let real_url = if url == null then "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" else url; - safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in { stdenv, fetchurl, ncurses, buildEnv @@ -15,7 +15,7 @@ in , flambdaSupport ? false }: -assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 707f7966dd9..529123398a5 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' + postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 39b84ae6a36..8006648a7dc 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (setf features (remove x features)))) '' + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)" + '' )) " > customize-target-features.lisp diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08443de111d..6d95805ddb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -937,11 +937,11 @@ self: super: { JuicyPixels = dontHaddock super.JuicyPixels; # armv7l fixes. - happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2; + happy = if pkgs.stdenv.isAarch32 then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if pkgs.stdenv.isAarch32 then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if pkgs.stdenv.isAarch32 then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if pkgs.stdenv.isAarch32 then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if pkgs.stdenv.isAarch32 then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a29056d965a..01e2eef58cb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -133,7 +133,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f7324fc6d01..b3381c1dd8f 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -82,7 +82,7 @@ let preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isArm || stdenv.isMips) '' + '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 4618d0da9dd..6f7f2df96bf 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; - patchPhase = optionalString stdenv.isArm '' + patchPhase = optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < libGLU_combined != null; @@ -153,8 +153,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM - ++ optional ((isLinux || isFreeBSD) && !isArm) libva + ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8f16f85cabf..be4da5a035b 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isArm "-std=gnu99"; + CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix index 6c443ebbb93..272e18905c1 100644 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ b/pkgs/development/libraries/glibc/common-2.27.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d40733adf87..5179ce4a9a8 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b65a8ee5fc1..57204776dec 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 5973c89cef7..551e7e5e1f6 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a46abe3b4f7..bb7c35ddc9c 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm" ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 87551ee6ee0..ee868d371ce 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' + '' + stdenv.lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 0882431cc15..d4c9e0ff24a 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; doCheck = true; patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index e5e1e2e7a39..45a71759d45 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 16fca9ce3d3..9af8718dc5f 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 8d0a467c82a..785bc6f3c84 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1e96ff9bb1a..272761cc6af 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -41,7 +41,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 824449a347a..a861428f0f7 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -43,11 +43,11 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in -assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support +assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3f873022f7a..67500216800 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -32,17 +32,17 @@ else let defaultGalliumDrivers = - if stdenv.isArm + if stdenv.isAarch32 then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]; defaultVulkanDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then [] else ["intel"] ++ lib.optional enableRadv "radeon"; in diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 6b891bdb38c..98d4c737ebd 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck libpng; - configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b7b09caed9b..6118d9c41d6 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isArm '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index 73f5febb668..e1a9336e3a5 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -3,10 +3,10 @@ assert readline != null; let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 4095ff20c2b..adebedbf2ac 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -4,7 +4,7 @@ }: let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then if stdenv.is64bit then"arm64" else "arm" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4d49fdce3a9..3246c23ab02 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -10,7 +10,7 @@ let arch = if stdenv.isx86_64 then "x64" else if stdenv.isi686 then "ia32" else if stdenv.isAarch64 then "arm64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b5a3aed91d9..529091518eb 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # Avoid this error: # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode - patchPhase = stdenv.lib.optionalString stdenv.isArm '' + patchPhase = stdenv.lib.optionalString stdenv.isAarch32 '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 751e064ad70..ce63970495b 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # result is "3L" instead of "3", so let's fix it in-place. # # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' + postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isAarch32) && !isPy3k) '' sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ tests/run/cpdef_enums.pyx ''; diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix index 830c0733052..2a8e6d88b93 100644 --- a/pkgs/development/tools/misc/binutils/2.30.nix +++ b/pkgs/development/tools/misc/binutils/2.30.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05d0d21a179..549eaf5253d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index d1e40371e37..bfade509fca 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' + ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fbd9955c2a..50f5999c557 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -353,7 +353,7 @@ with stdenv.lib; SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default SECURITY_YAMA? y # Prevent processes from ptracing non-children processes DEVKMEM n # Disable /dev/kmem - ${optionalString (! stdenv.hostPlatform.isArm) + ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fc72728cbab..5992c1ffa95 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isAarch32 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index c4d2bf04d7a..180aabc94cc 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -43,7 +43,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) '' + '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5..1b4585e065b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; + ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 42288e6245e..190fc500068 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -117,7 +117,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian; + isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d16e730b5ab..817da08c05e 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = - stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d20cb3c3785..3dfd136ad06 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); let diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 40332f7b0d4..179b4cb1a4c 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ad4769977..d38f8d20188 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5988,7 +5988,7 @@ with pkgs; # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = !stdenv.isArm; + profiledCompiler = !stdenv.isAarch32; libcCross = if targetPlatform != buildPlatform then libcCross else null; })); @@ -6352,12 +6352,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else if stdenv.isDarwin then jre8 @@ -6366,12 +6366,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; - jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + jdk9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; + jre9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk9.jre // { outputs = [ "jre" ]; })); jre9_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else if stdenv.isDarwin then jre9 @@ -9126,7 +9126,7 @@ with pkgs; cairo = callPackage ../development/libraries/cairo { glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isArm && !stdenv.isMips); + !stdenv.isAarch32 && !stdenv.isMips); }; From 3a8b8bcb693bcae570d2541bc9eb4849ad73d2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Mon, 4 Dec 2017 19:37:09 +0100 Subject: [PATCH 022/181] all-packages.nix: made new block CHEMISTRY --- pkgs/top-level/all-packages.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaa458529e3..5ede261d5c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2770,8 +2770,6 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; - gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -3114,8 +3112,6 @@ with pkgs; jmespath = callPackage ../development/tools/jmespath { }; - jmol = callPackage ../applications/science/chemistry/jmol { }; - jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; @@ -3744,8 +3740,6 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; - molden = callPackage ../applications/science/chemistry/molden { }; - molly-guard = callPackage ../os-specific/linux/molly-guard { }; moneyplex = callPackage ../applications/office/moneyplex { }; @@ -7151,8 +7145,6 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; - inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -14842,10 +14834,6 @@ with pkgs; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { - eigen = eigen2; - }; - avrdudess = callPackage ../applications/misc/avrdudess { }; avxsynth = callPackage ../applications/video/avxsynth { @@ -17404,8 +17392,6 @@ with pkgs; puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; - pymol = callPackage ../applications/science/chemistry/pymol { }; - pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -19730,6 +19716,22 @@ with pkgs; ### SCIENCE + ### SCIENCE/CHEMISTY + + avogadro = callPackage ../applications/science/chemistry/avogadro { + eigen = eigen2; + }; + + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + + jmol = callPackage ../applications/science/chemistry/jmol { }; + + molden = callPackage ../applications/science/chemistry/molden { }; + + octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + + pymol = callPackage ../applications/science/chemistry/pymol { }; + ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { From 75d8c81868fdbffbc27fe0ae94c6870da5f42143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Mon, 26 Mar 2018 13:01:25 +0200 Subject: [PATCH 023/181] pymol: 1.8.4 -> 2.1.0 --- .../applications/science/chemistry/pymol/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 39c027706ee..e7dd04377be 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeDesktopItem , python3, python3Packages -, glew, freeglut, libpng, libxml2, tk, freetype }: +, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }: with stdenv.lib; let pname = "pymol"; - ver_maj = "1.8"; - ver_min = "4"; + ver_maj = "2"; + ver_min = "1"; version = "${ver_maj}.${ver_min}.0"; description = "A Python-enhanced molecular graphics tool"; @@ -16,7 +16,7 @@ let name = "${pname}"; exec = "${pname}"; desktopName = "PyMol Molecular Graphics System"; - genericName = "Molecular Modeller"; + genericName = "Molecular Modeler"; comment = description; mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; categories = "Graphics;Education;Science;Chemistry;"; @@ -26,10 +26,10 @@ python3Packages.buildPythonApplication { name = "pymol-${version}"; src = fetchurl { url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2"; - sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n"; + sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s"; }; - buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ]; + buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; installPhase = '' From 329d1ba69a3b8b16af228bff28066274bc4cf085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Mon, 4 Dec 2017 19:53:36 +0100 Subject: [PATCH 024/181] jmol: made it runnable --- .../science/chemistry/jmol/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c85e1143d10..4c4278c30fa 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -1,9 +1,20 @@ { stdenv , fetchurl , unzip +, makeDesktopItem , jre }: +let + desktopItem = makeDesktopItem { + name = "jmol"; + exec = "jmol"; + desktopName = "JMol"; + genericName = "Molecular Modeler"; + mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; + categories = "Graphics;Education;Science;Chemistry;"; + }; +in stdenv.mkDerivation rec { version = "${baseVersion}.${patchVersion}"; baseVersion = "14.29"; @@ -16,19 +27,18 @@ stdenv.mkDerivation rec { sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv"; }; - buildInputs = [ - jre - ]; + patchPhase = '' + sed -i -e "4s:.*:command=${jre}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol + ''; installPhase = '' - mkdir -p "$out/share/jmol" - mkdir -p "$out/bin" + mkdir -p "$out/share/jmol" "$out/bin" ${unzip}/bin/unzip jsmol.zip -d "$out/share/" - sed -i -e 's|command=java|command=${jre}/bin/java|' jmol.sh cp *.jar jmol.sh "$out/share/jmol" - ln -s $out/share/jmol/jmol.sh "$out/bin/jmol" + cp -r ${desktopItem}/share/applications $out/share + cp jmol $out/bin ''; enableParallelBuilding = true; @@ -38,7 +48,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/jmol; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = with maintainers; [ timokau mounium ]; }; } - From 274579cc95ae33457b5cd643ea030d1f530eb31e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 24 Nov 2016 15:40:04 +0100 Subject: [PATCH 025/181] nixos/infinoted: Abstract over libinfinity version --- nixos/modules/services/editors/infinoted.nix | 2 +- pkgs/development/libraries/libinfinity/default.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 963147b18a0..9074a4345ea 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -129,7 +129,7 @@ in { serviceConfig = { Type = "simple"; Restart = "always"; - ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf"; + ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 944cf7a6f5e..208e0111062 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -12,7 +12,8 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.7.1"; + name = "libinfinity-${version}"; + version = "0.7.1"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; @@ -36,6 +37,10 @@ in stdenv.mkDerivation rec { ${edf avahiSupport "avahi"} ''; + passthru = { + inherit version; + }; + meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; From cd3047f313773bbe60df63f512dcf9271c60b34a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:33:31 -0700 Subject: [PATCH 026/181] libraw: 0.18.8 -> 0.18.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions. These checks were done: - built on NixOS - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu help’ got 0 exit code - found 0.18.9 with grep in /nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9 - directory tree listing: https://gist.github.com/5d0a0f5fe58f15c25701c4dc878c5080 --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d4ad1c03860..4ad2f7ba34d 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.8"; + version = "0.18.9"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n"; + sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj"; }; outputs = [ "out" "lib" "dev" "doc" ]; From 8a3cdb993d1c7e62dc62dd7239852930f2e71997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 06:18:41 -0700 Subject: [PATCH 027/181] containerd: 1.0.3 -> 1.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/containerd/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd -h’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd --help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release -h’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release --help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr -h’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr --help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr help’ got 0 exit code - found 1.1.0 with grep in /nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0 - directory tree listing: https://gist.github.com/7b4a990853acfbf946f8abe02582f41d --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 53372103457..3854c577188 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; + sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8"; }; hardeningDisable = [ "fortify" ]; From ff3b88713c4e5bfeb839e59b3ad4753043d3b47c Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 27 Apr 2018 12:01:24 +1000 Subject: [PATCH 028/181] labelImg: init at 1.6.0 --- .../machine-learning/labelimg/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/labelimg/default.nix diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix new file mode 100644 index 00000000000..802a03bd4c7 --- /dev/null +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python2Packages, fetchurl }: + python2Packages.buildPythonApplication rec { + name = "labelImg-${version}"; + version = "1.6.0"; + src = fetchurl { + url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; + sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4"; + }; + propagatedBuildInputs = with python2Packages; [ + pyqt4 + lxml + ]; + preBuild = '' + make qt4py2 + ''; + meta = with stdenv.lib; { + description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; + homepage = https://github.com/tzutalin/labelImg; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.cmcdragonkai ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e07f237448..fbb5d864e88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12428,6 +12428,8 @@ with pkgs; lwan = callPackage ../servers/http/lwan { }; + labelImg = callPackage ../applications/science/machine-learning/labelimg { }; + mailman = callPackage ../servers/mail/mailman { }; mattermost = callPackage ../servers/mattermost { }; From 9939fb2cb6ae28e87be6ac38b85d0537eb0a097e Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:31 +0300 Subject: [PATCH 029/181] parity-beta: 1.10.1 -> 1.10.2 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- .../parity/patches/vendored-sources-1.10.patch | 18 +++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b1bf38427a8..9cbab6ad095 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.10.1"; - sha256 = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b"; - cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7"; + version = "1.10.2"; + sha256 = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l"; + cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh"; patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch index 3e8e032f30c..e59858442c9 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -2,7 +2,7 @@ diff --git a/.cargo/config b/.cargo/config index 72652ad2f..b21c6aa7b 100644 --- a/.cargo/config +++ b/.cargo/config -@@ -1,3 +1,113 @@ +@@ -1,3 +1,108 @@ [target.x86_64-pc-windows-msvc] # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 rustflags = ["-Ctarget-feature=+crt-static"] @@ -42,6 +42,11 @@ index 72652ad2f..b21c6aa7b 100644 +rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -97,16 +102,6 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" @@ -116,3 +111,4 @@ index 72652ad2f..b21c6aa7b 100644 +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" +replace-with = "vendored-sources" ++ From 82f24d65a3c6f58e6c0a14aec1b048cd2f521992 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:52 +0300 Subject: [PATCH 030/181] parity: 1.9.6 -> 1.9.7 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- .../parity/patches/vendored-sources-1.9.patch | 20 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 71485551ef6..d85fc25355c 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.6"; - sha256 = "17h7c93c95pj71nbw152rl4ka240zzd8w0yf8k4l4rimcsbra92g"; - cargoSha256 = "0gk26yncahrlnx6xz13x775wrwh7xsfqiifspjislmgk7xknqjm0"; + version = "1.9.7"; + sha256 = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph"; + cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0"; patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d91b103c6ce..3e1ba2429f2 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,10 +1,9 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- /dev/null +--- /dev/null +++ b/.cargo/config -@@ -0,0 +1,100 @@ -+ +@@ -0,0 +1,94 @@ +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +branch = "master" @@ -30,6 +29,11 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -85,16 +89,6 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" From fa850e8fda68c92984760f9ff9086e8cde6ef835 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 27 Apr 2018 18:52:46 -0400 Subject: [PATCH 031/181] conglomerate: init at 2017-09-10 --- .../science/biology/conglomerate/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/biology/conglomerate/default.nix diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix new file mode 100644 index 00000000000..c04bc84c156 --- /dev/null +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools, + makeWrapper, GetoptTabular, MNI-Perllib }: + +stdenv.mkDerivation rec { + pname = "conglomerate"; + name = "${pname}-2017-09-10"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "7343238bc6215942c7ecc885a224f24433a291b0"; + sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc zlib bicpl ]; + propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ]; + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/BIC-MNI/conglomerate; + description = "More command-line utilities for working with MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10053f926da..d98e2aec1d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,6 +19740,10 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; diamond = callPackage ../applications/science/biology/diamond { }; From 9f2b67d89b10b2f5375e77c976990f87c869d6fd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:27:10 +0200 Subject: [PATCH 032/181] Revert ".version: remove final newline" This reverts commit e109784f84d44cc73abeaa6c96c5a5d5bf9e3e06. --- .editorconfig | 4 ---- .version | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index f5df33889e6..7b40ff1ff56 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,7 +26,3 @@ indent_size = 4 # Match diffs, avoid to trim trailing whitespace [*.{diff,patch}] trim_trailing_whitespace = false - -# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754 -[.version] -insert_final_newline = false diff --git a/.version b/.version index c1b80a50279..770bde1f44b 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -18.09 \ No newline at end of file +18.09 From f66cdc71a3300581501fd953f8e359b7ff824933 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:30:12 +0200 Subject: [PATCH 033/181] osquery: use `stdenv.lib.nixpkgsVersion` This way easier to understand and the officially recommended approach. /cc @dezgeg @fpletz --- pkgs/tools/system/osquery/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 2a719efd79b..b88186a610b 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}"; + OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}"; src = fetchFromGitHub { owner = "facebook"; From 39909289f452fcd60127cbd2372f22ac35f25d08 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:33:35 +0200 Subject: [PATCH 034/181] lib: deduplicate version/suffix references The logic regarding the generated `.version-suffix` file is already defined in `lib/trivial.nix` and shouldn't be duplicated in `nixos/version`. --- lib/trivial.nix | 9 +++++---- nixos/modules/misc/version.nix | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index a928e1dbca9..a6a4abba118 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,11 +58,12 @@ rec { inherit (lib.strings) fileContents; + version = fileContents ../.version; + suffix = let suffixFile = ../.version-suffix; in + if pathExists suffixFile then fileContents suffixFile else "pre-git"; + # Return the Nixpkgs version number. - nixpkgsVersion = - let suffixFile = ../.version-suffix; in - fileContents ../.version - + (if pathExists suffixFile then fileContents suffixFile else "pre-git"); + nixpkgsVersion = version + suffix; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b8f0a223c91..d9d60b72509 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.system.nixos; - releaseFile = "${toString pkgs.path}/.version"; - suffixFile = "${toString pkgs.path}/.version-suffix"; revisionFile = "${toString pkgs.path}/.git-revision"; gitRepo = "${toString pkgs.path}/.git"; gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); @@ -25,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = fileContents releaseFile; + default = trivial.version; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = if pathExists suffixFile then fileContents suffixFile else "pre-git"; + default = trivial.suffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; From 9274ea390348e17f766732e7fbd335e3bc164954 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 Apr 2018 10:31:05 +0200 Subject: [PATCH 035/181] treewide: rename version attributes As suggested in https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745 the versioning attributes in `lib` should be consistent to `nixos/version` which implicates the following changes: * `lib.trivial.version` -> `lib.trivial.release` * `lib.trivial.suffix` -> `lib.trivial.versionSuffix` * `lib.nixpkgsVersion` -> `lib.version` As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`, `NixOS/nix` and probably several user's setups. As the rename will cause a notable impact it's better to keep `lib.nixpkgsVersion` as alias with a warning yielded by `builtins.trace`. --- doc/Makefile | 2 +- doc/default.nix | 2 +- lib/default.nix | 2 +- lib/trivial.nix | 8 +++++--- nixos/doc/manual/release-notes/rl-1809.xml | 5 +++++ nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- nixos/modules/misc/version.nix | 4 ++-- pkgs/tools/system/osquery/default.nix | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 0ddae8631f3..952ef4bfcbb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -64,7 +64,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml .version: nix-instantiate --eval \ - -E '(import ../lib).nixpkgsVersion' > .version + -E '(import ../lib).version' > .version %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/doc/default.nix b/doc/default.nix index 8abde58bb11..e5be364506f 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -30,7 +30,7 @@ pkgs.stdenv.mkDerivation { ]; postPatch = '' - echo ${lib.nixpkgsVersion} > .version + echo ${lib.version} > .version ''; installPhase = '' diff --git a/lib/default.nix b/lib/default.nix index b3c4fdc0e59..60ce01a93cd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -58,7 +58,7 @@ let replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod compare splitByAndCompare + nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions diff --git a/lib/trivial.nix b/lib/trivial.nix index a6a4abba118..251cb796db0 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,12 +58,14 @@ rec { inherit (lib.strings) fileContents; - version = fileContents ../.version; - suffix = let suffixFile = ../.version-suffix; in + release = fileContents ../.version; + versionSuffix = let suffixFile = ../.version-suffix; in if pathExists suffixFile then fileContents suffixFile else "pre-git"; # Return the Nixpkgs version number. - nixpkgsVersion = version + suffix; + version = release + versionSuffix; + + nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 2e53f0563ba..949dbf0e0c1 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -123,6 +123,11 @@ following incompatible changes: lib.traceCallXml has been deprecated. Please complain if you use the function regularly. + + The attribute lib.nixpkgsVersion has been deprecated in favor of + lib.version. Please refer to the discussion in + NixOS/nixpkgs#39416 for further reference. + diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 347e6b9c6e0..9461144fad5 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -6,7 +6,7 @@ set -e set -o pipefail -version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) +version=$(nix-instantiate --eval --strict '' -A lib.version | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index d9d60b72509..74c86443ab9 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -23,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = trivial.version; + default = trivial.release; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = trivial.suffix; + default = trivial.versionSuffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index b88186a610b..a0aaa846bc7 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}"; + OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}"; src = fetchFromGitHub { owner = "facebook"; From 3c4efe448d96693cd370b3994c0b9087970e1e83 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 29 Apr 2018 00:58:17 +0200 Subject: [PATCH 036/181] xen_4_10: fix build (qemu-xen memfd patch) --- pkgs/applications/virtualization/xen/4.10.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index c3280cbda94..dab90a1ed78 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -29,6 +29,12 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib glib python2 @@ -53,6 +59,9 @@ callPackage (import ./generic.nix (rec { rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; }; + patches = [ + qemuMemfdBuildFix + ]; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox From 6e8118b2395ab928594e20585dba1e83c8354820 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 28 Apr 2018 22:11:30 -0500 Subject: [PATCH 037/181] nix: fix stdenv.system check -- should be hostPlatform (stdenv.system is the system running the build, apparently) --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aee6678d116..23099489723 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let propagatedBuildInputs = [ boehmgc ]; # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; configureFlags = [ "--with-store-dir=${storeDir}" From 8a07916fa965d752d929890c4621823401862ab6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 20:30:51 +0000 Subject: [PATCH 038/181] hplip: 3.17.11 -> 3.18.3 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b18ae7762df..91be6cf743a 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.11"; + version = "3.18.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g"; + sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w"; + sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; }; hplipState = substituteAll { From 841643796a8efc8c3412eb7488646094cb607ef7 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 29 Apr 2018 20:03:05 -0400 Subject: [PATCH 039/181] rclone: 1.40 -> 1.41 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa2a971b15f..405ff2fde73 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.40"; + version = "1.41"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; + sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr"; }; outputs = [ "bin" "out" "man" ]; From d207e043d3315330e5011be63783a335f645c9d0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 29 Apr 2018 22:46:16 -0400 Subject: [PATCH 040/181] asymptote: move Emacs Lisp files to $out/share/emacs/site-lisp/asymptote/ This way, emacs can find the 'asymptote' mode. --- pkgs/tools/graphics/asymptote/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 7337cd227a2..01ddd6ba7fc 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation { rmdir $out/share/info/asymptote rm $out/share/info/dir - rm -rf "$out"/share/texmf + rm -rfv "$out"/share/texmf + mkdir -pv "$out"/share/emacs/site-lisp/${s.name} + mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name} ''; enableParallelBuilding = true; From f3062702096f42c6a2349693bf776e17fb8dd4d9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 23:11:37 -0500 Subject: [PATCH 041/181] netbsd.games: cleanup This gets a few more games working. --- pkgs/os-specific/bsd/netbsd/default.nix | 73 ++++++++++++++++++++----- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index ecd09eaff80..4961ab6080a 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,5 @@ { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils -, yacc, flex, libressl, bash }: +, yacc, flex, libressl, bash, more }: let fetchNetBSD = path: version: sha256: fetchcvs { @@ -42,6 +42,7 @@ let LIBCURSES = ""; LIBTERMINFO = ""; LIBM = ""; + LIBL = ""; "LIBDO.terminfo" = "_external"; "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; @@ -370,6 +371,14 @@ in rec { version = "7.1.2"; }; + dict = netBSDDerivation { + path = "share/dict"; + version = "7.1.2"; + sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; + preBuild = "mkdir -p $out/share/dict"; + makeFlags = [ "BINDIR=/share" ]; + }; + games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; @@ -377,6 +386,21 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c + for f in $(find . -name pathnames.h); do + substituteInPlace $f \ + --replace /usr/share/games $out/share/games \ + --replace /usr/games $out/bin \ + --replace /usr/libexec $out/libexec \ + --replace /var/games $out/var/games \ + --replace /usr/bin/more ${more}/bin/more \ + --replace /usr/share/dict ${dict}/share/dict + done + substituteInPlace ching/ching/ching.sh \ + --replace /usr/share $out/share \ + --replace /usr/libexec $out/libexec + substituteInPlace hunt/huntd/driver.c \ + --replace "(void) setpgrp(getpid(), getpid());" "" + # Disable some games that don't build. They should be possible # to build but need to look at how to implement stuff in # Linux. macOS is missing gettime. TODO try to get these @@ -386,16 +410,10 @@ in rec { } disableGame atc - disableGame boggle disableGame dm - disableGame fortune - disableGame hunt - disableGame larn - disableGame phantasia - disableGame rogue - disableGame sail - disableGame trek disableGame dab + ${lib.optionalString stdenv.isDarwin "disableGame sail"} + ${lib.optionalString stdenv.isDarwin "disableGame trek"} ${lib.optionalString stdenv.isDarwin "disableGame adventure"} ${lib.optionalString stdenv.isDarwin "disableGame factor"} ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} @@ -405,6 +423,17 @@ in rec { --replace 2555 555 \ --replace 2550 550 ''; + + # HACK strfile needs to be installed first & in the path + preBuild = '' + pushd fortune/strfile + mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 + make + make BINDIR=/bin install + popd + export PATH=$out/bin:$PATH + ''; + NIX_CFLAGS_COMPILE = [ "-D__noinline=" "-D__scanflike(a,b)=" @@ -412,24 +441,29 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" - (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "") + (lib.optionalString hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") + "-DBE32TOH(x)=((void)0)" + "-DBE64TOH(x)=((void)0)" + "-D__c99inline=__inline" ]; + postBuild = '' mkdir -p $out/usr/games $out/usr/share/games/ching \ + $out/usr/share/games/fortune \ $out/usr/share/games/quiz.db \ + $out/usr/share/games/boggle \ $out/usr/libexec/ching $out/var/games/hackdir touch $out/var/games/hackdir/perm ''; + preFixup = '' mkdir -p $out/bin mv $out/games/* $out/bin rmdir $out/games ''; + buildInputs = [ compat libcurses libterminfo libressl ]; - extraPaths = [ - (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") - who.src - ]; + extraPaths = [ dict.src who.src ]; }; # finger = netBSDDerivation { @@ -477,6 +511,17 @@ in rec { sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; + patchPhase = '' + substituteInPlace term.c \ + --replace /usr/share $out/share + ''; + postBuild = '' + pushd $NETBSDSRCDIR/share/terminfo + mkdir -p $out/share/misc + make + make BINDIR=/share install + popd + ''; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") ]; From 8ce6db16244b2fb312a2cfb7a8ba425dc3b4a18a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 16:11:37 +0800 Subject: [PATCH 042/181] grc: 1.11.1 -> 1.11.3 --- pkgs/tools/misc/grc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index c554c13bb4a..451828b0f47 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "grc-${version}"; - version = "1.11.1"; + version = "1.11.3"; src = fetchFromGitHub { owner = "garabik"; repo = "grc"; rev = "v${version}"; - sha256 = "10h65qmv2cymixzfsckfcn6f01xsjzfq1x303rv01nibniwbq5z9"; + sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; }; buildInputs = with python3Packages; [ wrapPython makeWrapper ]; From 6a32965e17910c18bd166a79502c0a3639854ea7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Apr 2018 22:09:25 +0200 Subject: [PATCH 043/181] notary: fix build The package is broken on master for some time now: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all The main reason for the breackage is that the `Makefile` script attempts to retrieve the latest git commit by using `git rev-parse` which breaks as `git` is not in the build environment. This could be fixed by using `?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script to easily override `GITCOMMIT` in the `buildPhase`. See the Hydra logs for reference: https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv Furthermore some refactoring was applied: * Activated the test suite for `cmd/notary` to confirm the basic functionality when building for NixOS. * Added {pre,post} hooks for `{build,install}Phase` * Added myself as maintainer to have more people available in case of further breakage. --- pkgs/tools/security/notary/default.nix | 34 ++++++++++++------- pkgs/tools/security/notary/no-git-usage.patch | 15 ++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 pkgs/tools/security/notary/no-git-usage.patch diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 4a42c9162e1..071bfdaea00 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,32 +1,42 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, git, libtool }: +{ stdenv, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { name = "notary-${version}"; - version = "0.6.0"; - gitcommit = "34f53ad"; + version = "0.6.1"; + gitcommit = "d6e1431f"; src = fetchFromGitHub { owner = "theupdateframework"; repo = "notary"; rev = "v${version}"; - sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a"; + sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9"; }; + patches = [ ./no-git-usage.patch ]; + buildInputs = [ libtool ]; + buildPhase = '' + runHook preBuild + cd go/src/github.com/theupdateframework/notary + make client GITCOMMIT=${gitcommit} + runHook postBuild + ''; goPackagePath = "github.com/theupdateframework/notary"; - buildPhase = '' - cd go/src/github.com/theupdateframework/notary - make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client + installPhase = '' + runHook preInstall + install -D bin/notary $bin/bin/notary + runHook postInstall ''; - installPhase = '' - install -D bin/notary $bin/bin/notary + doCheck = true; + checkPhase = '' + make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; meta = with stdenv.lib; { - description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; + description = "Notary is a project that allows anyone to have trust over arbitrary collections of data"; longDescription = '' The Notary project comprises a server and a client for running and interacting with trusted collections. See the service architecture @@ -49,7 +59,7 @@ buildGoPackage rec { ''; license = licenses.asl20; homepage = https://github.com/theupdateframework/notary; - maintainers = with maintainers; [ vdemeester ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ vdemeester ma27 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/tools/security/notary/no-git-usage.patch new file mode 100644 index 00000000000..363eefe3692 --- /dev/null +++ b/pkgs/tools/security/notary/no-git-usage.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index ab794165..0cbd047f 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd) + # Add to compile time flags + NOTARY_PKG := github.com/theupdateframework/notary + NOTARY_VERSION := $(shell cat NOTARY_VERSION) +-GITCOMMIT := $(shell git rev-parse --short HEAD) +-GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) ++GITCOMMIT ?= $(shell git rev-parse --short HEAD) ++GITUNTRACKEDCHANGES := + ifneq ($(GITUNTRACKEDCHANGES),) + GITCOMMIT := $(GITCOMMIT)-dirty + endif From 2fcf50a323a8fe695e3ad0520eb25bdcff976e2e Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 30 Apr 2018 10:59:57 +0200 Subject: [PATCH 044/181] luafilesystem: 1.6.3 -> 1.7.0 --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3da44309803..e6ec2f8ed9d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -267,14 +267,14 @@ let }; luafilesystem = buildLuaPackage rec { - version = "1.6.3"; + version = "1.7.0"; name = "filesystem-${version}"; src = fetchFromGitHub { owner = "keplerproject"; repo = "luafilesystem"; rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}"; - sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; + sha256 = "0fibrasshlgpa71m9wkpjxwmylnxpcf06rpqbaa0qwvqh94nhwby"; }; preConfigure = '' From 9786bd06a621dbb2c0cd7de696df5ed269e54ddd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 17:22:01 +0800 Subject: [PATCH 045/181] libqmatrixclient: 0.2 -> 0.2.1 --- .../libraries/libqmatrixclient/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f537013d2fe..7d8ec42700c 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -1,40 +1,26 @@ { stdenv, fetchFromGitHub, cmake , qtbase }: -# This doesn't actually do anything really yet as it doesn't support dynamic building -# When it does, quaternion and tensor should use it - stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; - rev = "v${version}-q0.0.5"; - sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; + rev = "v${version}"; + sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib *.a - - runHook postInstall - ''; - meta = with stdenv.lib; { description= "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; - hydraPlatforms = [ ]; }; } From dbcdcb63d886b8ded089b06e7f727a2d16739664 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 17:22:20 +0800 Subject: [PATCH 046/181] quaternion: 0.0.5 -> 0.0.9 --- .../instant-messengers/quaternion/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 768ab24c2f3..6c716cc3e1c 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.5"; - - # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + version = "0.0.9"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; + sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - # take the source from libqmatrixclient + # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet + # https://github.com/QMatrixClient/Quaternion/issues/239 postPatch = '' rm -rf lib ln -s ${libqmatrixclient.src} lib From d5eef36abb2914a98c25475409b71819d4c94162 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:12:37 -0400 Subject: [PATCH 047/181] linux: 4.4.129 -> 4.4.130 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fe8633ed0da..ccc8b4ba2dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.129"; + version = "4.4.130"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1"; + sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj"; }; } // (args.argsOverride or {})) From 24a7d14ab43d2366f917397e4a42715e1245fa10 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:00 -0400 Subject: [PATCH 048/181] linux: 4.9.96 -> 4.9.97 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 63fe3db3b57..cc4609676d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.96"; + version = "4.9.97"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2"; + sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4"; }; } // (args.argsOverride or {})) From 6cbded6551e4d6c8608814a6752774807d1cc67a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:17 -0400 Subject: [PATCH 049/181] linux: 4.14.37 -> 4.14.38 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d9aef3a2193..177a5c878f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.37"; + version = "4.14.38"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1"; + sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg"; }; } // (args.argsOverride or {})) From cf994a3d3d14272f624e20d1c3c64f86a27904a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:32 -0400 Subject: [PATCH 050/181] linux: 4.16.5 -> 4.16.6 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 3da2cda30e2..46bdcff66a1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.5"; + version = "4.16.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r"; + sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs"; }; } // (args.argsOverride or {})) From a7ce93955d962ecaa263f04ef3c87a1fe6799f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 29 Apr 2018 23:41:36 -0300 Subject: [PATCH 051/181] uget-integrator: init at 1.0.0 --- .../networking/browsers/firefox/wrapper.nix | 3 +- .../networking/uget-integrator/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/uget-integrator/default.nix diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 45917bf65c1..ed6cf712ed9 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , vlc_npapi -, browserpass, chrome-gnome-shell +, browserpass, chrome-gnome-shell, uget-integrator , libudev , kerberos }: @@ -64,6 +64,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix new file mode 100644 index 00000000000..cc93da7f253 --- /dev/null +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, uget, python3Packages }: + +stdenv.mkDerivation rec { + name = "uget-integrator-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ugetdm"; + repo = "uget-integrator"; + rev = "v${version}"; + sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ uget python3Packages.python ]; + + installPhase = '' + for f in conf/com.ugetdm.{chrome,firefox}.json; do + substituteInPlace $f --replace "/usr" "$out" + done + + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Native messaging host to integrate uGet Download Manager with web browsers"; + homepage = https://github.com/ugetdm/uget-integrator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77f54000df8..be80fc69933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5306,6 +5306,8 @@ with pkgs; uget = callPackage ../tools/networking/uget { }; + uget-integrator = callPackage ../tools/networking/uget-integrator { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; umlet = callPackage ../tools/misc/umlet { }; From 2cc9da33af1db5750fdf41b8ed397ff48f318d28 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 30 Apr 2018 13:15:25 +0200 Subject: [PATCH 052/181] pcsc-scm-scl011: clean up unpack phase --- pkgs/tools/security/pcsc-scm-scl011/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 88b5c147f30..1418a4ead58 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; unpackPhase = '' - echo ${stdenv.system} unzip $src tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz" - cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd` + export sourceRoot=$(readlink -e sclgeneric_${version}_linux_${arch}bit) ''; # Add support for SCL011 nPA (subsidized model for German eID) From e12cc85b070ec62144c5bfc8036041fee4b3692e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Apr 2018 11:59:53 +0200 Subject: [PATCH 053/181] nixos/osquery: add test Some time ago I fixed the broken package `osquery` (see #39336). I had to test the package manually by starting the daemon locally, however this doesn't ensure that the module is still functional. In order to cover the package *and* the integration with the NixOS module I thought that adding a testcase might be the best idea. The current testcase does the following things: * Starts an `osqueryd` service in a test machine with customized logger path and PID file * Ensures that the `osqueryd.service` unit is running * Checks if the customized flags (`pidfile`, `logger_path`) are applied to `osquery`. * Performs a simple test query against the `etc_hosts` database to check if the basic funcitonality of `osquery` (storing system information into a database) works fine. --- nixos/release.nix | 1 + nixos/tests/osquery.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/tests/osquery.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4994cd98302..4ad947f11d1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -307,6 +307,7 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; + tests.osquery = callTest tests/osquery.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix new file mode 100644 index 00000000000..281dbcff664 --- /dev/null +++ b/nixos/tests/osquery.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "osquery"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { + services.osquery.enable = true; + services.osquery.loggerPath = "/var/log/osquery/logs"; + services.osquery.pidfile = "/var/run/osqueryd.pid"; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("osqueryd.service"); + + $machine->succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | grep '127.0.0.1'"); + $machine->succeed( + "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs" + ); + + $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid"); + ''; +}) From ccb7e5488e879de3645ca66081f3cb8a638783a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 Apr 2018 16:01:07 +0100 Subject: [PATCH 054/181] pdf-quench: no manual shebang patch --- pkgs/applications/misc/pdf-quench/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 5b80fb16122..291ab241b08 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -12,17 +12,17 @@ pythonPackages.buildPythonApplication rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ]; + buildInputs = with pkgs; [ + gtk3 + gobjectIntrospection + goocanvas2 + (poppler.override { introspectionSupport = true; }) + ]; propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; - dontBuild = true; + format = "other"; doCheck = false; - postPatch = '' - substituteInPlace src/pdf_quench.py \ - --replace /usr/bin/python "${pythonPackages.python}/bin/python" - ''; - installPhase = '' install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench ''; From 1478878caba8c9c73780d3615cd1dea6a1686593 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 30 Apr 2018 17:26:59 +0200 Subject: [PATCH 055/181] pdf-quench: use poppler_gi from top-level --- pkgs/applications/misc/pdf-quench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 291ab241b08..c567a7903b8 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { gtk3 gobjectIntrospection goocanvas2 - (poppler.override { introspectionSupport = true; }) + poppler_gi ]; propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; From dc6cda78fb1aa77bdc2c80b6401821628aa64cae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 10:57:52 -0500 Subject: [PATCH 056/181] gllvm: 2018-02-09 -> 2018-04-28 (~= 1.0.2) --- pkgs/development/tools/gllvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 58ee7699b45..da8f90cd940 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "2018-02-09"; + version = "2018-04-28"; # ~= 1.0.2, but no release tags yet goPackagePath = "github.com/SRI-CSL/gllvm"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "ef83222afd22452dd1277329df227a326db9f84f"; - sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a"; + rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e"; + sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl"; }; meta = with stdenv.lib; { From 751aa3dff2ad43b1cc872f33b859c62cd671812e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 08:58:49 -0700 Subject: [PATCH 057/181] linuxPackages.wireguard: 0.0.20180413 -> 0.0.20180420 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/62dbb660d0b10010e5638c9be376d68b --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b88646424be..6e3e444240a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180413"; + version = "0.0.20180420"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1"; + sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m"; }; meta = with stdenv.lib; { From 02cb787c0cf4d38c9eb64e7110201a19ab6469cd Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Mon, 30 Apr 2018 11:47:18 +0300 Subject: [PATCH 058/181] flow: 0.70.0 -> 0.71.0 --- 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 042b338b2b1..31bc1848d58 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; + sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w"; }; installPhase = '' From 89001d8d158ca0040084811c6f517416ddc2c7d9 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 30 Apr 2018 12:18:14 -0400 Subject: [PATCH 059/181] hplipWithPlugin_3_16_11: Refer to correct base derivation This appears to be a cut-and-paste error. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06e..cf2d9e9db3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20632,7 +20632,7 @@ with pkgs; hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; + hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; hyperfine = callPackage ../tools/misc/hyperfine { }; From eaf71dd33e8ec5836193f27717139be44c0ada3d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 30 Apr 2018 12:20:01 -0400 Subject: [PATCH 060/181] notmuch: 0.26.1 -> 0.26.2 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d89219cce5f..13add2690db 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.1"; + version = "0.26.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; + sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; }; nativeBuildInputs = [ pkgconfig ]; From 99964ff49336a782f7ff67f39d61a608347c7507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:35:47 -0700 Subject: [PATCH 061/181] wesnoth-dev: 1.13.13 -> 1.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wesnoth/versions. These checks were done: - built on NixOS - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth -h’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth --help’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -h’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --help’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -V’ and found version 1.14.0 - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --version’ and found version 1.14.0 - found 1.14.0 with grep in /nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0 - directory tree listing: https://gist.github.com/faf1d8fe4a47781eb51e8a411a546099 --- pkgs/games/wesnoth/dev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index c9cd7119d8f..81ffd6b135f 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.13"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; + sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 92f00a58533b7fd58b0ed6efbe86ccd387682b7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:39:09 -0700 Subject: [PATCH 062/181] utf8proc: 2.1.0 -> 2.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/utf8proc/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.1.1 with grep in /nix/store/bzpfz4cpf1lf7269ymwdblz2kn0iwf2b-utf8proc-2.1.1 - directory tree listing: https://gist.github.com/bc9fd69cddc0fd9435fab30a0abcae97 --- pkgs/development/libraries/utf8proc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 48c2428bbcd..89dbeaab04a 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15"; + sha256 = "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17"; }; makeFlags = [ "prefix=$(out)" ]; From b405a6537c79a00f3d754dfd9b7a3b3ca467b4f0 Mon Sep 17 00:00:00 2001 From: Milo Date: Mon, 30 Apr 2018 13:03:05 -0400 Subject: [PATCH 063/181] nixos/bspwm: spawn bpswm process in the background and properly set waiPID (#39707) --- nixos/modules/services/x11/window-managers/bspwm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 6783ac3479e..23cd4f6529a 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -59,7 +59,7 @@ in start = '' export _JAVA_AWT_WM_NONREPARENTING=1 SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} & - ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & waitPID=$! ''; }; From dc2f012215f15dc05e447ce6611039fcaede3910 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 10:12:01 -0700 Subject: [PATCH 064/181] riot-web: 0.14.0 -> 0.14.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/riot-web/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.14.1 with grep in /nix/store/77d4rg2yy4gj8m1mvrw6zqhdi7jv7cg8-riot-web-0.14.1 - directory tree listing: https://gist.github.com/4606f4af0dcfc7ef1ece43dfe4b38abe --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 0d3342e6668..ce558130a6c 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; + sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; }; installPhase = '' From 078b764f38cb779e32f7be4f1e614157b72cac2d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 30 Apr 2018 19:22:42 +0200 Subject: [PATCH 065/181] highlight: 3.42 -> 3.43 --- pkgs/tools/text/highlight/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 1fcfdd85e7a..c2fe3fcd576 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.42"; + version = "3.43"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; - rev = "${version}"; - sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; + rev = "v${version}"; + sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; From 1022dc54bab9fa076fe3033a0c1e3f7f9549345d Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 30 Apr 2018 13:28:46 -0400 Subject: [PATCH 066/181] strongswan: include curl plugin by default (#39506) This is necessary for OCSP and/or remote CRL verification of server certificates to work, which is a fairly common thing to need. --- pkgs/tools/networking/strongswan/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 042f8bea3d6..eb466745ef8 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -3,11 +3,15 @@ , gmp, python, iptables, ldns, unbound, openssl, pcsclite , openresolv , systemd, pam - -, enableTNC ? false, curl, trousers, sqlite, libxml2 +, curl +, enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager }: +# Note on curl support: If curl is built with gnutls as its backend, the +# strongswan curl plugin may break. +# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. + with stdenv.lib; stdenv.mkDerivation rec { @@ -23,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ gmp python iptables ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + [ curl gmp python iptables ldns unbound openssl pcsclite ] + ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam ] ++ optionals enableNetworkManager [ networkmanager ]; @@ -61,12 +65,12 @@ stdenv.mkDerivation rec { "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" - "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] + "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" + "--enable-curl" ] ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ optional (stdenv.system == "i686-linux") "--enable-padlock" ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" From 49ef9019f149f9051d4b1da4190f078c19980921 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:12:01 -0500 Subject: [PATCH 067/181] psstop: init at 1.3 --- pkgs/tools/system/psstop/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/system/psstop/default.nix diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix new file mode 100644 index 00000000000..178e08938fe --- /dev/null +++ b/pkgs/tools/system/psstop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "psstop-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "clearlinux"; + repo = "psstop"; + rev = "v${version}"; + sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clearlinux/psstop; + description = "Show processes' memory usage by looking into pss"; # upstream summary + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77b7a822c5c..49160d59ac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1358,6 +1358,8 @@ with pkgs; ps_mem = callPackage ../tools/system/ps_mem { }; + psstop = callPackage ../tools/system/psstop { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; socklog = callPackage ../tools/system/socklog { }; From a8f3b1ad752c6552245f42e7428319642d7ca627 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:27:36 -0500 Subject: [PATCH 068/181] openmw: update hash missed in update to 0.43.0 Fixes #39712 --- pkgs/games/openmw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index f64bbe4c125..8080c959638 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43"; + sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi"; }; enableParallelBuilding = true; From b45a5a1801d677d67b9e20a8b216719b914bc9ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 12:43:38 -0700 Subject: [PATCH 069/181] nextcloud: 13.0.1 -> 13.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nextcloud/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 13.0.2 with grep in /nix/store/370na6b77ds8vj2qjxij4id8r5ihjpiq-nextcloud-13.0.2 - directory tree listing: https://gist.github.com/bb7d1d9b3be5379cba2c2852ec4b8e56 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e6baf9e64d8..7513d3c71d2 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp"; + sha256 = "0zf4z4cn4wwsybxirvzyk7l6xjw9gkc60lzm8jqz9aak3a5gk5kk"; }; installPhase = '' From b0989d3c76439277198557375893c29d8b0bcf2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 13:49:46 -0700 Subject: [PATCH 070/181] pam_u2f: 1.0.5 -> 1.0.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pam_u2f/versions. These checks were done: - built on NixOS - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -h’ got 0 exit code - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --help’ got 0 exit code - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -V’ and found version 1.0.6 - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --version’ and found version 1.0.6 - found 1.0.6 with grep in /nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6 - directory tree listing: https://gist.github.com/7d4bb96a876d359bc67f88a024a674f8 --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 0f0b6ebb37a..5cc235c3104 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217"; + sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h"; }; nativeBuildInputs = [ pkgconfig ]; From 7ce53bee97d55dab2c3fe8ccdf06e6b3461432e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:42:45 -0700 Subject: [PATCH 071/181] mwic: 0.7.4 -> 0.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mwic/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.5 with grep in /nix/store/3r91cbyw9xi6iy67l5nalznb7rkq1idq-mwic-0.7.5 - directory tree listing: https://gist.github.com/0513e07e310449f5f9f06de443e90f43 --- pkgs/applications/misc/mwic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 02c18109abc..67e6ed3fa9c 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; + sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc"; }; makeFlags=["PREFIX=\${out}"]; From 1fe6cca2db75e24f3e23ab645baf4a349447a903 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:53:47 -0700 Subject: [PATCH 072/181] miniupnpd: 2.0.20180410 -> 2.0.20180422 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/miniupnpd/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/f8b4c06f4c61efa13671b5156550d7b5 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 129db56dc55..99e12084ccb 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180410"; + name = "miniupnpd-2.0.20180422"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; + sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; name = "${name}.tar.gz"; }; From acdbf504e3f756de9964123b355a8c4f2d60e133 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:57:13 -0700 Subject: [PATCH 073/181] ipmiutil: 3.0.9 -> 3.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ipmiutil/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/706664f90d887aff46e82433584920a1 --- pkgs/tools/system/ipmiutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 6b206ea8761..bace31a17bd 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.9"; + version = "3.1.0"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0j4lsfdj2bk1b1vw9l00zv1g4jan05p09szqbzxgqqw2lpnca4i7"; + sha256 = "1vvdydql5gmq103wr0ris2fvr3l5an2a8zgg2mmgdi88pxi11xfx"; }; buildInputs = [ openssl ]; From d50a31a7106bb6d38fb3f594652a862de8f71281 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:01:58 -0700 Subject: [PATCH 074/181] html-xml-utils: 7.6 -> 7.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/html-xml-utils/versions. These checks were done: - built on NixOS - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcite -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract --help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcopy -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxincl -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxpipe -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxtabletrans -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxuncdata --help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxwls -h’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxref -v’ and found version 7.7 - found 7.7 with grep in /nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7 - directory tree listing: https://gist.github.com/f303211f05f8424805b5314ae0ff7c9e --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 987d192bafc..f681ae62aea 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "html-xml-utils-${version}"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m"; + sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; buildInputs = [curl libiconv]; From eb8e6f1f014577295f1cf9e53ad89a25cdce9f92 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 30 Apr 2018 17:44:42 -0500 Subject: [PATCH 075/181] vit: enable on all Fixes #39762 --- pkgs/applications/misc/vit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 37d7aeb88e6..40a399247e9 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; maintainers = with pkgs.lib.maintainers; [ ]; - platforms = pkgs.lib.platforms.linux; + platforms = pkgs.lib.platforms.all; license = pkgs.lib.licenses.gpl3; }; } From 67b3dcde4c259897b1909dcef795309a33413deb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:58:28 -0700 Subject: [PATCH 076/181] goxel: 0.7.3 -> 0.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/goxel/versions. These checks were done: - built on NixOS - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --help’ got 0 exit code - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel -V’ and found version 0.8.0 - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --version’ and found version 0.8.0 - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --help’ got 0 exit code - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped -V’ and found version 0.8.0 - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --version’ and found version 0.8.0 - found 0.8.0 with grep in /nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0 - directory tree listing: https://gist.github.com/ee8a96a0b785c0293e1e477b693c483b --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 8df630d582c..03f7b515747 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9"; + sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; }; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; From 855e0463abe182e4cb481db8246ae5cd029c1298 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:43:54 -0500 Subject: [PATCH 077/181] tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux "platforms.gnu" has been linux-only since at least 17.03: $ nix eval -f channel:nixos-17.03 lib.platforms.gnu [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ] Unlike platforms.linux, platforms.gnu indicates "must use glibc" which for the most part is not intended. Replacing platforms.gnu with platforms.linux would be the same "today" but let's err on preserving existing behavior and be optimistic about platforms these packages work on. --- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- pkgs/applications/graphics/scantailor/advanced.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 2 +- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- .../networking/instant-messengers/telepathy/salut/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- pkgs/development/guile-modules/guile-ncurses/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/vcdimager/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 2 +- pkgs/tools/misc/grub/pvgrub_image/default.nix | 2 +- pkgs/tools/misc/grub/trusted.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/security/gnupg/1.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ee0ebf234ce..3ffc5265f7a 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://mpg321.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index d034f5d64d9..a1ea88da84b 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; maintainers = with maintainers; [ jfrankenau pSub ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ac67759c258..d8811791627 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index bea4fe9b2c6..1fb8d572e95 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fa1c64ba0ad..fa3c66e67b6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 111970ab711..f1b3c55d14c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.gnu; # Arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index e060eaabf28..17cd20c09cb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu; # Random choice + platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index d1834217724..e15c3588c29 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ viric vrthra ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 95741e07600..35eb4667bd6 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -40,6 +40,6 @@ in stdenv.mkDerivation { homepage = "http://www.nongnu.org/guile-lib/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 152a3488304..8f601858267 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -39,6 +39,6 @@ in stdenv.mkDerivation { homepage = "https://www.gnu.org/software/guile-ncurses/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 74e5bbc952a..418e9cf0b57 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; maintainers = gnome3.maintainers; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1be3a74fbff..5790672d8e5 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://nongnu.org/libchop/; license = licenses.gpl3Plus; maintainers = with maintainers; [ viric ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 48ad33424f6..77956be3b12 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.gnu; # random choice + platforms = platforms.gnu ++ platforms.linux; # random choice license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 0fa99163845..be4cf0f493b 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { a Miscellaneous section. ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ee6e5065f40..df5e3f15e95 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { Xen guests ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; }) diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index e57c98bf51b..2bf7e3dcf43 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; homepage = https://github.com/Sirrix-AG/TrustedGRUB2; license = licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 26bfd27bf9a..4df7f80fff6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index fa4555dcafb..9a147caa7e2 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { other applications. A wealth of frontend applications and libraries are available. ''; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 96c91def9ac..4741fecb90c 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; maintainers = with maintainers; [ ndowens ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index cec4fc1ce8b..752a6f31432 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; license = licenses.gpl2Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } From 4b7b083bcbfffe0cddc79eb618fbf316918dea6b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:47:47 -0500 Subject: [PATCH 078/181] treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux Include all linux platforms. --- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/editors/emacs-modes/calfw/default.nix | 2 +- pkgs/applications/editors/emacs-modes/jdee/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/panotools/default.nix | 2 +- pkgs/applications/graphics/qtpfsgui/default.nix | 2 +- pkgs/applications/graphics/scantailor/default.nix | 2 +- pkgs/applications/graphics/ufraw/default.nix | 2 +- pkgs/applications/graphics/viewnior/default.nix | 2 +- pkgs/applications/graphics/xfig/default.nix | 2 +- .../networking/instant-messengers/telepathy/gabble/default.nix | 2 +- .../networking/instant-messengers/telepathy/haze/default.nix | 2 +- .../networking/instant-messengers/telepathy/idle/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/git.nix | 2 +- pkgs/applications/networking/p2p/gnunet/svn.nix | 2 +- pkgs/applications/office/gnucash/2.6.nix | 2 +- pkgs/applications/office/gnucash/default.nix | 2 +- .../science/machine-learning/torch/torch-distro.nix | 2 +- pkgs/applications/science/misc/megam/default.nix | 2 +- pkgs/applications/science/misc/tulip/default.nix | 2 +- pkgs/applications/video/qstopmotion/default.nix | 2 +- pkgs/desktops/gnome-3/core/folks/default.nix | 2 +- pkgs/development/compilers/gprolog/default.nix | 2 +- pkgs/development/libraries/clutter-gst/default.nix | 2 +- pkgs/development/libraries/clutter-gtk/default.nix | 2 +- pkgs/development/libraries/libcanberra/default.nix | 2 +- pkgs/development/libraries/libgpod/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- pkgs/development/libraries/tokyo-tyrant/default.nix | 2 +- pkgs/development/tools/misc/complexity/default.nix | 2 +- pkgs/os-specific/gnu/mig/default.nix | 2 +- pkgs/servers/pies/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/misc/picocom/default.nix | 2 +- pkgs/tools/misc/urjtag/default.nix | 2 +- pkgs/tools/networking/connect/default.nix | 2 +- pkgs/tools/networking/inetutils/default.nix | 2 +- pkgs/tools/networking/p2p/amule/default.nix | 2 +- pkgs/tools/networking/p2p/seeks/default.nix | 2 +- pkgs/tools/networking/telnet/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/system/freeipmi/default.nix | 2 +- pkgs/tools/text/namazu/default.nix | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ac945bee7f7..efaef97257e 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index c173684fab4..091635feda6 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index e47da7a4193..306fe66823c 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -92,7 +92,7 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 447e729d4f9..d3d95e5886a 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f491f5dc914..01d086cc4ed 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -196,7 +196,7 @@ rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 9ca90d2f5df..719aca5096a 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index d3edc40cbea..4be7d230b5f 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index ec7af882907..395179ff70a 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index cb1c37aefeb..50cd9485a3e 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # needs GTK+ + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+ }; } diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index c655cadef40..5afd7a0237d 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index c70b1029b79..545675ab154 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { meta = { description = "An interactive drawing tool for X11"; homepage = http://xfig.org; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 2d880bef753..4fa4967c898 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index a1669183bb3..89be42781a4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu; # Random choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 7894554eee4..4607961cdf0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "IRC connection manager for the Telepathy framework"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index 6a0063dfb87..9763c0ee97f 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 8c8d95169c8..688bb11acd0 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index c768f4c7fa3..4d85374ee9a 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d17cd2a7ab7..252c6d878d0 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index a4247eac627..d8ce1d2c628 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -9,7 +9,7 @@ let homepage = http://torch.ch; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; distro_src = src; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index a0ee505dc97..8cd119c7b7b 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = "non-commercial"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 8560d900a4f..7db2e6a12c2 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 412cc1ad272..2454044bb48 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 776f7664222..beb40209bc8 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -45,6 +45,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 0e3eb88f537..b12b055342c 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 962ca9ff9b5..a06691d5c71 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 71789b45a28..22f205cdcec 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 1b2cf4084f9..54f2273c2fc 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 60400712e30..fbe421e9974 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { homepage = http://gtkpod.sourceforge.net/; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 46d38b16ccf..81c5b5e2891 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ccd619e8bc1..7bf08a3560a 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 60a0370e86e..41bfa520e62 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/complexity/; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 34426b45d55..2855f5b4240 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; - # platforms = stdenv.lib.platforms.gnu; # really GNU/Hurd + # platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # really GNU/Hurd maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index c472f767d52..73af60e55c4 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/pies/; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 63abc31e007..b31a512e84a 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/xnee/; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 57be275d32a..bb66b97039d 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Minimal dumb-terminal emulation program"; homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 99cd407a9ae..25687a3dbe1 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = http://urjtag.org/; license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 387987c588a..f7a0c00fb48 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index c5ecb5eb6da..04045615a9b 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c278cc98935..ac440fc6d33 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index f11c0a63b07..2a89e419b2e 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index 3a5117653c8..c38f3c46fa4 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; license = "BSD"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index eb05c374807..f9dced33ed4 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ]; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index fd70dce4edf..6996d66abe0 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice updateWalker = true; inherit version; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21548de5efb..67a26cb41aa 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; broken = true; # File-MMagic is not compatible with our Perl version }; From 9bbac8b3bf8daa22d3b632eacd625328396243c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:48:58 -0500 Subject: [PATCH 079/181] mtools: optimistically extend platforms (gnu + darwin) => unix --- pkgs/tools/filesystems/mtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index ff311b9fae2..e7a9963f650 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } From 9bde5abedd34add6fdc579635cd4d522cad1a299 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:51:17 -0500 Subject: [PATCH 080/181] more platforms.gnu -> gnu ++ linux changes, manually --- pkgs/development/compilers/mit-scheme/default.nix | 2 +- pkgs/servers/http/myserver/default.nix | 2 +- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 4670f39eac1..f254e91e5c6 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { # Build fails on Cygwin and Darwin: # . - platforms = platforms.gnu ++ platforms.freebsd; + platforms = platforms.gnu ++ platforms.linux ++ platforms.freebsd; }; } diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3e1c94e79b4..fa3b57a0b22 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = lib.platforms.gnu; + platforms = lib.platforms.gnu ++ lib.platforms.linux; broken = true; # needs patch for gets() }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8c0c4a6c566..c682100b438 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -89,6 +89,6 @@ pythonPackages.buildPythonApplication rec { homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } From 52a9b6e896508e3794dff8b102da65e23596ed05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:18:09 -0700 Subject: [PATCH 081/181] encfs: 1.9.4 -> 1.9.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/encfs/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5/bin/encfs --version’ and found version 1.9.5 - ran ‘/nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5/bin/encfsctl --version’ and found version 1.9.5 - found 1.9.5 with grep in /nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5 - directory tree listing: https://gist.github.com/43f0591cfbd83d8f0ed7349f3b2cbec2 --- pkgs/tools/filesystems/encfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 03da84f7c73..1a9951a33fd 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { - sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag"; + sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; From 02d34f7d9e72bc8c4373784d3d23a2c86cc25cef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:33:57 -0700 Subject: [PATCH 082/181] guake: 3.2.0 -> 3.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guake/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/guake -h’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/guake --help’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/..guake-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/..guake-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/.guake-wrapped -h’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/.guake-wrapped --help’ got 0 exit code - found 3.2.1 with grep in /nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1 - directory tree listing: https://gist.github.com/507c9c542414dc20262767a01f4ba0d9 --- pkgs/applications/misc/guake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 17837c6c254..9ae4ca0be03 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.2.0"; + version = "3.2.1"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d"; + sha256 = "0qzrkmjizpc3kirvhml62wya1sr3pbig25nfcrfhk1hhr3jxq17s"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; From e9d67529f7c83530e6caf1cc2e807dd33994653a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 18:45:22 -0500 Subject: [PATCH 083/181] nss-mdns: fix build w/musl --- pkgs/tools/networking/nss-mdns/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index b3d4ec95e06..9f83949e8de 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + ( + fetchpatch + { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + } + ); + + meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; longDescription = '' @@ -34,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; maintainers = [ ]; }; From e6f9103afcab0b7bf2fd64c2f4de2950d97eb4b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:15:47 -0700 Subject: [PATCH 084/181] eclib: 20171002 -> 20171219 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eclib/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/qexp --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/qexp help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/nfcount -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/nfcount help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/aplist --help’ got 0 exit code - found 20171219 with grep in /nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219 - directory tree listing: https://gist.github.com/65ae32e270027abb20516fbca4766d48 --- pkgs/development/libraries/eclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index dbe487368dc..b2a224e10b1 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -17,12 +17,12 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20171002"; + version = "20171219"; src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "092an90405q9da0k0z5jfp5rng9jl0mqbvsbv4fx6jc9ykfcahsj"; + sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr"; }; buildInputs = [ pari From 6cad5785ea0fc6d3d5f3dba2172e9d885b1c3661 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:24:48 -0700 Subject: [PATCH 085/181] extremetuxracer: 0.7.4 -> 0.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/extremetuxracer/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.5 with grep in /nix/store/aqs72fzhj8mlf9dlcrh0nsmwczsxa0il-extremetuxracer-0.7.5 - directory tree listing: https://gist.github.com/af25592b4861fd5c1e67e48c17da69d9 --- pkgs/games/extremetuxracer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index d1bf190be57..26703b8288e 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "extremetuxracer-${version}"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s"; + sha256 = "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg"; }; buildInputs = [ From 07c025424ee0685801ed76cc6b9bd243e435a6e7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 30 Apr 2018 20:52:09 -0400 Subject: [PATCH 086/181] xmlformat: init at 1.04 --- pkgs/tools/text/xml/xmlformat/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/xml/xmlformat/default.nix diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix new file mode 100644 index 00000000000..5982aa3828e --- /dev/null +++ b/pkgs/tools/text/xml/xmlformat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + name = "xmlformat-${version}"; + version = "1.04"; + + src = fetchurl { + url = "http://www.kitebird.com/software/xmlformat/xmlformat-${version}.tar.gz"; + sha256 = "1vwgzn4ha0az7dx0cyc6dx5nywwrx9gxhyh08mvdcq27wjbh79vi"; + }; + + buildInputs = [ perl ]; + buildPhase = '' + patchShebangs ./xmlformat.pl + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./xmlformat.pl $out/bin/xmlformat + cp ./LICENSE $out/ + ''; + + meta = { + description = "a configurable formatter (or 'pretty-printer') for XML documents"; + homepage = "http://www.kitebird.com/software/xmlformat/"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fea7117310..b20cf36a05f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5736,6 +5736,8 @@ with pkgs; xml2 = callPackage ../tools/text/xml/xml2 { }; + xmlformat = callPackage ../tools/text/xml/xmlformat { }; + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmloscopy = callPackage ../tools/text/xml/xmloscopy { }; From 1c86f0cc4683e055df981cded464464cb48e05aa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 19:59:33 -0500 Subject: [PATCH 087/181] netbsd: cleanup bootstrapping --- pkgs/os-specific/bsd/netbsd/default.nix | 242 +++++++++++++----------- 1 file changed, 133 insertions(+), 109 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 4961ab6080a..aea0ddac302 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -10,10 +10,11 @@ let }; netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; + setOutputFlags = false; nativeBuildInputs = [ makeMinimal mandoc groff install stat yacc flex tsort lorder ]; @@ -25,17 +26,24 @@ let DESTDIR = "$(out)"; TOOLDIR = "$(out)"; USETOOLS = "never"; - NOCLANGERROR="yes"; - NOGCCERROR="yes"; + NOCLANGERROR = "yes"; + NOGCCERROR = "yes"; LEX = "flex"; + MKUNPRIVED = "yes"; + INSTPRIV = '' ''${INSTPRIV.unpriv}''; + HOST_SH = "${bash}/bin/sh"; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; + PRESERVE = "-p"; + MACHINE_ARCH = hostPlatform.parsed.cpu.name; + MACHINE_CPU = hostPlatform.parsed.cpu.name; # libs will be provided by cc-wrapper - LIBCRT0=""; - LIBCRTI=""; - LIBCRTEND=""; - LIBCRTBEGIN=""; - LIBC=""; - LIBUTIL=""; + LIBCRT0 = ""; + LIBCRTI = ""; + LIBCRTEND = ""; + LIBCRTBEGIN = ""; + LIBC = ""; + LIBUTIL = ""; LIBSSL = ""; LIBCRYPTO = ""; LIBCRYPT = ""; @@ -43,8 +51,6 @@ let LIBTERMINFO = ""; LIBM = ""; LIBL = ""; - "LIBDO.terminfo" = "_external"; - "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; _GCC_CRTBEGINS = ""; _GCC_CRTEND = ""; @@ -54,10 +60,14 @@ let _GCC_CRTDIR = ""; _GCC_CRTN = ""; + "LIBDO.terminfo" = "_external"; + "LIBDO.curses" = "_external"; + # all dirs will be prefixed with DESTDIR BINDIR = "/bin"; LIBDIR = "/lib"; SHLIBDIR = "/lib"; + INCSDIR = "/include"; MANDIR = "/share/man"; INFODIR = "/share/info"; DOCDIR = "/share/doc"; @@ -65,22 +75,12 @@ let X11BINDIR = "/bin"; X11USRLIBDIR = "/lib"; X11MANDIR = "/share/man"; - SHLINKDIR = "/usr/libexec"; - - HOST_SH = "${bash}/bin/sh"; - - SHLIB_WARNTEXTREL = "no"; - SHLIB_MKMAP = "no"; - PRESERVE = "-p"; - OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - - MACHINE_ARCH = hostPlatform.parsed.cpu.name; - MACHINE_CPU = hostPlatform.parsed.cpu.name; # NetBSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv preConfigure = '' export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} + # Parallel building. Needs the space. export makeFlags+=" -j $NIX_BUILD_CORES" ''; @@ -91,6 +91,7 @@ let sourceRoot=$PWD/$sourceRoot export NETBSDSRCDIR=$sourceRoot export BSDSRCDIR=$NETBSDSRCDIR + export _SRC_TOP_=$NETBSDSRCDIR chmod -R u+w $sourceRoot for path in $extraPaths; do cd $path @@ -109,15 +110,14 @@ let # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR + $out$DOCDIR $out$LOCALEDIR $out$INCSDIR for i in 1 2 3 4 5 6 7 8 9; do mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ $out$DOCDIR/reference/ref$i done - mkdir -p $out/usr/include ''; - postInstall = '' + preFixup = '' # Remove lingering /usr references if [ -d $out/usr ]; then cd $out/usr @@ -125,6 +125,10 @@ let find . -type f -exec mv \{} $out/\{} \; fi + if [ -f $out/METALOG ]; then + rm $out/METALOG + fi + find $out -type d -empty -delete ''; @@ -135,7 +139,9 @@ let }; }) // attrs); - # BOOTSTRAPPING + ## + ## BOOTSTRAPPING + ## makeMinimal = netBSDDerivation rec { path = "tools/make"; sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; @@ -144,16 +150,26 @@ let buildInputs = []; nativeBuildInputs = []; - patchPhase = '' + postPatch = '' patchShebangs configure - ${make.patchPhase} + ${make.postPatch} + ''; + buildPhase = '' + runHook prePatch + + sh ./buildmake.sh + + runHook postPatch ''; - buildPhase = "sh ./buildmake.sh"; installPhase = '' + runHook preInstall + install -D nbmake $out/bin/nbmake ln -s $out/bin/nbmake $out/bin/make mkdir -p $out/share - cp -r ../../share/mk $out/share/mk + cp -r $NETBSDSRCDIR/share/mk $out/share/mk + + runHook postInstall ''; extraPaths = [ make.src ] ++ make.extraPaths; }; @@ -171,7 +187,8 @@ let # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = "INSTALL=${coreutils}/bin/install"; + makeFlags = [ "INSTALL=${coreutils}/bin/install" ]; + installFlags = []; RENAME = "-D"; postInstall = '' @@ -219,7 +236,17 @@ let extraPaths = [ mtree.src make.src ]; nativeBuildInputs = [ makeMinimal mandoc groff ]; buildInputs = [ compat fts ]; - RENAME = "-D"; + installPhase = '' + runHook preInstall + + install -D install.1 $out/share/man/man1/install.1 + install -D xinstall $out/bin/install + ln -s $out/bin/install $out/bin/xinstall + ln -s $out/bin/install $out/bin/binstall + + runHook postInstall + ''; + # INSTALL_FILE = "install -D"; }; fts = netBSDDerivation { @@ -240,10 +267,14 @@ let ar -rsc libfts.a lib/libc/gen/fts.o ''; installPhase = '' + runHook preInstall + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 install -D include/fts.h $out/include/fts.h install -D lib/libc/include/namespace.h $out/include/namespace.h install -D libfts.a $out/lib/libfts.a + + runHook postInstall ''; setupHook = ./fts-setup-hook.sh; }; @@ -268,7 +299,9 @@ let sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ makeMinimal mandoc groff install ]; }; - # END BOOTSTRAPPING + ## + ## END BOOTSTRAPPING + ## libutil = netBSDDerivation { path = "lib/libutil"; @@ -292,44 +325,31 @@ let path = "usr.bin/make"; sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; version = "7.1.2"; - patchPhase = '' + postPatch = '' # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - # can't set owner or group in Nix build - # maybe there is a better way to trick it? substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}:U''${SCRIPTSOWN}}' "" \ - --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}:U''${SCRIPTSGRP}}' "" \ - --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ - --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ - --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ - --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \ - --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \ - --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \ - --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \ - --replace '-o ''${MANOWN} -g ''${MANGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \ - --replace '-o ''${FILESOWN_''${.ALLSRC:T}:U''${FILESOWN}}' "" \ - --replace '-g ''${FILESGRP_''${.ALLSRC:T}:U''${FILESGRP}}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.inc.mk \ - --replace '-o ''${BINOWN} -g ''${BINGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \ - --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" + --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" + --replace '-Wl,--no-whole-archive' "" \ + --replace '-Wl,--warn-shared-textrel' "" \ + --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + ''; + preInstall = '' + mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \ + $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk ''; postInstall = '' - (cd $NETBSDSRCDIR/share/mk && make install) + (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; extraPaths = [ (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") @@ -346,17 +366,23 @@ let path = "usr.bin/who"; version = "7.1.2"; sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; - patchPhase = '' + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ + --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec" + '' + '' substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ - --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ - --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \ - --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" + --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \ + --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0" ''; }; in rec { - inherit compat install netBSDDerivation fts; + inherit compat install netBSDDerivation fts make; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -375,23 +401,26 @@ in rec { path = "share/dict"; version = "7.1.2"; sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; - preBuild = "mkdir -p $out/share/dict"; makeFlags = [ "BINDIR=/share" ]; + preInstall = "mkdir -p $out/share/dict"; }; games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; version = "7.1.2"; - patchPhase = '' + makeFlags = [ "BINDIR=/bin" + "SCRIPTSDIR=/bin" + "FILESDIR=/share/games" ]; + postPatch = '' sed -i '1i #include ' adventure/save.c for f in $(find . -name pathnames.h); do substituteInPlace $f \ + --replace /usr/share/games/fortune $out/share/games \ --replace /usr/share/games $out/share/games \ --replace /usr/games $out/bin \ --replace /usr/libexec $out/libexec \ - --replace /var/games $out/var/games \ --replace /usr/bin/more ${more}/bin/more \ --replace /usr/share/dict ${dict}/share/dict done @@ -424,13 +453,11 @@ in rec { --replace 2550 550 ''; - # HACK strfile needs to be installed first & in the path + # HACK strfile needs to be installed first & in the path. The + # Makefile should do this for us but haven't gotten it to work preBuild = '' - pushd fortune/strfile mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 - make - make BINDIR=/bin install - popd + (cd fortune/strfile && make && make BINDIR=/bin install) export PATH=$out/bin:$PATH ''; @@ -447,38 +474,37 @@ in rec { "-D__c99inline=__inline" ]; - postBuild = '' - mkdir -p $out/usr/games $out/usr/share/games/ching \ - $out/usr/share/games/fortune \ - $out/usr/share/games/quiz.db \ - $out/usr/share/games/boggle \ - $out/usr/libexec/ching $out/var/games/hackdir + preInstall = '' + mkdir -p $out/var/games/hackdir \ + $out/share/games \ + $out$DOCDIR/reference/ref6/rogue \ + $out$MANDIR/man6 $out$MANDIR/html6 touch $out/var/games/hackdir/perm ''; - preFixup = '' - mkdir -p $out/bin - mv $out/games/* $out/bin - rmdir $out/games - ''; - buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ dict.src who.src ]; }; - # finger = netBSDDerivation { - # path = "usr.bin/finger"; - # sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - # version = "7.1.2"; - # extraPaths = [ who.src ]; - # NIX_CFLAGS_COMPILE = [ - # "-DSUPPORT_UTMP" - # "-USUPPORT_UTMPX" - # ]; - # patchPhase = '' - # ${who.patchPhase} - # ''; - # }; + finger = netBSDDerivation { + path = "usr.bin/finger"; + sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + version = "7.1.2"; + NIX_CFLAGS_COMPILE = [ + (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") + (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX") + ]; + postPatch = '' + NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include" + + substituteInPlace extern.h \ + --replace psort _psort + + ${who.postPatch} + ''; + extraPaths = [ who.src ] + ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); + }; fingerd = netBSDDerivation { path = "libexec/fingerd"; @@ -490,8 +516,8 @@ in rec { path = "lib/libedit"; buildInputs = [ libterminfo libcurses ]; propagatedBuildInputs = [ compat ]; - postBuild = "mkdir -p $out/usr/include/readline"; - patchPhase = '' + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' sed -i '1i #undef bool_t' el.h substituteInPlace config.h \ --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" @@ -511,16 +537,13 @@ in rec { sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; - patchPhase = '' - substituteInPlace term.c \ - --replace /usr/share $out/share + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' + substituteInPlace term.c --replace /usr/share $out/share ''; - postBuild = '' - pushd $NETBSDSRCDIR/share/terminfo + postInstall = '' mkdir -p $out/share/misc - make - make BINDIR=/share install - popd + (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") @@ -532,6 +555,7 @@ in rec { version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; buildInputs = [ libterminfo ]; + makeFlags = [ "INCSDIR=/include" ]; NIX_CFLAGS_COMPILE = [ "-D__scanflike(a,b)=" "-D__va_list=va_list" @@ -540,7 +564,7 @@ in rec { propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr MKPIC = if stdenv.isDarwin then "no" else "yes"; - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' From ab1648bf0d13afc19bdf7e3d092a3f7ce15a4de1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 30 Apr 2018 22:35:54 -0400 Subject: [PATCH 088/181] nixpkgs doc: add format Make target --- doc/Makefile | 7 +++- doc/default.nix | 3 +- doc/shell.nix | 1 + nixos/doc/xmlformat.conf | 72 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/xmlformat.conf diff --git a/doc/Makefile b/doc/Makefile index 952ef4bfcbb..8a4612e95f1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,12 +1,17 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md))) .PHONY: all -all: validate out/html/index.html out/epub/manual.epub +all: validate format out/html/index.html out/epub/manual.epub .PHONY: debug debug: nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" +.PHONY: format +format: + find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {} + .PHONY: clean clean: rm -f ${MD_TARGETS} .version manual-full.xml diff --git a/doc/default.nix b/doc/default.nix index e5be364506f..0d95d3f0457 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -7,7 +7,7 @@ in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ]; + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ]; src = ./.; @@ -18,6 +18,7 @@ pkgs.stdenv.mkDerivation { HIGHLIGHTJS = pkgs.documentation-highlighter; XSL = "${pkgs.docbook5_xsl}/xml/xsl"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; + XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" diff --git a/doc/shell.nix b/doc/shell.nix index 22590142ee1..e8da2eaf16b 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,4 +1,5 @@ { pkgs ? import ../. {} }: (import ./default.nix).overrideAttrs (x: { buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; + }) diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf new file mode 100644 index 00000000000..50255857b24 --- /dev/null +++ b/nixos/doc/xmlformat.conf @@ -0,0 +1,72 @@ +# +# DocBook Configuration file for "xmlformat" +# see http://www.kitebird.com/software/xmlformat/ +# 10 Sept. 2004 +# + +# Only block elements +ackno address appendix article biblioentry bibliography bibliomixed \ +biblioset blockquote book bridgehead callout calloutlist caption caution \ +chapter chapterinfo classsynopsis cmdsynopsis colophon constraintdef \ +constructorsynopsis dedication destructorsynopsis entry epigraph equation example \ +figure formalpara funcsynopsis glossary glossdef glossdiv glossentry glosslist \ +glosssee glossseealso graphic graphicco highlights imageobjectco important \ +index indexdiv indexentry indexinfo info informalequation informalexample \ +informalfigure informaltable legalnotice literallayout lot lotentry mediaobject \ +mediaobjectco msgmain msgset note orderedlist para part preface primaryie \ +procedure qandadiv qandaentry qandaset refentry refentrytitle reference \ +refnamediv refsect1 refsect2 refsect3 refsection revhistory screenshot sect1 \ +sect2 sect3 sect4 sect5 section seglistitem set setindex sidebar simpara \ +simplesect step substeps synopfragment synopsis table term title \ +toc variablelist varlistentry warning itemizedlist listitem \ +footnote colspec partintro row simplelist subtitle tbody tgroup thead tip + format block + normalize no + + +#appendix bibliography chapter glossary preface reference +# element-break 3 + +sect1 section + element-break 2 + + +# +para abstract + format block + entry-break 1 + exit-break 1 + normalize yes + wrap-length 79 + +title + format block + normalize = yes + entry-break = 0 + exit-break = 0 + +# Inline elements +abbrev accel acronym action application citation citebiblioid citerefentry citetitle \ +classname co code command computeroutput constant country database date email emphasis \ +envar errorcode errorname errortext errortype exceptionname fax filename \ +firstname firstterm footnoteref foreignphrase funcdef funcparams function \ +glossterm group guibutton guiicon guilabel guimenu guimenuitem guisubmenu \ +hardware holder honorific indexterm inlineequation inlinegraphic inlinemediaobject \ +interface interfacename \ +keycap keycode keycombo keysym lineage link literal manvolnum markup medialabel \ +menuchoice methodname methodparam modifier mousebutton olink ooclass ooexception \ +oointerface option optional otheraddr othername package paramdef parameter personname \ +phrase pob postcode productname prompt property quote refpurpose replaceable \ +returnvalue revnumber sgmltag state street structfield structname subscript \ +superscript surname symbol systemitem token trademark type ulink userinput \ +uri varargs varname void wordasword xref year mathphrase member tag + format inline + +programlisting screen + format verbatim + entry-break = 0 + exit-break = 0 + + +#term +# format inline From 5c1b3d93bfc70d14fba94afb2e824ab88faa0aef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 02:43:01 +0000 Subject: [PATCH 089/181] netbsd.games: disable some broken linux games --- pkgs/os-specific/bsd/netbsd/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index aea0ddac302..188d9709ee0 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -382,7 +382,7 @@ let }; in rec { - inherit compat install netBSDDerivation fts make; + inherit compat install netBSDDerivation fts; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -441,16 +441,17 @@ in rec { disableGame atc disableGame dm disableGame dab - ${lib.optionalString stdenv.isDarwin "disableGame sail"} - ${lib.optionalString stdenv.isDarwin "disableGame trek"} + disableGame sail + disableGame trek + ${lib.optionalString stdenv.isLinux "disableGame boggle"} + ${lib.optionalString stdenv.isLinux "disableGame hunt"} + ${lib.optionalString stdenv.isLinux "disableGame larn"} + ${lib.optionalString stdenv.isLinux "disableGame phantasia"} + ${lib.optionalString stdenv.isLinux "disableGame rogue"} ${lib.optionalString stdenv.isDarwin "disableGame adventure"} ${lib.optionalString stdenv.isDarwin "disableGame factor"} ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} ${lib.optionalString stdenv.isDarwin "disableGame mille"} - - substituteInPlace Makefile.inc \ - --replace 2555 555 \ - --replace 2550 550 ''; # HACK strfile needs to be installed first & in the path. The From 8838533ec12db36483a6e3aee903075b62b14130 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:11 -0500 Subject: [PATCH 090/181] dejagnu: supports darwin --- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 0cb483027c1..b734eadae90 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/dejagnu/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington vrthra ]; }; } From 85e1f22b98a022fb3a3fb0be15bee6771cd81c25 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:42 -0500 Subject: [PATCH 091/181] inetutils: cleanup - supports darwin (only when servers are disabled) - pass SUIDMODE= to avoid setuid - add myself as maintainer --- pkgs/tools/networking/inetutils/default.nix | 23 ++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 04045615a9b..c050758a8ee 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, help2man }: +{ stdenv, lib, fetchurl, ncurses, perl, help2man }: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -16,25 +16,20 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd + ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd "--disable-rcp" "--disable-rsh" "--disable-rlogin" "--disable-rexec" - ]; + ] ++ lib.optional stdenv.isDarwin "--disable-servers"; # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. - #doCheck = true; + doCheck = false; + installFlags = [ "SUIDMODE=" ]; - postInstall = '' - # XXX: These programs are normally installed setuid but since it - # fails, they end up being non-executable, hence this hack. - chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute} - ''; - - meta = { + meta = with lib; { description = "Collection of common network programs"; longDescription = @@ -45,9 +40,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.unix; }; } From e1bc2fbfdd18ae04343ebe50f736d2601e751b8e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:44:14 -0500 Subject: [PATCH 092/181] moe: supports darwin --- pkgs/applications/editors/moe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 751b78ab674..764877a11cb 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/moe/; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } # TODO: a configurable, global moerc file From 426a9acf1e266308b05975694d2125381b27ae94 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:54:42 -0500 Subject: [PATCH 093/181] dirmngr: supports darwin --- pkgs/tools/security/dirmngr/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index bd94c6786d7..888fa48eab9 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }: +{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap +, libiconv}: stdenv.mkDerivation rec { name = "dirmngr-1.1.1"; @@ -6,9 +7,10 @@ stdenv.mkDerivation rec { url = "mirror://gnupg/dirmngr/${name}.tar.bz2"; sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; }; - buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ]; + buildInputs = [ libgpgerror libgcrypt libassuan libksba + pth openldap libiconv ]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 884babe32431ba40e9aa1d7160bc42daaf926f13 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:07:57 -0500 Subject: [PATCH 094/181] ballandpaddle: supports darwin --- pkgs/games/ball-and-paddle/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index 4a7eb9376da..dbd2814a6fb 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; - # The fancy libs aren't available on {Cyg,Dar}win. - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From d424d34bf7faa42277e9ec506647e25128d54eaf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:15:33 -0500 Subject: [PATCH 095/181] jwhois: supports darwin - also set license to gpl3 --- pkgs/tools/networking/jwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index cd0821ef9ef..be8e9e210d1 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } From 262fdca5e90eb7fb8d0ca994b834a401dada0acf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:16:14 -0500 Subject: [PATCH 096/181] gcal: supports darwin --- pkgs/applications/misc/gcal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 67bb5feff8c..f3f7fe2aacb 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnu.org/software/gcal/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From 7cbf40808631996d5fca0785026c31e09e4413b1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:30:42 -0500 Subject: [PATCH 097/181] vcdimager: supports darwin --- pkgs/development/libraries/vcdimager/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 77956be3b12..ddecf4a96a7 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt +, libiconv, darwin }: stdenv.mkDerivation rec { name = "vcdimager-2.0.1"; @@ -10,14 +11,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 popt ]; + buildInputs = [ libxml2 popt libiconv ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); propagatedBuildInputs = [ libcdio ]; meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.gnu ++ platforms.linux; # random choice + platforms = platforms.unix; license = licenses.gpl2; }; } From ccaebf04c15ce3b0c8f054d2e48826c68e7cbee0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:33:49 -0500 Subject: [PATCH 098/181] ocrad: supports darwin --- pkgs/applications/graphics/ocrad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index d8811791627..2ff62cc9eef 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } From 038a0c9a603166eada74e930859ccd7e0197f78d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 30 Apr 2018 20:03:23 -0700 Subject: [PATCH 099/181] treewide: http to https --- pkgs/applications/audio/gmpc/default.nix | 2 +- pkgs/applications/graphics/digikam/default.nix | 2 +- pkgs/applications/graphics/dosage/default.nix | 2 +- pkgs/applications/graphics/gimp/plugins/default.nix | 4 ++-- pkgs/applications/misc/chirp/default.nix | 4 ++-- pkgs/applications/misc/gramps/default.nix | 2 +- pkgs/applications/misc/lilyterm/default.nix | 4 ++-- .../networking/cluster/kubernetes/default.nix | 2 +- pkgs/applications/networking/ids/snort/default.nix | 2 +- .../networking/instant-messengers/franz/default.nix | 2 +- pkgs/applications/networking/irc/irssi/default.nix | 2 +- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/applications/window-managers/i3/default.nix | 2 +- pkgs/applications/window-managers/i3/status.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-menus/default.nix | 2 +- pkgs/development/compilers/hhvm/default.nix | 2 +- pkgs/development/libraries/LASzip/default.nix | 2 +- pkgs/development/libraries/fcppt/default.nix | 2 +- pkgs/development/libraries/libLAS/default.nix | 2 +- pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 2 +- pkgs/development/libraries/libmsgpack/generic.nix | 2 +- pkgs/development/libraries/liboil/default.nix | 2 +- pkgs/development/libraries/libssh2/default.nix | 2 +- pkgs/development/libraries/movit/default.nix | 2 +- .../tools/analysis/include-what-you-use/default.nix | 2 +- pkgs/development/tools/build-managers/cmake/2.8.nix | 8 ++++---- pkgs/development/tools/castxml/default.nix | 2 +- pkgs/development/tools/gauge/default.nix | 2 +- pkgs/games/assaultcube/default.nix | 2 +- pkgs/misc/emulators/emulationstation/default.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- pkgs/servers/xmpp/ejabberd/default.nix | 4 ++-- pkgs/tools/backup/burp/default.nix | 2 +- pkgs/tools/filesystems/bindfs/default.nix | 2 +- pkgs/tools/filesystems/irods/common.nix | 2 +- pkgs/tools/misc/gparted/default.nix | 2 +- pkgs/tools/networking/easyrsa/2.x.nix | 2 +- pkgs/tools/networking/easyrsa/default.nix | 2 +- pkgs/tools/networking/openvpn/default.nix | 4 ++-- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/tools/security/mpw/default.nix | 2 +- 41 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index c2adc58f9ce..099e4428016 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://gmpclient.org; + homepage = https://gmpclient.org; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 633a1d9bd6e..5c6a4bab930 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -116,7 +116,7 @@ mkDerivation rec { meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index f95370e39e7..4bc0e93a3b4 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -23,6 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; - homepage = http://dosage.rocks/; + homepage = https://dosage.rocks/; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 01d086cc4ed..5b21b349764 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -43,7 +43,7 @@ rec { */ name = "gap-2.6.0"; src = fetchurl { - url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; patchPhase = '' @@ -53,7 +53,7 @@ rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; - homepage = http://www.gimp.org; + homepage = https://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". license = with licenses; [ gpl3 free ]; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 22d659dd10e..b8fc63c2c9e 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20180412"; src = fetchurl { - url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = http://chirp.danplanet.com/; + homepage = https://chirp.danplanet.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 5f219dc4752..50f575d15ce 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -51,7 +51,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Genealogy software"; - homepage = http://gramps-project.org; + homepage = https://gramps-project.org; license = licenses.gpl2; }; } diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 36527cdbe7c..662ca9761fb 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -15,7 +15,7 @@ let then rec { version = "0.9.9.4"; src = fetchurl { - url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; + url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; }; } @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; - homepage = http://lilyterm.luna.com.tw/; + homepage = https://lilyterm.luna.com.tw/; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2b555435327..1a7ba3cf93d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; - homepage = http://kubernetes.io; + homepage = https://kubernetes.io; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index e3a917a12eb..ff19a62ef30 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index c2e6528e637..95e01e586ec 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = http://meetfranz.com; + homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b03673a00b6..b5bab3585c5 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://irssi.org; + homepage = https://irssi.org; description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 421e0dbb8a3..aa17cf183e3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -77,7 +77,7 @@ let # for purity reasons this behavior should be avoided. wafVersion = "1.9.15"; waf = fetchurl { - urls = [ "http://waf.io/waf-${wafVersion}" + urls = [ "https://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5"; }; @@ -200,7 +200,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; - homepage = http://mpv.io; + homepage = https://mpv.io; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 46c87b0b189..986639c947b 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; - homepage = "http://i3wm.org"; + homepage = "https://i3wm.org"; maintainers = with maintainers; [ garbas modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index b54f6e8def3..fa964e86974 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A tiling window manager"; - homepage = http://i3wm.org; + homepage = https://i3wm.org; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix index fdd23d13459..8a316b60f02 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool glib gobjectIntrospection ]; meta = { - homepage = http://www.gnome.org; + homepage = https://www.gnome.org; description = "Gnome menu specification"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 1cb28118ccb..749e4125a0b 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "High-performance JIT compiler for PHP/Hack"; - homepage = "http://hhvm.com"; + homepage = "https://hhvm.com"; license = "PHP/Zend"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 384178d2c8d..4a166242eb3 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = http://www.laszip.org; + homepage = https://www.laszip.org; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index c4332df5a3d..660cdfa6414 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming (which is both efficient and syntactically affordable in C++11). ''; - homepage = http://fcppt.org; + homepage = https://fcppt.org; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 272a9774a7f..1e7720b0656 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; - homepage = http://www.liblas.org; + homepage = https://www.liblas.org; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 75cf69035cb..9c25757efb0 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdbusmenu-qt-0.9.3+14"; src = fetchbzr { - url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; + url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; }; diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix index 7bca8f21c6b..889ef134773 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; + homepage = https://msgpack.org; license = licenses.asl20; maintainers = with maintainers; [ redbaron wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index a8d2953cad0..fb2dad60525 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; - homepage = http://liboil.freedesktop.org; + homepage = https://liboil.freedesktop.org; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 4d754dc8086..a09a7670739 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A client-side C library implementing the SSH2 protocol"; - homepage = http://www.libssh2.org; + homepage = https://www.libssh2.org; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 3766140eea1..b5188cb66d2 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = http://movit.sesse.net; + homepage = https://movit.sesse.net; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index ec4d19423e6..9aac638d0a8 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; - homepage = http://include-what-you-use.org; + homepage = https://include-what-you-use.org; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 5fcd6b34165..e014276cd67 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -28,16 +28,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = - [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959 name = "FindFreetype-2.5.patch"; - url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + url = "https://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in our libc. [ ./search-path.patch ] ++ optional (hostPlatform != buildPlatform) (fetchurl { name = "fix-darwin-cross-compile.patch"; - url = "http://public.kitware.com/Bug/file_download.php?" + url = "https://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; }); @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.cmake.org/; + homepage = https://cmake.org; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f8389786b9d..f42adffc5f4 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.kitware.com; + homepage = https://www.kitware.com; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; platforms = platforms.unix; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 58bc24e1ec6..12152e98866 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Light weight cross-platform test automation"; - homepage = http://gauge.org; + homepage = https://gauge.org; license = licenses.gpl3; maintainers = [ maintainers.vdemeester ]; platforms = platforms.unix; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index cef48978b6d..6f742bb64f7 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and fun first-person-shooter based on the Cube fps"; - homepage = http://assault.cubers.net; + homepage = https://assault.cubers.net; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; # should work on darwin with a little effort. license = stdenv.lib.licenses.zlib; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 16cb7af3d60..9dec1ecacae 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = http://emulationstation.org; + homepage = https://emulationstation.org; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index da54936092b..24ed1dffd4d 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = { description = "SQL relational database management system"; - homepage = http://www.firebirdnews.org; + homepage = https://www.firebirdnews.org; license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f95b5efe3d3..6a0bedeab26 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { name = "ejabberd-${version}"; src = fetchurl { - url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; + url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6"; }; @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source XMPP application server written in Erlang"; license = licenses.gpl2; - homepage = http://www.ejabberd.im; + homepage = https://www.ejabberd.im; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ]; broken = withElixir; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index c079d8272b1..4133478dbf9 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; - homepage = http://burp.grke.org; + homepage = https://burp.grke.org; license = licenses.agpl3; maintainers = with maintainers; [ tokudan ]; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a83ee771d69..1499e81b624 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; - homepage = http://bindfs.org; + homepage = https://bindfs.org; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index c7267aca107..902d7d7d1a1 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -47,7 +47,7 @@ with stdenv; important in data management. The development infrastructure supports exhaustive testing on supported platforms; plug-in support for microservices, storage resources, drivers, and databases; and extensive documentation, training and support services.''; - homepage = http://irods.org; + homepage = https://irods.org; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 451bcae1efd..ca078c16ab6 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = http://gparted.org; + homepage = https://gparted.org; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index b33034515fb..3c6c5f3d299 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 59d97a4a18b..fcc6c1d86bd 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index d96652e456d..358c53f453b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "2.4.6"; src = fetchurl { - url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; + url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz"; sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 8c12e4e30c3..c3aa92bf4b0 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.clamav.net; + homepage = https://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz ]; diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 3e1e3a88283..0994c649c83 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://masterpasswordapp.com/; + homepage = https://masterpasswordapp.com/; description = "A stateless password management solution"; license = licenses.gpl3; platforms = platforms.unix; From 1beb4236a21f2e9e7adcad1aa97191a4420295da Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:07:39 -0500 Subject: [PATCH 100/181] gpa: supports darwin --- pkgs/applications/misc/gpa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index ef805a31567..149092c70d3 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Graphical user interface for the GnuPG"; homepage = https://www.gnupg.org/related_software/gpa/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 0c3efb9ba05828822ba61105aead64ee3d6dd12c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:13:44 -0400 Subject: [PATCH 101/181] openssl: Support iOS cross compilation (in theory) --- pkgs/development/libraries/openssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a9052222cb..1eac225387d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,6 +48,8 @@ let then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" + else if hostPlatform.isiOS + then "./Configure ios${toString hostPlatform.parsed.cpu.bits}-cross" else throw "Not sure what configuration to use for ${hostPlatform.config}" ); From 9a845de873dfcc31f360a08f1b1f786c6f649c7d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:14:58 -0400 Subject: [PATCH 102/181] lib/systems: Update iOS examples The commented-out configs are @shlevy's old known-good ones. I changed them as needed to play nice with lib.systems.parse but did not test so leaving them as comments for now. --- lib/systems/examples.nix | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 848737700b0..e229cccb365 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -88,16 +88,36 @@ rec { # iphone64 = { - config = "aarch64-apple-darwin14"; - arch = "arm64"; - libc = "libSystem"; + config = "aarch64-apple-ios"; + # config = "aarch64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; platform = {}; }; iphone32 = { - config = "arm-apple-darwin10"; - arch = "armv7-a"; - libc = "libSystem"; + config = "armv7-apple-ios"; + # config = "arm-apple-darwin10"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + platform = {}; + }; + + iphone64-simulator = { + config = "x86_64-apple-ios"; + # config = "x86_64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; + platform = {}; + }; + + iphone32-simulator = { + config = "i686-apple-ios"; + # config = "i386-apple-darwin11"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; platform = {}; }; From 57a4db244995c9852cf5a202bd7540a5c1e7c410 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:45:05 -0500 Subject: [PATCH 103/181] pspp: supports darwin --- pkgs/applications/science/math/pspp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 486a2e69d26..957a4cf6421 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { more traditional syntax commands. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 152454d9875cc1df645c5aa01ec41451d985199f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 1 May 2018 07:36:35 +0100 Subject: [PATCH 104/181] nixos-install manual: remove --chroot option This option has been removed from the tool in favour of nixos-enter. --- nixos/doc/manual/man-nixos-install.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index c9887146989..d6e70d16098 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -57,9 +57,6 @@ - - - @@ -177,14 +174,6 @@ it. - - - - Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot. - - - - From 800c46b24bda32efbc30faf6c7fcf63b1f8758ff Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 30 Apr 2018 23:45:30 -0700 Subject: [PATCH 105/181] dolphinEmuMaster: 20171218 -> 20180430 also fix build --- pkgs/misc/emulators/dolphin-emu/master.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e2bac5d3884..5d4e22fefae 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib -, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline +, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline , openal, libXdmcp, portaudio, libusb, libevdev , libpulseaudio ? null , curl @@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui; assert !(dolphin-wxgui && dolphin-qtgui); stdenv.mkDerivation rec { - name = "dolphin-emu-20171218"; + name = "dolphin-emu-20180430"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa"; - sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc"; + rev = "ad098283c023b0f5f0d314c646bc5d5756c35e3d"; + sha256 = "17fv3vz0nc5jax1bbl4wny1kzsshbbhms82dxd8rzcwwvd2ad1g7"; }; cmakeFlags = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre - gettext libpthreadstubs libXrandr libXext libSM readline openal + gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp portaudio libusb libpulseaudio libpng hidapi ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev ] From 79897e15ab405c884b864b9196e0f9d94cd2cf43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Apr 2018 20:50:34 +0200 Subject: [PATCH 106/181] LTS Haskell 11.7 --- .../configuration-hackage2nix.yaml | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5e12e90a3c3..6b18694dc8d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.6 + # LTS Haskell 11.7 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -141,7 +141,7 @@ default-package-overrides: - avwx ==0.3.0.2 - axiom ==0.4.6 - b9 ==0.5.47 - - backprop ==0.1.5.1 + - backprop ==0.1.5.2 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -157,7 +157,7 @@ default-package-overrides: - basic-prelude ==0.7.0 - bbdb ==0.8 - bcrypt ==0.0.11 - - beam-core ==0.7.2.0 + - beam-core ==0.7.2.1 - beam-migrate ==0.3.1.0 - beam-sqlite ==0.3.2.0 - bench ==1.0.9 @@ -242,7 +242,7 @@ default-package-overrides: - buffer-pipe ==0.0 - butcher ==1.3.0.0 - bv ==0.5 - - bv-little ==0.1.0.0 + - bv-little ==0.1.1 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 @@ -306,7 +306,7 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - cisco-spark-api ==0.1.0.2 + - cisco-spark-api ==0.1.0.3 - clang-compilation-database ==0.1.0.1 - classyplate ==0.3.0.2 - classy-prelude ==1.4.0 @@ -400,7 +400,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.0.2.11 + - crypto-enigma ==0.0.2.12 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -670,7 +670,7 @@ default-package-overrides: - foundation ==0.0.20 - FPretty ==1.1 - Frames ==0.3.0.2 - - free ==5.0.1 + - free ==5.0.2 - freenect ==1.2.1 - freer-simple ==1.1.0.0 - freetype2 ==0.1.2 @@ -800,12 +800,12 @@ default-package-overrides: - haddock-library ==1.4.5 - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - - hakyll ==4.12.1.0 + - hakyll ==4.12.2.0 - half ==0.2.2.3 - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.4 + - hapistrano ==0.3.5.5 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 @@ -906,7 +906,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hocilib ==0.2.0 - Hoed ==0.5.1 - - hOpenPGP ==2.6 + - hOpenPGP ==2.6.1 - hopfli ==0.2.2.1 - hosc ==0.16 - hostname ==1.0 @@ -931,8 +931,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1013,7 +1013,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.5.0.2 + - hw-prim ==0.5.0.3 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 @@ -1046,7 +1046,7 @@ default-package-overrides: - immortal ==0.2.2.1 - imprint ==0.0.1.0 - include-file ==0.1.0.3 - - incremental-parser ==0.2.5.3 + - incremental-parser ==0.2.5.4 - indentation-core ==0.0.0.1 - indentation-parsec ==0.0.0.1 - indents ==0.4.0.1 @@ -1285,6 +1285,7 @@ default-package-overrides: - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.7 - minimorph ==0.1.6.1 + - minio-hs ==1.0.0 - miniutter ==0.4.7.0 - mintty ==0.1.1 - misfortune ==0.1.1.2 @@ -1468,7 +1469,7 @@ default-package-overrides: - pagination ==0.2.1 - palette ==0.1.0.5 - pandoc ==2.1.2 - - pandoc-citeproc ==0.14.3 + - pandoc-citeproc ==0.14.3.1 - pandoc-types ==1.17.3.1 - pango ==0.13.5.0 - papillon ==0.1.0.5 @@ -1507,7 +1508,7 @@ default-package-overrides: - perf ==0.3.1.1 - perfect-hash-generator ==0.2.0.6 - persistable-record ==0.6.0.3 - - persistable-types-HDBC-pg ==0.0.1.5 + - persistable-types-HDBC-pg ==0.0.3.2 - persistent ==2.8.2 - persistent-mongoDB ==2.8.0 - persistent-mysql ==2.8.1 @@ -1753,8 +1754,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.16 - sbv ==7.5 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1887,6 +1888,7 @@ default-package-overrides: - Spock-core ==0.12.0.0 - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 + - spoon ==0.3.1 - spreadsheet ==0.1.3.7 - sqlite-simple ==0.4.15.0 - sql-words ==0.1.6.0 @@ -2012,7 +2014,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - testing-feat ==0.4.0.3 - - texmath ==0.10.1.1 + - texmath ==0.10.1.2 - text ==1.2.3.0 - text-binary ==0.2.1.1 - text-conversions ==0.3.0 @@ -2140,8 +2142,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.2 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2154,7 +2156,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.8 - - unliftio ==0.2.6.0 + - unliftio ==0.2.7.0 - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 @@ -2232,7 +2234,7 @@ default-package-overrides: - wai-middleware-prometheus ==0.3.0 - wai-middleware-rollbar ==0.10.0 - wai-middleware-static ==0.8.2 - - wai-middleware-throttle ==0.2.2.0 + - wai-middleware-throttle ==0.2.2.1 - wai-predicates ==0.10.0 - wai-route ==0.3.1.2 - wai-routing ==0.13.0 @@ -2241,7 +2243,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.2 - - warp ==3.2.19 + - warp ==3.2.22 - warp-tls ==3.2.4.3 - wave ==0.1.5 - wavefront ==0.7.1.2 @@ -2264,7 +2266,7 @@ default-package-overrides: - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - wild-bind ==0.1.2.0 - - wild-bind-x11 ==0.2.0.2 + - wild-bind-x11 ==0.2.0.3 - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 @@ -2341,13 +2343,13 @@ default-package-overrides: - yesod-auth ==1.6.3 - yesod-auth-fb ==1.9.0 - yesod-auth-hashdb ==1.7 - - yesod-bin ==1.6.0 - - yesod-core ==1.6.3 + - yesod-bin ==1.6.0.2 + - yesod-core ==1.6.4 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - yesod-form ==1.6.1 - - yesod-form-bootstrap4 ==0.1.0.2 + - yesod-form-bootstrap4 ==0.1.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 @@ -2356,7 +2358,7 @@ default-package-overrides: - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0 - yesod-table ==2.0.3 - - yesod-test ==1.6.2 + - yesod-test ==1.6.3 - yesod-websockets ==0.3.0 - yes-precure5-command ==5.5.3 - yi-core ==0.17.1 From e9c955fb8477c30f0e9bbf9f9f96065e38dd81d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Apr 2018 02:30:52 +0200 Subject: [PATCH 107/181] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4fb888414b6e1d312df6e38bc41ee5289154aeeb. --- .../haskell-modules/hackage-packages.nix | 1324 ++++++++--------- 1 file changed, 631 insertions(+), 693 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8b035359730..f3ea3b8954f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13317,6 +13317,27 @@ self: { license = "unknown"; }) {}; + "Network-NineP_0_4_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, convertible + , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl + , network, NineP, regex-posix, stateref, transformers + }: + mkDerivation { + pname = "Network-NineP"; + version = "0.4.3"; + sha256 = "1hsfcicijzqy7vxvknxxq9qa4qx3d1smg6mw4mpvk46nvxny8sc1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers convertible exceptions hslogger + monad-loops monad-peel mstate mtl network NineP regex-posix + stateref transformers + ]; + description = "High-level abstraction over 9P protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "NewBinary" = callPackage ({ mkDerivation, array, base, integer }: mkDerivation { @@ -30450,8 +30471,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.11"; - sha256 = "09c2nldzaqm8a203gqk6lc81gfhmvz30pxicxi9g1971y1q0nklj"; + version = "2.10.0.20"; + sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -30463,8 +30484,8 @@ self: { zip-archive zlib ]; executableHaskellDepends = [ - base composition-prelude directory lens optparse-applicative shake - shake-ats temporary text + base composition-prelude directory lens optparse-applicative + parallel-io shake shake-ats temporary text ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; @@ -32486,29 +32507,6 @@ self: { }) {}; "backprop" = callPackage - ({ mkDerivation, base, bifunctors, binary, criterion, deepseq - , directory, hmatrix, lens, microlens, mnist-idx, mwc-random - , primitive, reflection, time, transformers, type-combinators - , vector - }: - mkDerivation { - pname = "backprop"; - version = "0.1.5.1"; - sha256 = "1jii5nwnkh44jxxyfkgm14695ah7p3rpbydcgj84g5ijmhdnmks0"; - libraryHaskellDepends = [ - base binary deepseq microlens primitive reflection transformers - type-combinators vector - ]; - benchmarkHaskellDepends = [ - base bifunctors criterion deepseq directory hmatrix lens mnist-idx - mwc-random time transformers vector - ]; - homepage = "https://github.com/mstksg/backprop#readme"; - description = "Heterogeneous automatic differentation (backpropagation)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_1_5_2" = callPackage ({ mkDerivation, base, bifunctors, binary, criterion, deepseq , directory, hmatrix, lens, microlens, mnist-idx, mwc-random , primitive, random, reflection, time, transformers @@ -32529,7 +32527,6 @@ self: { homepage = "https://github.com/mstksg/backprop#readme"; description = "Heterogeneous automatic differentation (backpropagation)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -33822,28 +33819,6 @@ self: { }) {}; "beam-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, dlist, free - , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty - , tasty-hunit, text, time, vector-sized - }: - mkDerivation { - pname = "beam-core"; - version = "0.7.2.0"; - sha256 = "1m3jyz1wh9g14cv5nyklqi6v8rqxi73xnppk308lrjh00iwrvgvb"; - libraryHaskellDepends = [ - aeson base bytestring containers dlist free ghc-prim hashable - microlens mtl network-uri tagged text time vector-sized - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit text time - ]; - homepage = "http://travis.athougies.net/projects/beam.html"; - description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "beam-core_0_7_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty , tasty-hunit, text, time, vector-sized @@ -39185,7 +39160,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_36_2" = callPackage + "brick_0_36_3" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -39193,8 +39168,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.36.2"; - sha256 = "0zzd3lwlb60n3zdcyyqf89b066337f6qny5m4clf1fbvqiw7g771"; + version = "0.36.3"; + sha256 = "1j53pj4axgyah3qj9zkaicbccmypm8cjfrpdjzarpcnb1za9y60n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40295,29 +40270,6 @@ self: { }) {}; "bv-little" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp - , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "bv-little"; - version = "0.1.0.0"; - sha256 = "0gll7czp8xcm8lcvlxqxfx1gn8wj6cvqm5c9xh0g1s445ykrs93w"; - libraryHaskellDepends = [ - base deepseq hashable integer-gmp mono-traversable primitive - QuickCheck - ]; - testHaskellDepends = [ - base hashable mono-traversable QuickCheck tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - homepage = "https://github.com/recursion-ninja/bv-little"; - description = "Efficient little-endian bit vector library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bv-little_0_1_1" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit , tasty-quickcheck @@ -40338,7 +40290,6 @@ self: { homepage = "https://github.com/recursion-ninja/bv-little"; description = "Efficient little-endian bit vector library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv-sized" = callPackage @@ -41330,8 +41281,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.36.2"; - sha256 = "142y8ng64qcykyjp1yz989ksznhippgij3m5qy5rgh77kdncbpb1"; + version = "4.38"; + sha256 = "0c5c3xd3lipnwdyvnvlxk4wk8gi2akbjwmhnc1bsdyr6g6ihai81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41493,6 +41444,8 @@ self: { pname = "cabal-helper"; version = "0.8.0.2"; sha256 = "0yhsyq2z660qj5vp38lak2cz90r5jy69ifvz6dfipj6miyh2vmm6"; + revision = "1"; + editedCabalFile = "0hzjhnb9iyvk2qs3zbyj6rjhf3dbjksq0jqi8is522sph20zavvk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -44041,22 +43994,12 @@ self: { }) {}; "cautious" = callPackage - ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec - , genvalidity-hspec-aeson, hspec, hspec-discover, QuickCheck - , transformers, validity - }: + ({ mkDerivation, aeson, base, transformers, validity }: mkDerivation { pname = "cautious"; - version = "0.1.0.0"; - sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w"; - libraryHaskellDepends = [ - aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover - QuickCheck transformers validity - ]; - testHaskellDepends = [ - aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson - hspec hspec-discover QuickCheck transformers validity - ]; + version = "0.3.0.0"; + sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6"; + libraryHaskellDepends = [ aeson base transformers validity ]; homepage = "https://github.com/Nickske666/cautious#readme"; description = "Keep track of warnings and errors during calculations"; license = stdenv.lib.licenses.bsd3; @@ -44077,6 +44020,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cautious-gen" = callPackage + ({ mkDerivation, base, cautious, genvalidity, genvalidity-hspec + , genvalidity-hspec-aeson, hspec, QuickCheck + }: + mkDerivation { + pname = "cautious-gen"; + version = "0.0.0.0"; + sha256 = "1i9cmqkh1n6s3dkqr0f9slm6frslw82rwvngx80iw9rc95anhykl"; + libraryHaskellDepends = [ base cautious genvalidity ]; + testHaskellDepends = [ + base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson + hspec QuickCheck + ]; + homepage = "https://github.com/Nickske666/cautious#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cayley-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson @@ -44247,10 +44207,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.0.0"; - sha256 = "1klj3cx7cx39iyskv7fs6s28jplyn13dwv4khz79kxgg1sxd9gv5"; - revision = "2"; - editedCabalFile = "1r2ihgk5yj6xv4qc276b29gfzblksf82qdp0qg06cz590kxb8v2x"; + version = "0.1.0.1"; + sha256 = "16pzba0zc346d3azw4wd90apz7ldx68d5vd3q13dd3s9f3gqy4wv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46182,35 +46140,6 @@ self: { }) {}; "cisco-spark-api" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 - , bytestring, conduit, data-default, hspec, http-conduit - , http-types, network-uri, optparse-applicative, text, utf8-string - , wai, warp - }: - mkDerivation { - pname = "cisco-spark-api"; - version = "0.1.0.2"; - sha256 = "0cgs3d4dlc5vxz51d8c6hjvi1zxsvxzni4nqhqrc0rxnxkimc7bw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bitset-word8 bytestring conduit data-default - http-conduit network-uri text - ]; - executableHaskellDepends = [ - aeson base bytestring conduit data-default http-conduit - optparse-applicative text utf8-string - ]; - testHaskellDepends = [ - aeson async attoparsec base bytestring conduit data-default hspec - http-conduit http-types network-uri text wai warp - ]; - homepage = "https://github.com/nshimaza/cisco-spark-api#readme"; - description = "A Haskell bindings for Cisco Spark API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cisco-spark-api_0_1_0_3" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, http-conduit , http-types, network-uri, optparse-applicative, text, utf8-string @@ -46237,7 +46166,6 @@ self: { homepage = "https://github.com/nshimaza/webex-teams-api#readme"; description = "A Haskell bindings for Webex Teams API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "citation-resolve" = callPackage @@ -49007,6 +48935,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colorful-monoids_0_2_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "colorful-monoids"; + version = "0.2.1.1"; + sha256 = "0n1f9x6kyb3fcg1fbs80wrlm3c897l089ma4cxm47v1dcgczix8b"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/minad/colorful-monoids#readme"; + description = "Styled console text output using ANSI escape sequences"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colorize-haskell" = callPackage ({ mkDerivation, ansi-terminal, base, haskell-lexer }: mkDerivation { @@ -54926,23 +54868,6 @@ self: { }) {}; "crypto-enigma" = callPackage - ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck - , split - }: - mkDerivation { - pname = "crypto-enigma"; - version = "0.0.2.11"; - sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1"; - revision = "1"; - editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz"; - libraryHaskellDepends = [ base containers MissingH mtl split ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - homepage = "https://github.com/orome/crypto-enigma-hs"; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_0_2_12" = callPackage ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck , split }: @@ -54955,7 +54880,6 @@ self: { homepage = "https://github.com/orome/crypto-enigma-hs"; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -60562,6 +60486,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "deferred-folds" = callPackage + ({ mkDerivation, base, foldl }: + mkDerivation { + pname = "deferred-folds"; + version = "0.2.1"; + sha256 = "0i8wzih07532zw276h271lzdk3lkinjsjyhn8lks04yqkgq4b2x8"; + libraryHaskellDepends = [ base foldl ]; + homepage = "https://github.com/metrix-ai/deferred-folds"; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -60719,17 +60655,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_5_0_0" = callPackage - ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, profunctors, random, transformers + "dejafu_1_5_1_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.5.0.0"; - sha256 = "1d32y12mzd9vfj2ww2cqn4jsvkc4yysnada6wijk5hm6ax7in822"; + version = "1.5.1.0"; + sha256 = "0whxbn6h5k7n38w0wzm5iwqc20yyvzri88zsp3hhp8pdfj34df7d"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck - profunctors random transformers + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers ]; homepage = "https://github.com/barrucadu/dejafu"; description = "A library for unit-testing concurrent programs"; @@ -60967,18 +60903,18 @@ self: { }) {}; "dependency" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, containers - , criterion, deepseq, hspec, lens, recursion-schemes, tardis - , transformers + ({ mkDerivation, ansi-wl-pprint, base, binary, containers, cpphs + , criterion, deepseq, hspec, lens, recursion-schemes, transformers }: mkDerivation { pname = "dependency"; - version = "0.1.0.11"; - sha256 = "0nazbm1mf3agjkfc1ll0fy4jxdkb65dzx92jz15jp7xp5y10866h"; + version = "1.0.0.0"; + sha256 = "08n38sqcnljja235cv4xlvfmir7cbcmb53rayc81nl3km292hr8i"; libraryHaskellDepends = [ ansi-wl-pprint base binary containers deepseq lens - recursion-schemes tardis transformers + recursion-schemes transformers ]; + libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base containers hspec ]; benchmarkHaskellDepends = [ base containers criterion ]; description = "Dependency resolution for package management"; @@ -61593,34 +61529,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_12_0" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base - , base16-bytestring, bytestring, case-insensitive, containers - , contravariant, cryptonite, deepseq, directory, exceptions - , filepath, formatting, haskeline, http-client, http-client-tls - , insert-ordered-containers, lens-family-core, memory, mtl - , optparse-generic, parsers, prettyprinter - , prettyprinter-ansi-terminal, repline, scientific, tasty - , tasty-hunit, text, transformers, trifecta, unordered-containers + "dhall_1_13_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive + , containers, contravariant, cryptonite, deepseq, directory + , exceptions, filepath, formatting, haskeline, http-client + , http-client-tls, insert-ordered-containers, lens-family-core + , megaparsec, memory, mtl, optparse-applicative, parsers + , prettyprinter, prettyprinter-ansi-terminal, repline, scientific + , tasty, tasty-hunit, text, transformers, unordered-containers , vector }: mkDerivation { pname = "dhall"; - version = "1.12.0"; - sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab"; + version = "1.13.0"; + sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base base16-bytestring bytestring case-insensitive - containers contravariant cryptonite directory exceptions filepath - formatting http-client http-client-tls insert-ordered-containers - lens-family-core memory parsers prettyprinter - prettyprinter-ansi-terminal scientific text transformers trifecta + ansi-terminal base bytestring case-insensitive containers + contravariant cryptonite directory exceptions filepath formatting + http-client http-client-tls insert-ordered-containers + lens-family-core megaparsec memory parsers prettyprinter + prettyprinter-ansi-terminal scientific text transformers unordered-containers vector ]; executableHaskellDepends = [ - ansi-terminal base haskeline mtl optparse-generic prettyprinter - prettyprinter-ansi-terminal repline text trifecta + ansi-terminal base haskeline megaparsec mtl optparse-applicative + prettyprinter prettyprinter-ansi-terminal repline text ]; testHaskellDepends = [ base deepseq insert-ordered-containers prettyprinter tasty @@ -61634,12 +61569,14 @@ self: { "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall, formatting , insert-ordered-containers, neat-interpolation, optparse-generic - , shell-escape, text, trifecta + , shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.11"; - sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g"; + version = "1.0.12"; + sha256 = "1q9bwcdxyn2f7zp6r67k3kxqydj54shf0v0liyps7g7c9fixzrij"; + revision = "1"; + editedCabalFile = "12qklhw4jk2i1qiq9wyv23d6bl3yyqyjwf8dda649clby2my0hrc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61647,7 +61584,7 @@ self: { insert-ordered-containers neat-interpolation shell-escape text ]; executableHaskellDepends = [ - base bytestring dhall optparse-generic text trifecta + base bytestring dhall optparse-generic text ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; @@ -61693,6 +61630,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , optparse-generic, text, unordered-containers, yaml + }: + mkDerivation { + pname = "dhall-json"; + version = "1.1.0"; + sha256 = "13fan1zdgj8zdv1br5vj57iqbfb5grllk8a2xkz6yyfk8kylmrc7"; + revision = "1"; + editedCabalFile = "0k8q44hfhd95k7i92g1zvsw9ys1ak6vl663r2v7pf6k1zl70cyhs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base dhall text unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring dhall optparse-generic text yaml + ]; + description = "Compile Dhall to JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -61715,12 +61675,12 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, formatting , hnix, insert-ordered-containers, neat-interpolation - , optparse-generic, scientific, text, trifecta + , optparse-generic, scientific, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.2"; - sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj"; + version = "1.1.3"; + sha256 = "0dpkg84qzviasadgif30ivbg6k7azqq9ki8grd3g93zbrdxgv4fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61728,7 +61688,7 @@ self: { insert-ordered-containers neat-interpolation scientific text ]; executableHaskellDepends = [ - base dhall hnix optparse-generic text trifecta + base dhall hnix optparse-generic text ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; @@ -61739,8 +61699,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.8"; - sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d"; + version = "1.0.9"; + sha256 = "0jh2nm26i5gdicsxzvx54rmx7x1g5mpjiwd7c5wfj6pmrpcp606r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -62619,6 +62579,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diff3_0_3_1" = callPackage + ({ mkDerivation, base, Diff, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "diff3"; + version = "0.3.1"; + sha256 = "0myajph6iv6vddwfsrwzdbjw8di9wpabb393is98jnacjwa9csx3"; + libraryHaskellDepends = [ base Diff ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + homepage = "http://github.com/ocharles/diff3.git"; + description = "Perform a 3-way difference of documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diffarray" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -63797,6 +63775,8 @@ self: { pname = "distributed-process"; version = "0.7.3"; sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5"; + revision = "1"; + editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -66211,8 +66191,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.1"; - sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9"; + version = "1.1.0.1"; + sha256 = "18p10a2x6ra18aj6cphgswq4sjjkdrq58pk7ikgmpgq9sj4bxgpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68007,8 +67987,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.12"; - sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq"; + version = "1.0.13"; + sha256 = "0w9zafd8ipq2hpxqmd9iywryjl0ym5gwwrv90kx80jxmv2dpqpzp"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -68024,8 +68004,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.9"; - sha256 = "00xdyrvwmd9jp59awh9i1yzbnywndzmjmz8qsn87hrcd2848fdnm"; + version = "1.0.10"; + sha256 = "0mvx5qpj5fzdb991gb344a5a34fvgys6xy3xxpr65bddlbpv0mk9"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -72826,20 +72806,16 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, base, combinat-compat - , composition-prelude, criterion, gmpint, hspec, QuickCheck + ({ mkDerivation, arithmoi, base, combinat, composition-prelude + , criterion, gmpint, hspec, QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.0.1"; - sha256 = "1am161zrjaann9pnazsv9ic43cnw1bimqcy6vvh5qinigc33p08f"; + version = "0.6.0.3"; + sha256 = "1q9fdx61wpznpw551id09xg1yw8vyh77cvcwswmi0grld4hqn17g"; libraryHaskellDepends = [ base composition-prelude gmpint ]; - testHaskellDepends = [ - arithmoi base combinat-compat hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - arithmoi base combinat-compat criterion - ]; + testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; + benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; @@ -74800,6 +74776,8 @@ self: { pname = "filtrable"; version = "0.1.0.5"; sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd"; + revision = "1"; + editedCabalFile = "0wa848jypc7vvr4y6h7rvfd6m8n1747889rqzybrl3cvm138572v"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/strake/filtrable.hs"; description = "Class of filtrable containers"; @@ -77799,28 +77777,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, profunctors, semigroupoids - , semigroups, template-haskell, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "free"; - version = "5.0.1"; - sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p"; - revision = "1"; - editedCabalFile = "0d6wzbazlw9yamka4p01scqypl6kcg2kzh00amim40wx6f4sdyqj"; - libraryHaskellDepends = [ - base bifunctors comonad containers distributive exceptions mtl - profunctors semigroupoids semigroups template-haskell transformers - transformers-base transformers-compat - ]; - homepage = "http://github.com/ekmett/free/"; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_0_2" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers , distributive, exceptions, mtl, profunctors, semigroupoids , semigroups, template-haskell, transformers, transformers-base @@ -77838,7 +77794,6 @@ self: { homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-concurrent" = callPackage @@ -83752,8 +83707,8 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.15"; - sha256 = "0j2bqphjfhgm9nk8pyfpd6zp7i3q4b11s4vlgas9xdwwi9p1md8r"; + version = "2.0.16"; + sha256 = "0vqnskshbfp9nsgyfg4pifrh007rb7k176ci8niik96kxh95zfzx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -90318,6 +90273,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groot" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-autoscaling + , amazonka-core, amazonka-ec2, amazonka-ecs, ansi-terminal + , attoparsec, base, bytestring, checkers, conduit + , conduit-combinators, directory, exceptions, free, hashable, hspec + , http-conduit, http-types, ini, lens, lifted-base, mmorph + , monad-control, mtl, optparse-applicative, pptable, prettyprinter + , prettyprinter-ansi-terminal, prettyprinter-compat-ansi-wl-pprint + , QuickCheck, quickcheck-text, resourcet, stm, stm-chans + , stm-conduit, stm-delay, text, these, time, transformers + , unordered-containers, uuid, vector, yaml + }: + mkDerivation { + pname = "groot"; + version = "0.0.1.0"; + sha256 = "04klrvsc0j16zhv5a1b80gmv91p0xlbp22ylq1cfh8qbbp5mpf5a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-ecs ansi-terminal attoparsec base bytestring conduit + conduit-combinators directory exceptions free hashable http-conduit + http-types ini lens lifted-base mmorph monad-control mtl + optparse-applicative pptable prettyprinter + prettyprinter-ansi-terminal prettyprinter-compat-ansi-wl-pprint + resourcet stm stm-chans stm-conduit stm-delay text these time + transformers unordered-containers uuid vector yaml + ]; + executableHaskellDepends = [ + aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-ecs attoparsec base bytestring conduit conduit-combinators + directory exceptions free hashable http-conduit http-types lens + lifted-base mmorph monad-control mtl resourcet stm stm-chans + stm-conduit stm-delay text these time transformers + unordered-containers uuid vector yaml + ]; + testHaskellDepends = [ + aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-ecs attoparsec base bytestring checkers conduit + conduit-combinators directory exceptions free hashable hspec + http-conduit http-types lens lifted-base mmorph monad-control mtl + QuickCheck quickcheck-text resourcet stm stm-chans stm-conduit + stm-delay text these time transformers unordered-containers uuid + vector yaml + ]; + homepage = "https://github.com/alonsodomin/groot#readme"; + description = "Command line utility to manage AWS ECS resources"; + license = stdenv.lib.licenses.asl20; + }) {}; + "gross" = callPackage ({ mkDerivation, base, lens, mtl, ncurses }: mkDerivation { @@ -91704,58 +91709,6 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite - , data-default-class, errors, hashable, incremental-parser - , ixset-typed, lens, memory, monad-loops, nettle, network - , network-uri, newtype, openpgp-asciiarmor, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers - , wl-pprint-extras, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.6"; - sha256 = "0vsrgyzh7zlx9z27fvpjzk4s4gv1zpxwb68n529hvilsphyz35kf"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - data-default-class errors hashable incremental-parser ixset-typed - lens memory monad-loops nettle network-uri newtype - openpgp-asciiarmor resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - wl-pprint-extras zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype QuickCheck quickcheck-instances - resourcet semigroups split tasty tasty-hunit tasty-quickcheck text - time time-locale-compat transformers unliftio-core - unordered-containers wl-pprint-extras zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype openpgp-asciiarmor resourcet - semigroups split text time time-locale-compat transformers - unliftio-core unordered-containers wl-pprint-extras zlib - ]; - homepage = "https://salsa.debian.org/clint/hOpenPGP"; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_6_1" = callPackage ({ mkDerivation, aeson, asn1-encoding, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-conduit, bytestring, bzlib, conduit, conduit-extra @@ -93546,6 +93499,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.7"; + sha256 = "1ldh6q96xz2a8frvgq29j3gr8jc2m0rx652215bm8w99mbq4pcri"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + homepage = "https://bitbucket.org/robertmassaioli/hailgun"; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -93775,8 +93748,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.12.1.0"; - sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg"; + version = "4.12.2.0"; + sha256 = "1bkr94dakfwq86pm68r61x4g2xmcsliqn8lxgp2jkf8603mjla47"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -94303,6 +94276,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "halves" = callPackage + ({ mkDerivation, base, hedgehog, lens }: + mkDerivation { + pname = "halves"; + version = "0.1.0.0"; + sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ base hedgehog lens ]; + description = "Splitting/combining data structures to/from halves, quarters, eighths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "halvm-web" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , HALVMCore, hans, HTTP, mime-types, network-uri, simple-tar, text @@ -94747,33 +94732,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.5.4"; - sha256 = "02cc7bgld3cl36wq4n1c0n6gf2kbz0klj6ssfgjmjwvxvl064cg5"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - homepage = "https://github.com/stackbuilders/hapistrano"; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_5" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path , path-io, process, stm, temporary, time, transformers, yaml @@ -94798,7 +94756,6 @@ self: { homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -95872,8 +95829,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; - revision = "1"; - editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2"; + revision = "2"; + editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -96848,8 +96805,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.3.0"; - sha256 = "0l09s90mfwnyc3nz3xpgja6dh99qm2yvim4r0fxyvh0adfzkmiwn"; + version = "0.0.4.0"; + sha256 = "1nzaf9zwqsx1jgspimkig6vhh2d1iz7kc3hr2kixc52sbr7y9iag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -105173,6 +105130,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hjsonpointer_1_4_0" = callPackage + ({ mkDerivation, aeson, base, hashable, hspec, http-types + , QuickCheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "hjsonpointer"; + version = "1.4.0"; + sha256 = "0hkcaqiich4ap323ir2dmr3v498rlavy34g69m386d4ml1gxm411"; + revision = "1"; + editedCabalFile = "0l84zr0p1ywwn81fdb2z365vrs9xaaz7c7bcmx8pjvb5wfx1g9g4"; + libraryHaskellDepends = [ + aeson base hashable QuickCheck text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base hspec http-types QuickCheck text unordered-containers + vector + ]; + homepage = "https://github.com/seagreen/hjsonpointer"; + description = "JSON Pointer library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjsonschema" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec @@ -105201,29 +105181,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hjsonschema_1_8_0" = callPackage + "hjsonschema_1_9_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-client-tls, http-types, pcre-heavy, profunctors - , protolude, QuickCheck, safe-exceptions, scientific, semigroups - , text, unordered-containers, vector, wai-app-static, warp + , protolude, QuickCheck, safe-exceptions, scientific, text + , unordered-containers, vector, wai-app-static, warp }: mkDerivation { pname = "hjsonschema"; - version = "1.8.0"; - sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl"; + version = "1.9.0"; + sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki"; revision = "1"; - editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i"; + editedCabalFile = "1kxn0smmcmzysvi1bw9v0j6j68fk4s36nqyqmvbkl61pgm6bs803"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-client-tls http-types pcre-heavy - profunctors protolude QuickCheck safe-exceptions scientific - semigroups text unordered-containers vector + profunctors protolude QuickCheck safe-exceptions scientific text + unordered-containers vector ]; testHaskellDepends = [ aeson async base bytestring directory filepath hjsonpointer hspec - profunctors protolude QuickCheck semigroups text - unordered-containers vector wai-app-static warp + profunctors protolude QuickCheck text unordered-containers vector + wai-app-static warp ]; homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; @@ -116218,27 +116198,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.5.0.2"; - sha256 = "0pqg7a46j63n8gp4c2hsxh98f0xppfhaww00zbjy45zx8h2gb1qm"; - libraryHaskellDepends = [ base bytestring mmap vector ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck vector - ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap vector - ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_5_0_3" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector }: @@ -116257,7 +116216,6 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -119349,8 +119307,8 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.1.1"; - sha256 = "0drq4rzbljql51hc2d8ldsm6xhsj7imlsxclivmf3lr9lykkp0p1"; + version = "1.1.2"; + sha256 = "13iwy9pn3w3whg8hqy83mgbzcb156pz88nfcx4axkw9hpkh4810s"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/luna/impossible"; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; @@ -119584,8 +119542,8 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.2.5.3"; - sha256 = "0646hxjd25hpmffabbdp6bxa5720gd99hgg31ifcx8nprlm8sl7a"; + version = "0.2.5.4"; + sha256 = "0891m40bl9jlblfg3wf6fi3bgzfl9d8lhmab5s755mpp1bw9gr6w"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -119595,7 +119553,7 @@ self: { ]; homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -120055,7 +120013,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_1" = callPackage + "influxdb_1_6_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -120065,8 +120023,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.1"; - sha256 = "14xk27qg5w7pdrmbz7fys96x4yywv0hk82z46802dlnxlfpikyc3"; + version = "1.6.0.2"; + sha256 = "0f5lcwvs4cw7ipqw3da5baf2sw4m1a7g29iw3big5m93wc2flk38"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -130113,6 +130071,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lazy" = callPackage + ({ mkDerivation, base, comonad }: + mkDerivation { + pname = "lazy"; + version = "0.1"; + sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp"; + libraryHaskellDepends = [ base comonad ]; + homepage = "https://github.com/nikita-volkov/lazy"; + description = "Explicit laziness for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -140833,6 +140803,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microaeson" = callPackage + ({ mkDerivation, aeson, alex, array, base, bytestring, containers + , deepseq, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "microaeson"; + version = "0.1.0.0"; + sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; + libraryHaskellDepends = [ + array base bytestring containers deepseq text + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + aeson base bytestring containers QuickCheck quickcheck-instances + tasty tasty-quickcheck text unordered-containers vector + ]; + description = "A tiny JSON library with light dependency footprint"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "microbench" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -149062,6 +149053,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_2_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit + , unix + }: + mkDerivation { + pname = "network"; + version = "2.7.0.0"; + sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring directory doctest hspec HUnit + ]; + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -150622,8 +150631,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.1"; - sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx"; + version = "1.0.2"; + sha256 = "1n1f3p5hamvlc7jhl9m569d8li9kxqwkjmv5nn1mq1n1ldhdlwxj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153006,8 +153015,8 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "1.0.0.1"; - sha256 = "1fvpsiv5xdc7jamhdsaw2kzm32qrbg7c2b5s5zhhhcd7j4vgn3xq"; + version = "1.0.0.3"; + sha256 = "0i674vjbp03nkr76fdi7bjylv264nxwnxw0ija11fkpd1rdg045g"; libraryHaskellDepends = [ base bytestring Cabal containers directory http-types safe safe-exceptions template-haskell text unix wai @@ -155775,6 +155784,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "palette_0_3" = callPackage + ({ mkDerivation, array, base, colour, containers, MonadRandom }: + mkDerivation { + pname = "palette"; + version = "0.3"; + sha256 = "1wpzrhr3b9psa7b56ys34vnaag6z12xam2rymld2g8fd13jlkxh6"; + libraryHaskellDepends = [ + array base colour containers MonadRandom + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Utilities for choosing and creating color schemes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "palindromes" = callPackage ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { @@ -155928,41 +155952,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat - , bytestring, Cabal, containers, data-default, directory, filepath - , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec - , process, rfc5051, setenv, split, syb, tagsoup, temporary, text - , time, unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.14.3"; - sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers data-default directory - filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec - rfc5051 setenv split syb tagsoup text time unordered-containers - vector xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base base-compat bytestring filepath - pandoc pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base base-compat bytestring containers directory filepath mtl - pandoc pandoc-types process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_14_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat , bytestring, Cabal, containers, data-default, directory, filepath , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec @@ -155995,7 +155984,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -156462,27 +156450,27 @@ self: { "pansite" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default , directory, doctest, filepath, Glob, hspec, http-types, MissingH - , optparse-applicative, pandoc, pandoc-types, shake, split - , template-haskell, text, time, unordered-containers, vcs-revision - , vector, wai, wai-logger, warp, yaml + , optparse-applicative, pandoc, pandoc-types, QuickCheck, shake + , split, template-haskell, text, time, unordered-containers + , vcs-revision, vector, wai, wai-logger, warp, yaml }: mkDerivation { pname = "pansite"; - version = "0.1.0.0"; - sha256 = "1hm8lgcrr5my2h3n8yn40qmf9kghsaai1fjh4q8qxqlk4jsblvb5"; + version = "0.2.0.0"; + sha256 = "0y60pk4zryxllpv1h27ja7c7a91vd00g9p29ml2l7rvdgprcy5ar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring data-default split text unordered-containers - vector yaml + aeson base bytestring data-default MissingH shake split text + unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base blaze-html bytestring data-default directory filepath http-types MissingH optparse-applicative pandoc pandoc-types shake - template-haskell text time unordered-containers vcs-revision wai - wai-logger warp + split template-haskell text time unordered-containers vcs-revision + wai wai-logger warp ]; - testHaskellDepends = [ base doctest Glob hspec ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; homepage = "https://github.com/rcook/pansite#readme"; description = "Pansite: a simple web site management tool"; license = stdenv.lib.licenses.mit; @@ -157567,6 +157555,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parser-combinators_1_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "1.0.0"; + sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mrkkrp/parser-combinators"; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -159498,31 +159499,14 @@ self: { }) {}; "persistable-types-HDBC-pg" = callPackage - ({ mkDerivation, base, bytestring, convertible, HDBC - , persistable-record, relational-query-HDBC, text-postgresql - }: - mkDerivation { - pname = "persistable-types-HDBC-pg"; - version = "0.0.1.5"; - sha256 = "0kdrqn6j7vsq748j9j22g3wqxik9pfy3s3dgk4gd5bqnp4gv7949"; - libraryHaskellDepends = [ - base bytestring convertible HDBC persistable-record - relational-query-HDBC text-postgresql - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "HDBC and Relational-Record instances of PostgreSQL extended types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-types-HDBC-pg_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC , text-postgresql }: mkDerivation { pname = "persistable-types-HDBC-pg"; - version = "0.0.3.1"; - sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc"; + version = "0.0.3.2"; + sha256 = "0ddzmc19in35vxivgqp9yi8p2afvg67q2dwgl39pkw6camrqlh2r"; libraryHaskellDepends = [ base bytestring convertible dlist HDBC persistable-record relational-query relational-query-HDBC text-postgresql @@ -159533,7 +159517,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "HDBC and Relational-Record instances of PostgreSQL extended types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent_2_7_3_1" = callPackage @@ -160592,8 +160575,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.22.0"; - sha256 = "0ala51fps5yd1lk47blsbfby6sysnz2v39frmc53ggqzzlsls2q7"; + version = "0.0.23.0"; + sha256 = "139fjsyximny4ikgqrjxx9pg4spkz8s1fh6b3a9xgrsyya4r1sw7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160997,6 +160980,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pier" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary + , binary-orphans, bytestring, Cabal, containers, cryptohash-sha256 + , directory, hashable, http-client, http-client-tls, http-types + , optparse-applicative, process, shake, split, temporary, text + , transformers, unix, unordered-containers, yaml + }: + mkDerivation { + pname = "pier"; + version = "0.1.0.0"; + sha256 = "19l8ghpik8j8igh0xa8kcmn6zs6r4xa8yks60n8v37d6ksr5k9m6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary binary-orphans bytestring Cabal + containers cryptohash-sha256 directory hashable http-client + http-client-tls http-types process shake temporary text + transformers unix unordered-containers yaml + ]; + executableHaskellDepends = [ + base Cabal directory optparse-applicative shake split + unordered-containers + ]; + homepage = "https://github.com/judah/pier#readme"; + description = "Yet another Haskell build system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "piet" = callPackage ({ mkDerivation, array, base, containers, Imlib, mtl }: mkDerivation { @@ -162861,15 +162872,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "plot-light_0_3_2_1" = callPackage + "plot-light_0_3_3" = callPackage ({ mkDerivation, base, blaze-svg, colour, containers , data-default-class, hspec, mtl, QuickCheck, scientific, text , time }: mkDerivation { pname = "plot-light"; - version = "0.3.2.1"; - sha256 = "00gl17lsavwn1cglaa8jqzl1v3vczskkiz0zg51xg4g7v1v1irr7"; + version = "0.3.3"; + sha256 = "1ymfrrn28l6dbvw6m6j0cqxjb027ynhcc7b7y6i7bq4gq6rd60dz"; libraryHaskellDepends = [ base blaze-svg colour containers data-default-class mtl scientific text time @@ -167571,8 +167582,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.2.0"; - sha256 = "19q61qjmygjah49qjy4a89hpn8ra8z9pq0f72p1c7wzgk38zp55r"; + version = "3.2.2"; + sha256 = "1sswdhbfgh2pnhyixj03khp5ylsxkyisghyg0mqgb039kq1lxxci"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -168453,6 +168464,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_7_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq + , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue + , QuickCheck, random, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2, unordered-containers + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.7.0"; + sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree-psqueue ghc-prim + hashable mtl PSQueue random unordered-containers + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pstemmer" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -169776,6 +169811,38 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "qnap-decrypt" = callPackage + ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit + , conduit-extra, crypto-api, directory, filepath, hspec, HUnit + , optparse-applicative, streaming-commons, tagged, temporary + , utf8-string + }: + mkDerivation { + pname = "qnap-decrypt"; + version = "0.3.1"; + sha256 = "1ns5wz427ilw7xn886sw7ip9d1nbfqbs1qcgjm9cvdi5v5v89pi6"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory streaming-commons tagged utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory filepath optparse-applicative + streaming-commons tagged utf8-string + ]; + testHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory filepath hspec HUnit streaming-commons tagged + temporary utf8-string + ]; + homepage = "https://github.com/alexkazik/qnap-decrypt#readme"; + description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qq-literals" = callPackage ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { @@ -175595,6 +175662,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_11_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.11.1.0"; + sha256 = "1iydq7jdsizacvanvxdfad52vjaazb2awv2h3lyiqrsmva1y0qmq"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -177921,8 +178012,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.1.0"; - sha256 = "0mr78bd5xcq4gxc7vhz1k70gxbng2rbpip648fs4k0hb7gf2z0ds"; + version = "0.1.2.0"; + sha256 = "0449jjgw38dwf0lw3vq0ri3gh7mlzfjkajz8xdvxr76ffs9kncwq"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -180918,17 +181009,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; - "sbv_7_6" = callPackage + "sbv_7_7" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, data-binary-ieee754, deepseq, directory, doctest , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty , process, QuickCheck, random, syb, tasty, tasty-golden - , tasty-hunit, template-haskell, time, z3 + , tasty-hunit, tasty-quickcheck, template-haskell, time, z3 }: mkDerivation { pname = "sbv"; - version = "7.6"; - sha256 = "0ycrwmyi1ba5v71qjladn0mn2hlrxdswy5mlx2dxzhrf2r6k6zd9"; + version = "7.7"; + sha256 = "0yf68qyp29kxgpdx5xdyx64vkn0dvfrizn5hq2xgrik0v9vb1ja0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -180937,8 +181028,8 @@ self: { ]; testHaskellDepends = [ base bytestring containers data-binary-ieee754 directory doctest - filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit - template-haskell + filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell ]; testSystemDepends = [ z3 ]; homepage = "http://leventerkok.github.com/sbv/"; @@ -181714,6 +181805,8 @@ self: { pname = "scotty"; version = "0.11.1"; sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw"; + revision = "1"; + editedCabalFile = "0msb0ydgga07gicchs8k0f7d35gp18vrin649q6yqah75l5i2f9x"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -181866,8 +181959,8 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.2.0.1"; - sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj"; + version = "0.2.0.2"; + sha256 = "1lhaajsx34hlci76wjvab7a1sjd42silxsvf94ncf0pc0rmjqg1n"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; @@ -183279,7 +183372,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_5_0" = callPackage + "sensu-run_0_5_0_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, filepath , http-client, http-client-tls, http-types, lens, network , optparse-applicative, process, temporary, text, time, unix @@ -183287,8 +183380,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.5.0"; - sha256 = "0826al67dwzdyazqkvrcsbxdv6gg6zk52q32avfz7l8dlpswgr9m"; + version = "0.5.0.1"; + sha256 = "1kxdndaimwgj9mjjhb5z8kb36k4awby8a3h1dpghvas1l64i5dfl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186645,8 +186738,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.1"; - sha256 = "09gg30b8xiq2krz58lkavcgi1gybc5sn6snscdq8nj3qbxcvd0av"; + version = "2.11.0.2"; + sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy"; libraryHaskellDepends = [ base Cabal cdeps composition-prelude cpphs directory shake template-haskell @@ -188575,8 +188668,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.7.1"; - sha256 = "1h7acjqis9qrj4i5k4aspjjrd8a86bkhhcn6ib3aa8s384ar0wfv"; + version = "0.8"; + sha256 = "0w4adm7zjiqbzm0vg8ky4xyldid00grsnjf7n4pkw5a2fw81qi3d"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -190330,8 +190423,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "smtLib"; - version = "1.0.8"; - sha256 = "1a91ml428xxb9pd88vdw5cj076s13k864bk9kp48hb3l4a9ny09p"; + version = "1.0.9"; + sha256 = "19hfw5pgygka2wrnlr8s6wqpw92kz259lli83w1i7igw3v7vyzcc"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; license = stdenv.lib.licenses.bsd3; @@ -199307,19 +199400,19 @@ self: { }) {}; "superrecord" = callPackage - ({ mkDerivation, aeson, base, bookkeeper, constraints, criterion - , deepseq, ghc-prim, hspec, labels, mtl, text + ({ mkDerivation, aeson, base, bookkeeper, bytestring, constraints + , criterion, deepseq, ghc-prim, hspec, labels, mtl, text }: mkDerivation { pname = "superrecord"; - version = "0.3.0.0"; - sha256 = "1yya0lx3lqhr7pj3p72zi8xgjrqlrsrs9b6ilrskzkh0gjqcfjw5"; + version = "0.5.0.0"; + sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a"; libraryHaskellDepends = [ - aeson base constraints deepseq ghc-prim mtl text + aeson base bytestring constraints deepseq ghc-prim mtl text ]; - testHaskellDepends = [ aeson base hspec ]; + testHaskellDepends = [ aeson base hspec mtl text ]; benchmarkHaskellDepends = [ - aeson base bookkeeper criterion deepseq labels + aeson base bookkeeper criterion deepseq labels text ]; homepage = "https://github.com/agrafix/superrecord#readme"; description = "Supercharged anonymous records"; @@ -204167,11 +204260,14 @@ self: { }: mkDerivation { pname = "tersmu"; - version = "0.2.1"; - sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n"; - isLibrary = false; + version = "0.2.2"; + sha256 = "1wyrbggpgr6jyskvvkh12g6a440md1aqj405cxqhdmy0bzwz5cfn"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers mtl process syb transformers + ]; executableHaskellDepends = [ base containers mtl process syb transformers ]; @@ -204773,29 +204869,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.10.1.1"; - sha256 = "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_10_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -204816,7 +204889,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -214850,27 +214922,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, time, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.6.0"; - sha256 = "0rmklk2d2ip1mcizqn8j38lbqy58lc8h9hwigvab5ggilxpmnzgq"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec process stm time - transformers unix unliftio-core - ]; - homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_7_0" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath, hspec , process, stm, time, transformers, unix, unliftio-core }: @@ -214889,7 +214940,6 @@ self: { homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -216085,8 +216135,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.5.0"; - sha256 = "0rll7fv31bamnqcy3hcm8vdgzz5wjzlqhvz5lnbp1gfymx43jrga"; + version = "0.1.6.0"; + sha256 = "0qym7if90kp51f0mf8yxsw3csfpdp2mnp7aah3vc6wdh58gljva5"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -220268,27 +220318,6 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, containers - , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm - , text, token-bucket, transformers, wai, wai-extra - }: - mkDerivation { - pname = "wai-middleware-throttle"; - version = "0.2.2.0"; - sha256 = "0k5q6vziq67bscfrm1dx6i4wkvw30wa35mgdd7x1dzniibx87dva"; - libraryHaskellDepends = [ - base bytestring bytestring-builder containers hashable http-types - mtl network stm text token-bucket transformers wai - ]; - testHaskellDepends = [ - base bytestring hspec http-types HUnit QuickCheck stm transformers - wai wai-extra - ]; - description = "WAI Middleware for Request Throttling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-middleware-throttle_0_2_2_1" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, containers , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm , text, token-bucket, transformers, wai, wai-extra @@ -220307,7 +220336,6 @@ self: { ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-verbs" = callPackage @@ -220910,41 +220938,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.19"; - sha256 = "0laggqs2bjf4vn58fjpippbwd1i2z82ssmnyn6l0qb3q54d2fyqb"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network unix unix-compat - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_22" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date @@ -220977,7 +220970,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -222296,6 +222288,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weigh_0_0_11" = callPackage + ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: + mkDerivation { + pname = "weigh"; + version = "0.0.11"; + sha256 = "0q4l2npli78w3p74rsh56q1azwh07856ckip9v3vmw53xzx0n42l"; + libraryHaskellDepends = [ + base deepseq mtl process split temporary + ]; + testHaskellDepends = [ base deepseq ]; + homepage = "https://github.com/fpco/weigh#readme"; + description = "Measure allocations of a Haskell functions/values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weighted" = callPackage ({ mkDerivation, base, mtl, semiring-num, transformers }: mkDerivation { @@ -222697,26 +222705,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.2"; - sha256 = "0vf6jm5gw76hcrwrqmfrq8niwh4z5p2wg0j0rh74wn9vbs6cm8cl"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - homepage = "https://github.com/debug-ito/wild-bind"; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_3" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -222734,7 +222722,6 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -228026,39 +228013,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , http-client, http-client-tls, http-reverse-proxy, http-types - , network, optparse-applicative, parsec, process, project-template - , resourcet, say, shakespeare, split, stm, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp - , warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0"; - sha256 = "096yxpb6dxy44s2ydf137rmd0b7zm5ww4yqkf7mnapslhc25wznn"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types network optparse-applicative parsec - process project-template resourcet say shakespeare split stm - streaming-commons tar template-haskell text time transformers - transformers-compat unix-compat unliftio unordered-containers wai - wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-bin_1_6_0_2" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, Cabal, conduit, conduit-extra, containers , data-default-class, directory, file-embed, filepath, fsnotify @@ -228234,46 +228188,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec - , hspec-expectations, http-types, HUnit, monad-logger, mtl, network - , old-locale, parsec, path-pieces, primitive, QuickCheck, random - , resourcet, safe, semigroups, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.3"; - sha256 = "0k2gwnbrpwwbna03bbi53fppgyn7x5g9167jyjcfyjb8qfn4pwxg"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq deepseq-generics directory fast-logger - http-types monad-logger mtl old-locale parsec path-pieces primitive - random resourcet safe semigroups shakespeare template-haskell text - time transformers unix-compat unliftio unordered-containers vector - wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces QuickCheck random resourcet shakespeare - streaming-commons template-haskell text transformers unliftio wai - wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_4" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -228311,7 +228225,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -228606,8 +228519,8 @@ self: { ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "0.1.0.2"; - sha256 = "0lsdvs33xsy7ipr44calfhyf375mkq7h3axi39q91f28r76iy6cf"; + version = "0.1.1"; + sha256 = "17bdd0pmhpj85w7vc7vzzb3iggl3azr1jzpkmy9x9mxdl1birgmg"; libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme"; description = "renderBootstrap4"; @@ -229536,33 +229449,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, conduit, containers - , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , network, persistent, pretty-show, semigroups, text, time - , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.2"; - sha256 = "172m7nafq8w1j3cm6p110vlxzy14y6pgm8ica357b1qn0wvzd39x"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network persistent pretty-show semigroups text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_3" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit @@ -229587,7 +229473,6 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -230626,14 +230511,16 @@ self: { }: mkDerivation { pname = "z3"; - version = "4.2.0"; - sha256 = "1rzdsn54508y6w965a8y2g118ylx6588gxbdi3dd9ihqh9mdzg31"; + version = "4.3"; + sha256 = "1c29zzc6y7l169hdj9278z95530h6hc161fxgfn4zlxs3k5611d1"; + revision = "1"; + editedCabalFile = "0spg0sqqra4h5k5zagmmhh0sh10p3bzrhgrfspcd3i5c7yymwagb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://bitbucket.org/iago/z3-haskell"; + homepage = "https://github.com/IagoAbal/haskell-z3"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; }) {gomp = null; inherit (pkgs) z3;}; @@ -230873,6 +230760,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zeromq;}; + "zeromq4-clone-pattern" = callPackage + ({ mkDerivation, async, base, binary, bytestring, exceptions + , QuickCheck, stm, test-framework, test-framework-quickcheck2 + , transformers, zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-clone-pattern"; + version = "0.1.0.0"; + sha256 = "1czc3p9s3jqmjmvasqcraqv0fjn2j7s3qj59l35cb1nd8gvxzmyg"; + revision = "1"; + editedCabalFile = "01shrkqnl65lbj3vaj96hm6vbvw0qp0jwdaza5hwzwwlzarfylaa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring exceptions stm transformers + zeromq4-haskell + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + async base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/hverr/zeromq4-clone-pattern#readme"; + description = "Haskell implementation of the ZeroMQ clone pattern"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeromq4-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base , monad-control, mtl, resourcet, semigroups, transformers @@ -230915,6 +230829,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) zeromq;}; + "zeromq4-patterns" = callPackage + ({ mkDerivation, async, base, binary, bytestring, exceptions + , QuickCheck, stm, test-framework, test-framework-quickcheck2 + , zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-patterns"; + version = "0.3.0.0"; + sha256 = "0y5rk13rzmyfxrxbkn38klzxgnbmqi2xg69m5l2gb2gqrza8szy7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring exceptions stm zeromq4-haskell + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + async base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/hverr/zeromq4-patterns#readme"; + description = "Haskell implementation of several ZeroMQ patterns"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath , haskell-src-exts, hskeleton, monoid-record, process, syb From 59490ae47235a6248863c4cb48ea53cdf22d72c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 May 2018 09:30:23 +0200 Subject: [PATCH 108/181] haskell-brick: update override for ghc 8.4.x --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index da65c269822..cf103628312 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -555,7 +555,7 @@ self: super: { }); # Older versions don't compile. - brick = self.brick_0_36_2; + brick = self.brick_0_36_3; HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; hspec-smallcheck = self.hspec-smallcheck_0_5_2; From 16e46207ec55a9610f5f08bb7f07966b13742ff7 Mon Sep 17 00:00:00 2001 From: tilpner Date: Tue, 1 May 2018 10:36:38 +0200 Subject: [PATCH 109/181] goxel: don't save imgui.ini to working directory --- pkgs/applications/graphics/goxel/default.nix | 2 ++ .../graphics/goxel/disable-imgui_ini.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/graphics/goxel/disable-imgui_ini.patch diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 03f7b515747..3d49452cbe6 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; }; + patches = [ ./disable-imgui_ini.patch ]; + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch new file mode 100644 index 00000000000..9427d45487d --- /dev/null +++ b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui.cpp b/src/gui.cpp +index 9b7236c..a8a11b2 100644 +--- a/src/gui.cpp ++++ b/src/gui.cpp +@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs) + ImGuiIO& io = ImGui::GetIO(); + io.DeltaTime = 1.0f/60.0f; + ++ io.IniFilename = NULL; ++ + io.KeyMap[ImGuiKey_Tab] = KEY_TAB; + io.KeyMap[ImGuiKey_LeftArrow] = KEY_LEFT; + io.KeyMap[ImGuiKey_RightArrow] = KEY_RIGHT; From b4d0647752cbc50b919fbd6723aa9d4068952c13 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Apr 2018 14:21:21 +0000 Subject: [PATCH 110/181] coqPackages.mathcomp: 1.6.4 -> 1.7.0 --- .../coq-modules/autosubst/default.nix | 5 +++- .../coq-modules/coquelicot/default.nix | 4 ++- .../coq-modules/interval/default.nix | 5 +++- .../coq-modules/mathcomp/default.nix | 26 +++++++++---------- .../coq-modules/mathcomp/generic.nix | 4 +-- .../coq-modules/ssreflect/default.nix | 26 +++++++++---------- .../coq-modules/ssreflect/generic.nix | 4 +-- 7 files changed, 41 insertions(+), 33 deletions(-) diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 75e78d8ac44..9c24e77e0f7 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; - passthru = { inherit (mathcomp) compatibleCoqVersions; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 2e6c95bfe3c..c4dc8b5fc5b 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { inherit (coq.meta) platforms; }; - passthru = { inherit (ssreflect) compatibleCoqVersions; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index b1036e61f1b..6797a71703b 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation { platforms = coq.meta.platforms; }; - passthru = { inherit (mathcomp) compatibleCoqVersions; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 79bced9ad0e..92c3c87774a 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,29 +1,29 @@ { callPackage, fetchurl, coq }: let param = + + let param_1_7 = { + version = "1.7.0"; + sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + }; in + { "8.5" = { version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; - "8.6" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; - - "8.7" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; + "8.6" = param_1_7; + "8.7" = param_1_7; + "8.8" = param_1_7; }."${coq.coq-version}" ; in callPackage ./generic.nix { name = "coq${coq.coq-version}-mathcomp-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; + src = fetchurl { + url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; + inherit (param) sha256; + }; } diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 5d39f9b3b0c..1cc5dc368da 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildFlags = stdenv.lib.optionalString withDoc "doc"; preBuild = '' - patchShebangs etc/utils/ssrcoqdep + patchShebangs etc/utils/ssrcoqdep || true cd mathcomp export COQBIN=${coq}/bin/ ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 3b53a2831e8..9e9c3c7957a 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,29 +1,29 @@ { callPackage, fetchurl, coq }: let param = + + let param_1_7 = { + version = "1.7.0"; + sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + }; in + { "8.5" = { version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; - "8.6" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; - - "8.7" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; + "8.6" = param_1_7; + "8.7" = param_1_7; + "8.8" = param_1_7; }."${coq.coq-version}" ; in callPackage ./generic.nix { name = "coq${coq.coq-version}-ssreflect-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; + src = fetchurl { + url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; + inherit (param) sha256; + }; } diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index ca20e17dd50..a44e81d3c19 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit patches; preBuild = '' - patchShebangs etc/utils/ssrcoqdep + patchShebangs etc/utils/ssrcoqdep || true cd mathcomp/ssreflect export COQBIN=${coq}/bin/ ''; @@ -43,7 +43,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; }; } From 9c01a7745093c8698c60df066bb50e6060ea1168 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 1 May 2018 09:13:59 +0000 Subject: [PATCH 111/181] gron: 0.5.1 -> 0.5.2 --- pkgs/development/tools/gron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 59f7360df2a..14c8f53a394 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gron-${version}"; - version = "0.5.1"; + version = "0.5.2"; owner = "tomnomnom"; repo = "gron"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; rev = "v${version}"; - sha256 = "1s688ynjddchviwbiggnfbw28s4wsff2941f4b1q1j7mfak7iym2"; + sha256 = "0nxcvih8n5a4f0a53dxaipab5ckqxgnsznzymhfw5kv4inr9v6j6"; }; goDeps = ./deps.nix; From 519b64592d5bd89c0975b44120b88ec2684d8352 Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Tue, 1 May 2018 02:36:36 -0700 Subject: [PATCH 112/181] hitch: init at 1.4.8 + service + test (#39358) Add the Hitch TLS reverse proxy as an option for TLS termination. --- maintainers/maintainer-list.nix | 5 + nixos/modules/module-list.nix | 1 + .../services/web-servers/hitch/default.nix | 108 ++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/hitch/default.nix | 33 ++++++ nixos/tests/hitch/example.pem | 53 +++++++++ nixos/tests/hitch/example/index.txt | 1 + pkgs/servers/hitch/default.nix | 23 ++++ pkgs/top-level/all-packages.nix | 2 + 9 files changed, 227 insertions(+) create mode 100644 nixos/modules/services/web-servers/hitch/default.nix create mode 100644 nixos/tests/hitch/default.nix create mode 100644 nixos/tests/hitch/example.pem create mode 100644 nixos/tests/hitch/example/index.txt create mode 100644 pkgs/servers/hitch/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aec6f67a919..14fd53b2f49 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1760,6 +1760,11 @@ github = "tftio"; name = "James Felix Black"; }; + jflanglois = { + email = "yourstruly@julienlanglois.me"; + github = "jflanglois"; + name = "Julien Langlois"; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b0889e62f7c..38f961c0467 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -651,6 +651,7 @@ ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix ./services/web-servers/fcgiwrap.nix + ./services/web-servers/hitch/default.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/cgit.nix ./services/web-servers/lighttpd/collectd.nix diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix new file mode 100644 index 00000000000..895d02827f7 --- /dev/null +++ b/nixos/modules/services/web-servers/hitch/default.nix @@ -0,0 +1,108 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.services.hitch; + ocspDir = lib.optionalString cfg.ocsp-stapling.enabled "/var/cache/hitch/ocsp"; + hitchConfig = with lib; pkgs.writeText "hitch.conf" (concatStringsSep "\n" [ + ("backend = \"${cfg.backend}\"") + (concatMapStrings (s: "frontend = \"${s}\"\n") cfg.frontend) + (concatMapStrings (s: "pem-file = \"${s}\"\n") cfg.pem-files) + ("ciphers = \"${cfg.ciphers}\"") + ("ocsp-dir = \"${ocspDir}\"") + "user = \"${cfg.user}\"" + "group = \"${cfg.group}\"" + cfg.extraConfig + ]); +in +with lib; +{ + options = { + services.hitch = { + enable = mkEnableOption "Hitch Server"; + + backend = mkOption { + type = types.str; + description = '' + The host and port Hitch connects to when receiving + a connection in the form [HOST]:PORT + ''; + }; + + ciphers = mkOption { + type = types.str; + default = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; + description = "The list of ciphers to use"; + }; + + frontend = mkOption { + type = types.either types.str (types.listOf types.str); + default = "[127.0.0.1]:443"; + description = '' + The port and interface of the listen endpoint in the ++ form [HOST]:PORT[+CERT]. + ''; + apply = toList; + }; + + pem-files = mkOption { + type = types.listOf types.path; + default = []; + description = "PEM files to use"; + }; + + ocsp-stapling = { + enabled = mkOption { + type = types.bool; + default = true; + description = "Whether to enable OCSP Stapling"; + }; + }; + + user = mkOption { + type = types.str; + default = "hitch"; + description = "The user to run as"; + }; + + group = mkOption { + type = types.str; + default = "hitch"; + description = "The group to run as"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional configuration lines"; + }; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.hitch = { + description = "Hitch"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + preStart = '' + ${pkgs.hitch}/sbin/hitch -t --config ${hitchConfig} + '' + (optionalString cfg.ocsp-stapling.enabled '' + mkdir -p ${ocspDir} + chown -R hitch:hitch ${ocspDir} + ''); + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.hitch}/sbin/hitch --daemon --config ${hitchConfig}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "always"; + RestartSec = "5s"; + LimitNOFILE = 131072; + }; + }; + + environment.systemPackages = [ pkgs.hitch ]; + + users.extraUsers.hitch.group = "hitch"; + users.extraGroups.hitch = {}; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index 4ad947f11d1..5b6640f1d3c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -297,6 +297,7 @@ in rec { tests.graphite = callTest tests/graphite.nix {}; tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; + tests.hitch = callTest tests/hitch {}; tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix new file mode 100644 index 00000000000..b024306cde5 --- /dev/null +++ b/nixos/tests/hitch/default.nix @@ -0,0 +1,33 @@ +import ../make-test.nix ({ pkgs, ... }: +{ + name = "hitch"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ jflanglois ]; + }; + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.hitch = { + enable = true; + backend = "[127.0.0.1]:80"; + pem-files = [ + ./example.pem + ]; + }; + + services.httpd = { + enable = true; + documentRoot = ./example; + adminAddr = "noone@testing.nowhere"; + }; + }; + + testScript = + '' + startAll; + + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('hitch.service'); + $machine->waitForOpenPort(443); + $machine->succeed('curl -k https://localhost:443/index.txt | grep "We are all good!"'); + ''; +}) diff --git a/nixos/tests/hitch/example.pem b/nixos/tests/hitch/example.pem new file mode 100644 index 00000000000..fde6f3cbd19 --- /dev/null +++ b/nixos/tests/hitch/example.pem @@ -0,0 +1,53 @@ +-----BEGIN CERTIFICATE----- +MIIEKTCCAxGgAwIBAgIJAIFAWQXSZ7lIMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD +VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UEBwwMUmVkd29vZCBD +aXR5MRkwFwYDVQQKDBBUZXN0aW5nIDEyMyBJbmMuMRQwEgYDVQQLDAtJVCBTZXJ2 +aWNlczEYMBYGA1UEAwwPdGVzdGluZy5ub3doZXJlMSQwIgYJKoZIhvcNAQkBFhVu +b29uZUB0ZXN0aW5nLm5vd2hlcmUwHhcNMTgwNDIzMDcxMTI5WhcNMTkwNDIzMDcx +MTI5WjCBqjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNV +BAcMDFJlZHdvb2QgQ2l0eTEZMBcGA1UECgwQVGVzdGluZyAxMjMgSW5jLjEUMBIG +A1UECwwLSVQgU2VydmljZXMxGDAWBgNVBAMMD3Rlc3Rpbmcubm93aGVyZTEkMCIG +CSqGSIb3DQEJARYVbm9vbmVAdGVzdGluZy5ub3doZXJlMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAxQq6AA9o/QErMbQwfgDF4mqXcvglRTwPr2zPE6Rv +1g0ncRBSMM8iKbPapHM6qHNfg2e1fU2SFqzD6HkyZqHHLCgLzkdzswEcEjsMqiUP +OR++5g4CWoQrdTi31itzYzCjnQ45BrAMrLEhBQgDTNwrEE+Tit0gpOGggtj/ktLk +OD8BKa640lkmWEUGF18fd3rYTUC4hwM5qhAVXTe21vj9ZWsgprpQKdN61v0dCUap +C5eAgvZ8Re+Cd0Id674hK4cJ4SekqfHKv/jLyIg3Vsdc9nkhmiC4O6KH5f1Zzq2i +E4Kd5mnJDFxfSzIErKWmbhriLWsj3KEJ983AGLJ9hxQTAwIDAQABo1AwTjAdBgNV +HQ4EFgQU76Mm6DP/BePJRQUNrJ9z038zjocwHwYDVR0jBBgwFoAU76Mm6DP/BePJ +RQUNrJ9z038zjocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAZzt +VdPaUqrvDAh5rMYqzYMJ3tj6daNYoX6CbTFoevK5J5D4FESM0D/FMKgpNiVz39kB +8Cjaw5rPHMHY61rHz7JRDK1sWXsonwzCF21BK7Tx0G1CIfLpYHWYb/FfdWGROx+O +hPgKuoMRWQB+txozkZp5BqWJmk5MOyFCDEXhMOmrfsJq0IYU6QaH3Lsf1oJRy4yU +afFrT9o3DLOyYLG/j/HXijCu8DVjZVa4aboum79ecYzPjjGF1posrFUnvQiuAeYy +t7cuHNUB8gW9lWR5J7tP8fzFWtIcyT2oRL8u3H+fXf0i4bW73wtOBOoeULBzBNE7 +6rphcSrQunSZQIc+hg== +-----END CERTIFICATE----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFCroAD2j9ASsx +tDB+AMXiapdy+CVFPA+vbM8TpG/WDSdxEFIwzyIps9qkczqoc1+DZ7V9TZIWrMPo +eTJmoccsKAvOR3OzARwSOwyqJQ85H77mDgJahCt1OLfWK3NjMKOdDjkGsAyssSEF +CANM3CsQT5OK3SCk4aCC2P+S0uQ4PwEprrjSWSZYRQYXXx93ethNQLiHAzmqEBVd +N7bW+P1layCmulAp03rW/R0JRqkLl4CC9nxF74J3Qh3rviErhwnhJ6Sp8cq/+MvI +iDdWx1z2eSGaILg7oofl/VnOraITgp3mackMXF9LMgSspaZuGuItayPcoQn3zcAY +sn2HFBMDAgMBAAECggEAcaR8HijFHpab+PC5vxJnDuz3KEHiDQpU6ZJR5DxEnCm+ +A8GsBaaRR4gJpCspO5o/DiS0Ue55QUanPt8XqIXJv7fhBznCiw0qyYDxDviMzR94 +FGskBFySS+tIa+dnh1+4HY7kaO0Egl0udB5o+N1KoP+kUsSyXSYcUxsgW+fx5FW9 +22Ya3HNWnWxMCSfSGGlTFXGj2whf25SkL25dM9iblO4ZOx4MX8kaXij7TaYy8hMM +Vf6/OMnXqtPKho+ctZZVKZkE9PxdS4f/pnp5EsdoOZwNBtfQ1WqVLWd3DlGWhnsH +7L8ZSP2HkoI4Pd1wtkpOKZc+yM2bFXWa8WY4TcmpUQKBgQD33HxGdtmtZehrexSA +/ZwWJlMslUsNz4Ivv6s7J4WCRhdh94+r9TWQP/yHdT9Ry5bvn84I5ZLUdp+aA962 +mvjz+GIglkCGpA7HU/hqurB1O63pj2cIDB8qhV21zjVIoqXcQ7IBJ+tqD79nF8vm +h3KfuHUhuu1rayGepbtIyNhLdwKBgQDLgw4TJBg/QB8RzYECk78QnfZpCExsQA/z +YJpc+dF2/nsid5R2u9jWzfmgHM2Jjo2/+ofRUaTqcFYU0K57CqmQkOLIzsbNQoYt +e2NOANNVHiZLuzTZC2r3BrrkNbo3YvQzhAesUA5lS6LfrxBLUKiwo2LU9NlmJs3b +UPVFYI0/1QKBgCswxIcS1sOcam+wNtZzWuuRKhUuvrFdY3YmlBPuwxj8Vb7AgMya +IgdM3xhLmgkKzPZchm6OcpOLSCxyWDDBuHfq5E6BYCUWGW0qeLNAbNdA2wFD99Qz +KIskSjwP/sD1dql3MmF5L1CABf5U6zb0i0jBv8ds50o8lNMsVgJM3UPpAoGBAL1+ +nzllb4pdi1CJWKnspoizfQCZsIdPM0r71V/jYY36MO+MBtpz2NlSWzAiAaQm74gl +oBdgfT2qMg0Zro11BSRONEykdOolGkj5TiMQk7b65s+3VeMPRZ8UTis2d9kgs5/Q +PVDODkl1nwfGu1ZVmW04BUujXVZHpYCkJm1eFMetAoGAImE7gWj+qRMhpbtCCGCg +z06gDKvMrF6S+GJsvUoSyM8oUtfdPodI6gWAC65NfYkIiqbpCaEVNzfui73f5Lnz +p5X1IbzhuH5UZs/k5A3OR2PPDbPs3lqEw7YJdBdLVRmO1o824uaXaJJwkL/1C+lq +8dh1wV3CnynNmZApkz4vpzQ= +-----END PRIVATE KEY----- diff --git a/nixos/tests/hitch/example/index.txt b/nixos/tests/hitch/example/index.txt new file mode 100644 index 00000000000..0478b1c2635 --- /dev/null +++ b/nixos/tests/hitch/example/index.txt @@ -0,0 +1 @@ +We are all good! diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix new file mode 100644 index 00000000000..366934829b8 --- /dev/null +++ b/pkgs/servers/hitch/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: +stdenv.mkDerivation rec { + version = "1.4.8"; + name = "hitch-${version}"; + + src = fetchurl { + url = "https://hitch-tls.org/source/${name}.tar.gz"; + sha256 = "1hqs5p69gr1lb3xldbrgq7d6d0vk4za0wpizlzybn98cv68acaym"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ docutils libev openssl ]; + + outputs = [ "out" "doc" "man" ]; + + meta = with stdenv.lib; { + description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software"; + homepage = https://hitch-tls.org/; + license = licenses.bsd2; + maintainers = [ maintainers.jflanglois ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20cf36a05f..4f9644f9bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5611,6 +5611,8 @@ with pkgs; varnishPackages = varnish5Packages; varnish = varnishPackages.varnish; + hitch = callPackage ../servers/hitch { }; + venus = callPackage ../tools/misc/venus { python = python27; }; From 175705b6ceec23b638965921582f54d3c75e8c65 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 May 2018 11:33:24 +0200 Subject: [PATCH 113/181] sshfs: 3.3.1 -> 3.3.2 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 6fd55c369d5..6f2fb68775d 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -5,14 +5,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; + sha256 = "01nrdprkqynk20yw6zdn6w8xv4hdw47g5d0v5qvfw0wls2kmadyr"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; From b8f9b2e55266d7f41b1056fb2238e4bc0b69f36e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 May 2018 11:41:50 +0200 Subject: [PATCH 114/181] androidStudioPackages.{dev,canary}: 3.2.0.11 -> 3.2.0.12 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 75385275ec8..630f5dd3447 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { - version = "3.2.0.11"; # "Android Studio 3.2 Canary 12" - build = "181.4729833"; - sha256Hash = "1b976m59d230pl35ajhdic46cw8qmnykkbrg3l7am7zmih0zk64c"; + version = "3.2.0.12"; # "Android Studio 3.2 Canary 13" + build = "181.4749738"; + sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10"; }; in rec { # Old alias From 3434cf40e12d8c99d35bd7ef4272ff7cf0f9a64c Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 24 Apr 2018 01:27:51 +0900 Subject: [PATCH 115/181] gnucash: 2.4.15 -> 3.1-1 --- pkgs/applications/office/gnucash/default.nix | 102 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 61 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 252c6d878d0..d12b1327e8f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,63 +1,81 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx -, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui -, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest +, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales +, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi +, libdbiDrivers, guile, perl, perlPackages }: -/* If you experience GConf errors when running GnuCash on NixOS, see - * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications - * for a possible solution. - */ +let + + # Enable gnc-fq-* to run in command line. + perlWrapper = stdenv.mkDerivation { + name = perl.name + "-wrapper-for-gnucash"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]); + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + for script in ${perl}/bin/*; do + makeWrapper $script $out''${script#${perl}} \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + done + ''; + }; + +in stdenv.mkDerivation rec { - name = "gnucash-2.4.15"; + name = "gnucash-${version}"; + version = "3.1-1"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; + sha256 = "0qfjpmr6hnr0v7l2fi00rilnlyan4kqiyygyidxlpdxqqg76dvx1"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml - libgnomeprint goffice enchant gettext intltool perl guile slibGuile - swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl - perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar - ]; - propagatedUserEnvPkgs = [ gconf ]; + nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + buildInputs = [ + boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales + webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi + libdbiDrivers guile perlWrapper + ]; + + propagatedUserEnvPkgs = [ dconf ]; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; postInstall = '' # Auto-updaters don't make sense in Nix. rm $out/bin/gnc-fq-update - sed -i $out/bin/update-gnucash-gconf \ - -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' + # Unnecessary in the release build. + rm $out/bin/gnucash-valgrind - for prog in $(echo "$out/bin/"*) - do - # Don't wrap the gnc-fq-* scripts, since gnucash calls them as - # "perl