diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 17b830e5fad0..5c2b495fa8e1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -47,6 +47,9 @@ /nixos/doc/manual/man-nixos-option.xml @nbp /nixos/modules/installer/tools/nixos-option.sh @nbp +# NixOS modules +/nixos/modules @Infinisil + # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index f22984cb56b0..ac0ad7125324 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -19,6 +19,7 @@ + diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml new file mode 100644 index 000000000000..d1c29c72f726 --- /dev/null +++ b/doc/languages-frameworks/ocaml.xml @@ -0,0 +1,101 @@ +
+ OCaml + + + OCaml libraries should be installed in + $(out)/lib/ocaml/${ocaml.version}/site-lib/. Such + directories are automatically added to the $OCAMLPATH + environment variable when building another package that depends on them + or when opening a nix-shell. + + + + Given that most of the OCaml ecosystem is now built with dune, + nixpkgs includes a convenience build support function called + buildDunePackage that will build an OCaml package + using dune, OCaml and findlib and any additional dependencies provided + as buildInputs or propagatedBuildInputs. + + + + Here is a simple package example. It defines an (optional) attribute + minimumOCamlVersion that will be used to throw a + descriptive evaluation error if building with an older OCaml is attempted. + It uses the fetchFromGitHub fetcher to get its source. + It sets the doCheck (optional) attribute to + true which means that tests will be run with + dune runtest -p angstrom after the build + (dune build -p angstrom) is complete. + It uses alcotest as a build input (because it is needed + to run the tests) and bigstringaf and + result as propagated build inputs (thus they will also + be available to libraries depending on this library). + The library will be installed using the angstrom.install + file that dune generates. + + + +{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, result, bigstringaf }: + +buildDunePackage rec { + pname = "angstrom"; + version = "0.10.0"; + + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "inhabitedtype"; + repo = pname; + rev = version; + sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw"; + }; + + buildInputs = [ alcotest ]; + propagatedBuildInputs = [ bigstringaf result ]; + doCheck = true; + + meta = { + homepage = https://github.com/inhabitedtype/angstrom; + description = "OCaml parser combinators built for speed and memory efficiency"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} + + + + Here is a second example, this time using a source archive generated with + dune-release. The unpackCmd + redefinition is necessary to be able to unpack the kind of tarball that + dune-release generates. This library does not depend + on any other OCaml library and no tests are run after building it. + + + +{ stdenv, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "wtf8"; + version = "1.0.1"; + + minimumOCamlVersion = "4.01"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; + }; + + unpackCmd = "tar xjf $src"; + + meta = with stdenv.lib; { + homepage = https://github.com/flowtype/ocaml-wtf8; + description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; + license = licenses.mit; + maintainers = [ maintainers.eqyiel ]; + }; +} + + +
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 858f5d9a763a..eefe46b15de1 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -484,11 +484,11 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as -respectively `python27`, `python35`, `python36` and `python37`. The PyPy interpreter -is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python37`. The default interpreter, `python`, maps to `python2`. -The Nix expressions for the interpreters can be found in -`pkgs/development/interpreters/python`. +respectively `python27`, `python35`, `python36`, and `python37`. The PyPy +interpreter is available as `pypy`. The aliases `python2` and `python3` +correspond to respectively `python27` and `python37`. The default interpreter, +`python`, maps to `python2`. The Nix expressions for the interpreters can be +found in `pkgs/development/interpreters/python`. All packages depending on any Python interpreter get appended `out/{python.sitePackages}` to `$PYTHONPATH` if such directory diff --git a/doc/meta.xml b/doc/meta.xml index 496b32916552..51c7b2dfc88f 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -250,6 +250,61 @@ meta.platforms = stdenv.lib.platforms.linux; + + + tests + + + + An attribute set with as values tests. A test is a derivation, which + builds successfully when the test passes, and fails to build otherwise. A + derivation that is a test requires some meta elements + to be defined: needsVMSupport (automatically filled-in + for NixOS tests) and timeout. + + + The NixOS tests are available as nixosTests in + parameters of derivations. For instance, the OpenSMTPD derivation + includes lines similar to: + +{ /* ... */, nixosTests }: +{ + # ... + meta.tests = { + basic-functionality-and-dovecot-integration = nixosTests.opensmtpd; + }; +} + + + + + + + timeout + + + + A timeout (in seconds) for building the derivation. If the derivation + takes longer than this time to build, it can fail due to breaking the + timeout. However, all computers do not have the same computing power, + hence some builders may decide to apply a multiplicative factor to this + value. When filling this value in, try to keep it approximately + consistent with other values already present in + nixpkgs. + + + + + + needsVMSupport + + + + A boolan that states whether the derivation requires build-time support + for Virtual Machine to build successfully. + + + hydraPlatforms diff --git a/doc/quick-start.xml b/doc/quick-start.xml index b9e6d789404a..8dd673ed2733 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -147,8 +147,8 @@ $ git add pkgs/development/libraries/libfoo/default.nix - You can use nix-prefetch-url (or similar - nix-prefetch-git, etc) url to get the + You can use nix-prefetch-url + url to get the SHA-256 hash of source distributions. There are similar commands as nix-prefetch-git and nix-prefetch-hg available in diff --git a/doc/stdenv.xml b/doc/stdenv.xml index b2f30bf08db1..ef45ec301a6b 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -618,7 +618,7 @@ let f(h, h + 1, i) = i + h - Variables affecting build properties + Attributes affecting build properties enableParallelBuilding @@ -637,21 +637,6 @@ let f(h, h + 1, i) = i + h - - - preferLocalBuild - - - - If set, specifies that the package is so lightweight in terms of build - operations (e.g. write a text file from a Nix string to the store) that - there's no need to look for it in binary caches -- it's faster to just - build it locally. It also tells Hydra and other facilities that this - package doesn't need to be exported in binary caches (noone would use it, - after all). - - - diff --git a/lib/licenses.nix b/lib/licenses.nix index 092cbbbdb25a..e3803c098c72 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -13,6 +13,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { * add it to this list. The URL mentioned above is a good source for inspiration. */ + abstyles = spdx { + spdxId = "Abstyles"; + fullName = "Abstyles License"; + }; + afl21 = spdx { spdxId = "AFL-2.1"; fullName = "Academic Free License v2.1"; diff --git a/lib/sources.nix b/lib/sources.nix index e64b23414e86..1a9f3f7d1f34 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -73,7 +73,7 @@ rec { # Get the commit id of a git repo # Example: commitIdFromGitRepo commitIdFromGitRepo = - let readCommitFromFile = path: file: + let readCommitFromFile = file: path: with builtins; let fileName = toString path + "/" + file; packedRefsName = toString path + "/packed-refs"; @@ -85,7 +85,7 @@ rec { matchRef = match "^ref: (.*)$" fileContent; in if isNull matchRef then fileContent - else readCommitFromFile path (lib.head matchRef) + else readCommitFromFile (lib.head matchRef) path # Sometimes, the file isn't there at all and has been packed away in the # packed-refs file, so we have to grep through it: else if lib.pathExists packedRefsName @@ -96,7 +96,7 @@ rec { then throw ("Could not find " + file + " in " + packedRefsName) else lib.head matchRef else throw ("Not a .git directory: " + path); - in lib.flip readCommitFromFile "HEAD"; + in readCommitFromFile "HEAD"; pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir); diff --git a/lib/types.nix b/lib/types.nix index ca6794e274c3..d1ece2402ad7 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -169,6 +169,9 @@ rec { # s32 = sign 32 4294967296; }; + # Alias of u16 for a port number + port = ints.u16; + float = mkOptionType rec { name = "float"; description = "floating point number"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60354432ad9b..47117ba8a7be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -624,6 +624,11 @@ github = "bramd"; name = "Bram Duvigneau"; }; + braydenjw = { + email = "nixpkgs@willenborg.ca"; + github = "braydenjw"; + name = "Brayden Willenborg"; + }; brian-dawn = { email = "brian.t.dawn@gmail.com"; github = "brian-dawn"; @@ -962,6 +967,11 @@ github = "danielfullmer"; name = "Daniel Fullmer"; }; + das-g = { + email = "nixpkgs@raphael.dasgupta.ch"; + github = "das-g"; + name = "Raphael Das Gupta"; + }; das_j = { email = "janne@hess.ooo"; github = "dasJ"; @@ -1744,6 +1754,11 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hlolli = { + email = "hlolli@gmail.com"; + github = "hlolli"; + name = "Hlodver Sigurdsson"; + }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; @@ -2224,6 +2239,11 @@ github = "knedlsepp"; name = "Josef Kemetmüller"; }; + knl = { + email = "nikola@knezevic.co"; + github = "knl"; + name = "Nikola Knežević"; + }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; @@ -2671,6 +2691,11 @@ github = "melsigl"; name = "Melanie B. Sigl"; }; + melkor333 = { + email = "samuel@ton-kunst.ch"; + github = "melkor333"; + name = "Samuel Ruprecht"; + }; metabar = { email = "softs@metabarcoding.org"; name = "Celine Mercier"; @@ -2680,6 +2705,11 @@ github = "mgdelacroix"; name = "Miguel de la Cruz"; }; + mgregoire = { + email = "gregoire@martinache.net"; + github = "M-Gregoire"; + name = "Gregoire Martinache"; + }; mgttlinger = { email = "megoettlinger@gmail.com"; github = "mgttlinger"; @@ -3805,6 +3835,11 @@ github = "scolobb"; name = "Sergiu Ivanov"; }; + screendriver = { + email = "nix@echooff.de"; + github = "screendriver"; + name = "Christian Rackerseder"; + }; Scriptkiddi = { email = "nixos@scriptkiddi.de"; github = "scriptkiddi"; @@ -3988,6 +4023,11 @@ github = "spacefrogg"; name = "Michael Raitza"; }; + spacekookie = { + email = "kookie@spacekookie.de"; + github = "spacekookie"; + name = "Katharina Fey"; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; github = "spencerjanssen"; diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index e6c9eae11a72..d993e47bc914 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -106,7 +106,7 @@ - + types.ints.{u8, u16, u32} @@ -131,6 +131,17 @@ + + + types.port + + + + A port number. This type is an alias to + types.ints.u16. + + + diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index e194f96dcd64..5beca39e8bed 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -99,18 +99,18 @@ start org.nixos.nix-daemon. - - - The Syncthing state and configuration data has been moved from - services.syncthing.dataDir to the newly defined - services.syncthing.configDir, which default to - /var/lib/syncthing/.config/syncthing. - This change makes possible to share synced directories using ACLs - without Syncthing resetting the permission on every start. - - + + + The Syncthing state and configuration data has been moved from + services.syncthing.dataDir to the newly defined + services.syncthing.configDir, which default to + /var/lib/syncthing/.config/syncthing. + This change makes possible to share synced directories using ACLs + without Syncthing resetting the permission on every start. + + Package rabbitmq_server is renamed to @@ -199,6 +199,13 @@ these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading. + + + Package ckb is renamed to ckb-next, + and options hardware.ckb.* are renamed to + hardware.ckb-next.*. + + @@ -226,6 +233,19 @@ supports loading TrueCrypt volumes. + + + The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. + This change is made in accordance with Kubernetes making CoreDNS the official default + starting from + Kubernetes v1.11. + Please beware that upgrading DNS-addon on existing clusters might induce + minor downtime while the DNS-addon terminates and re-initializes. + Also note that the DNS-service now runs with 2 pod replicas by default. + The desired number of replicas can be configured using: + . + + diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 42a0c60c7e19..8cdf4150057e 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -69,7 +69,9 @@ in rec { mkdir -p $out/coverage-data mv $i $out/coverage-data/$(dirname $(dirname $i)) done - ''; # */ + ''; + + meta.needsVMSupport = true; }; diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb-next.nix similarity index 64% rename from nixos/modules/hardware/ckb.nix rename to nixos/modules/hardware/ckb-next.nix index 8429572a8822..a275fb8fd604 100644 --- a/nixos/modules/hardware/ckb.nix +++ b/nixos/modules/hardware/ckb-next.nix @@ -3,17 +3,17 @@ with lib; let - cfg = config.hardware.ckb; + cfg = config.hardware.ckb-next; in { - options.hardware.ckb = { + options.hardware.ckb-next = { enable = mkEnableOption "the Corsair keyboard/mouse driver"; package = mkOption { type = types.package; - default = pkgs.ckb; - defaultText = "pkgs.ckb"; + default = pkgs.ckb-next; + defaultText = "pkgs.ckb-next"; description = '' The package implementing the Corsair keyboard/mouse driver. ''; @@ -23,12 +23,12 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - systemd.services.ckb = { - description = "Corsair Keyboard Daemon"; + systemd.services.ckb-next = { + description = "Corsair Keyboards and Mice Daemon"; wantedBy = ["multi-user.target"]; - script = "${cfg.package}/bin/ckb-daemon"; + script = "exec ${cfg.package}/bin/ckb-next-daemon"; serviceConfig = { - Restart = "always"; + Restart = "on-failure"; StandardOutput = "syslog"; }; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 6e7f0a007bc2..446a311807cc 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -334,6 +334,7 @@ slurm = 307; kapacitor = 308; solr = 309; + alerta = 310; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -628,6 +629,7 @@ slurm = 307; kapacitor = 308; solr = 309; + alerta = 310; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 37e90232da2a..2fbde1c451ce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -34,7 +34,7 @@ ./config/zram.nix ./hardware/all-firmware.nix ./hardware/brightnessctl.nix - ./hardware/ckb.nix + ./hardware/ckb-next.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix ./hardware/digitalbitbox.nix @@ -90,6 +90,7 @@ ./programs/criu.nix ./programs/dconf.nix ./programs/digitalbitbox/default.nix + ./programs/dmrconfig.nix ./programs/environment.nix ./programs/firejail.nix ./programs/fish.nix @@ -419,6 +420,7 @@ ./services/misc/weechat.nix ./services/misc/xmr-stak.nix ./services/misc/zookeeper.nix + ./services/monitoring/alerta.nix ./services/monitoring/apcupsd.nix ./services/monitoring/arbtt.nix ./services/monitoring/bosun.nix @@ -429,6 +431,7 @@ ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix + ./services/monitoring/grafana-reporter.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix ./services/monitoring/heapster.nix diff --git a/nixos/modules/programs/dmrconfig.nix b/nixos/modules/programs/dmrconfig.nix new file mode 100644 index 000000000000..e48a4f318370 --- /dev/null +++ b/nixos/modules/programs/dmrconfig.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.dmrconfig; + +in { + meta.maintainers = [ maintainers.etu ]; + + ###### interface + options = { + programs.dmrconfig = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to configure system to enable use of dmrconfig. This + enables the required udev rules and installs the program. + ''; + relatedPackages = [ "dmrconfig" ]; + }; + + package = mkOption { + default = pkgs.dmrconfig; + type = types.package; + defaultText = "pkgs.dmrconfig"; + description = "dmrconfig derivation to use"; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aa2b5c0b2dfb..dc0a175d5bb8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -282,6 +282,10 @@ with lib; (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ]) + # ckb + (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ]) + (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ]) + ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" "snmpExporter" "unifiExporter" "varnishExporter" ] diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index a0565ca26204..24cad6128260 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -346,8 +346,12 @@ in { description = "Bacula File Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.bacula ]; - serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}"; - serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + serviceConfig = { + ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + LogsDirectory = "bacula"; + StateDirectory = "bacula"; + }; }; systemd.services.bacula-sd = mkIf sd_cfg.enable { @@ -355,8 +359,12 @@ in { description = "Bacula Storage Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.bacula ]; - serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}"; - serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + serviceConfig = { + ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + LogsDirectory = "bacula"; + StateDirectory = "bacula"; + }; }; services.postgresql.enable = dir_cfg.enable == true; @@ -366,8 +374,12 @@ in { description = "Bacula Director Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.bacula ]; - serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}"; - serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + serviceConfig = { + ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + LogsDirectory = "bacula"; + StateDirectory = "bacula"; + }; preStart = '' if ! test -e "${libDir}/db-created"; then ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole bacula diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix index 43bbb50a48d4..5a3e281ea694 100644 --- a/nixos/modules/services/cluster/kubernetes/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/dns.nix @@ -3,8 +3,13 @@ with lib; let - version = "1.14.10"; + version = "1.2.5"; cfg = config.services.kubernetes.addons.dns; + ports = { + dns = 10053; + health = 10054; + metrics = 10055; + }; in { options.services.kubernetes.addons.dns = { enable = mkEnableOption "kubernetes dns addon"; @@ -27,49 +32,130 @@ in { type = types.str; }; - kube-dns = mkOption { - description = "Docker image to seed for the kube-dns main container."; - type = types.attrs; - default = { - imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64"; - imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8"; - finalImageTag = version; - sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj"; - }; + replicas = mkOption { + description = "Number of DNS pod replicas to deploy in the cluster."; + default = 2; + type = types.int; }; - dnsmasq-nanny = mkOption { - description = "Docker image to seed for the kube-dns dnsmasq container."; + coredns = mkOption { + description = "Docker image to seed for the CoreDNS container."; type = types.attrs; default = { - imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64"; - imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8"; + imageName = "coredns/coredns"; + imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6"; finalImageTag = version; - sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1"; - }; - }; - - sidecar = mkOption { - description = "Docker image to seed for the kube-dns sidecar container."; - type = types.attrs; - default = { - imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64"; - imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4"; - finalImageTag = version; - sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0"; + sha256 = "13q19rgwapv27xcs664dw502254yw4zw63insf6g2danidv2mg6i"; }; }; }; config = mkIf cfg.enable { - services.kubernetes.kubelet.seedDockerImages = with pkgs.dockerTools; [ - (pullImage cfg.kube-dns) - (pullImage cfg.dnsmasq-nanny) - (pullImage cfg.sidecar) - ]; + services.kubernetes.kubelet.seedDockerImages = + singleton (pkgs.dockerTools.pullImage cfg.coredns); services.kubernetes.addonManager.addons = { - kubedns-deployment = { + coredns-sa = { + apiVersion = "v1"; + kind = "ServiceAccount"; + metadata = { + labels = { + "addonmanager.kubernetes.io/mode" = "Reconcile"; + "k8s-app" = "kube-dns"; + "kubernetes.io/cluster-service" = "true"; + }; + name = "coredns"; + namespace = "kube-system"; + }; + }; + + coredns-cr = { + apiVersion = "rbac.authorization.k8s.io/v1beta1"; + kind = "ClusterRole"; + metadata = { + labels = { + "addonmanager.kubernetes.io/mode" = "Reconcile"; + "k8s-app" = "kube-dns"; + "kubernetes.io/cluster-service" = "true"; + "kubernetes.io/bootstrapping" = "rbac-defaults"; + }; + name = "system:coredns"; + }; + rules = [ + { + apiGroups = [ "" ]; + resources = [ "endpoints" "services" "pods" "namespaces" ]; + verbs = [ "list" "watch" ]; + } + { + apiGroups = [ "" ]; + resources = [ "nodes" ]; + verbs = [ "get" ]; + } + ]; + }; + + coredns-crb = { + apiVersion = "rbac.authorization.k8s.io/v1beta1"; + kind = "ClusterRoleBinding"; + metadata = { + annotations = { + "rbac.authorization.kubernetes.io/autoupdate" = "true"; + }; + labels = { + "addonmanager.kubernetes.io/mode" = "Reconcile"; + "k8s-app" = "kube-dns"; + "kubernetes.io/cluster-service" = "true"; + "kubernetes.io/bootstrapping" = "rbac-defaults"; + }; + name = "system:coredns"; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "system:coredns"; + }; + subjects = [ + { + kind = "ServiceAccount"; + name = "coredns"; + namespace = "kube-system"; + } + ]; + }; + + coredns-cm = { + apiVersion = "v1"; + kind = "ConfigMap"; + metadata = { + labels = { + "addonmanager.kubernetes.io/mode" = "Reconcile"; + "k8s-app" = "kube-dns"; + "kubernetes.io/cluster-service" = "true"; + }; + name = "coredns"; + namespace = "kube-system"; + }; + data = { + Corefile = ".:${toString ports.dns} { + errors + health :${toString ports.health} + kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa { + pods insecure + upstream + fallthrough in-addr.arpa ip6.arpa + } + prometheus :${toString ports.metrics} + proxy . /etc/resolv.conf + cache 30 + loop + reload + loadbalance + }"; + }; + }; + + coredns-deploy = { apiVersion = "extensions/v1beta1"; kind = "Deployment"; metadata = { @@ -77,182 +163,96 @@ in { "addonmanager.kubernetes.io/mode" = "Reconcile"; "k8s-app" = "kube-dns"; "kubernetes.io/cluster-service" = "true"; + "kubernetes.io/name" = "CoreDNS"; }; - name = "kube-dns"; + name = "coredns"; namespace = "kube-system"; }; spec = { - selector.matchLabels."k8s-app" = "kube-dns"; + replicas = cfg.replicas; + selector = { + matchLabels = { k8s-app = "kube-dns"; }; + }; strategy = { - rollingUpdate = { - maxSurge = "10%"; - maxUnavailable = 0; - }; + rollingUpdate = { maxUnavailable = 1; }; + type = "RollingUpdate"; }; template = { metadata = { - annotations."scheduler.alpha.kubernetes.io/critical-pod" = ""; - labels.k8s-app = "kube-dns"; + labels = { + k8s-app = "kube-dns"; + }; }; spec = { - priorityClassName = "system-cluster-critical"; containers = [ { - name = "kubedns"; - image = with cfg.kube-dns; "${imageName}:${finalImageTag}"; + args = [ "-conf" "/etc/coredns/Corefile" ]; + image = with cfg.coredns; "${imageName}:${finalImageTag}"; + imagePullPolicy = "Never"; + livenessProbe = { + failureThreshold = 5; + httpGet = { + path = "/health"; + port = ports.health; + scheme = "HTTP"; + }; + initialDelaySeconds = 60; + successThreshold = 1; + timeoutSeconds = 5; + }; + name = "coredns"; + ports = [ + { + containerPort = ports.dns; + name = "dns"; + protocol = "UDP"; + } + { + containerPort = ports.dns; + name = "dns-tcp"; + protocol = "TCP"; + } + { + containerPort = ports.metrics; + name = "metrics"; + protocol = "TCP"; + } + ]; resources = { - limits.memory = "170Mi"; + limits = { + memory = "170Mi"; + }; requests = { cpu = "100m"; memory = "70Mi"; }; }; - livenessProbe = { - failureThreshold = 5; - httpGet = { - path = "/healthcheck/kubedns"; - port = 10054; - scheme = "HTTP"; - }; - initialDelaySeconds = 60; - successThreshold = 1; - timeoutSeconds = 5; - }; - readinessProbe = { - httpGet = { - path = "/readiness"; - port = 8081; - scheme = "HTTP"; - }; - initialDelaySeconds = 3; - timeoutSeconds = 5; - }; - args = [ - "--domain=${cfg.clusterDomain}" - "--dns-port=10053" - "--config-dir=/kube-dns-config" - "--v=2" - ]; - env = [ - { - name = "PROMETHEUS_PORT"; - value = "10055"; - } - ]; - ports = [ - { - containerPort = 10053; - name = "dns-local"; - protocol = "UDP"; - } - { - containerPort = 10053; - name = "dns-tcp-local"; - protocol = "TCP"; - } - { - containerPort = 10055; - name = "metrics"; - protocol = "TCP"; - } - ]; - volumeMounts = [ - { - mountPath = "/kube-dns-config"; - name = "kube-dns-config"; - } - ]; - } - { - name = "dnsmasq"; - image = with cfg.dnsmasq-nanny; "${imageName}:${finalImageTag}"; - livenessProbe = { - httpGet = { - path = "/healthcheck/dnsmasq"; - port = 10054; - scheme = "HTTP"; - }; - initialDelaySeconds = 60; - timeoutSeconds = 5; - successThreshold = 1; - failureThreshold = 5; - }; - args = [ - "-v=2" - "-logtostderr" - "-configDir=/etc/k8s/dns/dnsmasq-nanny" - "-restartDnsmasq=true" - "--" - "-k" - "--cache-size=1000" - "--log-facility=-" - "--server=/${cfg.clusterDomain}/127.0.0.1#10053" - "--server=/in-addr.arpa/127.0.0.1#10053" - "--server=/ip6.arpa/127.0.0.1#10053" - ]; - ports = [ - { - containerPort = 53; - name = "dns"; - protocol = "UDP"; - } - { - containerPort = 53; - name = "dns-tcp"; - protocol = "TCP"; - } - ]; - resources = { - requests = { - cpu = "150m"; - memory = "20Mi"; + securityContext = { + allowPrivilegeEscalation = false; + capabilities = { + drop = [ "all" ]; }; + readOnlyRootFilesystem = true; }; volumeMounts = [ { - mountPath = "/etc/k8s/dns/dnsmasq-nanny"; - name = "kube-dns-config"; + mountPath = "/etc/coredns"; + name = "config-volume"; + readOnly = true; } ]; } - { - name = "sidecar"; - image = with cfg.sidecar; "${imageName}:${finalImageTag}"; - livenessProbe = { - httpGet = { - path = "/metrics"; - port = 10054; - scheme = "HTTP"; - }; - initialDelaySeconds = 60; - timeoutSeconds = 5; - successThreshold = 1; - failureThreshold = 5; - }; - args = [ - "--v=2" - "--logtostderr" - "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A" - "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A" - ]; - ports = [ - { - containerPort = 10054; - name = "metrics"; - protocol = "TCP"; - } - ]; - resources = { - requests = { - cpu = "10m"; - memory = "20Mi"; - }; - }; - } ]; dnsPolicy = "Default"; - serviceAccountName = "kube-dns"; + nodeSelector = { + "beta.kubernetes.io/os" = "linux"; + }; + serviceAccountName = "coredns"; tolerations = [ + { + effect = "NoSchedule"; + key = "node-role.kubernetes.io/master"; + } { key = "CriticalAddonsOnly"; operator = "Exists"; @@ -261,10 +261,15 @@ in { volumes = [ { configMap = { - name = "kube-dns"; - optional = true; + items = [ + { + key = "Corefile"; + path = "Corefile"; + } + ]; + name = "coredns"; }; - name = "kube-dns-config"; + name = "config-volume"; } ]; }; @@ -272,51 +277,40 @@ in { }; }; - kubedns-svc = { + coredns-svc = { apiVersion = "v1"; kind = "Service"; metadata = { + annotations = { + "prometheus.io/port" = toString ports.metrics; + "prometheus.io/scrape" = "true"; + }; labels = { "addonmanager.kubernetes.io/mode" = "Reconcile"; "k8s-app" = "kube-dns"; "kubernetes.io/cluster-service" = "true"; - "kubernetes.io/name" = "KubeDNS"; + "kubernetes.io/name" = "CoreDNS"; }; name = "kube-dns"; - namespace = "kube-system"; + namespace = "kube-system"; }; spec = { clusterIP = cfg.clusterIp; ports = [ - {name = "dns"; port = 53; protocol = "UDP";} - {name = "dns-tcp"; port = 53; protocol = "TCP";} + { + name = "dns"; + port = 53; + targetPort = ports.dns; + protocol = "UDP"; + } + { + name = "dns-tcp"; + port = 53; + targetPort = ports.dns; + protocol = "TCP"; + } ]; - selector.k8s-app = "kube-dns"; - }; - }; - - kubedns-sa = { - apiVersion = "v1"; - kind = "ServiceAccount"; - metadata = { - name = "kube-dns"; - namespace = "kube-system"; - labels = { - "kubernetes.io/cluster-service" = "true"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; - }; - }; - }; - - kubedns-cm = { - apiVersion = "v1"; - kind = "ConfigMap"; - metadata = { - name = "kube-dns"; - namespace = "kube-system"; - labels = { - "addonmanager.kubernetes.io/mode" = "EnsureExists"; - }; + selector = { k8s-app = "kube-dns"; }; }; }; }; diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index 9fcc00431865..f20860af6e12 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -145,6 +145,7 @@ in { systemd.services.jupyter = { description = "Jupyter development server"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; # TODO: Patch notebook so we can explicitly pass in a shell diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index d83d6f1f750c..1c37ae41e07d 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -6,6 +6,7 @@ let cfg = config.services.rspamd; opts = options.services.rspamd; + postfixCfg = config.services.postfix; bindSocketOpts = {options, config, ... }: { options = { @@ -58,7 +59,7 @@ let }; type = mkOption { type = types.nullOr (types.enum [ - "normal" "controller" "fuzzy_storage" "proxy" "lua" + "normal" "controller" "fuzzy_storage" "rspamd_proxy" "lua" ]); description = "The type of this worker"; }; @@ -99,19 +100,21 @@ let description = "Additional entries to put verbatim into worker section of rspamd config file."; }; }; - config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") { + config = mkIf (name == "normal" || name == "controller" || name == "fuzzy" || name == "rspamd_proxy") { type = mkDefault name; - includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ]; - bindSockets = mkDefault (if name == "normal" - then [{ - socket = "/run/rspamd/rspamd.sock"; - mode = "0660"; - owner = cfg.user; - group = cfg.group; - }] - else if name == "controller" - then [ "localhost:11334" ] - else [] ); + includes = mkDefault [ "$CONFDIR/worker-${if name == "rspamd_proxy" then "proxy" else name}.inc" ]; + bindSockets = + let + unixSocket = name: { + mode = "0660"; + socket = "/run/rspamd/${name}.sock"; + owner = cfg.user; + group = cfg.group; + }; + in mkDefault (if name == "normal" then [(unixSocket "rspamd")] + else if name == "controller" then [ "localhost:11334" ] + else if name == "rspamd_proxy" then [ (unixSocket "proxy") ] + else [] ); }; }; @@ -138,24 +141,31 @@ let .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" } - ${concatStringsSep "\n" (mapAttrsToList (name: value: '' - worker ${optionalString (value.name != "normal" && value.name != "controller") "${value.name}"} { + ${concatStringsSep "\n" (mapAttrsToList (name: value: let + includeName = if name == "rspamd_proxy" then "proxy" else name; + tryOverride = if value.extraConfig == "" then "true" else "false"; + in '' + worker "${value.type}" { type = "${value.type}"; ${optionalString (value.enable != null) "enabled = ${if value.enable != false then "yes" else "no"};"} ${mkBindSockets value.enable value.bindSockets} ${optionalString (value.count != null) "count = ${toString value.count};"} ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)} - ${value.extraConfig} + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-${includeName}.inc" + .include(try=${tryOverride}; priority=10) "$LOCAL_CONFDIR/override.d/worker-${includeName}.inc" } '') cfg.workers)} - ${cfg.extraConfig} + ${optionalString (cfg.extraConfig != "") '' + .include(priority=10) "$LOCAL_CONFDIR/override.d/extra-config.inc" + ''} ''; + filterFiles = files: filterAttrs (n: v: v.enable) files; rspamdDir = pkgs.linkFarm "etc-rspamd-dir" ( - (mapAttrsToList (name: file: { name = "local.d/${name}"; path = file.source; }) cfg.locals) ++ - (mapAttrsToList (name: file: { name = "override.d/${name}"; path = file.source; }) cfg.overrides) ++ + (mapAttrsToList (name: file: { name = "local.d/${name}"; path = file.source; }) (filterFiles cfg.locals)) ++ + (mapAttrsToList (name: file: { name = "override.d/${name}"; path = file.source; }) (filterFiles cfg.overrides)) ++ (optional (cfg.localLuaRules != null) { name = "rspamd.local.lua"; path = cfg.localLuaRules; }) ++ [ { name = "rspamd.conf"; path = rspamdConfFile; } ] ); @@ -188,6 +198,15 @@ let in mkDefault (pkgs.writeText name' config.text)); }; }; + + configOverrides = + (mapAttrs' (n: v: nameValuePair "worker-${if n == "rspamd_proxy" then "proxy" else n}.inc" { + text = v.extraConfig; + }) + (filterAttrs (n: v: v.extraConfig != "") cfg.workers)) + // (if cfg.extraConfig == "" then {} else { + "extra-config.inc".text = cfg.extraConfig; + }); in { @@ -207,7 +226,7 @@ in }; locals = mkOption { - type = with types; loaOf (submodule (configFileModule "locals")); + type = with types; attrsOf (submodule (configFileModule "locals")); default = {}; description = '' Local configuration files, written into /etc/rspamd/local.d/{name}. @@ -220,7 +239,7 @@ in }; overrides = mkOption { - type = with types; loaOf (submodule (configFileModule "overrides")); + type = with types; attrsOf (submodule (configFileModule "overrides")); default = {}; description = '' Overridden configuration files, written into /etc/rspamd/override.d/{name}. @@ -284,7 +303,7 @@ in description = '' User to use when no root privileges are required. ''; - }; + }; group = mkOption { type = types.string; @@ -292,7 +311,30 @@ in description = '' Group to use when no root privileges are required. ''; - }; + }; + + postfix = { + enable = mkOption { + type = types.bool; + default = false; + description = "Add rspamd milter to postfix main.conf"; + }; + + config = mkOption { + type = with types; attrsOf (either bool (either str (listOf str))); + description = '' + Addon to postfix configuration + ''; + default = { + smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; + non_smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; + }; + example = { + smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; + non_smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; + }; + }; + }; }; }; @@ -300,6 +342,25 @@ in ###### implementation config = mkIf cfg.enable { + services.rspamd.overrides = configOverrides; + services.rspamd.workers = mkIf cfg.postfix.enable { + controller = {}; + rspamd_proxy = { + bindSockets = [ { + mode = "0660"; + socket = "/run/rspamd/rspamd-milter.sock"; + owner = cfg.user; + group = postfixCfg.group; + } ]; + extraConfig = '' + upstream "local" { + default = yes; # Self-scan upstreams are always default + self_scan = yes; # Enable self-scan + } + ''; + }; + }; + services.postfix.config = mkIf cfg.postfix.enable cfg.postfix.config; # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index a222325579fe..7a10bd872994 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -6,6 +6,7 @@ let cfg = config.services.gitea; gitea = cfg.package; pg = config.services.postgresql; + useMysql = cfg.database.type == "mysql"; usePostgresql = cfg.database.type == "postgres"; configFile = pkgs.writeText "app.ini" '' APP_NAME = ${cfg.appName} @@ -14,7 +15,7 @@ let [database] DB_TYPE = ${cfg.database.type} - HOST = ${cfg.database.host}:${toString cfg.database.port} + HOST = ${if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port} NAME = ${cfg.database.name} USER = ${cfg.database.user} PASSWD = #dbpass# @@ -148,6 +149,13 @@ in ''; }; + socket = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/mysqld/mysqld.sock"; + description = "Path to the unix socket file to use for authentication."; + }; + path = mkOption { type = types.str; default = "${cfg.stateDir}/data/gitea.db"; @@ -253,7 +261,7 @@ in systemd.services.gitea = { description = "gitea"; - after = [ "network.target" "postgresql.service" ]; + after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; path = [ gitea.bin ]; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 5e171c08d893..973575570612 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -62,11 +62,15 @@ let ''} $extraOptions END - '' + optionalString cfg.checkConfig '' - echo "Checking that Nix can read nix.conf..." - ln -s $out ./nix.conf - NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null - ''); + '' + optionalString cfg.checkConfig ( + if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then '' + echo "Ignore nix.checkConfig when cross-compiling" + '' else '' + echo "Checking that Nix can read nix.conf..." + ln -s $out ./nix.conf + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null + '') + ); in diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index 2d1ff7bb4117..bce21e8acff3 100644 --- a/nixos/modules/services/misc/packagekit.nix +++ b/nixos/modules/services/misc/packagekit.nix @@ -6,11 +6,8 @@ let cfg = config.services.packagekit; - backend = "nix"; - packagekitConf = '' [Daemon] -DefaultBackend=${backend} KeepCache=false ''; diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix new file mode 100644 index 000000000000..8f4258e26ded --- /dev/null +++ b/nixos/modules/services/monitoring/alerta.nix @@ -0,0 +1,116 @@ +{ options, config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.alerta; + + alertaConf = pkgs.writeTextFile { + name = "alertad.conf"; + text = '' + DATABASE_URL = '${cfg.databaseUrl}' + DATABASE_NAME = '${cfg.databaseName}' + LOG_FILE = '${cfg.logDir}/alertad.log' + LOG_FORMAT = '%(asctime)s - %(name)s - %(levelname)s - %(message)s' + CORS_ORIGINS = [ ${concatMapStringsSep ", " (s: "\"" + s + "\"") cfg.corsOrigins} ]; + AUTH_REQUIRED = ${if cfg.authenticationRequired then "True" else "False"} + SIGNUP_ENABLED = ${if cfg.signupEnabled then "True" else "False"} + ${cfg.extraConfig} + ''; + }; +in +{ + options.services.alerta = { + enable = mkEnableOption "alerta"; + + port = mkOption { + type = types.int; + default = 5000; + description = "Port of Alerta"; + }; + + bind = mkOption { + type = types.str; + default = "0.0.0.0"; + example = literalExample "0.0.0.0"; + description = "Address to bind to. The default is to bind to all addresses"; + }; + + logDir = mkOption { + type = types.path; + description = "Location where the logfiles are stored"; + default = "/var/log/alerta"; + }; + + databaseUrl = mkOption { + type = types.str; + description = "URL of the MongoDB or PostgreSQL database to connect to"; + default = "mongodb://localhost"; + example = "mongodb://localhost"; + }; + + databaseName = mkOption { + type = types.str; + description = "Name of the database instance to connect to"; + default = "monitoring"; + example = "monitoring"; + }; + + corsOrigins = mkOption { + type = types.listOf types.str; + description = "List of URLs that can access the API for Cross-Origin Resource Sharing (CORS)"; + example = [ "http://localhost" "http://localhost:5000" ]; + default = [ "http://localhost" "http://localhost:5000" ]; + }; + + authenticationRequired = mkOption { + type = types.bool; + description = "Whether users must authenticate when using the web UI or command-line tool"; + default = false; + }; + + signupEnabled = mkOption { + type = types.bool; + description = "Whether to prevent sign-up of new users via the web UI"; + default = true; + }; + + extraConfig = mkOption { + description = "These lines go into alertad.conf verbatim."; + default = ""; + type = types.lines; + }; + }; + + config = mkIf cfg.enable { + systemd.services.alerta = { + description = "Alerta Monitoring System"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + environment = { + ALERTA_SVR_CONF_FILE = alertaConf; + }; + serviceConfig = { + ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}"; + User = "alerta"; + Group = "alerta"; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -p ${cfg.logDir} + chown alerta:alerta ${cfg.logDir} + ''; + }; + + environment.systemPackages = [ pkgs.python36Packages.alerta ]; + + users.users.alerta = { + uid = config.ids.uids.alerta; + description = "Alerta user"; + }; + + users.groups.alerta = { + gid = config.ids.gids.alerta; + }; + }; +} diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix new file mode 100644 index 000000000000..149026d20188 --- /dev/null +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -0,0 +1,66 @@ +{ options, config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.grafana_reporter; + +in { + options.services.grafana_reporter = { + enable = mkEnableOption "grafana_reporter"; + + grafana = { + protocol = mkOption { + description = "Grafana protocol."; + default = "http"; + type = types.enum ["http" "https"]; + }; + addr = mkOption { + description = "Grafana address."; + default = "127.0.0.1"; + type = types.str; + }; + port = mkOption { + description = "Grafana port."; + default = 3000; + type = types.int; + }; + + }; + addr = mkOption { + description = "Listening address."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Listening port."; + default = 8686; + type = types.int; + }; + + templateDir = mkOption { + description = "Optional template directory to use custom tex templates"; + default = "${pkgs.grafana_reporter}"; + type = types.str; + }; + }; + + config = mkIf cfg.enable { + systemd.services.grafana_reporter = { + description = "Grafana Reporter Service Daemon"; + wantedBy = ["multi-user.target"]; + after = ["network.target"]; + serviceConfig = let + args = lib.concatSepString " " [ + "-proto ${cfg.grafana.protocol}://" + "-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}" + "-port :${toString cfg.port}" + "-templates ${cfg.templateDir}" + ]; + in { + ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix index 1de0a8d5af2f..a4bdfa8f8053 100644 --- a/nixos/modules/services/monitoring/kapacitor.nix +++ b/nixos/modules/services/monitoring/kapacitor.nix @@ -42,6 +42,15 @@ let password = "${cfg.defaultDatabase.password}" ''} + ${optionalString (cfg.alerta.enable) '' + [alerta] + enabled = true + url = "${cfg.alerta.url}" + token = "${cfg.alerta.token}" + environment = "${cfg.alerta.environment}" + origin = "${cfg.alerta.origin}" + ''} + ${cfg.extraConfig} ''; }; @@ -120,6 +129,35 @@ in type = types.string; }; }; + + alerta = { + enable = mkEnableOption "kapacitor alerta integration"; + + url = mkOption { + description = "The URL to the Alerta REST API"; + default = "http://localhost:5000"; + example = "http://localhost:5000"; + type = types.string; + }; + + token = mkOption { + description = "Default Alerta authentication token"; + type = types.str; + default = ""; + }; + + environment = mkOption { + description = "Default Alerta environment"; + type = types.str; + default = "Production"; + }; + + origin = mkOption { + description = "Default origin of alert"; + type = types.str; + default = "kapacitor"; + }; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index d48e5c550abb..32e14ab21ffc 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -1,33 +1,30 @@ -# Monit system watcher -# http://mmonit.org/monit/ - {config, pkgs, lib, ...}: -let inherit (lib) mkOption mkIf; +with lib; + +let + cfg = config.services.monit; in { - options = { - services.monit = { - enable = mkOption { - default = false; - description = '' - Whether to run Monit system watcher. - ''; - }; - config = mkOption { - default = ""; - description = "monitrc content"; - }; + options.services.monit = { + + enable = mkEnableOption "Monit"; + + config = mkOption { + type = types.lines; + default = ""; + description = "monitrc content"; }; + }; - config = mkIf config.services.monit.enable { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.monit ]; environment.etc."monitrc" = { - text = config.services.monit.config; + text = cfg.config; mode = "0400"; }; diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 8ac9f801dcb8..adf59100f067 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -198,6 +198,9 @@ in install -m 0755 -d /var/log/glusterfs ''; + # glustereventsd uses the `gluster` executable + path = [ glusterfs ]; + serviceConfig = { Type="simple"; Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages"; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c16fbe8a52fa..5fab79f1b3d7 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -130,7 +130,7 @@ in }; ports = mkOption { - type = types.listOf types.int; + type = types.listOf types.port; default = [22]; description = '' Specifies on which ports the SSH daemon listens. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index c7e97bbeba9a..d0efdf88d73c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -171,7 +171,12 @@ in { dbhost = mkOption { type = types.nullOr types.str; default = "localhost"; - description = "Database host."; + description = '' + Database host. + + Note: for using Unix authentication with PostgreSQL, this should be + set to /tmp. + ''; }; dbport = mkOption { type = with types; nullOr (either int str); diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 3bc33a20a09f..6a4ac8128ab3 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -246,10 +246,7 @@ checkFS() { if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi # Don't check resilient COWs as they validate the fs structures at mount time - if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi - - # Skip fsck for bcachefs - not implemented yet. - if [ "$fsType" = bcachefs ]; then return 0; fi + if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. if [ "$fsType" = nilfs2 ]; then return 0; fi diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index b3690fad1a6a..9e4057b50897 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -230,6 +230,8 @@ in let fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; + # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces + escape = string: builtins.replaceStrings [ " " ] [ "\\040" ] string; in '' # This is a generated file. Do not edit! # @@ -238,10 +240,10 @@ in # Filesystems. ${concatMapStrings (fs: - (if fs.device != null then fs.device - else if fs.label != null then "/dev/disk/by-label/${fs.label}" + (if fs.device != null then escape fs.device + else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" else throw "No device specified for mount point ‘${fs.mountPoint}’.") - + " " + fs.mountPoint + + " " + escape fs.mountPoint + " " + fs.fsType + " " + builtins.concatStringsSep "," fs.options + " 0" diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 227707173a3d..5fda24adb978 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -1,26 +1,65 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let - inInitrd = any (fs: fs == "bcachefs") config.boot.initrd.supportedFilesystems; + bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; + + commonFunctions = '' + prompt() { + local name="$1" + printf "enter passphrase for $name: " + } + tryUnlock() { + local name="$1" + local path="$2" + if bcachefs unlock -c $path > /dev/null 2> /dev/null; then # test for encryption + prompt $name + until bcachefs unlock $path 2> /dev/null; do # repeat until sucessfully unlocked + printf "unlocking failed!\n" + prompt $name + done + printf "unlocking successful.\n" + fi + } + ''; + + openCommand = name: fs: + let + # we need only unlock one device manually, and cannot pass multiple at once + # remove this adaptation when bcachefs implements mounting by filesystem uuid + # also, implement automatic waiting for the constituent devices when that happens + # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) + firstDevice = head (splitString ":" fs.device); + in + '' + tryUnlock ${name} ${firstDevice} + ''; in { - config = mkIf (any (fs: fs == "bcachefs") config.boot.supportedFilesystems) { + config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ + { + system.fsPackages = [ pkgs.bcachefs-tools ]; - system.fsPackages = [ pkgs.bcachefs-tools ]; + # use kernel package with bcachefs support until it's in mainline + boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; + } - # use kernel package with bcachefs support until it's in mainline - boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; - boot.initrd.availableKernelModules = mkIf inInitrd [ "bcachefs" ]; + (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + # the cryptographic modules are required only for decryption attempts + boot.initrd.availableKernelModules = [ "bcachefs" "chacha20" "poly1305" ]; - boot.initrd.extraUtilsCommands = mkIf inInitrd - '' - copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/fsck.bcachefs + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs + ''; + boot.initrd.extraUtilsCommandsTest = '' + $out/bin/bcachefs version ''; - }; + boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs); + }) + ]); } diff --git a/nixos/release.nix b/nixos/release.nix index 4647f28be186..c2372da23f57 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -45,6 +45,7 @@ let system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; }; + makeModules = module: rest: [ configuration versionModule module rest ]; makeIso = { module, type, system, ... }: @@ -53,7 +54,9 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; + modules = makeModules module { + isoImage.isoBaseName = "nixos-${type}"; + }; }).config.system.build.isoImage); @@ -64,7 +67,7 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ]; + modules = makeModules module {}; }).config.system.build.sdImage); @@ -77,7 +80,7 @@ let config = (import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ]; + modules = makeModules module {}; }).config; tarball = config.system.build.tarball; @@ -97,7 +100,7 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ] ++ singleton + modules = makeModules module ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; @@ -108,7 +111,7 @@ let let configEvaled = import lib/eval-config.nix { inherit system; - modules = [ module versionModule ]; + modules = makeModules module {}; }; build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; @@ -301,6 +304,7 @@ in rec { tests.fsck = callTest tests/fsck.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; + tests.gitea = callSubTests tests/gitea.nix {}; tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; @@ -332,6 +336,7 @@ in rec { tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; + tests.incron = callTest tests/incron.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.kafka = callSubTests tests/kafka.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix new file mode 100644 index 000000000000..7ffe05ef3f1f --- /dev/null +++ b/nixos/tests/gitea.nix @@ -0,0 +1,74 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; + +{ + mysql = makeTest { + name = "gitea-mysql"; + meta.maintainers = [ maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.mysql.enable = true; + services.mysql.package = pkgs.mariadb; + services.mysql.ensureDatabases = [ "gitea" ]; + services.mysql.ensureUsers = [ + { name = "gitea"; + ensurePermissions = { "gitea.*" = "ALL PRIVILEGES"; }; + } + ]; + + services.gitea.enable = true; + services.gitea.database.type = "mysql"; + services.gitea.database.socket = "/run/mysqld/mysqld.sock"; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('gitea.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; + + postgres = makeTest { + name = "gitea-postgres"; + meta.maintainers = [ maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { + services.gitea.enable = true; + services.gitea.database.type = "postgres"; + services.gitea.database.password = "secret"; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('gitea.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; + + sqlite = makeTest { + name = "gitea-sqlite"; + meta.maintainers = [ maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.gitea.enable = true; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('gitea.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; +} diff --git a/nixos/tests/hydra/create-trivial-project.sh b/nixos/tests/hydra/create-trivial-project.sh index 3cca5665acc5..39122c9b473a 100755 --- a/nixos/tests/hydra/create-trivial-project.sh +++ b/nixos/tests/hydra/create-trivial-project.sh @@ -31,7 +31,8 @@ mycurl -X POST -d '@data.json' $URL/login -c hydra-cookie.txt cat >data.json <> /root/incron.log + ''; + + # ensure the directory to be monitored exists before incron is started + system.activationScripts.incronTest = '' + mkdir /test + ''; + }; + + testScript = '' + startAll; + + $machine->waitForUnit("multi-user.target"); + $machine->waitForUnit("incron.service"); + + $machine->succeed("test -d /test"); + # create some activity for incron to monitor + $machine->succeed("touch /test/file"); + $machine->succeed("echo foo >> /test/file"); + $machine->succeed("mv /test/file /root"); + $machine->succeed("mv /root/file /test"); + + $machine->sleep(1); + + # touch /test/file + $machine->succeed("grep '/test/file IN_CREATE' /root/incron.log"); + + # echo foo >> /test/file + $machine->succeed("grep '/test/file IN_MODIFY' /root/incron.log"); + $machine->succeed("grep '/test/file IN_CLOSE_WRITE' /root/incron.log"); + + # mv /test/file /root + $machine->succeed("grep '/test/file IN_MOVED_FROM' /root/incron.log"); + + # mv /root/file /test + $machine->succeed("grep '/test/file IN_MOVED_TO' /root/incron.log"); + + # ensure something unexpected is not present + $machine->fail("grep 'IN_OPEN' /root/incron.log"); + ''; +}) diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 30e1acd255a0..f25ea5b9ed84 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -87,7 +87,7 @@ let # check if pods are running $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running"); $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'kube-dns.*3/3'"); + $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'"); # check dns on host (dnsmasq) $machine1->succeed("host redis.default.svc.cluster.local"); @@ -111,7 +111,7 @@ let # check if pods are running $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running"); $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'kube-dns.*3/3'"); + $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'"); # check dns on hosts (dnsmasq) $machine1->succeed("host redis.default.svc.cluster.local"); diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 4d3479168f70..883ad7604941 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -120,4 +120,6 @@ import ./make-test.nix { $smtp2->waitUntilFails('smtpctl show queue | egrep .'); $client->succeed('check-mail-landed >&2'); ''; + + meta.timeout = 30; } diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index af765f37b91b..c2175f1bc257 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -28,6 +28,8 @@ let ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } sleep 10; $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf")); $machine->log($machine->succeed("systemctl cat rspamd.service")); $machine->log($machine->succeed("curl http://localhost:11334/auth")); $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); @@ -56,6 +58,8 @@ in ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf")); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); ''; @@ -78,6 +82,15 @@ in owner = "root"; group = "root"; }]; + workers.controller2 = { + type = "controller"; + bindSockets = [ "0.0.0.0:11335" ]; + extraConfig = '' + static_dir = "''${WWWDIR}"; + secure_ip = null; + password = "verysecretpassword"; + ''; + }; }; }; @@ -87,8 +100,14 @@ in ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'LOCAL_CONFDIR/override.d/worker-controller2.inc' /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("grep 'verysecretpassword' /etc/rspamd/override.d/worker-controller2.inc")); + $machine->waitUntilSucceeds("journalctl -u rspamd | grep -i 'starting controller process' >&2"); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + $machine->log($machine->succeed("curl http://localhost:11335/ping")); ''; }; customLuaRules = makeTest { @@ -110,16 +129,33 @@ in ''; services.rspamd = { enable = true; - locals."groups.conf".text = '' - group "cows" { - symbol { - NO_MUH = { - weight = 1.0; - description = "Mails should not muh"; + locals = { + "antivirus.conf" = mkIf false { text = '' + clamav { + action = "reject"; + symbol = "CLAM_VIRUS"; + type = "clamav"; + log_clean = true; + servers = "/run/clamav/clamd.ctl"; + } + '';}; + "redis.conf" = { + enable = false; + text = '' + servers = "127.0.0.1"; + ''; + }; + "groups.conf".text = '' + group "cows" { + symbol { + NO_MUH = { + weight = 1.0; + description = "Mails should not muh"; + } } } - } - ''; + ''; + }; localLuaRules = pkgs.writeText "rspamd.local.lua" '' local rspamd_logger = require "rspamd_logger" rspamd_config.NO_MUH = { @@ -152,6 +188,10 @@ in $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); $machine->log($machine->succeed("cat /etc/rspamd/rspamd.local.lua")); $machine->log($machine->succeed("cat /etc/rspamd/local.d/groups.conf")); + # Verify that redis.conf was not written + $machine->fail("cat /etc/rspamd/local.d/redis.conf >&2"); + # Verify that antivirus.conf was not written + $machine->fail("cat /etc/rspamd/local.d/antivirus.conf >&2"); ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } $machine->log($machine->succeed("curl --unix-socket /run/rspamd/rspamd.sock http://localhost/ping")); $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat")); @@ -162,4 +202,48 @@ in $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH")); ''; }; + postfixIntegration = makeTest { + name = "rspamd-postfix-integration"; + machine = { + environment.systemPackages = with pkgs; [ msmtp ]; + environment.etc."tests/gtube.eml".text = '' + From: Sheep1 + To: Sheep2 + Subject: Evil cows + + I find cows to be evil don't you? + + XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X + ''; + environment.etc."tests/example.eml".text = '' + From: Sheep1 + To: Sheep2 + Subject: Evil cows + + I find cows to be evil don't you? + ''; + users.users.tester.password = "test"; + services.postfix = { + enable = true; + destination = ["example.com"]; + }; + services.rspamd = { + enable = true; + postfix.enable = true; + }; + }; + testScript = '' + ${initMachine} + $machine->waitForOpenPort(11334); + $machine->waitForOpenPort(25); + ${checkSocket "/run/rspamd/rspamd-milter.sock" "rspamd" "postfix" "660" } + $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat")); + $machine->log($machine->succeed("msmtp --host=localhost -t --read-envelope-from < /etc/tests/example.eml")); + $machine->log($machine->fail("msmtp --host=localhost -t --read-envelope-from < /etc/tests/gtube.eml")); + + $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]'); + $machine->fail("journalctl -u postfix | grep -i error >&2"); + $machine->fail("journalctl -u postfix | grep -i warning >&2"); + ''; + }; } diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index edf7a313ff5f..44296d3c8b99 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bs1770gain-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; - sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii"; + sha256 = "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06"; }; buildInputs = [ ffmpeg sox ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index c8ac0a938efa..da3cff0bac24 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.11.0"; + version = "6.12.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18"; + sha256 = "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index f4160ff6f808..5d0af8cf17ab 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = https://github.com/espeak-ng/espeak-ng; + homepage = src.meta.homepage; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 8f3facec09b1..cec20743abdd 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "4.1.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "1sw2v2w3s79lbzhkf96m8lwvag824am7rwfzzsi8bz6sa6krmj0m"; + sha256 = "0pglqm2z7mp5igqmfnmvrgjhfbfrj8q5jvd0a0g2dzv3rqwfw4vc"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 0e636c532b46..3aea07235d8a 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -16,7 +16,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "7.1"; + version = "7.2"; in stdenv.mkDerivation rec { name = "gradio-${version}"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx"; + sha256 = "0c4vlrfl0ljkiwarpwa8wcfmmihh6a5j4pi4yr0qshyl9xxvxiv3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 8df2be1a0391..f68d93fa69d4 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.610"; + version = "0.9.611"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0nn4cjw0c2ysd3y2a7l08ybcd21v993wsz99f7w0881jhws3q5p4"; + sha256 = "1k78a26sld0xd14c9hr4qv8c7qaq1m8zqk1mzrh4pl7ysqqg9p20"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index a5582f908fc0..a99683ef9942 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1q1px4033marraprvgr5yq9jlz943kcc10fdkn7py2ma8cfgnipq"; + sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 3649a0a68863..c89bb2e897ba 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.28.1"; + version = "3.29.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64"; + sha256 = "1v767a2j6lzp5yppfjna0ifv8psj60pphzd7njcdkx71dvpswpi2"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index d7e6173da9ad..3dae0ca5d7c4 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,21 +1,22 @@ -{ stdenv, python2Packages, fetchurl, gettext }: +{ stdenv, python3Packages, fetchurl, gettext, chromaprint }: let - pythonPackages = python2Packages; + pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "1.4.2"; + version = "2.0.4"; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; - sha256 = "0d12k40d9fbcn801gp5zdsgvjdrh4g97vda3ga16rmmvfwwfxbgh"; + sha256 = "0ds3ylpqn717fnzcjrfn05v5xram01bj6n3hwn9igmkd1jgf8vhc"; }; buildInputs = [ gettext ]; propagatedBuildInputs = with pythonPackages; [ - pyqt4 + pyqt5 mutagen + chromaprint discid ]; @@ -23,6 +24,11 @@ in pythonPackages.buildPythonApplication rec { python setup.py install --prefix="$out" ''; + prePatch = '' + # Pesky unicode punctuation. + substituteInPlace setup.cfg --replace "‘" "'" + ''; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index baf49ff78e59..e26c2496d566 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -9,7 +9,7 @@ let optionals = stdenv.lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; - version = "4.1.0"; + version = "4.2.0"; # XXX, tests fail # https://github.com/quodlibet/quodlibet/issues/2820 @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "1vcxx4sz5i4ag74pjpdfw7jkwxfb8jhvn8igcjwd5cccw4gscm2z"; + sha256 = "0w64i999ipzgjb4c4lzw7jp792amd6km46wahx7m3bpzly55r3f6"; }; nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 97f59ee5f94f..af8b3ac93949 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala, gtk3, libxml2, granite, webkitgtk, clutter-gtk +{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk , clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "vocal"; - version = "2.2.0"; + version = "2.3.0"; name = "${pname}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "needle-and-thread"; repo = pname; rev = version; - sha256 = "09cm4azyaa9fmfymygf25gf0klpm5p04k6bc1i90jhw0f1im8sgl"; + sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp"; }; nativeBuildInputs = [ @@ -20,13 +20,14 @@ stdenv.mkDerivation rec { libxml2 ninja pkgconfig - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = with gst_all_1; [ clutter-gst clutter-gtk + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gst-plugins-base diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix new file mode 100644 index 000000000000..e8edcc3f634c --- /dev/null +++ b/pkgs/applications/display-managers/ly/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, linux-pam }: + +stdenv.mkDerivation rec { + name = "ly-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "cylgom"; + repo = "ly"; + rev = version; + sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d"; + fetchSubmodules = true; + }; + + buildInputs = [ linux-pam ]; + makeFlags = [ "FLAGS=-Wno-error" ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/ly $out/bin + ''; + + meta = with lib; { + description = "TUI display manager"; + license = licenses.wtfpl; + homepage = https://github.com/cylgom/ly; + maintainers = [ maintainers.spacekookie ]; + }; +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e97e22e4a9ef..f2e77d65f05f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r"; }; betaVersion = { - version = "3.3.0.14"; # "Android Studio 3.3 Beta 2" - build = "182.5078385"; - sha256Hash = "10jw508fzxbknfl1l058ksnnli2nav91wmh2x2p0mz96lkf5bvhn"; + version = "3.3.0.15"; # "Android Studio 3.3 Beta 3" + build = "182.5105271"; + sha256Hash = "03j3g39v1g4jf5q37bd50zfqsgjfnwnyhjgx8vkfwlg263vhhvdq"; }; latestVersion = { # canary & dev - version = "3.4.0.1"; # "Android Studio 3.4 Canary 2" - build = "183.5081642"; - sha256Hash = "0ck6habkgnwbr10pr3bfy8ywm3dsm21k9jdj7g685v22sw0zy3yk"; + version = "3.4.0.2"; # "Android Studio 3.4 Canary 3" + build = "183.5112304"; + sha256Hash = "0dzk4ag1dirfq8l2q91j6hsfyi07wx52qcsmbjb9a2710rlwpdhp"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index ee21bbbd9bd9..6576cd544729 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO +, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null @@ -61,9 +61,12 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ] + ++ lib.optionals stdenv.isDarwin [ + AppKit GSS ImageIO + # Needed for CFNotificationCenterAddObserver symbols. + cf-private + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index c1bfdf8157da..e95d2b615359 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin @@ -64,9 +64,12 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; - - propagatedBuildInputs = lib.optionals withNS [ AppKit GSS ImageIO ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk ] + ++ lib.optionals withNS [ + AppKit GSS ImageIO + # Needed for CFNotificationCenterAddObserver symbols. + cf-private + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 0876a71cbf73..7070ce597388 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake -, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, cf-private, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libxml2 gnutls texinfo gettext AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO # may be optional + # Needed for CFNotificationCenterAddObserver symbols. + cf-private ]; postUnpack = '' diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index e50625fa0e89..23f9e486ad9a 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018.09.04"; + version = "2018.10.27"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "08v55hh7whm6hx6a047gszh0h5g35k3r8r52aggv7r2ybzrrw6w1"; + sha256 = "1w7jmq57h8gxxbzg0n3lgd6cci77xb9mziy6lr8330nzqc85zp9p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix new file mode 100644 index 000000000000..d9bca5309489 --- /dev/null +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -0,0 +1,48 @@ +{ stdenv, appimage-run, fetchurl }: + +let + version = "2.3.12"; + + plat = { + "i386-linux" = "i386"; + "x86_64-linux" = "x86_64"; + }.${stdenv.hostPlatform.system}; + + sha256 = { + "i386-linux" = "0q7izk20r14kxn3n4pn92jgnynfnlnylg55brz8n1lqxc0dc3v24"; + "x86_64-linux" = "0myg4qv0vrwh8s9sckb12ld9f86ymx4yypvpy0w5qn1bxk5hbafc"; + }.${stdenv.hostPlatform.system}; +in + +stdenv.mkDerivation rec { + name = "standardnotes-${version}"; + + src = fetchurl { + url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage"; + inherit sha256; + }; + + buildInputs = [ appimage-run ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/{bin,share} + cp $src $out/share/standardNotes.AppImage + echo "#!/bin/sh" > $out/bin/standardnotes + echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes + chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage + ''; + + meta = with stdenv.lib; { + description = "A simple and private notes app"; + longDescription = '' + Standard Notes is a private notes app that features unmatched simplicity, + end-to-end encryption, powerful extensions, and open-source applications. + ''; + homepage = https://standardnotes.org; + license = licenses.agpl3; + maintainers = with maintainers; [ mgregoire ]; + platforms = [ "i386-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index c5f691e95c24..036bd8e546c4 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "texmaker"; - version = "5.0.2"; + version = "5.0.3"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; - sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9"; + sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30"; }; buildInputs = [ qtbase qtscript poppler zlib ]; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 26cd61d182bd..2f34a6ddeb6b 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -6,7 +6,7 @@ sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks -, Carbon, Cocoa +, cf-private, Carbon, Cocoa }: let @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + Carbon Cocoa + # Needed for OBJC_CLASS_$_NSArray symbols. + cf-private + ]; configureFlags = [ "--enable-multibyte" diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index bbc533d37e84..5146919fde6c 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.28"; + version = "2.28.1"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk"; + sha256 = "0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 15033b8b2b09..201ebf7b2984 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 @@ -9,11 +9,11 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.6"; + version = "2.10.8"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"; + sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"; }; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; @@ -36,6 +36,15 @@ in stdenv.mkDerivation rec { export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" ''; + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (substituteAll { + src = ./remove-cc-reference.patch; + cc_version = stdenv.cc.cc.name; + }) + ]; + postFixup = '' wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \ diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch new file mode 100644 index 000000000000..0d6a87000ccd --- /dev/null +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -0,0 +1,13 @@ +diff --git a/app/gimp-version.c b/app/gimp-version.c +index 12605c6..a9083da 100644 +--- a/app/gimp-version.c ++++ b/app/gimp-version.c +@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose, + lib_versions = gimp_library_versions (localized); + verbose_info = g_strdup_printf ("git-describe: %s\n" + "C compiler:\n%s\n%s", +- GIMP_GIT_VERSION, CC_VERSION, ++ GIMP_GIT_VERSION, "@cc_version@", + lib_versions); + g_free (lib_versions); + diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 2858086e0d64..c4c889cdba52 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "arminstraub"; repo = pname; rev = "v${version}"; - sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf"; + sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 1980f470435b..f405ca01200d 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.8.15"; + version = "1.8.16"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0fbl5rzmip5q155lfsr07n65dnhww1kw97masps1i1x40gq15czx"; + sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index d4edbae1d28e..59d6fec45dae 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0nzahps7hs120xv2r55k293kialf83nx44x3jg85yh349rpqrii8"; + sha256 = "1517w18sxil1gwd78jjbbixcd1b0sp05imnnd5h5lr8wl3f0szj0"; }; # Disable version check and fix install tests diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix new file mode 100644 index 000000000000..3cf42343658c --- /dev/null +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, qmake, poppler, pkgconfig, libunarr, libGLU +, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols, qtscript +}: + +stdenv.mkDerivation rec { + name = "yacreader-${version}"; + version = "9.5.0"; + + src = fetchurl { + url = "https://github.com/YACReader/yacreader/releases/download/${version}/${name}-src.tar.xz"; + sha256 = "0cv5y76kjvsqsv4fp99j8np5pm4m76868i1nn40q6hy573dmxwm6"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; + propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; + + enableParallelBuilding = true; + + meta = { + description = "A comic reader for cross-platform reading and managing your digital comic collection"; + homepage = http://www.yacreader.com; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 594173f11c62..5237e02f15c0 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -18,6 +18,7 @@ libGL, xclip, # Darwin Frameworks + cf-private, AppKit, CoreFoundation, CoreGraphics, @@ -40,15 +41,6 @@ let libGL libXi ]; - darwinFrameworks = [ - AppKit - CoreFoundation - CoreGraphics - CoreServices - CoreText - Foundation - OpenGL - ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; version = "0.2.1"; @@ -71,7 +63,11 @@ in buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin darwinFrameworks; + ++ lib.optionals stdenv.isDarwin [ + AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL + # Needed for CFURLResourceIsReachable symbols. + cf-private + ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix new file mode 100644 index 000000000000..25fafb604c33 --- /dev/null +++ b/pkgs/applications/misc/archiver/default.nix @@ -0,0 +1,28 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +}: + +buildGoPackage rec { + name = "archiver-${version}"; + version = "3.0.0"; + + goPackagePath = "github.com/mholt/archiver"; + + src = fetchFromGitHub { + owner = "mholt"; + repo = "archiver"; + rev = "v${version}"; + sha256 = "1wngv51333h907mp6nbzd9dq6r0x06mag2cij92912jcbzy0q8bk"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Easily create and extract .zip, .tar, .tar.gz, .tar.bz2, .tar.xz, .tar.lz4, .tar.sz, and .rar (extract-only) files with Go"; + homepage = https://github.com/mholt/archiver; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/archiver/deps.nix b/pkgs/applications/misc/archiver/deps.nix new file mode 100644 index 000000000000..4b14fd47711b --- /dev/null +++ b/pkgs/applications/misc/archiver/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/dsnet/compress"; + fetch = { + type = "git"; + url = "https://github.com/dsnet/compress"; + rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; + sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; + fetch = { + type = "git"; + url = "https://github.com/nwaples/rardecode"; + rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; + sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e"; + sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki"; + }; + } + { + goPackagePath = "github.com/ulikunitz/xz"; + fetch = { + type = "git"; + url = "https://github.com/ulikunitz/xz"; + rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; + sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; + }; + } + { + goPackagePath = "github.com/xi2/xz"; + fetch = { + type = "git"; + url = "https://github.com/xi2/xz"; + rev = "48954b6210f8d154cb5f8484d3a3e1f83489309e"; + sha256 = "178r0fa2dpzxf0sabs7dn0c8fa7vs87zlxk6spkn374ls9pir7nq"; + }; + } +] diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1ad236f0d13f..3554c36f5194 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp -, xdg_utils, makeDesktopItem, wrapGAppsHook +, xdg_utils, makeDesktopItem, wrapGAppsHook, removeReferencesTo }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig qmake removeReferencesTo ]; buildInputs = [ poppler_utils libpng imagemagick libjpeg @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { export MAGICK_LIB=${imagemagick.out}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_LIB_DIR=${fontconfig.lib}/lib - export PODOFO_INC_DIR=${podofo}/include/podofo - export PODOFO_LIB_DIR=${podofo}/lib + export PODOFO_INC_DIR=${podofo.dev}/include/podofo + export PODOFO_LIB_DIR=${podofo.lib}/lib export SIP_BIN=${python2Packages.sip}/bin/sip ${python2Packages.python.interpreter} setup.py install --prefix=$out @@ -88,6 +88,15 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # Remove some references to shrink the closure size. This reference (as of + # 2018-11-06) was a single string like the following: + # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h + preFixup = '' + remove-references-to -t ${podofo.dev} $out/lib/calibre/calibre/plugins/podofo.so + ''; + + disallowedReferences = [ podofo.dev ]; + calibreDesktopItem = makeDesktopItem { name = "calibre"; desktopName = "calibre"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index ad3f65346593..1a162aca0d76 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -4,7 +4,7 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.3"; + version = "2.3.1"; propagatedBuildInputs = [ docopt pygments ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl"; + sha256 = "1dcpjvbv648r8325qjf30m8b4cyrrjbzc2kvh40zy2mbjsa755zr"; }; # no tests available doCheck = false; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 4f594d5d4c05..db67514cd077 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20181009"; + version = "20181018"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "1h7i8skdjkz7n6dz3q9pzg1k31nh1ivy2mx3864bjvpkc7m6yyd9"; + sha256 = "0jd7xi6q09b3djn1k7pj1sbqvw24kn7dcp9r6abvxily4pc1xhdr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 39a87314ca7b..e05e140048b9 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0drhafnr1d595wa8zwvmgmrrqb86navdk4iw6ly6gmh0i800wz0z"; + sha256 = "1dm02l1ry7ndn283774nzmg89wy1933f4iyf6n02p152zgx4llyf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 412a2e9d4fd0..f7c1990ef3c8 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.2.2"; + version = "5.2.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1rrj0c7ksvv9irsz9hb4ip30qgmzps4dy1nj4vl8mzzf389xa43n"; + sha256 = "1zwbqr5s76r77x7klydpqbaqakzzilzv92ddyck1sj5jiy5prwpp"; }; installPhase = '' diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix index 9edf5e4f88c2..5d02eb937ffe 100644 --- a/pkgs/applications/misc/dmrconfig/default.nix +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dmrconfig-${version}"; - version = "2018-10-29"; + version = "2018-11-07"; src = fetchFromGitHub { owner = "sergev"; repo = "dmrconfig"; - rev = "4924d00283c3c81a4b8251669e42aecd96b6145a"; - sha256 = "00a4hmbr71g0d4faskb8q96y6z212g2r4n533yvp88z8rq8vbxxn"; + rev = "b58985d3c848b927e91699d97f96d9de014c3fc7"; + sha256 = "083f21hz6vqjpndkn27nsjnhnc5a4bw0cr26ryfqcvz275rj4k18"; }; buildInputs = [ @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig ''; - preInstall = '' - mkdir -p $out/bin + installPhase = '' + mkdir -p $out/bin $out/lib/udev/rules.d + make install + install 99-dmr.rules $out/lib/udev/rules.d/99-dmr.rules ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 16693cfbf09c..ec867854dfb9 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "gImageReader-${version}"; - version = "3.2.99"; + version = "3.3.0"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "19dbxq83j77lbvi10a8x0xxgw5hbsqyc852c196zzvmwk3km6pnc"; + sha256 = "0pjk4kr7bc5q4hi1xf7na2zln9fyqdazgzq62r3bg41nzy7fakcz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 7e32e566234e..0cac0e6fd3f5 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, writeScript +{ stdenv, writeScript, fetchFromGitHub , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite , enableGlfw ? false, glfw }: @@ -22,12 +22,13 @@ let in stdenv.mkDerivation rec { name = "glava-${version}"; - version = "1.5.5"; + version = "1.5.8"; - src = fetchgit { - url = "https://github.com/wacossusca34/glava.git"; + src = fetchFromGitHub { + owner = "wacossusca34"; + repo = "glava"; rev = "v${version}"; - sha256 = "0mpbgllwz45wkax6pgvnh1pz2q4yvbzq2l8z8kff13wrsdvl8lh0"; + sha256 = "0mps82qw2mhxx8069jvqz1v8n4x7ybrrjv92ij6cms8xi1y8v0fm"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 0bb0926f048a..6cbdea8c6867 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGFlags_ROOT_DIR=${google-gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" + "-DENABLE_UNIT_TESTING=OFF" # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix index b617791dc2e1..5d9670ba3072 100644 --- a/pkgs/applications/misc/gnuradio/rds.nix +++ b/pkgs/applications/misc/gnuradio/rds.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bastibl"; repo = "gr-rds"; - rev = "$v{version}"; + rev = "v${version}"; sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; }; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 977bd5e50ddd..e6c66cba1e06 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -39,7 +39,7 @@ GEM nokogiri (1.8.4) mini_portile2 (~> 2.3.0) posix-spawn (0.3.13) - rack (1.6.10) + rack (1.6.11) rack-protection (1.5.5) rack rouge (2.2.1) @@ -65,4 +65,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.16.3 + 1.16.4 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 3413b6ba6310..bb105805ca8e 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -137,10 +137,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; rack-protection = { dependencies = ["rack"]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d2427d95c19d..50a81890789a 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "6.2"; + version = "6.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "13hd6n5mzkk4nx9v9dwg8vvixr73zjba72h6vmxvz9fmywc4rs5p"; + sha256 = "0kbnmcis04kjqkd0msfjd8rdmdf23c71dpzx9wcpf2yadc9rv4c9"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix new file mode 100644 index 000000000000..ba23078bba93 --- /dev/null +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, isPy3k +, fetchFromGitHub +, manuel +, setuptools +, docutils +, lxml +, svg-path +, pygments +, watchdog +}: + +buildPythonApplication rec { + pname = "hovercraft"; + version = "2.6"; + disabled = ! isPy3k; + + src = fetchFromGitHub { + owner = "regebro"; + repo = "hovercraft"; + rev = version; + sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp"; + }; + + checkInputs = [ manuel ]; + propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; + + meta = with lib; { + description = "Makes impress.js presentations from reStructuredText"; + homepage = https://github.com/regebro/hovercraft; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu makefu ]; + }; +} diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index a714cdbb0d06..6841bc14c384 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -9,7 +9,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.1) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) @@ -23,7 +23,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.4) + jekyll (3.8.5) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -47,14 +47,14 @@ GEM jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-watch (2.0.0) + jekyll-watch (2.1.2) listen (~> 3.0) jemoji (0.10.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) kramdown (1.17.0) - liquid (4.0.0) + liquid (4.0.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -62,18 +62,18 @@ GEM mercenary (0.3.6) mini_portile2 (2.3.0) minitest (5.11.3) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) - pathutil (0.16.1) + pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.0.3) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (3.2.1) + rouge (3.3.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.7) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -96,4 +96,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.16.3 + 1.16.4 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 7ab1c70a98b4..d680f9255905 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -28,10 +28,10 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.1"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw"; + sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3"; type = "gem"; }; - version = "3.8.4"; + version = "3.8.5"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -158,10 +158,10 @@ dependencies = ["listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp"; + sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.2"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; @@ -183,10 +183,10 @@ liquid = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y"; + sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -225,19 +225,19 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; type = "gem"; }; - version = "1.8.4"; + version = "1.8.5"; }; pathutil = { dependencies = ["forwardable-extended"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz"; + sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4"; type = "gem"; }; - version = "0.16.1"; + version = "0.16.2"; }; public_suffix = { source = { @@ -267,10 +267,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; ruby_dep = { source = { @@ -292,10 +292,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61"; + sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh"; type = "gem"; }; - version = "3.5.7"; + version = "3.6.0"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 01e4f368223c..5fe2d1085001 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -16,7 +16,7 @@ GEM execjs coffee-script-source (1.11.1) colorator (1.1.0) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.1) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) @@ -34,7 +34,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.4) + jekyll (3.8.5) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -68,14 +68,14 @@ GEM jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-watch (2.0.0) + jekyll-watch (2.1.2) listen (~> 3.0) jemoji (0.10.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) kramdown (1.17.0) - liquid (4.0.0) + liquid (4.0.1) liquid-c (3.0.0) liquid (>= 3.0.0) listen (3.1.5) @@ -90,11 +90,11 @@ GEM minitest (5.11.3) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) - octokit (4.12.0) + octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.16.1) + pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.0.3) pygments.rb (1.2.1) @@ -105,10 +105,10 @@ GEM rdiscount (2.2.0.1) rdoc (6.0.4) redcarpet (3.4.0) - rouge (3.2.1) + rouge (3.3.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.7) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -152,4 +152,4 @@ DEPENDENCIES yajl-ruby (~> 1.3.1) BUNDLED WITH - 1.16.3 + 1.16.4 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 3e92d3f28a01..4e33cd6ccdcf 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -62,10 +62,10 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.1"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw"; + sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3"; type = "gem"; }; - version = "3.8.4"; + version = "3.8.5"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -261,10 +261,10 @@ dependencies = ["listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp"; + sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.2"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; @@ -286,10 +286,10 @@ liquid = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y"; + sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; liquid-c = { dependencies = ["liquid"]; @@ -370,28 +370,28 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; type = "gem"; }; - version = "1.8.4"; + version = "1.8.5"; }; octokit = { dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh"; + sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6"; type = "gem"; }; - version = "4.12.0"; + version = "4.13.0"; }; pathutil = { dependencies = ["forwardable-extended"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz"; + sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4"; type = "gem"; }; - version = "0.16.1"; + version = "0.16.2"; }; public_suffix = { source = { @@ -454,10 +454,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; ruby_dep = { source = { @@ -479,10 +479,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61"; + sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh"; type = "gem"; }; - version = "3.5.7"; + version = "3.6.0"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 97e371e9e72c..d15926ba6fb7 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { pname = "kdeconnect"; - version = "1.3.1"; + version = "1.3.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0rzjbn4d2lh81n19dd3a5ilm8qml3zs3g3ahg75avcw8770rr344"; + sha256 = "1vac0mw1myrswr61adv7lgif0c4wzw5wnsj0sqxj6msp4l4pfgsg"; }; buildInputs = [ diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index b2980bcd8aea..b45cb24b1b51 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -1,12 +1,12 @@ { stdenv, buildEnv, fetchurl, mono }: let - version = "1.7.3.1"; + version = "1.8.0"; drv = stdenv.mkDerivation { name = "keepassrpc-${version}"; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; - sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k"; + sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; }; meta = with stdenv.lib; { @@ -14,7 +14,7 @@ let homepage = https://github.com/kee-org/keepassrpc; platforms = [ "x86_64-linux" ]; license = licenses.gpl2; - maintainers = with maintainers; [ mjanczyk svsdep ]; + maintainers = with maintainers; [ mjanczyk svsdep mgregoire ]; }; pluginFilename = "KeePassRPC.plgx"; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 6d22be32afaf..5af5d558dd74 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.1"; + version = "0.8.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1f480ahrsxrksiiyspg7kb1hnz4vcjbs3w039cjkq2vp4wvjd74q"; + sha256 = "1acwgxg9swmazi9bg5a0iyyin07h2gvp3mhbn6cfqqhpmndqxfdx"; name = "${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 31793031dc1f..c872af68cef7 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "06zylbinh84s9v79hrlvv44rd57z7kvgz9afbps3rjcbncxcmivd"; + sha256 = "10j7q7rk6ck86xl1898maxhgkp1h7vy7nliv9sk5bqgs7rdwn4kl"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 99d511d413c0..3fb268017750 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let - version = "1.1.5"; + version = "1.1.6"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "EliasOenal"; repo = "multimon-ng"; rev = "${version}"; - sha256 = "00h884hn5afrx5i52xmngpsv3204hgb7xpw9my3lm8sajmfrjj1g"; + sha256 = "1a166mh73x77yrrnhhhzk44qrkgwav26vpidv1547zj3x3m8p0bm"; }; buildInputs = [ qt4 libpulseaudio ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 7713b5256bfa..120d3a82b5e9 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencpn-${version}"; - version = "4.8.4"; + version = "4.8.8"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "0v4klprzddmpq7w8h2pm69sgbshirdmjrlzhz62b606gbr58fazf"; + sha256 = "1z9xfc5fgbdslzak3iqg9nx6wggxwv8qwfxfhvfblkyg6kjw30dg"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A concise ChartPlotter/Navigator"; maintainers = [ stdenv.lib.maintainers.kragniz ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; homepage = https://opencpn.org/; }; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix new file mode 100644 index 000000000000..36e58cf5070b --- /dev/null +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }: + +stdenv.mkDerivation rec { + name = "osmium-tool-${version}"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "osmcode"; + repo = "osmium-tool"; + rev = "v${version}"; + sha256 = "1cwabjbrdpqbi2gl7448sgniiwwa73avi9l6pnvh4r0jia2wi5wk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libosmium protozero boost bzip2 zlib expat ]; + + meta = with stdenv.lib; { + description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; + homepage = "https://osmcode.org/osmium-tool/"; + license = with licenses; [ gpl3 mit bsd3 ]; + maintainers = with maintainers; [ das-g ]; + }; +} diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix new file mode 100644 index 000000000000..1a46b275a5e3 --- /dev/null +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -0,0 +1,87 @@ +{ stdenv, lib, makeWrapper, fetchurl +, dpkg, wrapGAppsHook, autoPatchelfHook +, gtk3, cairo, gnome2, atk, gdk_pixbuf, glib +, at-spi2-atk, dbus, libX11, libxcb, libXi +, libXcursor, libXdamage, libXrandr, libXcomposite +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver +, nss, nspr, alsaLib, cups, fontconfig, expat +, libudev0-shim, glibc, curl, openssl, libnghttp2, gnome3 }: + + +stdenv.mkDerivation rec { + name = "polar-bookshelf-${version}"; + version = "1.0.11"; + + # fetching a .deb because there's no easy way to package this Electron app + src = fetchurl { + url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; + sha256 = "11rrwd5cr984nhgrib12hx6k74hzgmb3cfk6qnr1l604dk9pqfqx"; + }; + + buildInputs = [ + gnome3.gsettings_desktop_schemas + glib + gtk3 + cairo + gnome2.pango + atk + gdk_pixbuf + at-spi2-atk + dbus + libX11 + libxcb + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libXtst + libXScrnSaver + nss + nspr + alsaLib + cups + fontconfig + expat + ]; + + nativeBuildInputs = [ + wrapGAppsHook + autoPatchelfHook + makeWrapper + dpkg + ]; + + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out/share/polar-bookshelf + mkdir -p $out/bin + mkdir -p $out/lib + + mv opt/Polar\ Bookshelf/* $out/share/polar-bookshelf + mv $out/share/polar-bookshelf/*.so $out/lib + + mv usr/share/* $out/share/ + + ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibs}" ) + ''; + + meta = { + homepage = https://getpolarized.io/; + description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.noneucat ]; + }; + +} diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 90908c67b4e0..4865ed7ee000 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt5 }: let - version = "1.40.13"; + version = "1.40.23"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; src = fetchurl { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "0d6b9ls742nghzg5y97dx7myvv8i88f0s27lhr52yy4833hdxdwn"; + sha256 = "11r2jzb09a62hf9fkg6aw8pg2js8c87k6lba9xz2q8n6d6jv44r1"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 3a723907c925..a5d2f206f3a5 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "tzupdate"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1wj2r1wirnn5kllaasdldimvp3cc3w7w890iqrjksz5wwjbnj8pk"; + sha256 = "085kp4v9ijhkfvr0r5rzn4z7nrkb2qig05j0bajb0gkgynwf8wnz"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index dd95b231bd13..20e3c3daccb0 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { name = "${pname}-${version}"; pname = "visidata"; - version = "1.3.1"; + version = "1.5"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1d5sx1kfil1vjkynaac5sjsnn9azxxw834gwbh9plzd5fwxg4dz2"; + sha256 = "0schpfksxddbsv0s54pv1jrf151nw9kr51m41fp0ycnw7z2jqirm"; }; propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 7b95cf002ca1..280b30128727 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { name = "xca-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${version}"; - sha256 = "1d09329a80axwqhxixwasd8scsmh23vsq1076amy5c8173s4ambi"; + sha256 = "0slfqmz0b01lwmrv4h78hmrsdrhcyc7sjzsxcw05ylgmhvdq3dw9"; }; postPatch = '' diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index ed90689da1ea..8149c6fe8531 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "0n042vxrr52k6x86h06f298flmxghsfh2a3kqnc41r7p7qybgjj8"; + sha256 = "0fk51s0789arwkidgx4c5y4shdvawwc132dzn8z71fpi6kh6ggvm"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 9d86dfe4a445..709c1edb0b83 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,13 +1,20 @@ -{ stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, -gtk-mac-integration, girara, mupdf }: +{ stdenv, lib, meson, ninja, fetchurl, fetchFromGitHub +, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { - version = "0.3.3"; + version = "0.3.4"; name = "zathura-pdf-mupdf-${version}"; - src = fetchurl { - url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; - sha256 = "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; + # pwmt.org server was down at the time of last update + # src = fetchurl { + # url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; + # sha256 = "1zbaqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; + # }; + src = fetchFromGitHub { + owner = "pwmt"; + repo = "zathura-pdf-mupdf"; + rev = version; + sha256 = "1m4w4jrybpjmx6pi33a5saxzmfd8rrym2k13jpd1fv543s17d9dy"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 21631ef191c4..ff16ddb90f69 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake -, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }: +{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp +, qtsvg, qttools, qtwebengine, qtx11extras +, qtwayland +, kwallet +}: stdenv.mkDerivation rec { name = "falkon-${version}"; @@ -21,9 +25,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libxcb libXdmcp + qtsvg qttools qtwebengine qtx11extras kwallet - qtsvg qtwebengine qtx11extras - ]; + ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 54b588fb0979..9f81a2fda388 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0"; + version = "63.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ach/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ach/firefox-63.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0557937473fe8758371d21ec4b0d983ac2db59e8b9d3d627a318d3adf9a0cd0712f3e9b375f0cd6d9acf3f39b0c42fbcdb31364c5973916c7287f618a5f074ec"; + sha512 = "fcf06e003f7e3bfc79288d9f0199ad2ca13a91eee718437d25c745381dbb351483b992b0cad929e9c869d4a993eee66b2206ddb6e98023f12f4351f41e61313b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/af/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/af/firefox-63.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "4b0d715ba2a7edd648bcc2c396ea764e8a29fce69d526803e6621053f3886df44d758fdbf2c8af8a9e3acd307e10dcdcf3e13eff0e60bce28885b699cf2426d0"; + sha512 = "8b8515147df6deaff4356fee727acb377c3f46cc288271da813f6bb752a3a62585262d0e5a5760d6bc5c8d6f7e84b2d76825ff55dab8bdb5e20fe345230a3bc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/an/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/an/firefox-63.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "79665a9586e0fceacb0a49560d0fc2a72a76187799563b0f8ef972043020744dafc971cb94b52b30df6056673aea4e0885f994d55c99c7976f9f7805c30e5796"; + sha512 = "c532a212522ad51e0718339e1962f275b49d15a0e67cf397c1fc9dfdfddeb746a59572ef2cf1661f480736ecb7a77ce7da62f65f3e7898e2fe53321512820a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ar/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ar/firefox-63.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d338b5fdf1dc4bb920bd372ba69934ddf39bdc7e37b725a010fbc9fd71ff487181d898e863c7ce9a21039d51d256c4ec1ca2cdcf0da078788243e867b0bc151f"; + sha512 = "35fbbb6d2f53293eaee86d9d402d556abea5a5c62a1a282f35ea97d7afee57e2b222ad96f2c91ac8b30f6501e96d8702a52e2f96556abd838c244a36720d123f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/as/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/as/firefox-63.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "2022a993455456d0c900ddaf8e6a74a3d5478edec456df0cba627dfa1ad41f0274053c21b9c1ca4ca6b640e26993d60ffcc2f879c68143699f6e31d43f7acc19"; + sha512 = "86fc2f0b5089997dff76f5b5b4ef1e4be465da16a8fc119ab88ddf96cf6fbdfb4dca1e384ce336a033ca5430f041c60d34afaa3dfee9a8afb93d26c7717314b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ast/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ast/firefox-63.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1eca2ca8385215a886a16de77988d76e41b7257a41fceacd3df18e21ba82c8c67df045aa8201a2b18032f1690997b4b8bfb55a80c47341335aab45cbb15eefd1"; + sha512 = "ba960a426f0c6ccd703e3b12bc08c29dff71cb829a66346cceb689233c62777ed22ea047624833f6584867cf78c040684cccbae99a9518eaff069af756eeb983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/az/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/az/firefox-63.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3788f68a69a8605e3185e5e776edf3339a650e010fc4810f574e5c0a62c9aaf30c84151ea169c005c1f381c3eaa4c3a8f6758c336a9423cfeaffb83aef96dc73"; + sha512 = "6e2e9231fe88fed849c2d1850f24ab169a901b68be4bde9d9875d2cb736ae4c1456f53c2964f4f00b80ecf2e46543b4cd25cfed31cb04dbe4fae3a040432352c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/be/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/be/firefox-63.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f538b9f8d566f7f3c5bc92a24127966d618b47dd368ecbb4fae0e5c90045bb75cb1b921edd865227ca6c34e3e2e037acb81d9f7368cfdee59cbdcf6ff2798ffe"; + sha512 = "379ec5a79a4af1b141485230b9c5af0b622845df43499616417debead4db466ad16f7a63c1c0e8c09b4bddae288772bfcd2aea115a780a551e90001b2d353364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bg/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/bg/firefox-63.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "497a95b4309e60093ec3f1b0a72ac05d1b9a47d78799ca33492394c7bf0b81e64e60103218c479b4ff3a3b2acfcf95493f43be23feb89fbdfebe42ec8a124132"; + sha512 = "4aed2144069d39f00a0ab2f45ca7532f9f97684ff18cb2596b20b6639edbd793e0c4857b784657c354caa7503c2df6497ef0f298fbf438954c2c46de3c2f29b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-BD/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/bn-BD/firefox-63.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3c2123b34ebb2e3c6def220c679069b31b3d7a2110ec2eadea88a930b6582fcab0452bce97f0302a39af324ca1b58ec49ed49aa865ade7d814152bf16fd1cadc"; + sha512 = "bf87308c72330e32efe1473d879f36097fc1d0e697ab6f9034a03c5e872353ab5c2cb7391aa274b35e08c6102986a08ede184810e821f8ba02838d469b623528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/bn-IN/firefox-63.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "55fdb9a3efe54db994706fb8345918f5c19f1a24f77107e6819dd1272a09900ef3534897c1d3b38c331c94813446694b2422356ae6ca2356338d6253e15a37e1"; + sha512 = "0063c6dce614b8efa9a663c60d2d393816f6a65c87aa1a1a6a96f501cfc7e86a05b038ab5173b13bd86a2a02dcb3ac6ed15bb4e4c8eefd371027e07cb31c1e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/br/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/br/firefox-63.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c35e40bfd6b1fb06c8426c6f9f834f8a6d658ced8892c575079d852dbb2e24f09657b1f37bc8af3588cc2c8b9ba1924cf5a85c7be0d6db4334c592f03abeb142"; + sha512 = "93c3a9a59386c211c32c9aec1aeca3ab0a3f0b878001f6485a42283c2ca6fedc6847d7c2fddea870da462967dfddb94f518cbe0f115838b313d803ae8f12df65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bs/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/bs/firefox-63.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ea63659f3a930b4d0a8add69cd8ca1a3d98e015aab1b6bc607c8e0fbd610de8fdc49ac290c61bcd762092d4f56554f70f029a18be4bcf426cafffc6fe9677699"; + sha512 = "d191539482457407ae37e47b52b4d79eb99ebf2ed2999921c695268b6e3dc75b96ba93131f70666b29a3c2e73bad0a470abfd99c2f51d2ea3eb4af52296846fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ca/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ca/firefox-63.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "10993691fe9072706f1c092199dadea2f1ffbcfecede53771326dd03b88387133aa23e75f96bebe7117eb02ea2775e5758c36064c5ddd72f7aab441feca659e4"; + sha512 = "41520a18c201bea97b56a70a74546f7a2f2f1909f303740e14cf79701499bd26494cd453ebd630ce100ddd17b5ffcea08e8a9d95f908425da0a9ad22dd751dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cak/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/cak/firefox-63.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "0413afe78e4c8ca1af3edad09c801607c73069366a255d4d1d9e6d4589ba3757c732a2cd691b8f223ab10cc99cdcc322e98d8daca49b3107082a8cb41cd278ff"; + sha512 = "24aaa62ff598ee48d9c9b6b19e92adc38d00eeaec7d7d562160955c751ba5e3b01f281cc59a0fcecdfd24d6a792f070c151c58ba23d1db55699c25988ea9412f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cs/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/cs/firefox-63.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d4ee0844c1587ed0d65d40a444fd130022f99831749f721523b0f594d4967e723fd8af10c363f53b4fdca91f676962882e93327dd5b1529d3d66c27f17bf29a4"; + sha512 = "b29c9ae988b40ba77cf036d92b4d9cbcdc8af0c7c8e76f97222a3544bef06c81682fa35ab9e24a5f3d224873d2359e3c1f73b61de4101106ab4da57d3a362d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cy/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/cy/firefox-63.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "103177bdcb204d0da7dc8fbfcd82a52bbf3956b13f716de1547252a076d68b21f9bf4684ed63a62aa4635fa39cb776a64942d81333ebf41dfc5f12d6087261af"; + sha512 = "99963d98d62d811c03b2a841fb97b31f10b5d14a98b5bc5918f4c7164663511efc9a36a7271a6927fcbcfe00fb7d15693a7d031f6305d9dbc0e7e0718699d314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/da/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/da/firefox-63.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "38cc06165c713ffdb5a2bcef9b8e6c7f55c2e821c4e4c87d30b613cd78aa6320761e709f3a784a0f55da283dd7088ab67d0e58a16a90bbd182985d29691bd50e"; + sha512 = "622cf4fd584b9e4bc07661874093b1281b53e985355679b914b5becdd78b25daa43b3e6f0a220707fbe21f4a41c85d81728ccd2af998ca0be938e8ae955d6e56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/de/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/de/firefox-63.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "076276ef8556922e80bf74aaf3624e6604eb904ec6dda35df7f91edf99c62015d1309ea1a5cc28d84ce96f9924dc908c81f959ecf93f2419156d07bb303fcbd9"; + sha512 = "af9d143a4d5f26f81474681945b171fb9be80f7e679aeaeb08175d3b0957e274ea1ee4112781607c170a0af479dd45c5ec3d88b5cd39bac37e59d1343474dc02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/dsb/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/dsb/firefox-63.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "979013e2bc62db710891d95d8898857e51bc1a2073e3a56948af57c9676fdbc87b6a9d827177a5a1d7926f71d83e9df706c42ea98bca98fab998815daf50458d"; + sha512 = "963604bcd19ee34949ab256e1276423d3de262a87d8d5f3e098cab11af2ed62ecb793b86817e54f490f5accd32d7c35a50aab583118eee79270e827032edc464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/el/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/el/firefox-63.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "1f4e5983ca94ecd9da6d65ec7c39ef7e01296f957cbe3812a20981bafdd9a2c0e07bb5814b5caab781ed1f2f6fb2ce2079557e3b9bbc1422b2fb7d882b921ffb"; + sha512 = "9831e750314c3514e6e885dc4930836e296537cb16c8a9da189c9f53d122e0731e30fc068fbdc8cefe2582aad715d9eb36746bf7b289a45410c99e8ffcc4ee8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-CA/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/en-CA/firefox-63.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "77a9038b33a15a2f12db383039f89d29f1e855aad6354375517726d28c5e1984fe77993cb802f17975488441ef36ac143c1e4e2d29c7104143db511229e9b28a"; + sha512 = "6cb022756601db6273bfc2e84e9e7fc24e8d427ae5905c85b8f674132a740a9f7b1eb34562f996bb31be03cb7fa6173f3aff80fcec6c41c0e0e25a34180d8cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-GB/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/en-GB/firefox-63.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "62f5374d07b90e80d9f67b04a647f68fc75af267e9b9c04674d754b0d023ed9d78241a693f11504d5b74902328c68414be394923493c17c551a62d06621edf4d"; + sha512 = "1ecfd9ed098a97c9b6952f5ee56560cc7e5c9ee8976a0e744e8c50debd2eb100e4f4d3842593dfd6244740b7b48a9e64e49b082345197f969e4a0b52f9866196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-US/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/en-US/firefox-63.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "906376e344b9f01c5eca8a6e24386927a68613a74202062fe52de5bc1b9d1073103e9c59d19f40f33efabf0f5e4852210195691a73f1bd05db790e7c1eac5f28"; + sha512 = "49d776cfb5f42c6e5ea1a55a80d9f6bad223080b16baa0d39de63534c25e68340091b4e16be5355d565f81291cb94fb996f03ae7e3e4c7a28021b0a0929daf58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-ZA/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/en-ZA/firefox-63.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "895f9dbd5ef281a48e5c3124dcb668b9fe4d6b41a3402850e68e138190b756ab10292bd002c36a1f8391ff3598c48a8623552ac35d18d0948dbe194b28684f81"; + sha512 = "b3c8b9282822eca4a0be69eb4b26cc9e6fb0e20e7cb0e8244a1e54a680dee570ada3f6085e4efab67c63b68cbea64c8978a3ea430a791ae1b3bd71d31c03302f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eo/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/eo/firefox-63.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "defe31badc0ce4c41785abf6aef543584778e5c6f373300c2fc3582c89daaa500cc9aedac55e1a1569abd8eb0de207268e31b9eae61565e76a43eecf41ef774f"; + sha512 = "c08f5dce7559e3e363b8b66a3402697ec1b62e893c825c5820c8a0978a6d41431101a479a59b04065bd36f50c044c79de4e45e23fdd0a819fbd379bdbf65be22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-AR/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/es-AR/firefox-63.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "bfe81fbc669fa156c6741c62b00c9ebcf74fb2f49c92206c5ca79986358e7b8ec29d98d206c4d0e21e81a781ed8216fde5b072f0f1a19604ed7c3784b82829c5"; + sha512 = "ebbc1b36010ee9988ad2f63b100d48e52be391ea85ef170a8838978471b9354aa1d9a55a27d8214d4639c60879fecd56f0a488a38da5520dfb79aab078571a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-CL/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/es-CL/firefox-63.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cd3bc97552a30c9eabf8627ef97db2d4f48f2fbce4c72b5e6b41000a623ab1782f87ee8ac61dde5e3fccc59a91f87b4a3b279b90de3b08e90293329bc85976d9"; + sha512 = "aaa97d383fa7efa07d8958603f5bd5a0022bfd94f99d0644adf824544e4c1a932ec1b0bc10b78a409accd3c1e1e9e51231186f8063d9bf7cda5958447a27cc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-ES/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/es-ES/firefox-63.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1d761d479df22483c576598db8248b3ab6a7b838c518058c6903d7097452c4027b9c38cacd206063816669ce664501c138741044369de04eafcd40087ccc3688"; + sha512 = "cd742475b06eaeee5edd8561c9c5b45e95f0544a3a9e607b961827bf3dac722ea1fa124dd2eecfd18e339cf784694d267a83efd09c798608d99db66c0cbc078b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-MX/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/es-MX/firefox-63.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "934aabdcb204dcdc80d9e35cf19aaf83dc235f95d597f5b2a6302635275aa68245932f4b5f1b2725ec84711e8d0f2c830aaa45406ada91efa2d21c8b31995939"; + sha512 = "704856a075a4ddaf811856e3e2258e267bef132d9760e7ae61c81c5c832cbeece35cfd5018b69155a7673e93b439ab6997920164e6bf90d2564858385667b9a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/et/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/et/firefox-63.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5b669b4adb7d14eb4550fcbcd05a1e7a1a186954bfba39d491248b177d057662227b672d2902273315c12e9d57bb944ea2df41d7cb35514fa00d79d235c178c0"; + sha512 = "462bf71afc7ee40e2ddadd80f07d154b940075f1d88bd132513a6db776c6fb6ea98a02137cb60a3d8ad12c999313401ff4ec3fe498a2a2374cd8d11b6b0cc149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eu/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/eu/firefox-63.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c8555e93e6cc7d4fe179ad68ad1b2fe3f0735134c8a30bb9911b0bf5475e169e07640eee85afa2c7193b27d96c8cebe2227d38e1ff7499b3470b68a04bff2953"; + sha512 = "7869247c5b534874836ec636dcdd4186eaf5ad760eba1e7430b207d76454c5d9384f5b6d3ddd638380383504a17012ccd4c54acf4088aa428220e2be40e197ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fa/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/fa/firefox-63.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "c607251f6b855fd86504fec3780ba66d8d451d76a16d0541fe5b96ba5b8d809ecd7d591209f3320bfb044463470b394862a6c0717cd9398048a154d6c2b93bad"; + sha512 = "6dd1a2cda0e1e3837d8aa5fbbbd8a842dfedaa90a5e5b07249d904046b7645b5b025b90a2302e5b4751b958fa506305a9bedc89db7eabc663fc8a4461427572d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ff/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ff/firefox-63.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "d9850e4d78d6bebb9d342898bea876d66a9811ac62ffcd56ab8ca662a4db6bd872a643ac233e02fdebb9dc107349d7f0f258ad790ac11bfdd791a2d8336197a0"; + sha512 = "2c5da87b5879283fab3f59f5a7e628464efc1132f36f753404a805a2805e0305642cdbd1f6cee22384b1fad26315666fdcbe954e28a1661b27a2d8d9731b3f46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fi/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/fi/firefox-63.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8be60c2bc3c175aedc3a1c062107c5368f503bbea245e87f5f269c9faed3832ff8c93f221815637b3947c474b44be31f3ea09955e7a87d2be67454dbb4d4e9b4"; + sha512 = "9c4fecc333e4cdd779ac3e0f08f6c5dfb65d685a82295d0d6b24ca5d7709d5287e1e21515b41cb86014e59b2c87b8fb83f1625b8a1e8b1e74c1819d21fc02c3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/fr/firefox-63.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ac559deff6caa20f40bb561e350129e765ba7f63ee8758dc01542fb5f685262c0bd6ec0d13fd65c196aecb352b72b62d10335d121edcca11500684fdb1be8be3"; + sha512 = "3bf8845b1b1630fde8d86e0d163ddfa7d1bb2482f43e2cd22ed6208666087aa0af54a4bd2d93f56c0cec32a8621b5698531a5ae252cd1ceda197f9e4d773b47f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fy-NL/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/fy-NL/firefox-63.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c6a19730d2861a20a69ec8a7ded79377849554f21143e3b55ef0b009519b52d9ba2fa0f2e58ef592f3eba00305d0e2dcf44df958ed22043a83a86ed7fa72362a"; + sha512 = "aa17ff3c7b218ccc959d1746a9597837f0b2d1b1cb068a5dc4639fe2858cd3aadd4f981290eed5bb7c9729f1418f4ddbc8d309107ca3deb6b7a57d67611af110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ga-IE/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ga-IE/firefox-63.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "28c68d871e4e025eb22f19fc1c4d786185934bd6254f03061b95eea8459776c9c28a903e30edbcd53f6e0cc5b24b6c65e2311a6483e18620b246ca8ce2fc5470"; + sha512 = "eaca615bbd2d675d9d1bedde308700226fcc7ad529f1d0a3a432b04b1f7cbac582ce99645f23805dc7dd39029210c0b71855d4126dcd69de635d5465885697ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gd/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/gd/firefox-63.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d6e9b226b893050925259a7de5dfc67104b6defc76778272adb8e5b41427a646549ddf6e38d58d9ee4bd27c476406ac9e65244fc57f78a3ef54d7c7bc758df80"; + sha512 = "ed71b7907f8303ce9fdf6bc5b6aac7f7eb00b0be60eebc37f84158b22c54911479d2bd5122683ae0e2ffb662611e4510daae4cd17fe2271d3f361019a516d6fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/gl/firefox-63.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3f73ec82235a8345c2e1e86b521f062a5f45bf0fdb884533c22f1661bff430c1a3c440c5fa5c209474c2eb542d1be25ab2c6a4aa50b872ffe34bb66ef2da6e0d"; + sha512 = "d99b88e5530b08f406a85567070f3f4d709586815c7eb48254491442238b0cb5868a1afdc418739f8b33972ab94b38cad3a06a7211cff1a3e32ab5d0384e18a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gn/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/gn/firefox-63.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "4be814c72579653264990737b7eefed0ed7f332da1317bbff3a0a1d6f45aecdac12552eb0e6897ac0bae64f261de6b46b36588623a8523a51b880d1bde5d763c"; + sha512 = "0bc5d75e74d9b8aadda1d6a2c2379049bd269378a3c383b0afa787bbb4b35ab78a06492928a5c4aff2eb66f7897641f8c64240190e1987fdfb4059d743218266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gu-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/gu-IN/firefox-63.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "00670cb7caec8f841f17e613a86554182512e0aa49ff7c8298c9d3c9d364d7fd391063b890461cc41966e5facde0a8a325ac97e08bd0bd9d25858b32c348fa81"; + sha512 = "8231b8dddf89310ca92707e2bd6ba84b3cdca7e22c641c0fb307fd45dfd1b7de6ff5f29413a7bc303adf0d7601eedb560680b016d1e896deef6ee93a8767adb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/he/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/he/firefox-63.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "653538026ba533c7446108a2277dc7f87a2e519583d27c028be2b056c67299ceb9b2296dd83f94c3a043a2bb9fbb05de2260248d408f3279a7c8fc49e0e84416"; + sha512 = "14625dd32723b4d207fa545959d8af1a78cec0601a7b1073086c5b2da20ab54e679bb248bbab5fab05628665727058c00175d6826915779423b5709d166f7315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hi-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/hi-IN/firefox-63.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a4989edea0edf4f509d4387b225340a4b67805b3f8cd7af67b575b1b3b5a8cc98f9a8d6d2a05ee878e15dd8ac2b0c35f43fae52917a8b667098f1812e361fbef"; + sha512 = "5e8c2792d5509e2cdaa95d26829827cb5d183a734e46d11d91f94406267a481e5d780e233475ab87901c260e7c1cfc0b9584fca8b300c076921eda140f71c3ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/hr/firefox-63.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b762c1bf922e72a9cd8570012962fb63c5658de25fa08ce4532c6c96b7b06c0e13bc71b2306219a6e0219a8ef7aef168a8523cf39b1cc1e6362198fac0696545"; + sha512 = "f1753eb8e18920507d210c16c6b9da944444ab771b456871cface1e867afb142c24fd7e5b7ccbccae47dabedc396b47dbe68bd36b2a1ca723d1ff927a90f85e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hsb/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/hsb/firefox-63.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "22ea6afb26555d88680cea7bc1fba6570aa7e0b8517b23f4f5a7d3f2fee285315e29e818954dacd29768642e62a57adea282fa35116a7733c1012d2578647bbe"; + sha512 = "04e39227067e6a98d2398e0b832c0c3d18dbcaed3b683a6508479a29d20860117c2ca04489990508d503b045e882e388d198e62503a0446cfa40ced150000858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hu/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/hu/firefox-63.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cbd0d026cfb693c7eda3f58f0954bad41ec260e307b8a4a9d4e774e2277786420f99c8afab9ee0fc9f7cf7f9e4542904c6d1c1b92c1c3bffa62f8dd9aedd8a73"; + sha512 = "f260853efc310b0426e72a50e272c810f390069d743c5c0e64d1400d87df860704d87d1fb1b3f2c13a857ea0c15713561379a9e027db86f92cfcdb2e52c6bae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hy-AM/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/hy-AM/firefox-63.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "59315b0561ccccfc031b240b699b019c3b6d2769cda6d816bd60c359ca1a4076c4fcd8342bbff6cd4cf66243dc5164e1c0066bc7821275cf5c11caff0e86a6e4"; + sha512 = "5f1b3fe9cf4ce690105e99bf492ca4e67bcd4fe0a09aac45435bc1dd2acdcfd7d2c5faa7125e6ed14a4da1710e1e8564ef969e70cd0ff3b53fa434035d7232c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ia/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ia/firefox-63.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "2addd61131770c825227639d5d7790bc0c9f0be430077fa31cb11cf74f6ec191f6dbdd88c4e0b2fc199eeee7ecc39c6dce8c790924224ab0603e0af41e082a63"; + sha512 = "d4e20bf61a36438b018c5e69cb5fb9a305f4b67d1c1be82c619afb44faa536903944204d9cbbb05b766076038ffc0e0a51af528dbc93fe1690cf1f4ac8a0382d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/id/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/id/firefox-63.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "81a68f78f003685e1a06d242ca3c24df27b7a0b28d0a5df2f41cbe9b92e312b32a35608c7e094ca136d6f6356e523c62baded1cc027d19342ba44cf88b479843"; + sha512 = "0987ea50242ea6e843df40537519b13e6a0b6c85cafa9ea5957b69648b8aadbd12527e4adf04d135b98f50e1413a71f85e327fc3025897beaa0178b7013015ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/is/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/is/firefox-63.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cabbb8d0f7b5009aa6e889c983046a5c806f1c077c8e27f7cd148b54a25c9cadb5010acb97b2cdbe6480463f205bd7a4edb966fae0a92a8380439082542dd9bc"; + sha512 = "185e9bf39d07a0455b609286c498fe24e301cd7779913da4e16d36e36edb640d0d2e09bf04d85209f2879238f0596fb5a7ef3d9b53b611101cfa78ca8ec27166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/it/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/it/firefox-63.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "8d3eb041fccf54dfe389566cd11b2dad4276fee3b902914bdb4a8cf06c6613a39f4ebe7d00d33a1873bcee32f398b0527d4807d08ee91e0accabb92205eff51f"; + sha512 = "334d4f61f8bf56123a57a488da8af7ad364fa4998d41b0cf4052bcb33494642eb0f429b97193b36a23947350e94f97a37dcfa4092fc8c642321fffa66f2c022d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ja/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ja/firefox-63.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "facf7aa7f639104956f44dd4f2a6f4064ac4474d3c3bf2e355f1934c68831bb774172b719b2f0685435e3f3cd56ed589980d06a1d2dbb6e405a5f5c32395136f"; + sha512 = "51f4d9a5ad768d34354fa56839412ae4f89fc46bdcb0f4d427a58bbe7d7ecd5d6ac6d3282d305b69325d3bb360d6356d8915ac200efaaf645504d1d607a75eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ka/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ka/firefox-63.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c8d5407fd932d83fe6d55fa012c9fab70a4d67fc6043dc4c9e18c6f6e25bd4fb8feb0dba97ec7a8a3f1cccfa37c46cae482b9fab90ac29c34b57a35387742b66"; + sha512 = "973e37affd3574b682a245d4366c5868520ae832000f96c2c7ef7b0bfed82e65e838fd8895069d5c4b03b8553233928798bbfa94c20e713367f84845639d5217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kab/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/kab/firefox-63.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0949d40892060b97c1fdf69d9777893b2456d5c936d29876832aa41492c01c1a07c88665fb669d53b8cb91f23757cd14636f87ecfae7aa112384658288afd4e0"; + sha512 = "0d13ac3a4783623e09028d5ea9b860db230f8c9c5c98fa83d1db33ee1adf09f18b312412040a997293c53fcf4e9ebabdf3d5f935689f45613f1c70e959ee6ead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/kk/firefox-63.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "30d3e966ebad9eca27d255c20bf11bdc5c6073f0cec8954c568c4abda86f689e5a9c4c2f508cbe09687e0efdd2ea8f5f8ef5de781c3fde399f39bd9b229bd187"; + sha512 = "822c5d0a3f4ee7327712734258afbd4ac5216fefea0cb6d3dcdf144af7ac04ac79a2c5f09c79bbb9a1adf7d57f8d0ad3300d6e56a483b3d1c149723a1aebf9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/km/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/km/firefox-63.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f9514178a460bc3f1a6e56878f951208d6afe92de893ff1861e38ece04909535d9a5de8d59359b6de32f0bf4ad462c6958b0b881c3678da074cddcc5a6ad8150"; + sha512 = "8bcdc71c8d707295e753c5a9a06d47fd932a7acd35516cf857fc74d3e9025156c0a5ddef34cfc9b98311e672b386bb06c241c949fb34e238f1353d2ffd2b7385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kn/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/kn/firefox-63.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cc229a04e851f479f785d1abc0e2b486f20797ae0269d62cb64aa6bf8a3925958b9271bcbaf0acc3dcd7fe7f39b9077b1a8a7650055d2fceeb2ca6db676240e3"; + sha512 = "a6c6e301ce118c4b7f133255a082d0c9615e2de3977a7500d900ab24c8c6d585132f52d120c32b85892bf9df1fa6855e66a5ff4145fdceece917f81b92bed62f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ko/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ko/firefox-63.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6d7ccf3e6d062014af2c59abf03b3f9300a1045855cd6f6c37d8a9c9733ec7c2775fb702ce219b96d6c0aea4dc1121188805324e1f65e5b222190c5fe34a9fd9"; + sha512 = "950a8573fc2ec19b5cee1bdc8709d7724df4a89942b64a0e31969fc8e7802b16b1309fb98d7ccd929ac7e6a0444b4fee60db3d934346ac8c4209c9be467121d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lij/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/lij/firefox-63.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3ab2e904fd162bada37cb2536c928fb2f5bec09d8023556b42c9b0a77395f1288f65cec792d0bb6def19952e0d49dc6e3ae7a8398697ba2341750d7707c89fef"; + sha512 = "88a746f55e3f3d8fc5ea8b1f73c9112af0c87e18ac365341c7ce655edf25db58064c9bddf8e7ac9242fd67cca0911597ee795a222ca8cdaf37627f3addfae981"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lt/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/lt/firefox-63.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3e821ba12956af86bedc0d179542cff85631fd20bec53c34c410f5e3315be076634548ea512041241d82c46a88387a830af483fcb35cc6a4d897f09f3fb93be8"; + sha512 = "f7e7ec28ce981a931d2e5892d85ed5e6ef2685af52309ea5f8a779b3569b5a84bec5c7c1cd5583785211a5748663eca2e6b0db13ad0a1b846deafd7135db4afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lv/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/lv/firefox-63.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "21d5e0fad3bd77c2e414044dae95e8464d33fa41badaa0049294a142b04ccdeb62708f209b5ad8c07d7eb5064479b6f4a58433b0ca7fd0436e62ccbb5ff52786"; + sha512 = "78de629ab28273c18717f07d3609bea0e0690b5cf95c9ee380a4ff7b11d06b91a596fabff78c8935e7d52c2720875b224381f5e537bddc83ae7ad9c3fc80b802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mai/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/mai/firefox-63.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "c3e34de39bf5c77cf1c61d3e691b838ac4a560ce098540d6e58be13d7b1760a670f00aff505bbbb417b37190e494e48426bba73cee3e8e2454a73c15975465ab"; + sha512 = "aa0f2b177337837b9515ad1d14748f7e68146ce5d2b3f6fd128be1cd2c09a62538d0f79320e74c17c8ddad8b084705803a42a86bb621f8ae227363686d8469a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/mk/firefox-63.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "9a26b08ba538caf677e1a2f3f3c98e5c67e51e7dec72e73097036c6f34bbab2d5b77ec9bcc96679bd3ab7ae83c3bd94d2c3307843d82f8b1e9ea95455ec91308"; + sha512 = "36de8542490f43e7b63db4bbca49933716f79b85b4292a89aa16817c11bcaedc95e966529ab14fac87eced7a2feb5c0d4c077c0218c5dbd49567b0b77fc47d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ml/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ml/firefox-63.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "924193b490fb8d65604fc7f61a6f00b79074b61ba437060fc35efdfa117d5014144c285ab149fe7b9dcdb75486ffe516ef1109eb751a6951c88e317d0c3bf222"; + sha512 = "fc31609037e0f3796ae2fced50953042560e991059f565a3096fb30f27abe741933866442d6a6aa4e5c9beb60f5275b14576ec7424f0dd57b42e097b25cd9736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/mr/firefox-63.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "163b3aee29777bef44bdfb56a637c3fd06c435acd05294818f3993f32f8062d0f1ae4fce96c48c05d99a9d97521e58230fa7ee7a9129b63956fd5522722b5c8a"; + sha512 = "43aab6723f6f21087848358fc7a29c4c41f8a527c818c75b078f1a9b2db2ee28d25f12dc3456fd82400f75e22761063a51de8d237fbb8f72c45fb1be700b3c46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ms/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ms/firefox-63.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7eb5b0f2d0b69e56e01c3aed184a995e3634853a267d30fb5149850269c3f1efcabdda8625a367ffd0b70282d5853158084e5890c1e79078818c19a94630d9e7"; + sha512 = "3e6a411e234ba04e61337200f81dc8a4260be1d7fd7bebfafbf9430e25a96d3a0d944096feee643d34163f53f848caa6c27d6c6cfda5389cb59128ac98a1949d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/my/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/my/firefox-63.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "41eda41795d4db0198bf3b603ce097cafcab58e37bb58678aaef7ffad424fb6b9bf462801052a78c9d02092fef58a845cff5ab5640714efaf7eb94adeae2a669"; + sha512 = "6b61f60a70997576f2a08abf95f0647725a0df92c348173f64428187f9020e451077de36ae7ee2912ab8b708314effd4c8c6aec4958c14825266e82b6114534b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nb-NO/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/nb-NO/firefox-63.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d87d4b281238d8c54468196c3a3ac55a2774fc4d04a4e9939cb47f526c57fbc1366c2ffc590d01767bdb14448edf9a11a21e8e221044529d0b0bb83532476040"; + sha512 = "5b58f0fe658ef9bcffe9eb8553875a4ce01071b050ebe4c14dbbeaad0304d9eedcb18b5cc411c992c97ff043e9453f4bab937203d4c6f704fbdd02cba1415f65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ne-NP/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ne-NP/firefox-63.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "3cb49431e5831d63dd849aec87affb63e170f4feabd6701d520fbebe9ca16aafe448152231b4823c494d0595d23eae81fa79e5b9778a1c1a08d5011e7ad25908"; + sha512 = "f3acdc3d0b9cd75b70e5c01e38d20c7c3071f175e1d50daba8c4851ce56c8e1f54eb19eaa198bfed2a70903d796e4457a2a8afac57ce4b8f9f16b139c8277e1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/nl/firefox-63.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d29c06e0829eb07930605ac1c438175c65029f9635d0feda571c944e91e93332c99a697c47acd55f27f0adab49f46fae5f81955e783ae70cb1247029b0687de8"; + sha512 = "f106e3c846869bb55baa612960e2713ab89edc156b31bbdfb86b40be160c4ad97fd402a3ada7a5729bd94415c1d21e234b4c0212bb2f31407bb71e49aaf0adab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nn-NO/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/nn-NO/firefox-63.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2f9acb29eeba9aaff86ebec0de7e67a6b17ec48607b5bd1c9c9466d465fba2825d41c86e0ae7492873e093f7ac36ffaaf1c744a5e3ffe0f3b2b5ac468aa43c33"; + sha512 = "5a7371cbffd421e07e45120f87e85add83c75fcc62596321c08a1f5fd03b607a1d9f54f9be7d6174cb8f325aa77186728cca15e6d8a1a3f537cce5c996bcd477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/oc/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/oc/firefox-63.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "bad2f0d5f7a9a7013d74002ead12768d16cf949b7bb5ac3a130c5cfd1a8911a68da27d4682a7cfb31ba20f4d826ece3578aa46258c8773def49449e21d0bdbd5"; + sha512 = "de159758170c954884d76f5325c7c88c5650044a4867a833ec79a9b6fc3addcddc8703620548e44801313326d5827df18ca688d67de9354a3ce1890e6bcea3d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/or/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/or/firefox-63.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "aca0bdc501ca0d4de6f8036b3aa3670ac6044563d54aac931fdeb154f796b2814a420432644a53329d46677cf7b77d5d3a8e4a3f6aab5469708ef9e4364590ea"; + sha512 = "29c89abeb78cd688a2664dca3f6cf4da984187608f6c2e5e876bc7b15d744bce23a2a45de8bba87b3fcfcdd08d501f78c1ac6da44dca1391d0d9f391d371a8ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pa-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/pa-IN/firefox-63.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "e20d542fc62d4610f85c0c02737c294f4ffe14f88da9f15f557ae170c332f131900a59718cd725dccaf282fe29c22c85c8466267f6b0d16464f5992e9876b536"; + sha512 = "a4d4f1ba14a664d8df73d46695ab2ff403630c290a2e65dc7bd0896b5e6dcfd9175f09a1470f62c19b2f7d6a0c83105baa26625a4a63dba034150c6dc9b8ff79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/pl/firefox-63.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e3848d7706e78f36ff41ad10656976b11ca12c98285bd5b18afb13dae9cfd43f2a38378ccdbbd741b6a2603daa1b3ed72eda4e8f47153e2eedcb066cf073877e"; + sha512 = "bb8da953e6d290e7c89e1da82929c19b9918b1ba9edb020bf242bdda0999bd2af35c67b31f6ea9856a25e08330d25ba2f71f42ab00b1396173fdf97a8034e334"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-BR/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/pt-BR/firefox-63.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "9848181304658218d4bc0e2c21dbd878f40d3ec5a7d93d9ca6c7e1efc803f957e845344b15f697f347da0a743b7f25bce2e5b822a81c4e0f038380ea95509605"; + sha512 = "02f3b9091ee88864d5979631e4b968a8bd8d8530b47bb74b2ce32e34f7a91146d4acff58c122dae9b97db38b8dbda90aafed0a9d463ee7bc4871788bb112d042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-PT/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/pt-PT/firefox-63.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8d9e9f52b80bd790a919442a970dc8e0f19f8ed5b64de22c4756fa9c0f7d1b72998a62aa249a9e8f3dc1caed1e74a07cc91ea15ee5b3f5ed1e5e340cf148eec7"; + sha512 = "8cb41e6c6d14e4721ecff46b84af58c689d987f42cd6cc3abcc06c1e265b95421a7858bbd665395b86a0f101c78270c12d1d7fd6efb256871aef1b8f620c0234"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/rm/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/rm/firefox-63.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ea7cfa4dcf6b3cd3a483b73c8360b525d8002773a5c766887306320d99183b035f6acb9761384cd44cf5cf3391e3fc06d554e68cc95814ddd3548de5ff2e311b"; + sha512 = "1ac1d855316f38a0e570be034301fced730e61a5cfddfd43964689f003e454c9870ef215dfedba5027d2d291926cb3c26deaa9872b91686315ef76d14de2489f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ro/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ro/firefox-63.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "97271af95125b146c4d3655daa99e59c2b3f1dba57e9c947b7337cfacebdda5517be62f14a5a3eda723bd1dbba6437c0825e0f5200f9895fe678ae80708b53ee"; + sha512 = "431100bb1d819ae8bf5de1883210f96de661b5c1a8e735e70b2df6c7517190d4c9703aea6e406371f49e6b1287a8e9d53e6ed4a228a521b8f4a8a532e442bc1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ru/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ru/firefox-63.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "e8e3fefa17ae3ff51bec782b163049eb10398cb1a46b2fbc8124e9000ea0a37a0adaeb71794ef392fbad501bb4c04b0f98765cb94f90cdee4a46a30fa07dd925"; + sha512 = "35527353ebca6f60f310705dfd53f2a9dae16317c39bf05eac1f5ef4ebe9e5ba08d36c5557dba8a607d604483b4d02aa3085352c11295bbad1ad57d0e2a02ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/si/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/si/firefox-63.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d16d3ae7c5b5ef04b09b6c0afcf4fc55f8e47b20729bef33d2278bcf4727703710f27cfc610b78ebf8e9d45f80bdb3119f438da2598a4922a43cdd88967485f6"; + sha512 = "9ac19eb2441202229e730f8af9a23092b6da83aab1d879aab07affb39a37bbb8908c452721f37d2f6e062b871441aef9ce4aa5b616f1307f70091269fda8e3ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/sk/firefox-63.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3d23ce446b62314b5b6281aa4e8fa7e38ae3ea9ed7be7ae3d37d223b69ab8ab20a2e2d772d278538db8a572b839d59ebf4b7aa40211049f81641784c523e6fcc"; + sha512 = "b599713ba833c15c2626c174efe93bd34b63d78fcf06b1507ba0ac905bda58da37e138df4eb01bf560c5551156cc9468ca062846b4083ce0d217164deeb31f21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/sl/firefox-63.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "25e2bb9a9e92ebe5507ecea35302792acb7be4666fcbfe3dc7b0cd8ffe77ccfd514f92b9762346a5a71d55e28ed654ad55752b4ca82686d3e8fba97473afb6b8"; + sha512 = "506e20b8c55a6d3e20e24400bfc784fe81e135f2b71f761c10312b1af9983f43d6e71b77578dbb221247d730a1f372261a83db6b7fa1382c06407fc6d0599230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/son/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/son/firefox-63.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "13f167d22fb355b90b02c4d8fd8f9aa38e7f6e626c633276a34088d5ea83e410cf3a0c00d33560c4ab48aac4613cb0d422751f8c8b7440c0fd59b8e8be0ef204"; + sha512 = "41c7f4a449d181bb352c2e9f3b7c43b8e5782c9d86265992788ce8ba5b2e1c7fc1ce93a5f41973650ee816b60f6874e375cf780e1b76102dd7662d1f8651ec96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sq/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/sq/firefox-63.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f57dc4ec2cd1b8a45ac114b7f838d34f766f4f1f4fa9308504e6c9bfce05fb977e2982c1d83f433a957098d9069b58dc0c578af948b38f3d5f53ed59ecd3ef24"; + sha512 = "d73f03127c26cf55352e7963d4222efa26c43aca5d2b2a45a5bb958f9c4d7f0d618e018ed8ee86ba009b360338c2c559f553caace5735e27474357a392f2e80e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/sr/firefox-63.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "89ab6e7a42ccc21b0a2c3c2a55b0e3920d0addb4505dcdb98ff6d93e995f18130b31dc92c55a0f72301c59cccbd142f439a24962e19ae24ee25af59c6611c668"; + sha512 = "0f70af467f21d399258a41a9cf89b01f8461d9063d23e7e15c269effaa7d7c3a70fd034a4a1939fab1f31dcbcf293452c48ae5c49bacfb2a2e6151f343c30866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sv-SE/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/sv-SE/firefox-63.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e5e1e25d4c5d1c97e715bb984c0862237602329a786776b3b3a5407e585399fc3d5ea7c8e6927292f25b97924a568c95bcd758e23b74ce71cb7592877a5da3ad"; + sha512 = "dd2f383544dbd19efab3c967e762a54209da2ee3d6001d07f173141ce5abedd62216fb9888569e04f409def45b38d95989dbf3165a46a0270151c72bee4d3bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ta/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ta/firefox-63.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "4f9e44175061339559ee743528f4e7dbe4e9b0a3d92cc178879aa71f1a30fb260be307ff75722a2f69259e3fb13e509228ab86d4a6e9708564c3696ac3531afe"; + sha512 = "4c625d005c97f8dd8e31990c97d35fe51dcb614e6e8737d60daa42271b15c9a705cbcfa71a32b3a88860c57e7ed0dd3e22bde0b9485ec30d2dcfce9802a10f60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/te/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/te/firefox-63.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "99e52a537ec1048b63dd77a9a9ccd1e44e8a00af256ad8b0f61ecd4e2767591550a000e66cfc1b3db4819580cb05dd7a76f2d64a4839a9e72dc43e65940afb73"; + sha512 = "77a995c552e01b688de4651eab8df025d8163684a4096bec415f40468f49fc5bbce667748bbcf989c636440e8343eaeeb228a9b612d989c520c07420c2888a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/th/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/th/firefox-63.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2db11524432184bff0646b86f665431cf71a1f3389185e1e85312af7cc75be26f55f0d899262405db411acc21a549a8d451b63d1c060fb892040c72b996c0b0c"; + sha512 = "c51fbc08ec739f0c410537cb9f1897c3aba11c916c739c143ddf3e19cc6fc743ce50fbaaa95569302fb3411cee9d4a4ab6b525a02e1583387113a1cedfc4af94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/tr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/tr/firefox-63.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "90b2543238e92f66981c0aa6cc0e563eb1bd623c7bfcc9a72aa3f158b52ddf8fc7c0b550312cdb279dbb192c3cb5d2f9019817435a17d79b31239564771ea644"; + sha512 = "1aac702b3f84217813d76248e201c1923e812f57ae7fea00cb00f12874f8cdc17e6e90a633aa578673b793760bd2300d5f0a2bb7e5f3bb5d61dec8e082e45b2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/uk/firefox-63.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cc3973e6ebcc956a626292e09629a5041bdab89e92c94c4ef461e01f2384021b39057c04981d61deaae238bcfc6cbf0eda2ac19e271fb7fecc4c22f42808ed36"; + sha512 = "cf8bb456b740d856201d6a832c809b1be7a0b9541c73988d9d526b5251c5036d46fe1e2c26dabacaed9afc17cbff53f2f5beea3a5018d4ebb82c1085e272846e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ur/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/ur/firefox-63.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0efd6d37984445601e5076cfd19e345c2f0d038d4eb88e4543c90b27c468164ee16bf7695fe8a8f1d6fc2fdec1c8ff6525886da5b84ccb8ee6ceee8d751884b1"; + sha512 = "02f5ba3d99d84ae6990fa2fe7739365dded19914271f4967671365a6dee76e3fa125d523aa042a70f4fdce7144bc29349158834ad75cf5b195ff8f3bf916bb30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uz/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/uz/firefox-63.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "61ff04342906c902710dae18b8c83e40e14120bba2276aa677543032bb0667b12ff7c9df70ed5e478eb3fe79fcc1ba306b738ec5ea2b3bed2728698f49f7b1c2"; + sha512 = "fe7cd3f100ae5515304ece3341e5308a2efe2a650a603f8e4979097e95281f7e0f75470e599a2292ef5296cd001d3778bbfb877c8b80bec22a27c95b7c06010b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/vi/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/vi/firefox-63.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "615754da0770dc5ac5347f7fd3ab5d4ef7aad96167deb5e7b22714595ad96e59069794abb676bc553b8aff226fe37f3db84c63ee2f662a71bd3f9163698beb0f"; + sha512 = "293434d3817d02efe5af252e39f4cd9bcc9629f67011294f3e64c3700a0d41524fd2c7cbf7f7f38503422743006a57168d00251633d29f6dafdf2bc27ca9bfc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/xh/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/xh/firefox-63.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "4f82fe26348a515871f1c5775dc0ef4b31fff9a3bf48944379d08aed499bab55b314227e354ca17fe644807f1d2b1f732b8204c3179907c05f9c6d168c7fca3b"; + sha512 = "e1f3490f6809f98bfa6dc38e40d2bc2642bd9a161b54e43fa5d1f4891d1698d32a074f241ec68ca2bfedaf7f2a7912a9632c9292d4bb3fb9932640b274a73c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-CN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/zh-CN/firefox-63.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2d13d782b2988389d2bbdb5560d494c77d2ef0ec479289ab683a3a7336200d2775577b2508f23587bcc8d3441693c07593c3f040fa767ea19a8adf29ed9b9b0a"; + sha512 = "e66e82965e5aa68e82d1f85bed52bd79ac0729224ad5ae5fb4801cc1702c7578e3e9c8af5c3b1659e481076912796c608ed365b88c1fae1b4ee01dce15b22052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-TW/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-x86_64/zh-TW/firefox-63.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "af0c5f6d98fa4cd4556c46740edbbaa76653630d1b8fe265e63caa54e51977e6eacfbe4523ab29d3b9c9af466775dae5f62b00468cc644d6e84332d59605d6e7"; + sha512 = "ac6e7df610a1d49b655f084eb280468e711f1df668b8d6d077b7c84dba1aa8c0d47e7993e4322de8fb45d8bad7f7bdaf3325c1716501fa12f59e881cfa68172d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ach/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ach/firefox-63.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d4b255e6675e460c80df56aac8a81a531d90c4b6ebeab018a1c5d333da440d780a89ece811f2a24616949bd71e7471925059b13fd32a3376b636012b0b035f84"; + sha512 = "ba1444fa8ccebe86891a2777c5d8bb11d8098e2c61574b86e916e98c9fa6dbfea99c19fefae42708ee17142d095122c9a83303ed8a2143872f23bd0f3e63c7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/af/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/af/firefox-63.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "61ce8c74d62b9b2e35d7a46e0b1284ffcc3837247b12e8e5ae0242049631b5c8050b353ea07ecf7a925e237dec111d10fe10c86e49fada11f007db0b3ef3c29d"; + sha512 = "ad827930699e223cbb0ee7b34e89a76922f83f5ccc1bf14fc1743cae156623a190eb4d73ffb7cbdd9483460f30e868ee9a471af78d5f4aecb1c924e9a039fb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/an/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/an/firefox-63.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "eeb42821c1e94ab24cb4438245aa018d44b84c89afcbbf271e4905929e6908ddc922768868b3c9bb4e6a83ccb266ea6b4f2d82f4a3a35c527130f3bb2aab88cf"; + sha512 = "bce2959772589d2b356b3d3e0af7ed62448f77b66badd59ecdd4dad7fb7d43cce99aa5b3088770cd509dd262c585336b084982ad77b4328b4d3ac47ef7b0daf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ar/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ar/firefox-63.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "068310cf06b3149b8c54cbc8f56f4334eb1a5b0cab1ba5d7bcb899f507836240528d48c3762af4f37e4d5a9a1eb7bb0a5610d66e0911aba47c3e1ead3a0281b8"; + sha512 = "1ec918fb0cce996b80a5f3702720dccc09682a5d223d049eb9f69c4486de24196ce0760e2f33f76a613554e5feca71af392fa8a9938a4b4d8a1d48ed88bd0307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/as/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/as/firefox-63.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "1487c99d76cf37a4a53b6849501670fa8a80c6f7431f6b9503bd493dceb4786697685bb6d3970c4f47b121c8cf83299225112421217a314640ea7027cfc2c0bc"; + sha512 = "8fe8b70c8ca653885bfaf94875a9239b38477d1bba36b6c5c3cd5a76a444ff846d9ff49d07ab7460e56261458135a797cc3cc557aa0296cac12f428785801f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ast/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ast/firefox-63.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "cd8205327bcef45ef0610c4c8e5010c6eb3b488401b776186350351f433a3dd3639f9c8c7a2fc26c3a3d578f85f49a1f3525a84b40a473443ca81d8d8823454a"; + sha512 = "b83bf7d6797f652c10eeb1ec268fbf8bd892fce13590f506b076fd05e423e113eae859fc4833d9192b9e7fbbdffce1be59356e04b1e60505d1b0efe97b25dc08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/az/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/az/firefox-63.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0a7f11ea5f476e0a45e70bf8a1c6779ba32b96f81bff2f88c8cfd6ff29b6951456dc9aba4146ff13faaa35481c1fdb26ca944709dbbc72e4c11d9854cfc2476e"; + sha512 = "3a3178afd4616dd0949d92f886ba62105f182eaae574f4d9abec54851314bc67175c6a9c4f8f8490446505be456bdae59715cc50e08d563d43821011b598cedb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/be/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/be/firefox-63.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "8e34c1b191e2d2cae88c94d99dc3d5bf6afd8a658601fb723d1b0f75f3dc7dc85b9f3bb6ecf24bb75e94a411f82c56fc88dd8a548c670351f19fc4137ad77751"; + sha512 = "a70e7754379993e6d616374a337fc41d5ca3146b19d91290a09b6224eb6d38a0684466e1ea358268683296ad7c8cc34df51011d316239da2ef942ce5782e2238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bg/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/bg/firefox-63.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b7ba0be703e7e52abd61e8e27a25ee7a8868c1872f4babf82b3b1775abfd073c4112f738eb1ff9f341c56a15bbce5d5663895f342618e7b81fea0cfa35f3ae2d"; + sha512 = "3a55a9bab9b175a167c3044c873ba356868fa11b6da85a6ff8af155c21c604504b74018eb72f7ba17a4a31ba14020b9e4c13f9428e4759772771038996a242f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-BD/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/bn-BD/firefox-63.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ccf789ace9b1e5b378a8e37fa8e1c68e52f70247305e369c536981424f6baa9d8bb132475b4af512780a6b881d5e2090ee985c9fc9481c0a0718b0028b516dd2"; + sha512 = "e5a110accd63efa525b608b7c30d2468e5b6f1e0dcac670b09fa834d6964d5663b70783adcc4085caf6520f72d2e4faeda037ab0a5b2f5c105aae449cf8b6078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/bn-IN/firefox-63.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "4ca51c703f5a394b149e7c9fec038a84558fc2eab0f8ac7a2b7109e5e73207b94cfa998c9fa8f4d2ac4bec65e7f6ebdee804c5f0801bc815dc5aaa50aeda3db5"; + sha512 = "26f033b925adcf250619fe624eccd86350a4fddcf2eda3dedabfd5814d5ec7543173f0412b42dec6af6cd919041d8ed82867839f65c574f3a5c53bb7edfdf192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/br/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/br/firefox-63.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "750480cb435134377e0d09a1c0b342e104903bcec9c68ba08827ea20027754f55cde63b0d44bc248800f85f26747f5d5552bffb7f5344bd5848d6fd7d72d0269"; + sha512 = "adc30801180e72a4f6e5ef439aa1cb7fc0707b6b0f2b8439d5e5bf8f797ba568d2b66110b013079f251b80119dfd8c2cc6a6350ebc90e65a6aa189d56dd2bd50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bs/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/bs/firefox-63.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "1d8fdd486341c623b46a93d36bce8ce71e92269348f7e344122b9f8908c6db882d79f5d46b2498e3177df73b5344747f809b6938ee5f59f4fee43a3e1b116624"; + sha512 = "635b6c284cca1c601d6868f51e7528768691245501e95f8dfa575aed3f31f39a466e33355f228d080f406af9d9fc178d75f614a18f29f3d1263fb4c1fe59fd98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ca/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ca/firefox-63.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "760d086dec533bd4bd98760a9de99557591c9916bfd930de061105bccf97420d2662b9286287f6d92d5d81f37a08bc30fa57874d992592eca0c531faa61f98eb"; + sha512 = "3a0a0cef6114539553d1ae40cca4c71393a757d3eddab862e9d4192afb5c5e28c1c6884b929fd9de43bf122d4e8d73dbb0d46254393fbbd25ac0f88b3e6e7510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cak/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/cak/firefox-63.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e6238a1dd0ce26d80b3237f70ee822bcde3ec9149a55a152f24d4f9a44021044b8e15a2a386f731a4d7b026391fa72f3a28055f1f02dcae11d6feff670581f00"; + sha512 = "67967b99868c100d9014bd03e171be755993d476e9831cfdfbac8eeec97ab05c11959cbec0c4ef2da34a4c406f9fb4cd171293103e0cba131d6a05e1ebaa4d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cs/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/cs/firefox-63.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e96e451f5ad543bdcc44b87227190716f0e864408a006043dfebb37d6f5d464e08ace9c98c0fb9e51531c7aba364532a2b3147519bf6d521336d6950e4d54078"; + sha512 = "3d642f59728b4655e770f554eb5fa7c1893e581a1bc35aa5c680efd41a5e2747560b28acd6ae4a68aa2668098ad4b638673a033d4da19d2c2e4e9cc42165a48e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cy/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/cy/firefox-63.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0ea943b9b5156f4e814e501c8b7a589d888e1a2f9340f0c064b134d2299e40fc766e5fb8ac89ba82e3c5c586b410af16cc86caeb71285b94efde9e171652f57f"; + sha512 = "877caaef6d1398416f44a53b0a91d1d49e5694c319da19d0b5c5ff71164b80a30530a4ed4c2a22602f3daad37be28e499930099edec3668bb0cc008afc5b3404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/da/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/da/firefox-63.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6e2b71137d36912e6c4f28907b251a19bcb1f6a3f9d830b6c7b3e90fd28c5d4dfd5f31496ec45728141596b6b37c78b3c29fcf07b85fe0facf1e47c4953edf31"; + sha512 = "eb911318ee4231558a16b809ee69b936692c6a88d891041630eb01d3dfe9eb061a51313d07a3616140b30617b67620cbee00c3a0dfaa6e9c4f4fcedb84bcc770"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/de/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/de/firefox-63.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "def2445efecbd7a998cf846c438e85e4b751655d36212b46227aa95483b474a78249e46e5d44beeb8a2ceb4baaf1e0ea84cb742993941fa2ec0f90f13f11f098"; + sha512 = "f7f5a05c8c83eee203fa741a1cc09124688c21eac32f5122bf3e3f7b4a389dc37acbdb3ae6990b4413970c98eedafc0df4ecc08b508d52692d2fd3d9ece46538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/dsb/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/dsb/firefox-63.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "3cf731e4247dfc99ac7eaf85001b70413447a5409518a8aa7791e8affe85efa703c607ee9b2c3896b1ab3c640e0d80610bcca3600b057c8d0c09cedcc9e3b93e"; + sha512 = "f003cd4232bb20585aa08a7cd07e7d717eda2f6bca941cbf01615d1143015806423e3d6b55dccce207d9af6250e4e3c6e3470c4bf6b0055c8174bc17c8652e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/el/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/el/firefox-63.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8ac061359a5806661eabe8c5e22c30ce795b0e019abf6f2d6b673d37b2842887525a4ced40b6aecc6fb2f02ec841d309866fe638f105ffef8576af5d3fc6cb9c"; + sha512 = "f172315fa9608aa89e53c0db3fccb68e0e5313d18a8effa514049d555dffcada49693d4bb65c1f987ed5c28a92591daf1a85e0f4186bba7d2b53dbb98a485d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-CA/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/en-CA/firefox-63.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "9d62cfe7f055db10bdb8dd152d6dbbc40ce12b9ef4fe59086fe9818f87d95c9ea79092d25d3bf8a34cf2977b28a505f3ded4406a864d493a6f4bf2d625bf124e"; + sha512 = "0040a4809792c5739f68e5d95a4d4068f165daaca55408ba89641acee502ad3237dc1e9d6a2d37afe3feed0f44c3883b50b837f5626b5b86cca1430db46556fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-GB/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/en-GB/firefox-63.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ce98acdad497391f8872ee0c41d2fed73a51c0d52e8e812aa7a426684bc0f39103f95cbda3bde1006aeb95d8662275211efd32cfe82609a344178089153db2bd"; + sha512 = "4661b07660719c0d3ceac74642c4e70d9b406dee58f8ff0f7c40a006fc76dfe3e2a81699b70027e3ae209e05fe321d58a124d37bef10a1e1283cbc07643c0852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-US/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/en-US/firefox-63.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "06d5c79c57ac5b46cbd452a3a095ff0b87ed9a4cdfdb02d73d90947c29a8ab4c34f2bfc3f537a0dc2e60c83350531aae07f58d1808a08bd57a79bf2881144ee5"; + sha512 = "4d09db5a69fe203386e05bfeb909fcc798fcdce2c3a14c27af18cd1a3837439cd3fed50c6bf951b4882a125f181dc24d5ec201899097e65e279834db63018fad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-ZA/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/en-ZA/firefox-63.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a162dc2aaa5f2036849bd73bf0014f073235c853b3fab0e3571c08a85f6fefcbd9a7d3c033d5515126e72eb1cb54ad9f68241201ca9bbc786253f0c84f6e3590"; + sha512 = "85befa2c7d200fe88128724743186c354efc6eef85d780b245f05e0f657f898061862673be6816c9d13e2e37a4a6c1c8efdfb1bd8716c424e9a45f139cdebdd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eo/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/eo/firefox-63.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1639bf250506d4dc4aff272ab0517c76eff75cc3fb4e8e9fadd2028f877e204d0bf19e3eccd7107fe448f1372e3f6dd19c99ad2f8aa1891b1c3b2dbb4b8c34ed"; + sha512 = "12af4981f2da08abd4027052ea0fb6ce24af2aaf19c18190fadb19bf9a99326307f1ecef484f50ab0880e183ad971ffcc4853814ff97fdd0e32387434fcc731a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-AR/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/es-AR/firefox-63.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b9afb2474208530ca83b4d8bbd59176f02558d21143227f695a8705a70b16e6089d86316105deff2c89b857fd14a5c5bbd6c057aa9b66e9ebaaaff763321a86a"; + sha512 = "6d244ec1c396e165fd5507af11e74f202ca7793fbc4c2fd9e47eddf429bf6aac4477a2994fd2ca146f5d8eba1307fd7877406ee62bebb73c098d5dc342b1a64f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-CL/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/es-CL/firefox-63.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "134eefbb975dc1ad3f98cf340b0c544f084bd2a1bd1432594bf228e0a23e402461e936e777ee3fe0c9a86bfc59947c35f6c6d7cd74deaf6cdbf1224c9fbdf4ff"; + sha512 = "18ecebef241940ba62771850ae78d4249ff937c0c069782d0e1f83bc7d162fc0b2792a16231ee943ff1e93141fef860f9e376a1357c30375c5458d01156cfe82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-ES/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/es-ES/firefox-63.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "66fac925408ea40d3348f207716e732f878bf5bf5837499a9a27a9b1e8e4a9210c3400fe90faf2807aa30d49f67dae2324e7b41d80a21daeb531e907bbdb35b9"; + sha512 = "3edb35b0e6a8d0d8838fa9d648f138980e68bc08e6a36c78db8fc3053123f364cc888937722c6b2bb892586bdc9b9a7de730270fc433bfd1461a5d2c8a689f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-MX/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/es-MX/firefox-63.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e1dd051782b59f9b2601b051459e4f23bbf949b0d257dd70cd8bd171429f661274f3b7bd5d8d16a5daacf5a08a488db85b462c667c3c3ce0ea280648c5b2820c"; + sha512 = "a157fdfdc2488233c56b93a015f33e96c6ba2c7b9112bce83a1f53931421cc9523f3db0fa1cf428fe35c1ea0c1e9579b237c44537da89a8d05d4116d43db4eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/et/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/et/firefox-63.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "9b46809e42acaa8dbbcdce1df8f7471d20cf40b0a84384edafaad1a0afd17a1f2385c6d41d7eb5b472205e80c528e3408282ba0d81cd19b8d92c7f0550c4a5a2"; + sha512 = "7f118ae92f0a38ddd9a0eb35089f99c09771e377e6e6864006d8f2ae604d9ad76d38d641723660cfba138694840bfd5ad8cb9ffce87a4dee76fdd032d2ff3bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eu/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/eu/firefox-63.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "790dcd461764cad902cba93054c35539d2aeb30bb5fd3a6f940ae125368944e20fdbdba9899f3b52b6774fd27fe73a13c0eed7e269b20a7b73dc4fa123122a1d"; + sha512 = "f354842728b0821dd779957d7bc5ea58f7f498f26dba21f8822b6198148e47caa7e33b18e37651a92620387046eb2f494d9efa6f8a83091dd945191a24afb3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fa/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/fa/firefox-63.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4e0608da711a17faa10b5a043192b52e6d88360752d9c388e173bbee3de86bddf9693dfc75cba7ac42153e95a8056c6d0ba48141cde476b524d1fadfe3a3bc10"; + sha512 = "473441e4410cf8683a536802a1ba15cbbe0c802fc43e03eaca0b458ac8222f5f8b3f43cf4e85018288967ba2a305db8360c6d583e5aabb80b4146d8bd6c96865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ff/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ff/firefox-63.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1f50eae02bed18b0230c824c9768b13e2ede4c622e42120f6cc684f7cdfae4753eb31f867cfb272710b2fb2ad9e649a99d2187eeefa74a5afc1999e002b6cfaa"; + sha512 = "e8e1c2fd944f6839560e3182b2933b2cf9d62628589b9f3116179d918ff9b5aa8b518c5150d9178dd3aa4571e7e6c1a7c21e263faa409c106b0a63fdb9ea07ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fi/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/fi/firefox-63.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5f089861d3a67b754e5ddad49858789d6d6ee309507baf9ff5198e011c26f970cef54ed37398458a3729beebfe9451fb16981ef32607cf1635cc40b7556a7f9a"; + sha512 = "5c5360aa4afb19fc04126e3ac59eaf0ddcde87fbd702fff8c81084b1b14932de8a17965138eef2473532c7ce6a624ff89f7fe6f8f096aee42162fa26a6e4156e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/fr/firefox-63.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5f8963809cc8cc33dfce49b2ce7e44c8351d8a3d193766eea99c668533abdea89d53233ced42c9a8d57356195a3f31f549a486a42f9f06c8ee6d32720856ab1f"; + sha512 = "7be9df5480663cba5ca9d0ad5ae163073689395ff353e68deeb89714d5c535ddb2313f8495ff7933208c64360e74f6704a92e50c15a7b5c8b752e73080f0d743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fy-NL/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/fy-NL/firefox-63.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "50e1a6c68daa2d330ce9f8b070413e100bfc29f7a0f1a7794c58473de04961ff62f776e2c343452ed6ddc3cb309f615ebdada91e4d259e60f066398068141e3e"; + sha512 = "a376fa68939d16fe7dbbbf91437f7b757b66e7948eab2bb1170f390a310dbfb02f9ddac481896d1eb9deb5a12c942e7bb7e133dcad4fcbbdf90024d56a887e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ga-IE/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ga-IE/firefox-63.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "42b2b796a5ab27137e5207ead28daec4d9a0a0fdd58336064c30a56f13a4389d49188c91b6d2101d49550b071584ebefb81d1c3fcc3d9948e2b14f00a7c0feb9"; + sha512 = "90ee86c14d64bad009d4a976bb6290d4ff2c521422a12e42eaf31a58991d2d3cc20239f6c16b12aa7f11b5fc0f219ee0baeb660f1bf6036fb1b93a8d25da7ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gd/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/gd/firefox-63.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "794193059ee643092981491b0c32886e77be4faef7948c5db2b79a76e3ad4baf30dc149cc63d935a9210c02ccaa843521398e9274dacfa6f98ef4f49caf65c70"; + sha512 = "c3c1ef229cb2fb1c77ea10c13fb53a2b87cb43068f39182517787fa14043ca4e47b4a262b3ab11ee33ce28340ceadb1486127d280718b58f4d3d28c6d1e56155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/gl/firefox-63.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "3a494f60eefef37ad8b62b30d1e32ce9e783bbea29e594668839bceb416d6cc16786a95f9cba06f31b027b4bd40528738ad26c955adac3a433ac083e49642b90"; + sha512 = "8e403f07b874ca951b0fd0811308dbb6766a82ae9cdd2e826fc93e19fa89be075f2a480ba403c534ce7f078e29b92b2ecddec1cd461dfde5e7503ffe10757d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gn/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/gn/firefox-63.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "ddc555b5f0aeefd9fd435442a457c7c37d4bf4e338b16bf10e1f1798735c52a758b30beab270f03d425dae187bf9d83f828afee627c7d0eb3dc7615bf22f684d"; + sha512 = "288a0c5e1217924cc4b7596a4367d05914d4e3846871a7cabe0f733eac998cd18651e1083d23e034a22feec764f809bbea0ada464a19fb49673b86bc86cdd7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gu-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/gu-IN/firefox-63.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "a3b67578d9ab00920489d088d59f3ff1845319d9b4467ae3854ad9b08df72a07be94f2436f93db7524bed13a467ed0acf1d271dd6faa86ba9ce74535aee3d35d"; + sha512 = "39acbba4c189498cd9682a80475404ab8cb5fc344cc3daac6a2bc9161f062d4888fec2a7c6c710463f86c286d0ecd5ada624265ed0894cbb37b6d516b22daae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/he/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/he/firefox-63.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a6da54477d9a4ba632ab0c077904ead3f83c1e268781ca2bd8fbeecf15da62a3d1393c8cf316716c3c22f7c949a48e2cc7e90bf6d394b5dbf5559cb8c92c8097"; + sha512 = "8950daf8e742b4d643fb7f6fde87c80bc62e9af98896270bbc834b9e7bc73ed7ae1c9696b9a8c14b2ed372c05ab3b5206e9582b6aaca224a73d3260ea3a7ba91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hi-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/hi-IN/firefox-63.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "708c9f75ff02efca7cbc7a2483aba15cbe1b22fcc5d4a743633d027afcb22a0ca5778fa05ce40786279a1d145f75c4b9bb64a16bdcad87c9f6f6a439ff748fd8"; + sha512 = "902547d964746179ac21b4b6c3bdc92b1a11125fdbae97d501d497c882002e6c2ee1ce339b2447c6e650571b02803f51a009b751d6b100939ad5a09eb3e682c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/hr/firefox-63.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "6cc028e94748d9133887398299e21f70abffa4df216ab629eb579270be8c5ff9b600fbc2094b9d47ec60c577a2158ef3d3e81d63492954260d4b53bc19868769"; + sha512 = "f94af79ed665da21b9c798331409a1b1542d45e4abfe9a1124b0c5d38e175d7653cc2916fa59f380b8288766da88526742947902edcf147fd93b1f63f29af1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hsb/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/hsb/firefox-63.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "81e8f54353a6279041694ff9e95eeb730d3ccf7438cf0b1c4c45425144b3f9e655656b9ac912405f85b9206ddd37ea31bcd6e975b25a14b179849a33368c0693"; + sha512 = "10ce80b0c58913a50d279c9276365994597dbb2688aae32a8eab851a2fdcef4829e9f3b217b14103d82cd67aa586c7ef184121b688979080ee87b152738abfbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hu/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/hu/firefox-63.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "cbdc13d964387f0a5add945cb5f5f71fe2d4c6da9d37f77883074a5ffb22121c293e7c665580bea27a43d98547e2459c7d42cec60af80f44b0d5650b3b6d9042"; + sha512 = "909de698586db1192f09d8cc9b707c2487784910184ff2e72d1e5d8bdae103b4b4e3296073d57e5827f8063e17310632aba79acffa47313f577bdca30e35354a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hy-AM/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/hy-AM/firefox-63.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "16aa31cd906a9dcc41cdee45e00df6fbffd1fc83fe9fe5a7c10e0b6007f3ab542bfe328b456f8ec68283a6633d63457ce61dde4661283e75917a0198b38c1a72"; + sha512 = "4c5dc3c1030dae4153911faf69f5399b7e90927c8419a742f7fc7e319924a67e508c32d07be16d178fa579a4dda39373a828f32fa112a99a6da05dbcfa0b271b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ia/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ia/firefox-63.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f622f1a1c95bff1b68beb21398fc22e88e05350a2ca1d6d0c018db4d30962f1b5ee4bcc0b9fee7484b02bf06326596f702a1a9e5b0acad5e0fdb73be1c1dab45"; + sha512 = "bf6fdb4ec04641a9e9a7e349df82a431c78b4d3402a0f145309f364028e33d05a0126bcd236d69c355c8a60c3e3dbbd0db373bc9d5ceef1f7a2a1fcecd998a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/id/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/id/firefox-63.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9d44617bac45ccfc191ee02a3c6f994734c9a1bbd5f6cb160808361522430a57798493a33b774eeb331846c99ac09b46788e06abfc716a0a634324b2992085ff"; + sha512 = "66bc5e37493b5d49202a1a49b2a688e04fc279b4fc59b39501b1ca263d273fe64e4d100af49425be7487cd190cdc4774f1ed076bd9d31d6f10be099afe5a206e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/is/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/is/firefox-63.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6c64320f40b41fc0ba93b94302d83cfdeaa90992681a5ef810399b35fb1f1d40406b2ed80148cecbf6603bd9dc1298dc6b3b334b98a13ffcbdc0b2e19615051f"; + sha512 = "b0e5c494eaa593fce4e683fcb3483dfed0b23931eaaac632289cd4064c1244eaac82da8966db7fc85a9b380a5993cb1e21a3c5b811ae53bc4ecafba0e8a62842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/it/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/it/firefox-63.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "deaf12ee7fa25a650116dc21b2507df41ed0535821f43cf7e469d870154f4e0d9d66ade3ed3463742e1c5b28d4526f4cccecba4f3995178ad7f6b82d29ea0e88"; + sha512 = "e03a88871c696ea20917dc6e43707895bc8a2d12d1478b18f3f7059cb7d73d86a690038a0e65ad5434749c01874a41d414494544fc40c7a74a278fec6c409ea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ja/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ja/firefox-63.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e4c1a5724c77bd99d9d10bff3f9e011f35bc130aa711e629df458e7ee46a3bdf1fcfb4bdeba4852bd0dda773b8327bb3ddeba2115406517c77d0f4d224267af6"; + sha512 = "60548d2697967ba841350488239e061a597f56e1eb9285b763f83bb57df6c0906f39eb9d030cd649f496ad3ed54c717cc4ac71fa44bbdaf3f18e32288c6dd434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ka/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ka/firefox-63.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1040735b4e1f6616ac9b2676b7007435c7423116e5fdcf8a0a9b472c5cb0c17c089dda5d711fa10129d6bb1c84082602adf20161f5d6d560fbfa12f6225635c4"; + sha512 = "2c3a2454ef64a184b1a28f884462ee63806ac61b578f59f61ec194691690880a9ce2d76e0e183ed16ef9ad570383161ce9370cdc97515a1b33a6b279d134ca6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kab/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/kab/firefox-63.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "511ccb5a8745fb1b93fdd49ec9369498b577a155fe5134b9990e6740505f342e76b0da136cb3ebfd2a15921b677be7cab6099cdc8cdea9d6040b989cb12672db"; + sha512 = "0ab0ae54fb5472af7dadd987c2d8a5a6d820670b1d6fd2bf17eb036fbfa4151e7ae754028570be254d8520f98b2cfc953d50e98774be0ab5736c3ad52313aed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/kk/firefox-63.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1e5d5aec9db2fc36a56acd1d9e723659c3425ab4f048966f0550eb1723ffa27b0b91acf8daf8cac9bd6f9929a5fd880edbb4ec1aa4359282f4d4c4532bd6636d"; + sha512 = "0fe809a4ceedc163dc3923397c51ebce0bc933fa8d728fe8da44eea098a3a150ab3d86bef8e6904f59d20440dafe16a8c45be3d8d00f4a0392e446a3f60c925d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/km/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/km/firefox-63.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "76063e3d83454f4850849af7084d9489baf4d354001277a9f606a28db089e589147033c132320b34c59032b2dfc7611ee52786c960bd280b5426781a0a0b7be3"; + sha512 = "5ca1faa0a2dd1fbc1c2ea9b7c631ca682c442ad26a384065f27261265a731003214560fbb6b90be791b07f10a5ca7ee33d22c682a61f2eb65f813c9af06d6ea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kn/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/kn/firefox-63.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "14fdec60154ffe181f00808f8877de3b045c72b91b0a6c017951033eae786ee26e4f96555034b8161318edafb8ff07ac41203a9bce91ddc20215be87571c5e11"; + sha512 = "f4df227197c065304532c5dfc2e86393adcee0d494223d7771c724bcf8e11205db7e4085373c3b43b51c84274bf741d39712cc2143c7361c706ce0613e244c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ko/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ko/firefox-63.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7990af9dc0df8f9fae35d928ee5b476dde1e12db6294f5a3033d37e73e44fb8d0bcbf7916f79459dcc6c8f05ef065ff4b0dea95bc2c342ae81f2161fd61b2fd0"; + sha512 = "1e98e25daa86dd69a06c69146f171c84ae45c42e5906fb04aec245235c3eaab310bda6a08822081a18ea75c934905b3beee22d17f9f2a2f3cf823c3c0b695f08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lij/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/lij/firefox-63.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "42faccbb1029df56f17b94c7a5d9e6f6d5fcd7c5e6b623a6fe8f89f143c909961dba135e02d0ade1bd57399bed1279a61ae16381402ca391aeb55761428f97dc"; + sha512 = "864335bc53c70d738d0338426e499bb8aec9b35edb2e63451805a064c8601b6698293f1fc759a4cc3d38b556fb7ca83f4a1d15c7ae9aed7f668d9d901b47c456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lt/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/lt/firefox-63.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b4079f36c1a4788f8da2a4e1efd0ab4bb166ec45dcda1ff0077746a85ed5d34b8cd498a0f1d12463349d4fcfae820db39946caf7e55f4ae9ff1c9ec587a95fd0"; + sha512 = "676ffb0616224c53b61c5e13713fcd59078d9acd46268a76321e199414acdc734093979a71b1e7a054d690f6e62f1ef28f807345cad620e7b6ab7920f84a7559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lv/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/lv/firefox-63.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "5a8eeb1274c30e57f7ecaf307e23eddaabbd7272128063ece88f480c7a8bdf96efbf8d2db2416e0232773457b10474a531ace2eac264175e590050662c8d606b"; + sha512 = "ee93f40d4e624e24dd9fba0951d6f0d67e4caea63fe8d24ee1641f44de3c44f214aee0f26ce9a04418c585e9a6486d50957a68bfffabe614cdd9243604b9b519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mai/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/mai/firefox-63.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b2ff3a58ff0216df0d980c941648e143a3dea87e1c90c4ef1367a3a75d5052b1c1e54b07476602a91adb691bca2fe4e9b70d89895773b3a021944257b0429518"; + sha512 = "c71cd9d320f09e0d6307cf1e04cebee3ee565078a73630a32fe461815098c3dc09053fcfe15c51736da2686b6edee435138cf953931500bfa3b049a31cdc086d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/mk/firefox-63.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "4ee9b4744ed73d866d6d2e73d0a9aae983d063af3fb4e313e8c6a2fec055b10bb1d414cbf87c0909119f1f804cd64eacb981b5c17ecc87e29ab246d736b6f9df"; + sha512 = "d04883a77536aeefe29ec9efab45bac90ab548a9d67076911446f4f8d7e86ec01055367b5fdd089f857bb3e6e108ae1e4ff6727db2cafc17ef25ba9ac52914c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ml/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ml/firefox-63.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "9bdd87f047491ba138796e48e46dd4fefbccac03adb4d652978d51b933327f007ca89d41929c075dc61353584cfb5a3fbd94986ca791750117b55a4ed65b7994"; + sha512 = "d9c71712d7b852c4585245d87fd060b707c1789a5406e69248d46b8b6a2145fba33cdc5a31dcfb654e7386fb1b2b70be7f6e22c320d5fa85927d1bb9867280a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/mr/firefox-63.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7680c9af0d556599120b3d8a2883a4bfb9bd0dca47a2d2b3dec669fe2852de39c134cfaec0f53082b269245a28588bc699250d438668264c778c7cbf3037a50f"; + sha512 = "fc82d00af91de103828c99eab71ebdf0f047d978c7477f57bb7df64fa20b4fedc39bf0fcaeac4239981cd0a0eb845509e78e4b645860f2bc1835a2a3dd1c32b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ms/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ms/firefox-63.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ae78016ae552d10f4220e68259b464097464081cc2b3c114648a6e36e4381df7e9333f7c13c08e0346bdaaaaaadbbc9a111dea55cb6b4daafef29ff0b0db5afd"; + sha512 = "935f32b98168d0b136a6e1d1fed10b8636e74100f0f40d94273483acfc239e818907159e1b6009fec132ef88710a2a4189689a1313bb26eb7d3c7bf13cf365ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/my/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/my/firefox-63.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e682f1e998a946053672d61f880a75472d692ea9f7232df9e2a51c6b3d27f7d5496138144dc17a56cd07378b20bde48450a27157782e9ff0463ce922c08c6e3f"; + sha512 = "74d85bc47ba363f889f1d8785756406643f03e60d04a340f99a79f0fdd4ff733cab1807b16e76bdb1bc0fb8f8f69397624d8d8aea934e689637b90d283c171a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nb-NO/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/nb-NO/firefox-63.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b6b68de70089bc3f02741de04138922b3a4b6ea760d5b43c00bc636a3f60fdc510886e76b989facbc4db23e72e0659db9ed38705c8c56851ef9cb9209524d58a"; + sha512 = "a9e43f742b720a03b9c7ba43e812225c6d32174e908dad8de15a72e758dc2f6374aaca5eb7ed7abbfe7180d06936bf7eef6f021c25bf3d440d63c1a0bc3c1804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ne-NP/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ne-NP/firefox-63.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "057ba9953a8ff6824567de1d3629b7d995924a7da49f9b03e1b5e872cafe750dfafe05a74b72cc360c932237445712bddb646cad2a961523d29a8b5327ca3bc6"; + sha512 = "c20328156416c0678d701c386999a9de88365bda8b033804661158098911247b883e4521d7881d63fec08713136a457f1fa52cae000e7cea7e8392baef7986d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/nl/firefox-63.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "abfa808668e527940d7f344522650cccb4272555b67e4d90398faeb7aa31766002287c5e73f259b2ebeafdba890b0ca9940fe0bd12926f8b748ce172ff786abd"; + sha512 = "b1d16825d152c208108938846397d6fe1315493e5e5166835c546c611badd25f3e21aa2bd044ab84b827e81f3eef0094af8196d58dd84bb1cff604bd63e7fab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nn-NO/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/nn-NO/firefox-63.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e5048346227c41b20534e71042a911a74348e403283ecbcd3a90f1ecf3154907e0c7c21eb26b67f2ba09a6e8d04200c990f7a4babe4ea5782a847a31a6a880ab"; + sha512 = "7f86b552c74fae7a7d0ee81edb44696770cd31ad17fbb1cf8bf1a9cf6c102b006d76204185a6d36eba2c73fe9220735668ad12fdadeff6dfaf4a4fdf507c47af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/oc/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/oc/firefox-63.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ec1f24de15020cd6a16d95d47db8e2e73d1b3aa269e27d30421c15e3d71b57625c10e7c20427fb1fcf2ca7b2e1aeb0f16b254c1107aee28c2e8522fb535d4a5d"; + sha512 = "496cc5e21d8dee68a929d9338d3b7c341579af2092279168c846efb355eb28d47180173d159d3e93f279e1494fea778b0e769a2b87e483abaec3da4baf0a258f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/or/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/or/firefox-63.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c55f10e0a9a3cd3403eb9167139b4c6f0e8a5f66e3f33b12efb40bb6b2bbb7d1dc2aa365b1ab375f41da34e7d21d2848223934ffd2ab61fa93220bccbe9fc720"; + sha512 = "a4df6ee8516b67bfc783d566e3e78490ee89cc74645e1caef73cfb4623bb571df292b03a8796c313338df637ffd3825e7ee6dd0779e2217319fdce7b07bc9b8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pa-IN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/pa-IN/firefox-63.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f74dd4d54680d94ea270bb7755f6ea4fe058899cea2472c08ebe5f34b8323be7157b060abc83ec80aef8f2ca63f3c806a7a4d831a4e72025ad25d4ca40783cd8"; + sha512 = "7e6efcd008e69c56ee21d8f00a7d0766c2c9a79d8a2b01cf7b9deae0dce7e03ff3148b2ebacc587268d39a3564fe9870c5cd12db836ffa96891953306e6822ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/pl/firefox-63.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "05c82b2e08f65e37d4e82fd93d3d2ebe6a5d5441ab11069cbc66b18af0ed93e877466daf1d804c53ac3c712307aea475c99f922b5064cb551d136e5378e23765"; + sha512 = "947ad8bffca0d619d0c3a4fd77830120395592cdc342ea462c793c298252fe76819999110ba4dbb9b3b6189b107aa307a5b04270b4642113f634593a3813b565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-BR/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/pt-BR/firefox-63.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c8f2d36ada67a2fa7717527355a0e083ca5891ece1de70505efeac51dad5f6985666e2be0bdf23ad0f4402d6ee96fa2e12af50369297a3e46b9804cb0b830c89"; + sha512 = "9b465f5c34fafc80b33b45d03933c81dd7f2e1d54417d5b80953b35addce08b011d0ccd1a75353f5e600d4567794e62268c27603d5fa9ef6bd2e5ce83889ea6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-PT/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/pt-PT/firefox-63.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5e4478ab220636c747ce9c5564a1b71554b1c67999722bc55204f747d0ad430eb2a0b71336997e80ca391d7680ebf92c66ea7ef4d25dc568f8c6860cd31ee26b"; + sha512 = "4a9c47304cbd015ab36e5763ab0b6564cf81ae4c791d28c1c37d49224e4fd9aff186815b19a4047c7d6b713a6c4ea7f3d341d11e56885ee5b73cd2f2a2048efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/rm/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/rm/firefox-63.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "67438f3cb1a89a0258890448de6d16be5f79291d4c0989691d9c8f38966a7a4ba2f8eaccb26ee4458a81a733ae9513555a22f8b57652b4fce1eb1e3ab2368848"; + sha512 = "24dd07cee63e1a3370b970c5a2e0c215e6587ff17ca0438bb8b52313eeb52e9b241c56fb31740602067b635b314cf20d63e03fe269ae35b4374f2043c8292af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ro/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ro/firefox-63.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3cdc7f593af3bbd858285237a9ffaa07aa76cbfc67c0f7d22d5cf261a19756ba3aa8971d54a10b820344beb509810b601faf0cc89c86636bc60ea1a6d8421873"; + sha512 = "25c0d057571ca970344f91a07ee1437e290ffeaec2c15a3b106e4c690afcdf7b3bc9f92f28b11d179cb8912697b1d7e255a6596bebbe8e1488dcf4347cc7fecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ru/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ru/firefox-63.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7b6b03cca2fe3887d7ee86eeb8ee699157a6cd828108737e26724a48af72cf3fe326024f41c6afc13f7e332c262a4e991728ad5d46ac6fb6942c5c3b4ea93a9c"; + sha512 = "7110c2ff51b8d5539018383560c113e63ba1a870510501b0bfa1294bd5c19a992d07786732bbcbb820ece4045fb826bfcc778200dd3ad63504e64cc2d85deb4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/si/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/si/firefox-63.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "10f9fe43304931dbce1d0073ec4e827f369291b3705b322a3f3ba8f7002a974c019be8f5a594d8c88add527667d9295a27e85f2b1072e16ef1720e9e433111b3"; + sha512 = "6dcb0eccef3c582545e7de5d9c33c80690db698a9b28dc7fe654187b60e69a41309c3326eb2b73ed6869a4278c22db369e12a8fca5f2553327b2b6fa7fdf389d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/sk/firefox-63.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6b90fd21c51d48ca997ad47025aef3a4280e30152a0f18d0ab8948e055b80e5aa7cf1374b2eeeb1432d8892fb07de505adb9ae6c57e776ced4c429859577f040"; + sha512 = "9e7b74a0c495cc6247c5d37931d6038508186070de80a935d2a39540960d3d57996f47497fa430b24cc9164bae5bf5e761558cf60231594ab9637956a26326ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sl/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/sl/firefox-63.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "55faeb2d5310266395a442d0d9ce4a1020197d0ce7655caa8d00efd022db9e1c9926b7418f4cfa380d04e1971ed47e7025d434a36ca0fe6f58f02be7f0e26a69"; + sha512 = "6c65c39d0ae8a398e25733f0be9180dad1bc17d3ffa58f02844d6750bbb64a0d70f31b565e3ed606b6452431d0aa705f671b45dc2280cbb90aaba741b60d82a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/son/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/son/firefox-63.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "63f104da43ff4103b40e271de6c962fae3d77891f50fe5b39698d3c2e382b4234dad41a3a64794015ad88d34a7e2b819c0ecb62b1bb44a4d8e83eadbc1803151"; + sha512 = "55ea357bf7f6ddb7e8b51796ef199168c89ff5959e5e64fdbe8e362bfb1efa19f9f407c20510139c52cf44058a5c4823b2c1c10821a2ee06a18b19d48a85a403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sq/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/sq/firefox-63.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "534ce38e5dec85de50e9dd541f6d8445e95fdfac074a51866c993e97d020b9a310abebffa2162fc513572d202f9fec8e3a267207bf9c401b27c8541534ee2aaf"; + sha512 = "5fd975a71f9899b9eb90f46adaab044c2d21ac64cc71558748368c41bc50ea8ae688fffb0579693633f1ed82970917e1b46a41133af3133950dfb051c33556a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/sr/firefox-63.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1174da8c998cdd62370bb8c80c6a47360cdcc84144b03ab33f10367b5622ecf6ff3058e4f525e46ddb523f13e29b6fe557b7442dfec92956b34eaf507bd5f8c8"; + sha512 = "e8cc283b6d87718f81a619e0c54a2e440e21940375f8eabb318d24c22b5e04fa387d27dd6b2c28c98c65a94cc8aa1966ea8c6ac346f3012df0a6f268c9aac67a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sv-SE/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/sv-SE/firefox-63.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7c24f0d4552ca7bc3076b9b0485c757e0547713a58d09cd568e506e37dd6133c5c7a7ad3edcffdd387cc0c5661d3602f4252d778174bf78812788ad1daa9384a"; + sha512 = "324c7b8b0b313d9de9d83f05d2e802c9733537a5bc1a77bc7335f2551f1466da9c276622a848440e7a353f944e463e1b323fea7655985cf755b38c80e17fe335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ta/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ta/firefox-63.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4387b1cfd77da777a3257e714b014c686ad8c5ff1edb7ba0e2d01f62621eaec92766ccc3bbeb93be45c0b414b9b31676692e75b366a7ed0fb8e0526f95126807"; + sha512 = "6f35862c7052f55b06ffcf0205331288c4278fd2de713c57a509543a02394978a9726fe747709f4972ee2c43a5a001c0f7c5e58e63269047abcb5f4f26e78ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/te/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/te/firefox-63.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8ad96e47cfc1066d27560a5ad26659dba098724374605520198d580867be3bcc05a63120865745055ef00163b8c7cb97ac35f18bfcdc3d171e7eed6a05f50855"; + sha512 = "4a5534580d90af3f27ab1d66f54f38782179ab239ad913153660539591001db9dad409ef849df97f5f382388f559eef336c2f9245180704caf9d414e0965c17c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/th/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/th/firefox-63.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "74272739144c6ae69dba8229420894b10e0dd9d75ae386f1221b17f8e54baf8c3d921591c5707ab5d8847deedad2daa3061fff03add11a2e450fdf691dd49f9a"; + sha512 = "1a21c20e0f410aaff94eb4dee6f26555515c0095aae9cc5e7ec8c90e57bbc73e8dd5a931b9f6fae52d5ebf7de4a3aea2176b973effe3e65e844e1936387ed8d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/tr/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/tr/firefox-63.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "0cddf14cd7a7cd4594ca04d1416b3ab32db42a287e62b68197fe8e08078999028e47074e563302c77e480d02563932d20ceffdd89c53b53c79221f3cc309e802"; + sha512 = "1e69c3de2d1836082369994ea843e164212527a13808153b16c02e5a3986a3f11c87abbe0fb2eb9077f1273ff14cbb545856c376945a9e40143217896a444e17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uk/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/uk/firefox-63.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "17e3d498e900ddfc4b00e3ea99b7b2f55c0252e88eede45b47b020293131d6adf5642c1bf94c39bba5b9042e2f9e20ba5399e6717e6965e65d90c4717a236832"; + sha512 = "87c4e1b907db9bdce6d8dcd2e4c70d57a4e8ce5125473727582987c2eea25543d2d97596d0f3c776962c003f2a5356260d3d9f18410448dec4198fead5461da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ur/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/ur/firefox-63.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cef0ade8282d3360e27d51b4c5487882ae8dc78c598b4150cd3053cc442843cd58f5c362ed6c5ea8362517633dfbb2751a894c6cbc45bac796c181f32f095dc8"; + sha512 = "533dc9eefd4b7604d92420333aa4f6e1b741ac545814ec1a868393e321d3e84e5d3ba475a98cf1e226b746f1f6b5b42db082d7a6d65b10971b2576e0a3d4cc69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uz/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/uz/firefox-63.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e8dc2b26f35f5ddbc93e4891d7b9b4dfd932ba6c7d1da19a6bec1f5c259f78c1c3105d9f2c89cd97c91f4032489f95a339ba5a22dc4daf3c948a968bf580d4bf"; + sha512 = "e3830088e08eb8e16e6d7196e153eddc85bfb1bab3a29904aeb59c427215fdf82d7a5e50ab9db5e7abaa74b88ca7a4c002fef11883ab000b3b10814650d337e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/vi/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/vi/firefox-63.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "6dc0945c634052824326cfe8558d1eddb192dbb4eca9eac458b8cfb3680cb1cf5537dd8ff4237ed32264d730e95287d9504fd0b1528fa33907dc1a2b4558ea61"; + sha512 = "5cfce3e3a278964aec4b8b863caa60618691fcd959009395a705b8ccbc51fb7b30adcc84de3be6e2627329d0d61fc7ab7d6c2ab15f93c255c336f327b8aa8a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/xh/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/xh/firefox-63.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3792ce77db9de5080437b2aad6537f00963593ff98cdd47a145ffef8243a5ea23e8cd42f82e217885601b04df4c17d833aa88b9d15cad7a6840978af3a756b05"; + sha512 = "61630ecd035d69866d0934f3a4ef4b574c4ae1205af3c130889d1eb132066fd2068a4583eb87b9e214f033184a671bb973368faf417aaa3018e8badd16295592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-CN/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/zh-CN/firefox-63.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8043f8900ef35f85cb05f2092829899d119e079210dcb8bd9d369c7d73ff901e80afc4eecb25421058b65e5e267f7cf671c62cdec5849c2ff0da104f4ec12ad2"; + sha512 = "968987d12dcf4a9ac0e078132ae50b321987c990c9bd8cd3388d981c7e5dc94d26c7af14492e356d2b984badd595998bc7e9f955e0772534b5adf31886c319b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-TW/firefox-63.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.1/linux-i686/zh-TW/firefox-63.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "614b7835c82f80dd27c841023aca6aa8580bdadac8241f08fc053fe7657f069d6337e3edbe0bebcc4018d47f3d9f2d328176add89aacd9847393ebd21f3e9230"; + sha512 = "286919b5f69f2585c291c0736dec6b37493a809e7e2b342743523d73e749ac4e860236da061ffb14c28452884f72055d47084fa3455898f9afee798c1ec7cdea"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 16c9b548325e..2f0209ed8fd3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ ## optional libraries , alsaSupport ? stdenv.isLinux, alsaLib -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , gssSupport ? true, kerberos @@ -196,8 +196,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks" ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell" - ++ lib.optionals (lib.versionAtLeast ffversion "56" && !stdenv.hostPlatform.isi686) [ - # on i686-linux: --with-libclang-path is not available in this configuration + ++ lib.optionals (lib.versionAtLeast ffversion "56") [ "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 102b0de3fcc1..81f805feddff 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -8,22 +8,16 @@ let ./env_var_for_system_dir.patch ]; - firefox60_aarch64_skia_patch = fetchpatch { - name = "aarch64-skia.patch"; - url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch; - sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k"; - }; - in rec { firefox = common rec { pname = "firefox"; - ffversion = "63.0"; + ffversion = "63.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2"; + sha512 = "29acad70259d71a924cbaf4c2f01fb034cf8090759b3a2d74a5eabc2823f83b6508434e619d8501d3930702e2bbad373581a70e2ce57aead9af77fc42766fbe2"; }; patches = nixpkgsPatches ++ [ @@ -70,10 +64,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.2.2esr"; + ffversion = "60.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2h2naaxx4lv90bjpcrsma4sdhl4mvsisx3zi09vakjwv2lad91gy41cmcpqprpcbsmlvpqf8yiv52ah4d02a8d9335xhw2ajw6asjc1"; + sha512 = "7ded25a38835fbd73a58085e24ad83308afee1784a3bf853d75093c1500ad46988f5865c106abdae938cfbd1fb10746cc1795ece7994fd7eba8a002158cf1bcd"; }; patches = nixpkgsPatches ++ [ @@ -82,7 +76,7 @@ rec { # this one is actually an omnipresent bug # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 ./fix-pa-context-connect-retval.patch - ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; + ]; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 0d86e4f8294c..6043744f296c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk +, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -57,7 +57,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap at-spi2-atk + bzip2 libcap at-spi2-atk at-spi2-core kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 38b064ec6e29..7a26a4d19700 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -33,6 +33,7 @@ , libXxf86vm , libdrm , libffi +, libglvnd , libpng , libvdpau , libxcb @@ -132,8 +133,8 @@ stdenv.mkDerivation rec { alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libpng libvdpau - libxcb libxshmfence nspr nss pango pcre pixman zlib + libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng + libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib ]; meta = { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 108d7c5f4a1a..5c4d0540289b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -33,6 +33,7 @@ , libXxf86vm , libdrm , libffi +, libglvnd , libpng , libvdpau , libxcb @@ -88,8 +89,8 @@ stdenv.mkDerivation rec { alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libpng libvdpau - libxcb libxshmfence nspr nss pango pcre pixman zlib + libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng + libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib ]; meta = { diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 343380c60751..c3ed2d16df18 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1gm0v5p008w9i4k94ddjdyfqfsbx7a6ngmh81p155599hifm32zc"; + sha256 = "14w77yw8pd2y5d764byh31vv9203y38zlvcr1a9wylrs00kgzwfw"; }; buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 421fc652a328..c3be5eade390 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.21.0"; - sha256 = "17853l2s5z1y2g24wdkapdp26hw0sx5w73y118h0px85fiwhkq79"; + version = "1.22.0"; + sha256 = "19qn7q280ppsg7hjlmyagbhgb7qw365mk6c4avs0apvpq6n64rn3"; }; archive = { @@ -39,15 +39,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.42.0"; - sha256 = "1wi1m7i6vq53p36x1prax4yaz400834024q494zg0ckk4rvngfp6"; + version = "1.43.1"; + sha256 = "0fhw07kqcykfzlfhqh3wdz43kkhz3c63xkymnpw68kqx2vxx8ncv"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.17.0"; - sha256 = "03sjlqkwy0qa382sjwi21g6h2fz1mpsiqcd4naj5zh76fkp8aslw"; + version = "1.18.0"; + sha256 = "03vkpk9kl9zvfrprhqqn739klr9gpps5d6zq5r3qa56k588zcg4p"; }; azurestack = { @@ -102,8 +102,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.7.0"; - sha256 = "0sqq6miwyh6z86b3wq2bhkaj4x39g2nqq784py8nm8gvs06gcm5a"; + version = "1.8.0"; + sha256 = "1hsqxi27mwr96k8yn8f1nxwvs1jaq7nr8plxi7y4lqsv6s7mghjk"; }; cloudscale = { @@ -137,8 +137,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.4.0"; - sha256 = "06ik2k0jkm4200d8njpsidwfjl12ikn5ciqkmlxfwr3b8s1w8kpa"; + version = "1.5.0"; + sha256 = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz"; }; digitalocean = { @@ -305,8 +305,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - version = "1.1.0"; - sha256 = "19c269w8jjx04a8rhm4x7bg2xad3y0s74wgis446mwaw7mhla3l3"; + version = "1.2.0"; + sha256 = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l"; }; local = { @@ -340,8 +340,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "1.1.0"; - sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw"; + version = "1.5.0"; + sha256 = "1fsqfqz1db1pv8agr5zgqqyhizd7647n6rznf24iwapy1q0wkvmi"; }; netlify = { @@ -354,8 +354,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "1.1.0"; - sha256 = "040pxbr4xp0h6s0njdwy0phlkblnk5p3xrcms2gkwyzkqpd82s8b"; + version = "1.2.0"; + sha256 = "1dh2i7qps7nr876y54jrjb414vdjhd8c7m1zwdiny93ggvl8f5j2"; }; nomad = { @@ -396,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.5.0"; - sha256 = "0f4m6rahis1n62w0h0amg8sjs5bb3ifnrfzq1dys7r01k5411wcf"; + version = "3.6.0"; + sha256 = "0ilg52j6js6bvw9wng5rbcv2n9kp926x4f2q340qwyyna59r5s5l"; }; oneandone = { @@ -424,8 +424,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.2.0"; - sha256 = "05w899l18gmdywfhakjvaxqxxzd9cxga3s932ljfibr0ssipkhh9"; + version = "1.3.0"; + sha256 = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk"; }; opsgenie = { @@ -620,8 +620,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.2.0"; - sha256 = "1z92dcr5b665l69gxs1hw1rizc5znvf0ck1lksphd301l2ywk97b"; + version = "1.3.1"; + sha256 = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh"; }; vcd = { diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f35269eb2712..1fe9ad5ccc83 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.16.6"; + version = "0.17.2"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "0fzn2ymk8x0lzwfqlvnry8s6wf3q0sqn76lfardjyz6wgxl8011i"; + sha256 = "069l9ynyl96rfs9zw6w6n1yzjjin27731nj1ajr9jsyc8rhd84wv"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 64e3c822108f..d01019a56197 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { name = "psi-plus-${version}"; - version = "1.3.422"; + version = "1.4.404"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = "${version}"; - sha256 = "193n3yvhp9m14irb49kg2rc4h7ypdmvidrgvv1i2n373iq751z05"; + sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m"; }; resources = fetchFromGitHub { owner = "psi-plus"; repo = "resources"; - rev = "c0bfb8a025eeec82cd0a23a559e0aa3da15c3ec3"; - sha256 = "1q7v01w085vk7ml6gwis7j409w6f5cplpm7c0ajs4i93c4j53xdf"; + rev = "d623f57db35eb5af81ccdf69b2cbe1c437190f29"; + sha256 = "024cyazyxka5vcbjrkkw32c5zw6aa70n50fdp6zh5v5c51d9ci8k"; }; postUnpack = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index af2030a20b8a..529a530a4a36 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -5,7 +5,7 @@ let - version = "3.2.1"; + version = "3.3.3"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -47,7 +47,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "095dpkwvvnwlxsglyg6wi9126wpalzi736b6g6j3bd6d93z9afah"; + sha256 = "01x4anbm62y49zfkyfvxih5rk8g2qi32ppb8j2a5pwssyw4wqbfi"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1e8080fd9c9d..b5994d03bc68 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -13,8 +13,8 @@ let in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { - version = "1.4.4"; - sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0"; + version = "1.4.7"; + sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp"; stable = false; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index e8f2c135fa8a..63c3f9e07252 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -97,7 +97,9 @@ mkDerivation rec { sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ -e "/-msse2/d" - gyp \ + gyp ${lib.optionalString (!stable) '' + -Dapi_id=17349 \ + -Dapi_hash=344583e45741c457fe1862106095a5eb ''}\ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp \ diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 646b41cfe75a..cbf2dd7d99a2 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "toxic-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5"; + sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch deleted file mode 100644 index 41e3c54a2d57..000000000000 --- a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/src/core/wee-command.c b/src/core/wee-command.c -index 91c3c068d..8105e4171 100644 ---- a/src/core/wee-command.c -+++ b/src/core/wee-command.c -@@ -8345,10 +8345,20 @@ command_exec_list (const char *command_list) - void - command_startup (int plugins_loaded) - { -+ int i; -+ - if (plugins_loaded) - { - command_exec_list (CONFIG_STRING(config_startup_command_after_plugins)); -- command_exec_list (weechat_startup_commands); -+ if (weechat_startup_commands) -+ { -+ for (i = 0; i < weelist_size (weechat_startup_commands); i++) -+ { -+ command_exec_list ( -+ weelist_string ( -+ weelist_get (weechat_startup_commands, i))); -+ } -+ } - } - else - command_exec_list (CONFIG_STRING(config_startup_command_before_plugins)); -diff --git a/src/core/weechat.c b/src/core/weechat.c -index f74598ad5..ff2e539d1 100644 ---- a/src/core/weechat.c -+++ b/src/core/weechat.c -@@ -60,6 +60,7 @@ - #include "wee-eval.h" - #include "wee-hdata.h" - #include "wee-hook.h" -+#include "wee-list.h" - #include "wee-log.h" - #include "wee-network.h" - #include "wee-proxy.h" -@@ -102,7 +103,8 @@ int weechat_no_gnutls = 0; /* remove init/deinit of gnutls */ - /* (useful with valgrind/electric-f.)*/ - int weechat_no_gcrypt = 0; /* remove init/deinit of gcrypt */ - /* (useful with valgrind) */ --char *weechat_startup_commands = NULL; /* startup commands (-r flag) */ -+struct t_weelist *weechat_startup_commands = NULL; /* startup commands */ -+ /* (option -r) */ - - - /* -@@ -152,9 +154,13 @@ weechat_display_usage () - " -h, --help display this help\n" - " -l, --license display WeeChat license\n" - " -p, --no-plugin don't load any plugin at startup\n" -- " -r, --run-command run command(s) after startup\n" -- " (many commands can be separated by " -- "semicolons)\n" -+ " -P, --plugins load only these plugins at startup\n" -+ " (see /help weechat.plugin.autoload)\n" -+ " -r, --run-command run command(s) after startup;\n" -+ " many commands can be separated by " -+ "semicolons,\n" -+ " this option can be given multiple " -+ "times\n" - " -s, --no-script don't load any script at startup\n" - " --upgrade upgrade WeeChat using session files " - "(see /help upgrade in WeeChat)\n" -@@ -276,9 +282,10 @@ weechat_parse_args (int argc, char *argv[]) - { - if (i + 1 < argc) - { -- if (weechat_startup_commands) -- free (weechat_startup_commands); -- weechat_startup_commands = strdup (argv[++i]); -+ if (!weechat_startup_commands) -+ weechat_startup_commands = weelist_new (); -+ weelist_add (weechat_startup_commands, argv[++i], -+ WEECHAT_LIST_POS_END, NULL); - } - else - { -@@ -616,6 +623,8 @@ weechat_shutdown (int return_code, int crash) - free (weechat_home); - if (weechat_local_charset) - free (weechat_local_charset); -+ if (weechat_startup_commands) -+ weelist_free (weechat_startup_commands); - - if (crash) - abort (); -diff --git a/src/core/weechat.h b/src/core/weechat.h -index 9420ff415..cbb565a03 100644 ---- a/src/core/weechat.h -+++ b/src/core/weechat.h -@@ -96,6 +96,8 @@ - /* name of environment variable with an extra lib dir */ - #define WEECHAT_EXTRA_LIBDIR "WEECHAT_EXTRA_LIBDIR" - -+struct t_weelist; -+ - /* global variables and functions */ - extern int weechat_headless; - extern int weechat_debug_core; -@@ -112,7 +114,7 @@ extern char *weechat_local_charset; - extern int weechat_plugin_no_dlclose; - extern int weechat_no_gnutls; - extern int weechat_no_gcrypt; --extern char *weechat_startup_commands; -+extern struct t_weelist *weechat_startup_commands; - - extern void weechat_term_check (); - extern void weechat_shutdown (int return_code, int crash); diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 3ddbe9be4fc6..fdd00270d0eb 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "transmission-remote-gtk-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; rev = "${version}"; - sha256 = "02q0vl7achx9rpd0iv0347h838bwzm7aj4k04y88g3bh8fi3cddh"; + sha256 = "126s7aqh9j06zvnwhjbql5x9ibz05pdrrzwb9c6h4qndvr8iqqff"; }; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 07444fbb9fe9..5861513e7bd2 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.5.5"; + version = "1.6.0"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.5.5.tar.gz; - sha256 = "0g12hm84c48fjrmwljl0ii62f55vm6fk2mv8vna7fadabmk6dwhr"; + url = https://github.com/Syncplay/syncplay/archive/v1.6.0.tar.gz; + sha256 = "19x7b694p8b3qp578qk8q4g0pybhfjd4zk8rgrggz40s1yyfnwy5"; }; - propagatedBuildInputs = with python2Packages; [ pyside twisted ]; + propagatedBuildInputs = with python3Packages; [ pyside twisted ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 86c8b6db2c47..8bd21b1a6a09 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.51"; + version = "0.14.52"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1ycly3vh10s04pk0fk9hb0my7w5b16dfgmnk1mi0zjylcii3yzi5"; + sha256 = "1qzzbqfyjqlgzysyf6dr0xsm3gn35irmllxjjd94v169swvkk5kd"; }; inherit patches; diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/applications/office/ledger-web/Gemfile.lock index 2c94c53ebc99..290adb0e8e3d 100644 --- a/pkgs/applications/office/ledger-web/Gemfile.lock +++ b/pkgs/applications/office/ledger-web/Gemfile.lock @@ -17,7 +17,7 @@ GEM sinatra-session multi_json (1.12.1) pg (0.18.4) - rack (1.6.4) + rack (1.6.11) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -55,7 +55,7 @@ PLATFORMS ruby DEPENDENCIES - ledger_web (= 1.5.2) + ledger_web BUNDLED WITH - 1.12.5 + 1.16.4 diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/pkgs/applications/office/ledger-web/gemset.nix index 62e2ad54847d..acd1bed25a08 100644 --- a/pkgs/applications/office/ledger-web/gemset.nix +++ b/pkgs/applications/office/ledger-web/gemset.nix @@ -32,6 +32,7 @@ version = "1.5.1"; }; ledger_web = { + dependencies = ["database_cleaner" "directory_watcher" "pg" "rack" "rspec" "sequel" "sinatra" "sinatra-contrib" "sinatra-session"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh"; @@ -58,10 +59,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.4"; + version = "1.6.11"; }; rack-protection = { dependencies = ["rack"]; @@ -82,6 +83,7 @@ version = "0.6.3"; }; rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; source = { remotes = ["https://rubygems.org"]; sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; @@ -90,6 +92,7 @@ version = "3.5.0"; }; rspec-core = { + dependencies = ["rspec-support"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12yndf7y6g3s1306bv1aycsmd0gjy5m172spdhx54svca2fcpzy1"; @@ -98,6 +101,7 @@ version = "3.5.2"; }; rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; @@ -106,6 +110,7 @@ version = "3.5.0"; }; rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; @@ -130,6 +135,7 @@ version = "4.37.0"; }; sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; @@ -138,6 +144,7 @@ version = "1.4.7"; }; sinatra-contrib = { + dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; @@ -146,6 +153,7 @@ version = "1.4.7"; }; sinatra-session = { + dependencies = ["sinatra"]; source = { remotes = ["https://rubygems.org"]; sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq"; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 8566bd76e1e2..ce8910d76d45 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -13,4 +13,7 @@ in for i in $(ls "${libreoffice}/bin/"); do test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" done -'') // { inherit libreoffice dbus; } +'') // { + inherit libreoffice dbus; + meta = libreoffice.meta; +} diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 802f558731a8..65e12125801a 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct18b"; - version = "20181001_b"; + srcVersion = "nov18a"; + version = "20181101_a"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; - sha256 = "1q54q7y4zdax9vr28pvmy5g34kyr92jr3v1rkpjw7lxjafyqwy27"; + sha256 = "1dl2v8y6vrwaxm3b7nf6dv3ipzybhlhy2kxwnwgc7gqz5704251v"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 89e38104feb5..4ffbaf85fbda 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.14"; + version = "2.4.15"; src = fetchurl { url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "0z9hk01czkdgi55b0qdvvi43jsqkkx6gl7wglamv425c6rklcvhc"; + sha256 = "000l9hnkjbl9js7v8fyssgl4imrl0qd15mgz37qx2bwvimdp75gh"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index dab30e90f4d8..72dc154b71d4 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.26"; + version = "14.29.28"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0a728lwqbbnm5v2spi5rbqy3xldbcf2gcsf48rkq3p43laps3630"; + sha256 = "0m72w5qsnsc07p7jjya78i4yz7zrdjqj8zpk65sa0xa2fh1y01g0"; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 196374706e1f..4777c89e876b 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -2,11 +2,11 @@ , readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }: stdenv.mkDerivation { - name = "ngspice-28"; + name = "ngspice-29"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-28.tar.gz"; - sha256 = "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l"; + url = "mirror://sourceforge/ngspice/ngspice-29.tar.gz"; + sha256 = "0jjwz73naq7l9yhwdqbpnrfckywp2ffkppivxjv8w92zq7xhyvcd"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 0e978f2d5c9d..4d8e7b17b2bc 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eprover-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "1gh99ajmza33f54idhqkdqxp5zh2k06jsf45drihnrzydlqv1n7l"; + sha256 = "08ihpwgkz0l7skr42iw8lm202kqr51i792bs61qsbnk9gsjlab1c"; }; buildInputs = [ which ]; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index ff6b2d0ad2d1..efa2b55499ab 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "calc-${version}"; - version = "2.12.6.8"; + version = "2.12.7.1"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2" ]; - sha256 = "144am0pra3hh7635fmi7kqynba8z246dx1dzclm9qx965p3xb4hb"; + sha256 = "0k58vv8m26kq74b8p784d749mzir0pi6g48hch1f6680d3fwa7gb"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index bba08e3ae291..73fa2a5e678c 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -6,7 +6,6 @@ , granite , gnome3 , cmake -, ninja , vala_0_40 , libqalculate , gobjectIntrospection @@ -14,24 +13,28 @@ stdenv.mkDerivation rec { name = "nasc-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "parnold-x"; repo = "nasc"; rev = version; - sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9"; + sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5"; }; + postPatch = '' + # libqalculatenasc.so is not installed, and nasc fails to start + substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC + ''; + nativeBuildInputs = [ pkgconfig wrapGAppsHook vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake - ninja gobjectIntrospection # for setup-hook ]; - + buildInputs = [ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.gtksourceview diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 59dbfdb509dc..7cd22f22a4e7 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.6.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1yzw6avhka7bbi071z9d8cipcghyjq2bg9x3arv1cf395xlnrmb9"; + sha256 = "029yq9db2rm4fy83c11aynxjsd6vvi7ffamaf9zvkkamqqj1sjlf"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 50eae575bc18..295125eefd1e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -40,14 +40,16 @@ stdenv.mkDerivation rec { ]; packageUpgradePatches = let - fetchSageCommit = { rev, ...}@args: ( + # fetch a diff between base and rev on sage's git server + # used to fetch trac tickets by setting the base to the release and the + # revision to the last commit that should be included + fetchSageDiff = { base, rev, ...}@args: ( fetchpatch ({ - url = "https://git.sagemath.org/sage.git/patch/?h=${rev}"; - # TODO better https://git.sagemath.org/sage.git/patch/?id=${rev} ? + url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. excludes = [ "build/*" ]; - } // builtins.removeAttrs args [ "rev" ]) + } // builtins.removeAttrs args [ "rev" "base" ]) ); in [ # New glpk version has new warnings, filter those out until upstream sage has found a solution @@ -81,6 +83,21 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31"; sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30"; }) + + # https://trac.sagemath.org/ticket/26326 + # needs to be split because there is a merge commit in between + (fetchSageDiff { + name = "networkx-2.2-1.patch"; + base = "8.4"; + rev = "68f5ad068184745b38ba6716bf967c8c956c52c5"; + sha256 = "112b5ywdqgyzgvql2jj5ss8la9i8rgnrzs8vigsfzg4shrcgh9p6"; + }) + (fetchSageDiff { + name = "networkx-2.2-2.patch"; + base = "626485bbe5f33bf143d6dfba4de9c242f757f59b~1"; + rev = "db10d327ade93711da735a599a67580524e6f7b4"; + sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 9837a195d8c7..e215f12bbe6e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -630,7 +630,7 @@ GEM pry (>= 0.10.4) public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) - rack (1.6.10) + rack (1.6.11) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index ee262b6b5d96..dfbd535aaa82 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -2320,10 +2320,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; rack-accept = { dependencies = ["rack"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 4355b3ae2717..28018c6c5c22 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -659,7 +659,7 @@ GEM pry (>= 0.10.4) public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) - rack (1.6.10) + rack (1.6.11) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 03efc4e9600f..32fc41235f43 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -2441,10 +2441,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; rack-accept = { dependencies = ["rack"]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5464f605cbdb..35d374866c8a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.7.2"; + version = "4.8"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "1yq9r8s9jzj8hk2yizjk25s4w16yx9b8mbdj6wp8ld7j2r15kw4p"; + sha256 = "00rzjbf2blxkc0qwd9mdzx5fnzgpp4jxzijq6wgsjgmqscx40sy5"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 54eed51cd868..c8ef35d19434 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -89,7 +89,7 @@ GEM protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) public_suffix (3.0.3) - rack (1.6.10) + rack (1.6.11) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -201,4 +201,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.16.3 + 1.16.4 diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index fe56298056b1..c0b8cb8d6e2d 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -350,10 +350,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 2a77e1395b46..dfcc28142ac7 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -116,8 +116,8 @@ in { }; subversion19 = common { - version = "1.9.7"; - sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3"; + version = "1.9.9"; + sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd"; }; subversion_1_10 = common { @@ -125,4 +125,10 @@ in { sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz"; extraBuildInputs = [ lz4 utf8proc ]; }; + + subversion_1_11 = common { + version = "1.11.0"; + sha256 = "0miyz3xsxxp56iczxv6yqd8p06av3vxpb5nasyg2xb3ln1247i47"; + extraBuildInputs = [ lz4 utf8proc ]; + }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index c55f4bc5fb2a..b25560c50c90 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.12.3"; + ver = "1.14.0"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "0rggpzp7gp4y6gxnhl4saxpdwnaivwkildpwbjjh7zvmgka3749a"; + sha256 = "1xm5pww6jf3m704y7d7nc2ni2a6ygxwb2c665agg2i059sppwz1f"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "1w0l2rq9gyzli5ilw82v27d8v7fmchc1wdzcq06q1bsm9wmnbx1r"; + sha256 = "1ihma2nv7zgqx1psgj3bdz723h94f4vk8mbahxl1v4v2rn9kg25z"; }; nativeBuildInputs = [ pkgconfig ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ''; license = licenses.unfree; homepage = http://makemkv.com; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/applications/video/qgifer/default.nix b/pkgs/applications/video/qgifer/default.nix deleted file mode 100644 index 8185e15dcc8b..000000000000 --- a/pkgs/applications/video/qgifer/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchsvn, cmake, opencv, qt4, giflib }: - -stdenv.mkDerivation rec { - name = "qgifer-${version}"; - version = "0.2.1"; - - src = fetchsvn { - url = "https://svn.code.sf.net/p/qgifer/code/tags/${name}"; - sha256 = "0fv40n58xjwfr06ix9ga79hs527rrzfaq1sll3n2xxchpgf3wf4f"; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt --replace "SET(CMAKE_INSTALL_PREFIX" "#" - ''; - - buildInputs = [ cmake opencv qt4 giflib ]; - - meta = with stdenv.lib; { - description = "Video-based animated GIF creator"; - homepage = https://sourceforge.net/projects/qgifer/; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; - }; -} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e9bfbffe41e2..729ba9eae185 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -139,9 +139,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init @@ -200,10 +200,10 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* - docker_18_06 = dockerGen rec { - version = "18.06.1-ce"; - rev = "e68fc7a215d7133c34aa18e3b72b4a21fd0c6136"; # git commit - sha256 = "1bqd6pv5hga4j1s8jm8q5qdnfbjf8lw1ghdk0bw9hhqkn7rcnrv4"; + docker_18_09 = dockerGen rec { + version = "18.09.0"; + rev = "4d60db472b2bde6931072ca6467f2667c2590dff"; # git commit + sha256 = "0py944f5k71c1cf6ci96vnqk43d5979w7r82cngaxk1g6za6k5yj"; runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; containerdRev = "468a545b9edcd5932818eb9de8e72413e616e86e"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 40395568f4ba..f2cbe75b8690 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, intltool, file +{ stdenv, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 @@ -8,14 +8,14 @@ with stdenv.lib; -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.5.1"; + version = "2.0.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1ardmd4sxdmd57y7qpka44gf09c1yq2g0xs074d3k1h925crv27f"; + sha256 = "1b48xbrx99mfiv80c60k3ydzkpcpbq57c8h8dl0gnffmnzbs8vzb"; }; nativeBuildInputs = [ @@ -28,9 +28,9 @@ python2Packages.buildPythonApplication rec { gsettings-desktop-schemas libosinfo gtk3 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python2Packages; + propagatedBuildInputs = with python3Packages; [ - pygobject3 ipaddr libvirt libxml2 requests + pygobject3 ipaddress libvirt libxml2 requests ]; patchPhase = '' @@ -39,7 +39,7 @@ python2Packages.buildPythonApplication rec { ''; postConfigure = '' - ${python2Packages.python.interpreter} setup.py configure --prefix=$out + ${python3Packages.python.interpreter} setup.py configure --prefix=$out ''; postInstall = '' diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix index 0236a34bb124..8a339ac83224 100644 --- a/pkgs/applications/virtualization/virt-what/default.nix +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "virt-what-${version}"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz"; - sha256 = "1x32h7i6lh823wj97r5rr2hg1v215kqzly14dwg0mwx62j1dshmw"; + sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk"; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index bf2ab8bbdbe7..028bb8c87ee8 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -3,19 +3,19 @@ rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "1nyi0p9snx9hddb4hliihskj4gdp933xs0f8kydyiprckikwiyjk"; + sha256 = "0bv1jkqkf509akg3dvdy8b2q1kh8i75vw4n6a9rjvslx9s9nh6ca"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "1ngdzzxnv4y6xprmkawf6s2696zgwiwgb6ykj5adb4knlx5c634d"; + cargoSha256 = "0wbbbk99hxxlrkm389iqni9aqvw2laarwk6hhwsr4ph3y278qhi8"; postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 5c95b9daf251..2e18636c621b 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.15"; + version = "4.16"; src = fetchurl { url = "https://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91"; + sha256 = "1d2mnryn7m9c6d69awd7lwzadliapd0ahi5n8d0ppqy533ssaq6c"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 251b893f92ff..01a89b49e715 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.15.0.1"; + version = "4.16"; releaseDate = "2018-03-13"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal"; + sha256 = "16d215y9g27b75rifm1cgznxg73fmg5ksigi0gbj7pfd6x6bqcy9"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix new file mode 100644 index 000000000000..7386b07f575c --- /dev/null +++ b/pkgs/build-support/ocaml/dune.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, ocaml, findlib, dune, opaline }: + +{ pname, version, buildInputs ? [], ... }@args: + +if args ? minimumOCamlVersion && + ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion +then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation ({ + + buildPhase = '' + runHook preBuild + dune build -p ${pname} + runHook postBuild + ''; + checkPhase = '' + runHook preCheck + dune runtest -p ${pname} + runHook postCheck + ''; + installPhase = '' + runHook preInstall + ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR + runHook postInstall + ''; + + meta.platform = ocaml.meta.platform; + +} // args // { + + name = "ocaml${ocaml.version}-${pname}-${version}"; + + buildInputs = [ ocaml dune findlib ] ++ buildInputs; + +}) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 94e3218ad35e..b4de04780bd0 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20181011"; + name = "osinfo-db-20181101"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "1f0xa50xn15p3zig9031icqky8drf0654sbjmmziw2ijcdyzfkcp"; + sha256 = "1n9xq5nspfgsdqifh23ypsc85n5xl6cdbwdlacp0sa8rhkmfdvd7"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 610e367b09f8..3c99c40ee807 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }: +{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; homepage = https://github.com/linuxdeepin/dbus-factory; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index d8452e5f7a38..c1321acb853e 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,11 +1,12 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, -go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib, -libcanberra, gnome3, deepin-gettext-tools, go }: + deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib, + alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler, + pulseaudio, go, deepin }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-api"; - version = "3.1.30"; + version = "3.5.0"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -13,29 +14,32 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir"; + sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3"; }; goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig - go-gir-generator deepin-gettext-tools + go-dbus-factory + go-gir-generator + go-lib ]; buildInputs = [ + alsaLib glib gtk3 - poppler - librsvg - pulseaudio - alsaLib libcanberra - gnome3.libgudev + libgudev + librsvg + poppler + pulseaudio ]; postPatch = '' + patchShebangs . sed -i -e "s|/var|$bin/var|" Makefile ''; @@ -50,6 +54,8 @@ buildGoPackage rec { remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; homepage = https://github.com/linuxdeepin/dde-api; diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix index 9df368325e3c..bd7a13043da2 100644 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -32,35 +32,26 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2"; - sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm"; + rev = "9458da53d1e65e098d48467a4317c403327e4424"; + sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4"; }; } { - goPackagePath = "github.com/kr/pretty"; + goPackagePath = "github.com/fogleman/gg"; fetch = { type = "git"; - url = "https://github.com/kr/pretty"; - rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + url = "https://github.com/fogleman/gg"; + rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db"; + sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5"; }; } { - goPackagePath = "github.com/kr/text"; + goPackagePath = "github.com/golang/freetype"; fetch = { type = "git"; - url = "https://github.com/kr/text"; - rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-dbus-factory"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-dbus-factory"; - rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa"; - sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w"; + url = "https://github.com/golang/freetype"; + rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; + sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc"; }; } { @@ -68,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; - sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + rev = "03541136501cab4910ad8852fe749ef8e18907ca"; + sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; }; } { @@ -86,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "991ec62608f3c0da01d400756917825d1e2fd528"; - sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; + sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87"; - sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; }; } { @@ -108,22 +99,4 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd78401277ebd861206a03c884797c6ec5541"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "pkg.deepin.io/lib"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-lib.git"; - rev = "f09dcc32fc5a36b53ff7760e5a06e7f8f97b81f9"; - sha256 = "1z4iw7h6lknm9jrna2c73icg1a1mxvzrqdhgjvaiww89mql1jzb4"; - }; - } ] diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index ad6b0f1912a6..6d0abab2100f 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, - deepin-gettext-tools, dtkcore, dtkwidget + deepin-gettext-tools, dtkcore, dtkwidget, deepin }: stdenv.mkDerivation rec { @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { -e "s,/usr,$out," ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/dde-calendar; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fe2c5f8f55a1..3678694be9ee 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -2,12 +2,12 @@ dbus-factory, go-dbus-factory, go-gir-generator, go-lib, deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, - python3Packages, hicolor-icon-theme, go }: + python3Packages, hicolor-icon-theme, go, deepin }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.2.24.7"; + version = "3.6.0"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6"; + sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj"; }; patches = [ @@ -80,6 +80,8 @@ buildGoPackage rec { remove-references-to -t ${go} $out/lib/deepin-daemon/* ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; homepage = https://github.com/linuxdeepin/dde-daemon; diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix index 5ffecc28882d..3d241baa3260 100644 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; - sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + rev = "03541136501cab4910ad8852fe749ef8e18907ca"; + sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "991ec62608f3c0da01d400756917825d1e2fd528"; - sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; + sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e"; - sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; - sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; + sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; }; } { @@ -99,4 +99,13 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } + { + goPackagePath = "pkg.deepin.io/lib"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-lib.git"; + rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7"; + sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + }; + } ] diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix deleted file mode 100644 index 71f9e9b0298e..000000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, -dtkcore, dtkwidget, dde-qt-dbus-factory }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "dde-polkit-agent"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1n3hys5hhhd99ycpx4im6ihy53vl9c28z7ls7smn117h3ca4c8wc"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - dde-qt-dbus-factory - dtkcore - dtkwidget - polkit-qt - ]; - - postPatch = '' - patchShebangs . - - sed -i dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop \ - -e "s,/usr,$out," - - sed -i pluginmanager.cpp \ - -e "s,/usr/lib/polkit-1-dde/plugins,/run/current-system/sw/lib/polkit-1-dde/plugins," - ''; - - meta = with stdenv.lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-polkit-agent; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 007d58b3c304..f28d8f77b3c3 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, python }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0j0f57byzlz2ixgj6qr1pda83bpwn2q8kxv4i2jv99n6g0qw4nmw"; + sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8"; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index cab3aff14048..303c4db57dd1 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, - hicolor-icon-theme }: + hicolor-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; - version = "4.5.1.10"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0cr3g9jbgpp8k41i86lr4pg88gn690nzili7ah745vf1kdwvi1w0"; + sha256 = "190dgrwr5ji2bjndg2bmggpyccdz6pa3acx86yqmxfmirx669w92"; }; nativeBuildInputs = [ @@ -45,11 +45,13 @@ stdenv.mkDerivation rec { find -type f -exec sed -i -e "s,Exec=/usr,Exec=$out," {} + find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + sed -i global_util/xkbparser.h -e "s,/usr/share/X11/xkb/rules/base.xml,${xkeyboard_config}/share/X11/xkb/rules/base.xml," - sed -i lightdm-deepin-greeter/Scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," + sed -i lightdm-deepin-greeter/scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," # fix default background url sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; homepage = https://github.com/linuxdeepin/dde-session-ui; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 5b96e335c67e..80a368c5be99 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, deepin-wallpapers }: +{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-base"; - version = "2018.7.23"; + version = "2018.10.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc"; + sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235"; }; buildInputs = [ deepin-wallpapers ]; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-desktop-base; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index b1a9c52014b8..d2b70ec4a896 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, python, deepin-gtk-theme, -deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3 }: + deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; - version = "3.2.18.7"; + version = "3.4.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j"; + sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq"; }; nativeBuildInputs = [ @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index e275429b3951..779fae6a113e 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }: +{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; homepage = https://github.com/linuxdeepin/deepin-gettext-tools; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index c46dea2875ad..8d11ca8bf42a 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: stdenv.mkDerivation rec { - name = "deepin-gtk-theme-${version}"; - version = "17.10.9"; + name = "${pname}-${version}"; + pname = "deepin-gtk-theme"; + version = "17.10.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3"; + sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin GTK Theme"; homepage = https://github.com/linuxdeepin/deepin-gtk-theme; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index c6d7f3493019..ef4574206019 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-icon-theme"; - version = "15.12.59"; + version = "15.12.64"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq"; + sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc"; }; nativeBuildInputs = [ gtk3 papirus-icon-theme ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-icon-theme; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 0ba2e306110a..0b08f7cd39a0 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, - libexif + libexif, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; - version = "1.2.23"; + version = "1.3.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q"; + sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5"; }; nativeBuildInputs = [ @@ -41,11 +41,14 @@ stdenv.mkDerivation rec { -e "s,/usr,$out," ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-image-viewer; license = licenses.gpl3Plus; platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index eeed3579f459..9ac61355c75b 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration }: + qt5integration, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin menu service"; homepage = https://github.com/linuxdeepin/deepin-menu; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index b5eb71108763..78b6303188a2 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, - deepin-wallpapers, deepin-desktop-schemas }: + deepin-wallpapers, deepin-desktop-schemas, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "2D window manager for Deepin"; homepage = https://github.com/linuxdeepin/deepin-metacity; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 52a51c0db861..3d195f8f1c0c 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, - libdvdnav, libdvdread, xorg }: + libdvdnav, libdvdread, xorg, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; - version = "3.2.10"; + version = "3.2.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933"; + sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707"; }; nativeBuildInputs = [ @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin movie player"; homepage = https://github.com/linuxdeepin/deepin-movie-reborn; diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index e397ab53576d..be845d3c6bac 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, - libstartup_notification, libinput, cogl, clutter, systemd -}: + libstartup_notification, libinput, cogl, clutter, systemd, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-mutter"; - version = "3.20.34"; + version = "3.20.35"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd"; + sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7"; }; nativeBuildInputs = [ @@ -51,6 +50,8 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Base window manager for deepin, fork of gnome mutter"; homepage = https://github.com/linuxdeepin/deepin-mutter; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 1bb112b76f6e..737c99261f9d 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration -}: + qt5integration, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index f12419a615b3..bb004372497f 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "deepin-sound-theme-${version}"; + name = "${pname}-${version}"; + pname = "deepin-sound-theme"; version = "15.10.3"; src = fetchFromGitHub { @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin sound theme"; homepage = https://github.com/linuxdeepin/deepin-sound-theme; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 26146b8ab477..de5ac800747a 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,55 +1,61 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, - ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, - json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer -}: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala, + gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect, + gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, + libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, + deepin-menu, deepin-shortcut-viewer, deepin }: stdenv.mkDerivation rec { - name = "deepin-terminal-${version}"; - version = "3.0.3"; + name = "${pname}-${version}"; + pname = "deepin-terminal"; + version = "3.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "04yvim97a4j8fq5lq2g6svs8qs79np9m4nl6x83iv02wkb9b7gqa"; + sha256 = "1jrzx0igq2csb25k4ak5hj81gpvb7zwbg4i64p4mln4vl7x27i5q"; }; - patches = [ - # Do not build vendored zssh and vte - (fetchurl { - name = "remove-vendor.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e; - sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv"; - }) - ]; - - postPatch = '' - substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" - ''; - nativeBuildInputs = [ pkgconfig - vala cmake ninja + vala gettext gobjectIntrospection # For setup hook ]; buildInputs = [ - gtk3 - vte - libgee - wnck - librsvg - libsecret - json-glib + at-spi2-core + dbus deepin-menu deepin-shortcut-viewer + epoxy + expect + gtk3 + json-glib + libXdmcp + libgee + libpthreadstubs + librsvg + libsecret + libtasn1 + libxcb + libxkbcommon + p11-kit + pcre + vte + wnck ]; + postPatch = '' + patchShebangs . + ''; + enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; longDescription = '' diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index ed2c795fd9cb..8f04bd482184 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, dde-api }: +{ stdenv, fetchFromGitHub, dde-api, deepin }: stdenv.mkDerivation rec { - name = "deepin-wallpapers-${version}"; + name = "${pname}-${version}"; + pname = "deepin-wallpapers"; version = "1.7.5"; src = fetchFromGitHub { @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-wallpapers; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index f936934dcc0c..db60e7b499b0 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, - hicolor-icon-theme }: + hicolor-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wm"; - version = "1.9.32"; + version = "1.9.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc"; + sha256 = "01l2np31g7fnh61fgq927h7a6xrmdvagqd41vr29a6cc3q9q9rzv"; }; nativeBuildInputs = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin Window Manager"; homepage = https://github.com/linuxdeepin/deepin-wm; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index a6163cd32e20..62a67c11492b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -2,12 +2,12 @@ let packages = self: with self; { + updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-daemon = callPackage ./dde-daemon { }; - dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; @@ -28,7 +28,6 @@ let }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { }; - dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 4aeba1b4c1bc..000000000000 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, dde-polkit-agent }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "dpa-ext-gnomekeyring"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - dde-polkit-agent - gnome3.libgnome-keyring - ]; - - postPatch = '' - patchShebangs . - - sed -i dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp \ - -e "s,/usr,$out," - ''; - - meta = with stdenv.lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 3fc9a1b4a03e..9904c58128f5 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.9.4"; + version = "2.0.9.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4"; + sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h"; }; nativeBuildInputs = [ @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin tool kit core modules"; homepage = https://github.com/linuxdeepin/dtkcore; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 268f9518495e..16125efff8e2 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, - dde-qt-dbus-factory, dtkcore -}: + dde-qt-dbus-factory, dtkcore, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.9.4"; + version = "2.0.9.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m"; + sha256 = "1h4vm6a4lb6w6nkx2ns7a526mqyi9hqi7j5lqafd7ycwxlrc64nb"; }; nativeBuildInputs = [ @@ -41,6 +40,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin graphical user interface library"; homepage = https://github.com/linuxdeepin/dtkwidget; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index 46ed7bcc3bef..7154ae3da6a9 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -29,6 +30,8 @@ stdenv.mkDerivation rec { LIB_INSTALL_DIR=$out/lib" ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin graphical user interface library"; homepage = https://github.com/linuxdeepin/dtkwm; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index b9b3aa59a0b1..01d504eda896 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/go-dbus-factory; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index fa38e650c3a9..28873d8459ec 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go, go-lib }: +{ stdenv, fetchFromGitHub, go, go-lib, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "GOCACHE=off" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; homepage = https://github.com/linuxdeepin/go-dbus-generator; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index d5ec29f1ef8b..183ae58fecd0 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }: +{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, + libgudev, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-gir-generator"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl"; + sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; }; nativeBuildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { "GOCACHE=off" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; homepage = https://github.com/linuxdeepin/go-gir-generator; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index ff9394425e08..684f1dd7f32d 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio, - mobile-broadband-provider-info -}: + mobile-broadband-provider-info, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.2.16.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2"; + sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; }; buildInputs = [ @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { "GOSITE_DIR=$(out)/share/go" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; homepage = https://github.com/linuxdeepin/go-lib; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 3754de3ea980..c4ce0ca563bd 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, + mtdev, cairo, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; - version = "1.1.11"; + version = "1.1.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy"; + sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x"; }; nativeBuildInputs = [ @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; homepage = https://github.com/linuxdeepin/qt5dxcb-plugin; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 28e06bae42d2..809156377225 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt -, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype -, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget -}: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt , + lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype , + qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b"; + sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy"; }; nativeBuildInputs = [ @@ -42,6 +41,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; homepage = https://github.com/linuxdeepin/qt5integration; diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix new file mode 100644 index 000000000000..761ead015c6b --- /dev/null +++ b/pkgs/desktops/deepin/update.nix @@ -0,0 +1,37 @@ +{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: +{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }: + +let + nameAndVersion = builtins.parseDrvName name; + packageVersion = nameAndVersion.version; + packageName = nameAndVersion.name; + attrPath = "deepin.${packageName}"; +in + +writeScript "update-${packageName}" '' + set -o errexit + set -x + + # search for the latest version of the package on github + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} + tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags) + tags=$(echo "$tags" | jq -r '.[] | .name') + echo "# ${name}" >> git-commits.txt + echo "# available tags:" >> git-commits.txt + echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt + if [ -n "${ignored-versions}" ]; then + tags=$(echo "$tags" | grep -vE "${ignored-versions}") + fi + latest_tag=$(echo "$tags" | sort --version-sort | tail -1) + + # generate commands to commit the changes + if [ "${packageVersion}" != "$latest_tag" ]; then + pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath}) + echo " git add $pfile " >> git-commits.txt + echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt + fi + + # update the nix expression + update-source-version "${attrPath}" "$latest_tag" + echo "" >> git-commits.txt +'' diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 64907e6271d8..312691dcc7ef 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 690f5fafef27..a4d90aa7e3d7 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/bluedevil-5.14.0.tar.xz"; - sha256 = "0d1bw6cp2vwhs17j0bgc3gysy3g2syb1z0zwg28sa889l8a3qyv9"; - name = "bluedevil-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/bluedevil-5.14.3.tar.xz"; + sha256 = "048iyzps89caw6dr1x767byj8a7gcg9vl1fvnndabkhm3d71cgxk"; + name = "bluedevil-5.14.3.tar.xz"; }; }; breeze = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/breeze-5.14.0.tar.xz"; - sha256 = "0gd95a7km0pqc0qinn2p0kv72j0ihdl96vs14f5jr5n78a2r7r9a"; - name = "breeze-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/breeze-5.14.3.tar.xz"; + sha256 = "19wm6krcnyis1vgs655jynvgm93k776drvjra4ysy378d2n3f1w6"; + name = "breeze-5.14.3.tar.xz"; }; }; breeze-grub = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/breeze-grub-5.14.0.tar.xz"; - sha256 = "17kghx9qv7flm2019alqg1a6pnacgczj1hc9sc0bvj8znh9hhxvh"; - name = "breeze-grub-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/breeze-grub-5.14.3.tar.xz"; + sha256 = "1nkf4av6xdx7q8z6hq0gdsmm38z5xawh1awpcjwc61dd8n55bn8a"; + name = "breeze-grub-5.14.3.tar.xz"; }; }; breeze-gtk = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/breeze-gtk-5.14.0.tar.xz"; - sha256 = "1zlhyv26k3zqm2bbd9mk7123q5xy5g2cp6ayavhglgxxb8n0zyx9"; - name = "breeze-gtk-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/breeze-gtk-5.14.3.tar.xz"; + sha256 = "000w368cvyi8whbrp500jjcrdivm2fl7kwcn81fj8ydk7wn5pmyn"; + name = "breeze-gtk-5.14.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/breeze-plymouth-5.14.0.tar.xz"; - sha256 = "1ilf3cp7cg3lpkxvd8n7h33wvsbbikrvd514gan2ns16j9d4ziz1"; - name = "breeze-plymouth-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/breeze-plymouth-5.14.3.tar.xz"; + sha256 = "0fd8d5hwkhrd3n9ahfw99anh43azi28n5wh47ncrwdy7m81v4lgx"; + name = "breeze-plymouth-5.14.3.tar.xz"; }; }; discover = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/discover-5.14.0.tar.xz"; - sha256 = "1chkf5hjpnb4laq5sn7rr8f4fv90mg4brdsx71cz1b5xbvgyy1sf"; - name = "discover-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/discover-5.14.3.tar.xz"; + sha256 = "12zx6p68yq5mhv459wy7y2f90nmw3n0n9l7xpb6g7k5ssmr1jqk4"; + name = "discover-5.14.3.tar.xz"; }; }; drkonqi = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/drkonqi-5.14.0.tar.xz"; - sha256 = "0i5zgafkdxw6wqqfw81ygdmg5fffy2gkf6sciq7f8nfxxglw6pkp"; - name = "drkonqi-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/drkonqi-5.14.3.tar.xz"; + sha256 = "11k8mf45rjrqxb3pny96x6pz50x9hglpaspsmjz9w19b2drxg79i"; + name = "drkonqi-5.14.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kactivitymanagerd-5.14.0.tar.xz"; - sha256 = "03jxvf4mgh0wmphykskc8ra49ghrjv5in4mgzpafswn7w8q8gyii"; - name = "kactivitymanagerd-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kactivitymanagerd-5.14.3.tar.xz"; + sha256 = "0ham0p2zrjx47g12fad2gci56jiq5x57vgnpr29pypqrc3hqwsn5"; + name = "kactivitymanagerd-5.14.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kde-cli-tools-5.14.0.tar.xz"; - sha256 = "1n51vaiy073jzs051wlpll7652bb7vwg5qmravndhl8ibqrv7qaz"; - name = "kde-cli-tools-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kde-cli-tools-5.14.3.tar.xz"; + sha256 = "1ld4rhmjbm6xz5xri8r1zs4lr2d443372h7pqjs1hc3r836aivwa"; + name = "kde-cli-tools-5.14.3.tar.xz"; }; }; kdecoration = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kdecoration-5.14.0.tar.xz"; - sha256 = "01gkl0yqplm1l2qa4gfw7rzi5zfdxq7d3a25qicdwhas69hc8nzm"; - name = "kdecoration-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kdecoration-5.14.3.tar.xz"; + sha256 = "0sifflfdz3md5ymlpkzp2pvccfr0gzw8dx87j1s5qk1b04fx9vg8"; + name = "kdecoration-5.14.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kde-gtk-config-5.14.0.tar.xz"; - sha256 = "0mb1am14hd3x5gkmy3vcg3wb9g29c8y38ywhr0f93riphws0nhvh"; - name = "kde-gtk-config-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kde-gtk-config-5.14.3.tar.xz"; + sha256 = "1m0vhgwm5zrk7sg4j71qmn2gsm5qhhgvcdpgryc64kjdk24lss31"; + name = "kde-gtk-config-5.14.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kdeplasma-addons-5.14.0.tar.xz"; - sha256 = "0k98ms851z2naw4rjmxldy6pl9a51mmwvq6c4znm2pnrw04jz15d"; - name = "kdeplasma-addons-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kdeplasma-addons-5.14.3.tar.xz"; + sha256 = "1rw84wfym722z6cl127gwma9npjzy0yj65fzr9rqpplks8il6m4m"; + name = "kdeplasma-addons-5.14.3.tar.xz"; }; }; kgamma5 = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kgamma5-5.14.0.tar.xz"; - sha256 = "17vb1bb4glw6ccd1s1chjm07lvpkklcvny7rdjgmz2r00vk6mjqy"; - name = "kgamma5-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kgamma5-5.14.3.tar.xz"; + sha256 = "03r866icbnk5q11zpnkxg3azcgbr6fp16b8mmsw7j4jl820shv4q"; + name = "kgamma5-5.14.3.tar.xz"; }; }; khotkeys = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/khotkeys-5.14.0.tar.xz"; - sha256 = "0b2q4s0j6wji8112l89347fc8ph9vrf2p8ngig0c4dn4ayk7hqd1"; - name = "khotkeys-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/khotkeys-5.14.3.tar.xz"; + sha256 = "1arsjvxw7q6434y3c8l458ilmynqbdb30sdvfzgrlk19m1dqmkym"; + name = "khotkeys-5.14.3.tar.xz"; }; }; kinfocenter = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kinfocenter-5.14.0.tar.xz"; - sha256 = "0pc1jc7d26w2asa2yj8rr04rgjvmavlyhw3wd0dqv08rhr0rl7pj"; - name = "kinfocenter-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kinfocenter-5.14.3.tar.xz"; + sha256 = "1kapxxb4f4lia7yr4jmx83y0vwn6m1hrij05p5d1axy90jwmcy37"; + name = "kinfocenter-5.14.3.tar.xz"; }; }; kmenuedit = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kmenuedit-5.14.0.tar.xz"; - sha256 = "0ld9q5jq7zc6kz72pg9qqg10rbargkwyks657cnv8id1pna17bsr"; - name = "kmenuedit-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kmenuedit-5.14.3.tar.xz"; + sha256 = "0yikz8v3gawkbn1vds7i9xj2j4p1y8nv0adrhr4vwdii2ar37jvd"; + name = "kmenuedit-5.14.3.tar.xz"; }; }; kscreen = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kscreen-5.14.0.tar.xz"; - sha256 = "1y28a96kal2gziga2vr6vg5swv2ynfiv3804n06v9847rd7s3ixk"; - name = "kscreen-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kscreen-5.14.3.tar.xz"; + sha256 = "0jn2d5373agh5b47v7xd17apbkpbrvl5z7x3n83k4q4j30q7pgs3"; + name = "kscreen-5.14.3.tar.xz"; }; }; kscreenlocker = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kscreenlocker-5.14.0.tar.xz"; - sha256 = "1nyd8jy4ngpg51nq46cx038i4w1qak9zi4d4v69blkhzd65gckj1"; - name = "kscreenlocker-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kscreenlocker-5.14.3.tar.xz"; + sha256 = "1zn99zsn07fm4npf7l6n243bnn970pb818pfpbw9kgwjlh0nyms8"; + name = "kscreenlocker-5.14.3.tar.xz"; }; }; ksshaskpass = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/ksshaskpass-5.14.0.tar.xz"; - sha256 = "0nqvr3z7058hfymw8gglnfmcxx976km6sf0msyd3ykfpymxsmz74"; - name = "ksshaskpass-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/ksshaskpass-5.14.3.tar.xz"; + sha256 = "1gh5hakc2i7m2scvf8nyrl8inkh1fsrggdydiwb02mg763lkk9nc"; + name = "ksshaskpass-5.14.3.tar.xz"; }; }; ksysguard = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/ksysguard-5.14.0.tar.xz"; - sha256 = "0hbcx20r57lfh566q2974rs2kzlq5ghxadnd1ghiwz5141xh02bm"; - name = "ksysguard-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/ksysguard-5.14.3.tar.xz"; + sha256 = "1aw8r4ngq00lv0d38iddwdhlmmv97qiwqjvgzy4m20dfm7ldaldp"; + name = "ksysguard-5.14.3.tar.xz"; }; }; kwallet-pam = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kwallet-pam-5.14.0.tar.xz"; - sha256 = "0cw173wbf105p7028xik33lm38z82b1rlc7090l4khwsgmwgff97"; - name = "kwallet-pam-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kwallet-pam-5.14.3.tar.xz"; + sha256 = "109jzfwf9b0c1mm5rq4jgiaf4sxad1wx4j9pmwxr4m17nf3ys5pg"; + name = "kwallet-pam-5.14.3.tar.xz"; }; }; kwayland-integration = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kwayland-integration-5.14.0.tar.xz"; - sha256 = "19xbqb7m6hxyg8s8jdbg1x9qcfia2ypm0z4k6zgva6mwqwhqcbw1"; - name = "kwayland-integration-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kwayland-integration-5.14.3.tar.xz"; + sha256 = "117wvplwxhphk3yiy61dlid5nf42m869qkcsx5mlnjdwxglwgwfj"; + name = "kwayland-integration-5.14.3.tar.xz"; }; }; kwin = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kwin-5.14.0.tar.xz"; - sha256 = "0rd6hkyg6n0w2jnj648sp7gs7n624igraz8ajyrglfzvxkxvqi8i"; - name = "kwin-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kwin-5.14.3.tar.xz"; + sha256 = "0yv8sa96rnaabi29mny17vyxswj4b4rgny75kznqnk6n01wjm4xy"; + name = "kwin-5.14.3.tar.xz"; }; }; kwrited = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/kwrited-5.14.0.tar.xz"; - sha256 = "0s9lgi5a945xzpl1j5gdn65n8bywqlwfnrig56x90550achbvmlq"; - name = "kwrited-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/kwrited-5.14.3.tar.xz"; + sha256 = "1lzbrifsb9qvn4622rd3b0p5jfr67ql5rsd1lkw1jpib9ckzlrph"; + name = "kwrited-5.14.3.tar.xz"; }; }; libkscreen = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/libkscreen-5.14.0.tar.xz"; - sha256 = "1fsi9cb724kwr0cll60dl9qh67290r3gp8lcsmlyw30zk9mqwgdi"; - name = "libkscreen-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/libkscreen-5.14.3.tar.xz"; + sha256 = "14zfmycnzf30jgbf1gcyp8kpipvn1w2sd6inrylyyf089565r9ai"; + name = "libkscreen-5.14.3.tar.xz"; }; }; libksysguard = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/libksysguard-5.14.0.tar.xz"; - sha256 = "00s1dkiqykw2drlmvzs3hkdrkbk8n86s751kl4xlvcbslbijzcv0"; - name = "libksysguard-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/libksysguard-5.14.3.tar.xz"; + sha256 = "099cn9hmz5k10ms3wgskcdps91wmw8r0g52jknnid4ggb7vkpvkr"; + name = "libksysguard-5.14.3.tar.xz"; }; }; milou = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/milou-5.14.0.tar.xz"; - sha256 = "1k413zs70ggsamwxxidlfjdf8aqrcnzznar86z30q3ki1y14xf1l"; - name = "milou-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/milou-5.14.3.tar.xz"; + sha256 = "16xqshzc4q2c0h9ihgmcqvyh181qacqz7c3amczzf4yc14xcsgxl"; + name = "milou-5.14.3.tar.xz"; }; }; oxygen = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/oxygen-5.14.0.tar.xz"; - sha256 = "0kbafhzjkm61dpznx1w713jwyicj7qq76vk7zf6vz2g90b8c47na"; - name = "oxygen-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/oxygen-5.14.3.tar.xz"; + sha256 = "1q6xsk9aha6sxq98r28g6wg93ml6hcqd3b73ygrwgncx1rhia446"; + name = "oxygen-5.14.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-browser-integration-5.14.0.tar.xz"; - sha256 = "1s8cxlfyp8crq2j4appffnhc3cgx9igmqhxyyk9pr4jbb4cwv42b"; - name = "plasma-browser-integration-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-browser-integration-5.14.3.tar.xz"; + sha256 = "1fzxmrijrwh75ni5g79cy2dj6g6mja9vkgd3hqrbir7hmmrqs8b3"; + name = "plasma-browser-integration-5.14.3.tar.xz"; }; }; plasma-desktop = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-desktop-5.14.0.tar.xz"; - sha256 = "0qrqd78bp9n73rr142wxiynxij2i8cw41ckgd46iw8an550v8s80"; - name = "plasma-desktop-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-desktop-5.14.3.tar.xz"; + sha256 = "0kn2l5ca0pmpfjalnbc53h892hj9kr0xv9070a0i09fn6qn4pxcs"; + name = "plasma-desktop-5.14.3.tar.xz"; }; }; plasma-integration = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-integration-5.14.0.tar.xz"; - sha256 = "1dv43iwh6rp5ldn16jd6krkab6nmplav47j5qvngcp88src31k47"; - name = "plasma-integration-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-integration-5.14.3.tar.xz"; + sha256 = "0iwfkv32s97s459ksbmrk6w3p5qkmg99yiy3prclq73pa7i176x9"; + name = "plasma-integration-5.14.3.tar.xz"; }; }; plasma-nm = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-nm-5.14.0.tar.xz"; - sha256 = "1pr4dg90vw22jzsrbhzx3rycyj9by8r4239ypprw0i5d9795mian"; - name = "plasma-nm-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-nm-5.14.3.tar.xz"; + sha256 = "0sgqb5izlfpk95vjyn65jg9mwidvlranzrdjq5nyyl47pf8nfigf"; + name = "plasma-nm-5.14.3.tar.xz"; }; }; plasma-pa = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-pa-5.14.0.tar.xz"; - sha256 = "1b95vyirgxfpjrccnl81bynlk3zdxz0bf7czsap0bnwhal0mcp2w"; - name = "plasma-pa-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-pa-5.14.3.tar.xz"; + sha256 = "1s1csabc6w9vmi0klckq5kvrfbkv2qn9jv7x8r3v6nx6wibc5y7r"; + name = "plasma-pa-5.14.3.tar.xz"; }; }; plasma-sdk = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-sdk-5.14.0.tar.xz"; - sha256 = "0b5h7qvan0f5afdf4d19dmpalgbd9gyxgkq3r5h7axqdfdanz38f"; - name = "plasma-sdk-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-sdk-5.14.3.tar.xz"; + sha256 = "0sx7a24fzw15dwnlm574z8643sy4kqzcqai1v6l8078smqz4kdqc"; + name = "plasma-sdk-5.14.3.tar.xz"; }; }; plasma-tests = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-tests-5.14.0.tar.xz"; - sha256 = "01li04p44f1yajnjhvhhqd8mjwv8si5d02749p5dn0x80fkxgh9d"; - name = "plasma-tests-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-tests-5.14.3.tar.xz"; + sha256 = "0y975sv202gg68fnv3wycisx642vmb177zl7x9gkk66wdi5958gb"; + name = "plasma-tests-5.14.3.tar.xz"; }; }; plasma-vault = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-vault-5.14.0.tar.xz"; - sha256 = "1kclryjld7lanimr6n7r1b9y8wqgyjvcsky9cfq3ql1ssfc0ncm3"; - name = "plasma-vault-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-vault-5.14.3.tar.xz"; + sha256 = "05l96lnfni2vc92vsxjvzlwh0vd8kacmn1ywp3rwzklwdyzwwbw5"; + name = "plasma-vault-5.14.3.tar.xz"; }; }; plasma-workspace = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-5.14.0.tar.xz"; - sha256 = "1fgz06dnszrrq5kqa3zn22cj93adz8vwg9n9vdihgi6c77rqlxyf"; - name = "plasma-workspace-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz"; + sha256 = "0mrhlsgckin6n2njr9lmpd84qm515wfdvr4lbhs64dllmqa9c77f"; + name = "plasma-workspace-5.14.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-wallpapers-5.14.0.tar.xz"; - sha256 = "10j006wc1l2hjw9s9w7sxwimpahrnlpidnrrdgwjp0fswmnyqj5c"; - name = "plasma-workspace-wallpapers-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plasma-workspace-wallpapers-5.14.3.tar.xz"; + sha256 = "09cwydr45bh367jqi31fax459pj0w4cia6y752869hcm0x55m4jb"; + name = "plasma-workspace-wallpapers-5.14.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/plymouth-kcm-5.14.0.tar.xz"; - sha256 = "0smjnh3adhsbp2ds8gvi5k3jq21i85zvaf9pvr0ih4nqpn4plalk"; - name = "plymouth-kcm-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/plymouth-kcm-5.14.3.tar.xz"; + sha256 = "0srv7ph43hcyly69d0jydrxncc2hq8xxy0ppm6g8pdyl06q06iag"; + name = "plymouth-kcm-5.14.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.14.0"; + version = "1-5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/polkit-kde-agent-1-5.14.0.tar.xz"; - sha256 = "0bzz2qmxslmms7mrs4l8myg9byx0w7dz6xrmvi8v11wyk2lngsb0"; - name = "polkit-kde-agent-1-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/polkit-kde-agent-1-5.14.3.tar.xz"; + sha256 = "05qvwmbaj79m5myb8ah7873diflnqri2j3cwsr4y1i9wyjq2l5bw"; + name = "polkit-kde-agent-1-5.14.3.tar.xz"; }; }; powerdevil = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/powerdevil-5.14.0.tar.xz"; - sha256 = "057hj7c3pq5a064ydx2r6kkf0q8lj7rl0jfrzcpr72s0yri3wcjr"; - name = "powerdevil-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/powerdevil-5.14.3.tar.xz"; + sha256 = "0css6lrb7bfm4l2piqi6cc28blw45kfxdxrn6q3d30nwb9jhsfj6"; + name = "powerdevil-5.14.3.tar.xz"; }; }; sddm-kcm = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/sddm-kcm-5.14.0.tar.xz"; - sha256 = "0dz6iz0qf4ycfic1ad99cqxj05pa4m92m5l74as8pkqviv8mm33d"; - name = "sddm-kcm-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/sddm-kcm-5.14.3.tar.xz"; + sha256 = "0f25lyqrjq5kbqjh3bgxlgmfbii0nzgdf3pza8gnbmq8jfx58i5w"; + name = "sddm-kcm-5.14.3.tar.xz"; }; }; systemsettings = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/systemsettings-5.14.0.tar.xz"; - sha256 = "0gywcc1zcqp7613gd7m9811plmmk8hr9frd2v0ari69ppm1ndmpj"; - name = "systemsettings-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/systemsettings-5.14.3.tar.xz"; + sha256 = "1ks6ib4n1gcmrac9q1cdas1c7xl86cvcz278anrw3ch2dfr7xppc"; + name = "systemsettings-5.14.3.tar.xz"; }; }; user-manager = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/user-manager-5.14.0.tar.xz"; - sha256 = "17qdpdq1j53h49i71ri8f91fby9m47ngpd7gn6qp7gzsfcyqky3j"; - name = "user-manager-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/user-manager-5.14.3.tar.xz"; + sha256 = "043nc8nlxs6y9fqb2g574l2pjzdlklar9n5v1clrzqmxdrqva0ba"; + name = "user-manager-5.14.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.14.0"; + version = "5.14.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.0/xdg-desktop-portal-kde-5.14.0.tar.xz"; - sha256 = "0xziyrrccv0jjjf8h8p5w2wx0qz745ilib1i2l50amy6dwy0k0s9"; - name = "xdg-desktop-portal-kde-5.14.0.tar.xz"; + url = "${mirror}/stable/plasma/5.14.3/xdg-desktop-portal-kde-5.14.3.tar.xz"; + sha256 = "0g0b73ylhl6y7afdk2mxnsd809v6aby7vbw86zf82ymx23lmwg83"; + name = "xdg-desktop-portal-kde-5.14.3.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 77d9d85aaa93..573f5e175ec6 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,26 +1,43 @@ let - version = "11"; - buildNumber = "28"; - baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; - makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { + makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { name = if packageType == "jdk" then "adoptopenjdk-${vmType}-bin-${version}" else "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + + url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; }; in { jdk-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jdk"; vmType = "hotspot"; sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; }; jre-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jre"; vmType = "hotspot"; sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; }; + jdk-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; + packageType = "jdk"; + vmType = "openj9"; + sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f"; + }; + jre-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; + packageType = "jre"; + vmType = "openj9"; + sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8"; + }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index 6e00782c3918..f4990b6effc5 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,36 +1,43 @@ let - version = "11"; - buildNumber = "28"; - baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; - makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix { + makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix { name = if packageType == "jdk" then "adoptopenjdk-${vmType}-bin-${version}" else "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + + url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; }; in { jdk-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jdk"; vmType = "hotspot"; sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; }; jre-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jre"; vmType = "hotspot"; sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; }; jdk-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; packageType = "jdk"; vmType = "openj9"; - sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f"; + sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251"; }; jre-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; packageType = "jre"; vmType = "openj9"; - sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42"; + sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff"; }; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 7a062a552150..6fdbde242f32 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib -, gcc48, gcc49, gcc5, gcc6 +, gcc48, gcc49, gcc5, gcc6, gcc7 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: @@ -229,7 +229,7 @@ in rec { sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw"; }) ]; - gcc = gcc6; + gcc = gcc7; }; cudatoolkit_9 = cudatoolkit_9_2; @@ -239,7 +239,7 @@ in rec { url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj"; - gcc = gcc6; + gcc = gcc7; }; cudatoolkit_10 = cudatoolkit_10_0; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 1b5f514015d6..bcb724fd58c6 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -177,14 +177,14 @@ stdenv.mkDerivation ({ inherit patches; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + outputs = [ "out" "lib" "man" "info" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" ]; - postPatch = if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 172fd9d2665f..13ff4165a41c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -185,6 +185,8 @@ stdenv.mkDerivation ({ inherit patches; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + outputs = if langJava || langGo then ["out" "man" "info"] else [ "out" "lib" "man" "info" ]; setOutputFlags = false; @@ -192,8 +194,6 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" ]; - postPatch = if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 5933ba7a72da..a30cd6bbda97 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 5d7549ed1157..372a7065f2dc 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 90621205e383..094c26cbf696 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 1c08b1c89013..1335666c54ce 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix deleted file mode 100644 index 53693ff50521..000000000000 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ stdenv -, fetchurl, perl -, ncurses5, gmp, libiconv -, gcc, llvm_35 -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - libPath = stdenv.lib.makeLibraryPath ([ - ncurses5 gmp - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); - - libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" - + "LD_LIBRARY_PATH"; - -in - -stdenv.mkDerivation rec { - version = "7.10.3"; - - name = "ghc-${version}-binary"; - - src = fetchurl ({ - "i686-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-i386-deb7-linux.tar.bz2"; - sha256 = "20b32912fb7e57910a3c908f99a9519b57a4872e1ea0f4f2265b2f7b30e8a3cd"; - }; - "x86_64-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-deb8-linux.tar.bz2"; - sha256 = "5e163c557e9236cce68be41c984eab0fcdbdc1602e39040ca9ae325e6bdec1c3"; - }; - "armv7l-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.bz2"; - sha256 = "2913763eef88e4d1843a1e4c34225afb1866310d1a1956c08a4131f4593518f6"; - }; - "x86_64-darwin" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-apple-darwin.tar.bz2"; - sha256 = "4b537228d49b5ea0f8e8dbcc440a5b3c3cb19a92579d607291cc0041422fa5c3"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); - - nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ]; - - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location/ - ${libEnvVar} = libPath; - - postUnpack = - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - done - '' + - - # Some scripts used during the build need to have their shebangs patched - '' - patchShebangs ghc-${version}/utils/ - patchShebangs ghc-${version}/configure - '' + - - # Strip is harmful, see also below. It's important that this happens - # first. The GHC Cabal build system makes use of strip by default and - # has hardcoded paths to /usr/bin/strip in many places. We replace - # those below, making them point to our dummy script. - '' - mkdir "$TMP/bin" - for i in strip; do - echo '#! ${stdenv.shell}' > "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + - # We have to patch the GMP paths for the integer-gmp package. - '' - find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name base.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; - '' + - # Rename needed libraries and binaries, fix interpreter - stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ - --replace-needed libtinfo.so libtinfo.so.5 \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; - - paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - ''; - - configurePlatforms = [ ]; - configureFlags = [ - "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" - "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; - - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - preFixup = stdenv.lib.optionalString stdenv.isLinux '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - ''; - - doInstallCheck = true; - installCheckPhase = '' - unset ${libEnvVar} - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - }; - - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; -} diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix new file mode 100644 index 000000000000..6470f7b02957 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.6.2.nix @@ -0,0 +1,232 @@ +{ stdenv, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 + +, libiconv ? null, ncurses + +, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.6.2"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1mbn3n2ynmpfpb7jfnhpzzli31qqxqyi8ws71blws3i846fq3ana"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + })]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + 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.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" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ 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" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ]; + + postInstall = '' + for bin in "$out"/lib/${name}/bin/*; do + isELF "$bin" || continue + paxmark m "$bin" + done + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.6.2"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 7b88efd1e616..c427ec75cb37 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.71"; + version = "1.3.0"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0yzanv2jkjx3vfixzvjsihfi00khs7zr47y01cil8bylzvyr50p4"; + sha256 = "14i5qmni1dzfamab6y659b5nvgp99m1abx71i83zcbfi9nw1r1gz"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix similarity index 85% rename from pkgs/development/compilers/ocaml/ber-metaocaml-104.nix rename to pkgs/development/compilers/ocaml/ber-metaocaml.nix index e6c688940368..2eeb6ad84084 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -8,16 +8,16 @@ in stdenv.mkDerivation rec { name = "ber-metaocaml-${version}"; - version = "104"; + version = "107"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; - sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.1.tar.gz"; + sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a"; }; metaocaml = fetchurl { - url = "http://okmij.org/ftp/ML/ber-metaocaml-104.tar.gz"; - sha256 = "1gmwlxairxqcmqa2r6kbf8b4dxc7pfhfbh48g1s14d3z20rj8nib"; + url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz"; + sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm"; }; # Needed to avoid a SIGBUS on the final executable on mips diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index dac8b0279ad9..24043ce47740 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "1pbgijglyqrm998a6z5ahp4phd72crzr3s8vq17a9dz3i0a9hcj5"; + sha256 = "0xvnmpfj4c6h4gmc2c3d4gcs44527jrgfl11l2fs4ai1mc69w5zg"; }; isLibrary = false; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 0832d14992d1..1b84b9348520 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -21,12 +21,9 @@ stdenv.mkDerivation rec { buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed - installPhase = '' - for p in reason rtop - do - ${dune.installPhase} $p.install - done + inherit (dune) installPhase; + postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index a064064fd919..4abaec6528a9 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 python27 ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq python27 ] ++ (with coq.ocamlPackages; [ ocaml camlp5 ]); + + prePatch = "patchShebangs etc/coq-scripts"; doCheck = false; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 99a6fe311a01..1e5b6b7bf666 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,34 +1,33 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, fetchFromGitHub, coq, ncurses, which , graphviz, withDoc ? false }: -let params = - - let param_1_7 = { - version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.6" then { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; + version = "1.7.0"; + sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then + { + version = "1.6.1"; + sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; + } + else throw "No version of math-comp is available for Coq ${coq.coq-version}"; - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - "8.9" = param_1_7; - - }; - param = params."${coq.coq-version}"; in -stdenv.mkDerivation { - name = "coq${coq.coq-version}-mathcomp-${param.version}"; +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-mathcomp-${version}"; - src = fetchurl { - url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; + # used in ssreflect + inherit (param) version; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "math-comp"; + rev = "mathcomp-${param.version}"; inherit (param) sha256; }; @@ -39,10 +38,11 @@ stdenv.mkDerivation { buildFlags = stdenv.lib.optionalString withDoc "doc"; + COQBIN = "${coq}/bin/"; + preBuild = '' patchShebangs etc/utils/ssrcoqdep || true cd mathcomp - export COQBIN=${coq}/bin/ ''; installPhase = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 840189e347a5..1fcb7e2da8ae 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,46 +1,22 @@ -{ stdenv, fetchurl, coq, ncurses, which -, graphviz, withDoc ? false +{ stdenv, fetchFromGitHub, coq, ncurses, which +, graphviz, mathcomp, withDoc ? false }: -let params = +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-ssreflect-${version}"; - let param_1_7 = { - version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in - - { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - "8.9" = param_1_7; - - }; - param = params."${coq.coq-version}"; -in - -stdenv.mkDerivation { - - name = "coq${coq.coq-version}-ssreflect-${param.version}"; - src = fetchurl { - url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; - inherit (param) sha256; - }; + inherit (mathcomp) src version meta; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); enableParallelBuilding = true; + COQBIN = "${coq}/bin/"; + preBuild = '' patchShebangs etc/utils/ssrcoqdep || true cd mathcomp/ssreflect - export COQBIN=${coq}/bin/ ''; installPhase = '' @@ -52,15 +28,5 @@ stdenv.mkDerivation { cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ ''; - meta = with stdenv.lib; { - homepage = http://ssr.msr-inria.inria.fr/; - license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl jwiegley ]; - inherit (coq.meta) platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; - + passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a34f510ccb9c..5928f6624e9b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0mgmxcr36b86jh56my3vhp9y4cravi0hbppa463q3c21a1cmjc19"; + sha256 = "0dnrihpdshrldais74jm5wjfw650i4va8znc1k2zq8gl9p4i8p39"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -242,9 +242,11 @@ self: super: { # This is due to GenList having been removed from generic-random in 1.2.0.0 # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though - hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: { - testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - }))); + hnix = + generateOptparseApplicativeCompletion "hnix" ( + dontCheck (doJailbreak (overrideCabal super.hnix (old: { + testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; + })))); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -713,7 +715,9 @@ self: super: { }); # The standard libraries are compiled separately - idris = doJailbreak (dontCheck super.idris); + idris = generateOptparseApplicativeCompletion "idris" ( + doJailbreak (dontCheck super.idris) + ); # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; @@ -1047,7 +1051,20 @@ self: super: { vector-algorithms = dontCheck super.vector-algorithms; # The test suite attempts to use the network. - dhall = dontCheck super.dhall; + dhall = + generateOptparseApplicativeCompletion "dhall" ( + dontCheck super.dhall + ); + + dhall-json = + generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] ( + super.dhall-json + ); + + dhall-nix = + generateOptparseApplicativeCompletion "dhall-to-nix" ( + super.dhall-nix + ); # https://github.com/well-typed/cborg/issues/174 cborg = doJailbreak super.cborg; @@ -1064,14 +1081,18 @@ self: super: { # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); # The tool needs a newer hpack version than the one mandated by LTS-12.x. - cabal2nix = super.cabal2nix.overrideScope (self: super: { - hpack = self.hpack_0_31_1; - yaml = self.yaml_0_11_0_0; - }); + # Also generate shell completions. + cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" + (super.cabal2nix.overrideScope (self: super: { + hpack = self.hpack_0_31_1; + yaml = self.yaml_0_11_0_0; + })); stack2nix = super.stack2nix.overrideScope (self: super: { hpack = self.hpack_0_31_1; yaml = self.yaml_0_11_0_0; }); + # Break out of "aeson <1.3, temporary <1.3". + stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack); # https://github.com/pikajude/stylish-cabal/issues/11 stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; @@ -1112,6 +1133,9 @@ self: super: { # https://github.com/snapframework/xmlhtml/pull/37 xmlhtml = doJailbreak super.xmlhtml; + # Generate shell completions + purescript = generateOptparseApplicativeCompletion "purs" super.purescript; + # https://github.com/NixOS/nixpkgs/issues/46467 safe-money-aeson = super.safe-money-aeson.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); safe-money-store = super.safe-money-store.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 4276de9f90d7..315740b309fa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -64,10 +64,10 @@ self: super: { hspec-discover = self.hspec-discover_2_6_0; hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x hspec-meta = self.hspec-meta_2_5_6; + HTF = dontCheck super.HTF_0_13_2_5; # https://github.com/skogsbaer/HTF/issues/74 JuicyPixels = self.JuicyPixels_3_3_2; lens = self.lens_4_17; megaparsec = dontCheck (doJailbreak super.megaparsec); - neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF patience = markBrokenVersion "0.1.1" super.patience; polyparse = self.polyparse_1_12_1; primitive = self.primitive_0_6_4_0; @@ -97,12 +97,6 @@ self: super: { unicode-transforms = dontCheck super.unicode-transforms; monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66 - # https://github.com/bmillwood/haskell-src-meta/pull/80 - haskell-src-meta = doJailbreak super.haskell-src-meta; - - # https://github.com/skogsbaer/HTF/issues/69 - HTF = markBrokenVersion "0.13.2.4" super.HTF; - # https://github.com/jgm/skylighting/issues/55 skylighting-core = dontCheck super.skylighting-core; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0a2770cc4c01..97f2955d3a9e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.16 + # LTS Haskell 12.17 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -73,7 +73,7 @@ default-package-overrides: - aeson-typescript ==0.1.1.0 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - - Agda ==2.5.4.1 + - Agda ==2.5.4.2 - al ==0.1.4.2 - alarmclock ==0.5.0.2 - alerts ==0.1.0.0 @@ -731,8 +731,8 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - Fin ==0.2.6.0 - fin ==0.0.1 + - Fin ==0.2.6.0 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 @@ -842,9 +842,9 @@ default-package-overrides: - gi-glib ==2.0.17 - gi-gobject ==2.0.16 - gi-gtk ==3.0.25 - - gi-gtk-hs ==0.3.6.2 + - gi-gtk-hs ==0.3.6.3 - gi-gtksource ==3.0.16 - - gi-javascriptcore ==4.0.15 + - gi-javascriptcore ==4.0.16 - gio ==0.13.5.0 - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 @@ -1056,7 +1056,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - HTTP ==4000.3.12 - - http2 ==1.6.3 + - http2 ==1.6.4 - http-api-data ==0.3.8.1 - http-client ==0.5.13.1 - http-client-openssl ==0.2.2.0 @@ -1091,7 +1091,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.6.2.17 + - hw-prim ==0.6.2.18 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.3.2.1 - hw-string-parse ==0.0.0.4 @@ -1448,6 +1448,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 + - network-byte-order ==0.0.0.0 - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 @@ -1787,12 +1788,12 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 - - sandi ==0.4.2 + - sandi ==0.4.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - sbp ==2.3.17 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1877,11 +1878,11 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.1 + - simple-cmd ==0.1.2 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - simplest-sqlite ==0.1.0.0 - - simple-vec3 ==0.4.0.8 + - simple-vec3 ==0.4.0.9 - since ==0.0.0 - singleton-bool ==0.1.4 - singleton-nats ==0.4.2 @@ -2212,7 +2213,7 @@ default-package-overrides: - vec ==0.1 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.4 - - vector-binary-instances ==0.2.5 + - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.6 - vector-bytes-instances ==0.1.1 @@ -2307,10 +2308,10 @@ default-package-overrides: - X11 ==1.9 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 - - x509 ==1.7.4 - - x509-store ==1.6.6 + - x509 ==1.7.5 + - x509-store ==1.6.7 - x509-system ==1.6.6 - - x509-validation ==1.6.10 + - x509-validation ==1.6.11 - Xauth ==0.1 - xdg-basedir ==0.2.2 - xeno ==0.3.4 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7fd4df278f14..e0324f973b7a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -724,49 +724,6 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, alex, array, async, base, binary, blaze-html - , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq - , directory, EdisonCore, edit-distance, emacs, equivalence - , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable - , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process - , regex-tdfa, stm, strict, template-haskell, text, time - , transformers, unordered-containers, uri-encode, zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.5.4.1"; - sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal filemanip filepath process ]; - libraryHaskellDepends = [ - array async base binary blaze-html boxes bytestring containers - data-hash deepseq directory EdisonCore edit-distance equivalence - filepath geniplate-mirror gitrev hashable hashtables haskeline - ieee754 mtl murmur-hash pretty process regex-tdfa stm strict - template-haskell text time transformers unordered-containers - uri-encode zlib - ]; - libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ base directory filepath process ]; - executableToolDepends = [ emacs ]; - postInstall = '' - files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; - }) {inherit (pkgs) emacs;}; - - "Agda_2_5_4_2" = callPackage ({ mkDerivation, alex, array, async, base, binary, blaze-html , boxes, bytestring, Cabal, containers, data-hash, deepseq , directory, EdisonCore, edit-distance, emacs, equivalence @@ -806,7 +763,6 @@ self: { ''; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; @@ -8666,6 +8622,39 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "HTF_0_13_2_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, containers, cpphs, Diff, directory + , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl + , old-time, pretty, process, QuickCheck, random, regex-compat + , template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.13.2.5"; + sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + description = "The Haskell Test Framework"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl @@ -12316,8 +12305,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2018.11.4"; - sha256 = "179f7kf355bkmpz1xjlf072axwsixjafh77m0anqx6q3g7qd0b36"; + version = "0.2018.11.6"; + sha256 = "0zv8n80qmdykj40nqbrxb29grmy4kzjfhjxbyy3d7ylb64rq514n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -17300,6 +17289,8 @@ self: { pname = "Stack"; version = "0.3.2"; sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b"; + revision = "1"; + editedCabalFile = "1ngyrylqmc2fc088d49pn41nlps3mqjimh0y8wc6nmpkay5pj0m8"; libraryHaskellDepends = [ base nats stm ]; description = "Stack data structure"; license = stdenv.lib.licenses.bsd3; @@ -18315,6 +18306,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "TypeCompose_0_9_14" = callPackage + ({ mkDerivation, base, base-orphans }: + mkDerivation { + pname = "TypeCompose"; + version = "0.9.14"; + sha256 = "0msss17lrya6y5xfvxl41xsqs6yr09iw6m1px4xlwin72xwly0sn"; + libraryHaskellDepends = [ base base-orphans ]; + description = "Type composition classes & instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "TypeIlluminator" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -20462,6 +20465,8 @@ self: { pname = "accelerate-llvm-ptx"; version = "1.2.0.0"; sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5"; + revision = "1"; + editedCabalFile = "1fcgs1wcknqnj7wr907ixwlrzwgfnl1bmyr5j4d58bm2xrspid7m"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring containers cuda deepseq directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure @@ -30356,6 +30361,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "atomic-write_0_2_0_6" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , temporary, text, unix-compat + }: + mkDerivation { + pname = "atomic-write"; + version = "0.2.0.6"; + sha256 = "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl"; + libraryHaskellDepends = [ + base bytestring directory filepath temporary text unix-compat + ]; + testHaskellDepends = [ + base bytestring filepath hspec temporary text unix-compat + ]; + description = "Atomically write to a file"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomo" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hashable, haskeline, hint, mtl, parsec, pretty @@ -30870,15 +30894,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "attoparsec-uri_0_0_6" = callPackage + "attoparsec-uri_0_0_7" = callPackage ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck , text, vector }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.6"; - sha256 = "046aq5c56p51nxyrazv3sv7m49c214gc673cwyic75vfykgbk20b"; + version = "0.0.7"; + sha256 = "0p3j4m5ps4j8phm2c00rk6m06vidckf14fy50xgcq2zr8b1lk79n"; libraryHaskellDepends = [ attoparsec attoparsec-ip base bytedump ip QuickCheck quickcheck-instances strict text vector @@ -34332,6 +34356,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bencodex" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , containers, file-embed, filepath, hashable, hlint, hspec + , hspec-attoparsec, hspec-discover, HsYAML, text + , unordered-containers + }: + mkDerivation { + pname = "bencodex"; + version = "1.0.0"; + sha256 = "1ny60qg63kyi12rlk8spc6db40zq3laqfw0k89s0jvnkjlksdyj8"; + libraryHaskellDepends = [ + attoparsec base bytestring hashable text unordered-containers + ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers file-embed filepath + hlint hspec hspec-attoparsec hspec-discover HsYAML text + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Bencodex reader/writer for Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "bencoding" = callPackage ({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring , containers, criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl @@ -34594,6 +34641,8 @@ self: { pname = "bhoogle"; version = "0.1.3.5"; sha256 = "1gig9w1k1w2kw6y3wx6ckmc7kamwwzzq7mbaxil0rmb5ms0p1rf9"; + revision = "1"; + editedCabalFile = "006nqwl03lrs7nsly7l3kl9wfwabflkkxy4g34sbkik88ihipw56"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40076,8 +40125,8 @@ self: { }: mkDerivation { pname = "bugsnag-haskell"; - version = "0.0.2.1"; - sha256 = "09vvckg6advf47ciq3cv2g06g13d2az1kinby5fpfz1wma7s1zjg"; + version = "0.0.2.2"; + sha256 = "1fx9f0ddx8il141rhqxb81vms0nxkyckwx72cmjq2j0nwjhhh89l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40482,19 +40531,18 @@ self: { "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw - , OpenGLRaw21, repa, repa-devil + , repa, repa-devil }: mkDerivation { pname = "butterflies"; - version = "0.3.0.1"; - sha256 = "0dgjjfd4lna6kvqbckx378ssxc5mm9xyvdkwd3r197199rmxq733"; + version = "0.3.0.2"; + sha256 = "0syykvrgq6i0zxy1pn934j1r9glv4yypva1mfkn0vc0nikh9fm31"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ - base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa - repa-devil + base bytestring gl-capture GLUT OpenGLRaw repa repa-devil ]; description = "butterfly tilings"; license = stdenv.lib.licenses.gpl3; @@ -45598,6 +45646,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cheapskate_0_1_1_1" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize + }: + mkDerivation { + pname = "cheapskate"; + version = "0.1.1.1"; + sha256 = "0qnyd8bni2rby6b02ff4bvfdhm1hwc8vzpmnms84jgrlg1lly3fm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html containers data-default deepseq mtl syb text + uniplate xss-sanitize + ]; + executableHaskellDepends = [ base blaze-html bytestring text ]; + description = "Experimental markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cheapskate-highlight" = callPackage ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate , text @@ -49712,6 +49780,8 @@ self: { pname = "combinat"; version = "0.2.9.0"; sha256 = "1y617qyhqh2k6d51j94c0xnj54i7b86d87n0j12idxlkaiv4j5sw"; + revision = "1"; + editedCabalFile = "0yjvvxfmyzjhh0q050cc2wkhaahzixsw7hf27n8dky3n4cxd5bix"; libraryHaskellDepends = [ array base containers random transformers ]; @@ -54132,6 +54202,8 @@ self: { pname = "country"; version = "0.1.6"; sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9"; + revision = "1"; + editedCabalFile = "04a2s0zlm4garihnm3xl9avf88vjnbvpsyb2ckk3z7ydjq0y3938"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq ghc-prim hashable primitive scientific text unordered-containers @@ -63423,8 +63495,8 @@ self: { pname = "dictionary-sharing"; version = "0.1.0.0"; sha256 = "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc"; - revision = "2"; - editedCabalFile = "0pxbqck3fkfqrg51fkkplcmqxn9vllkc5ff83l282gandqv4glvi"; + revision = "3"; + editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439"; libraryHaskellDepends = [ base containers ]; description = "Sharing/memoization of class members"; license = stdenv.lib.licenses.bsd3; @@ -63592,6 +63664,8 @@ self: { pname = "diffmap"; version = "0.1.0.0"; sha256 = "0i6dyvp8ds1wz9jm7nva076pc18mz24fiz50gqgq3xv76aghl0i0"; + revision = "1"; + editedCabalFile = "0gkcsdf9jrfs5lwhayl808flwlv446mixdn3n91v5gsxbcqqrsi7"; libraryHaskellDepends = [ base containers ]; description = "diff on maps"; license = stdenv.lib.licenses.bsd3; @@ -68994,18 +69068,19 @@ self: { }) {eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, binary, bytestring, mtl, primitive - , transformers, vector + ({ mkDerivation, base, binary, bytestring, constraints, ghc-prim + , mtl, primitive, transformers, vector }: mkDerivation { pname = "eigen"; - version = "3.3.4.1"; - sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa"; + version = "3.3.4.2"; + sha256 = "0l88bzp6f5bs5lpcav1c0lg2dc59rfdka2d6dx3c6gzbj1jmf5iz"; libraryHaskellDepends = [ - base binary bytestring primitive transformers vector + base binary bytestring constraints ghc-prim primitive transformers + vector ]; testHaskellDepends = [ - base binary bytestring mtl primitive transformers vector + base binary bytestring ghc-prim mtl primitive transformers vector ]; description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -73518,7 +73593,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extensible_0_4_10" = callPackage + "extensible_0_4_10_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, exceptions, ghc-prim, hashable, lens , monad-skeleton, mtl, prettyprinter, primitive, profunctors @@ -73528,8 +73603,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.4.10"; - sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq"; + version = "0.4.10.1"; + sha256 = "009z0grpjnnmnsc887k6vgfz5w55mniax25dl4ispj1nq74djksb"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq exceptions ghc-prim hashable monad-skeleton mtl prettyprinter @@ -73584,24 +73659,23 @@ self: { "extensible-effects-concurrent" = callPackage ({ mkDerivation, async, base, containers, data-default, deepseq , directory, enclosed-exceptions, extensible-effects, filepath - , HUnit, lens, logging-effect, monad-control, mtl, parallel - , process, QuickCheck, random, stm, tagged, tasty, tasty-discover - , tasty-hunit, time, transformers + , HUnit, lens, monad-control, mtl, parallel, process, QuickCheck + , stm, tasty, tasty-discover, tasty-hunit, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.9.0"; - sha256 = "0y6rf1whjwhrzkjw70sayl95lf8b6dhn5l9pxhwp05gnz3ll81ka"; + version = "0.11.1"; + sha256 = "0jpf8rp2dfa6ggvv076fyipbyr97dq3lxwrxdbffsnjviz6232wd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base containers data-default deepseq directory - enclosed-exceptions extensible-effects filepath lens logging-effect - monad-control mtl parallel process QuickCheck random stm tagged - time transformers + async base containers data-default deepseq enclosed-exceptions + extensible-effects filepath lens monad-control mtl parallel process + QuickCheck stm time transformers-base ]; executableHaskellDepends = [ - base data-default extensible-effects lens + base data-default deepseq directory extensible-effects filepath + lens ]; testHaskellDepends = [ base containers data-default deepseq extensible-effects HUnit lens @@ -74117,20 +74191,18 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, base, combinat-compat - , composition-prelude, criterion, gmpint, hspec, QuickCheck + ({ mkDerivation, arithmoi, base, combinat, criterion, hgmp, hspec + , QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.3.0"; - sha256 = "0f02fi63xq0x1r5qqagwzz6wbsxblz99jm2g994gs13ba11abix1"; - libraryHaskellDepends = [ base composition-prelude gmpint ]; - testHaskellDepends = [ - arithmoi base combinat-compat hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - arithmoi base combinat-compat criterion - ]; + version = "0.6.4.1"; + sha256 = "0rnbqj495lj2c5xmk35iwhlx6h4m14b35hqz73adspm4ryym00b3"; + revision = "2"; + editedCabalFile = "0hla00m1v9sk480yif3kgi2zzqq7snfz6san3yznigpxqzq5rczm"; + libraryHaskellDepends = [ base hgmp ]; + testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; + benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -76740,8 +76812,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "fixedprec"; - version = "0.2.2.1"; - sha256 = "0s921nhkmdglmcwzyr048r04dswc6hz7kvh9p4lvd8i2mxq0szgi"; + version = "0.2.2.2"; + sha256 = "01ss9rzg2r4gii6f7771n4vdyg022skyws6ncc3l62xycgz153a7"; libraryHaskellDepends = [ base random ]; description = "A fixed-precision real number type"; license = stdenv.lib.licenses.bsd3; @@ -77037,21 +77109,20 @@ self: { "flat" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, doctest, filemanip, ghc-prim, mono-traversable, pretty - , primitive, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text, vector + , dlist, ghc-prim, mono-traversable, pretty, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, text, vector }: mkDerivation { pname = "flat"; - version = "0.3.2"; - sha256 = "0489w132m6j47m0jf1svwvql3fmw58iz9l2rqnhn4c5gg91wj53q"; + version = "0.3.4"; + sha256 = "1v7c5nrvhys4flq5xacws59w25qzbb6mvwhvk4f6jb6impmqnwyw"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist ghc-prim mono-traversable pretty primitive text vector ]; testHaskellDepends = [ - base bytestring containers deepseq doctest filemanip ghc-prim - quickcheck-instances tasty tasty-hunit tasty-quickcheck text + array base bytestring containers deepseq ghc-prim QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; @@ -77931,6 +78002,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "focuslist" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , genvalidity-containers, genvalidity-hspec, hedgehog, lens + , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec + , template-haskell + }: + mkDerivation { + pname = "focuslist"; + version = "0.1.0.0"; + sha256 = "1przphis37yh06q2scqh2njcrvgynh0p9km52f4a5yvmnxvaqs8n"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers lens mono-traversable QuickCheck + ]; + testHaskellDepends = [ + base doctest genvalidity-containers genvalidity-hspec hedgehog lens + QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell + ]; + description = "Lists with a focused element"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fold-debounce" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time @@ -81594,8 +81689,8 @@ self: { ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { pname = "gearbox"; - version = "1.0.0.5"; - sha256 = "01mzvbmzq7bl665xy5znqcivxp0b6x6wcrzq8r6kzsym5izm9qz4"; + version = "1.0.0.6"; + sha256 = "0f8zljk145yq3lq3ngiana5g39ybqijsv7n3b11wdr7mzymdgyw2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT OpenGLRaw Vec ]; @@ -82625,12 +82720,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_6_1_0" = callPackage + "genvalidity_0_7_0_0" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.6.1.0"; - sha256 = "0wjqwn040yn7wpmcmhfp5slvyspal104p5wgkwwi40ykaj2zhayg"; + version = "0.7.0.0"; + sha256 = "1bjsqqyr1n306icfdl8sh3amqq95zpr5hawwbv46nbf0rxci88w1"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; @@ -82678,21 +82773,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-bytestring_0_3_0_0" = callPackage + "genvalidity-bytestring_0_3_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, genvalidity , genvalidity-hspec, hspec, QuickCheck, validity , validity-bytestring }: mkDerivation { pname = "genvalidity-bytestring"; - version = "0.3.0.0"; - sha256 = "1jmy41mqjh3zj512fjikn6vqjvx81cdvi9llc9f0yp2h2rkmw4hf"; + version = "0.3.0.1"; + sha256 = "1jc3hd5aad5vblb1mmb1xzgfdcnk37w50vxyznr1m16rdfg1xrz8"; libraryHaskellDepends = [ base bytestring genvalidity QuickCheck validity validity-bytestring ]; testHaskellDepends = [ base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck + QuickCheck validity ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; @@ -82717,6 +82812,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-containers_0_5_1_1" = callPackage + ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-containers + }: + mkDerivation { + pname = "genvalidity-containers"; + version = "0.5.1.1"; + sha256 = "1z7bmbwi07nylkgm3dysmnv57z1iww2sjy2zv88jpg6nvq9r9ffg"; + libraryHaskellDepends = [ + base containers genvalidity QuickCheck validity validity-containers + ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-hspec hspec validity + ]; + description = "GenValidity support for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, transformers, validity @@ -82736,6 +82850,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-hspec_0_6_2_1" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, transformers, validity + }: + mkDerivation { + pname = "genvalidity-hspec"; + version = "0.6.2.1"; + sha256 = "100mjmbjfzy431a52yqkq2rja0mb5zw8dbkpfbfy17rdkwwx2yn1"; + libraryHaskellDepends = [ + base genvalidity genvalidity-property hspec hspec-core QuickCheck + transformers validity + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-property hspec hspec-core + QuickCheck validity + ]; + description = "Standard spec's for GenValidity instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec @@ -82757,6 +82892,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-hspec-aeson_0_3_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , genvalidity, genvalidity-aeson, genvalidity-hspec + , genvalidity-property, genvalidity-text, hspec, QuickCheck, text + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-aeson"; + version = "0.3.0.1"; + sha256 = "0x5ja3d6vab2gmcqif3cvvbvmdpxp4hrc4ygzns5pw91nlrf5lm2"; + libraryHaskellDepends = [ + aeson base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + testHaskellDepends = [ + aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec + genvalidity-property genvalidity-text hspec text validity + ]; + description = "Standard spec's for aeson-related instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-binary" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck @@ -82773,6 +82931,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-hspec-binary_0_2_0_3" = callPackage + ({ mkDerivation, base, binary, deepseq, doctest, genvalidity + , genvalidity-hspec, genvalidity-property, hspec, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-binary"; + version = "0.2.0.3"; + sha256 = "1am9brcf3wh2fdrfwlkcqiamwc2zlcw3lihpcqgz0sm3jhka56xr"; + libraryHaskellDepends = [ + base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-property hspec validity + ]; + description = "Standard spec's for binary-related Instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-cereal" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck @@ -82789,6 +82967,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-hspec-cereal_0_2_0_3" = callPackage + ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity + , genvalidity-hspec, genvalidity-property, hspec, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-cereal"; + version = "0.2.0.3"; + sha256 = "11bii2nf52jfarfb5jzgj6pmsz59mcvivb8nxc90z97gdd5w6zll"; + libraryHaskellDepends = [ + base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-property hspec validity + ]; + description = "Standard spec's for cereal-related instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-hashable" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck @@ -82810,19 +83008,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-hspec-hashable_0_2_0_3" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, hspec-core, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-hashable"; + version = "0.2.0.3"; + sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566"; + libraryHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-property hashable + hspec QuickCheck validity + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-hspec genvalidity-property + hashable hspec hspec-core QuickCheck validity + ]; + description = "Standard spec's for Hashable instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-optics" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec - , hspec, microlens, QuickCheck + , genvalidity-property, hspec, microlens, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec-optics"; - version = "0.1.1.0"; - sha256 = "13nspyfd8apvqf30dr8zz027d60qh2f25rc6gk8fliiq626ajz17"; + version = "0.1.1.1"; + sha256 = "121pjin5g1mgdqjydvj68639d5f17i3ibxrl8iiigp4q3xywp4ha"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec hspec microlens QuickCheck ]; testHaskellDepends = [ - base doctest genvalidity genvalidity-hspec hspec microlens + base doctest genvalidity genvalidity-hspec genvalidity-property + hspec microlens validity ]; description = "Standard spec's for optics"; license = stdenv.lib.licenses.mit; @@ -82887,6 +83108,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-property_0_3_0_0" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.3.0.0"; + sha256 = "03cpmkqmfqypj9kydrdzs0pyix0ffwrlx8idzvgyrqiyhg03rsis"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-scientific" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, scientific, validity, validity-scientific @@ -82959,6 +83197,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-unordered-containers_0_2_0_4" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.2.0.4"; + sha256 = "0rkvwm5imbgl8cx5pdk16dc4wzhcndw6g3wwxs0blykiri32wl3q"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + validity + ]; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-uuid" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid @@ -82995,6 +83255,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-vector_0_2_0_3" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.2.0.3"; + sha256 = "161w5shgj1k8691mmi9ddhxrnrqhsp502ywln2h0sk55zqcj1i5k"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geo-resolver" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, http-conduit, http-types, HUnit, QuickCheck @@ -84201,6 +84480,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_3_0" = callPackage + ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.3.0"; + sha256 = "077cvrx25qdl04qgp3wl7c3jxrakw1k873dwgybfwkhgfj2g8dx1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using lexer of GHC itself"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -85288,23 +85582,6 @@ self: { }) {}; "gi-gtk-hs" = callPackage - ({ mkDerivation, base, base-compat, containers, gi-gdk - , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl - , text, transformers - }: - mkDerivation { - pname = "gi-gtk-hs"; - version = "0.3.6.2"; - sha256 = "04gksr27nqzx77c8kv2c94ysf1pz3nwhvnxvbz8h7cn4hzvzhb8z"; - libraryHaskellDepends = [ - base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject - gi-gtk haskell-gi-base mtl text transformers - ]; - description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = stdenv.lib.licenses.lgpl21; - }) {}; - - "gi-gtk-hs_0_3_6_3" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl , text, transformers @@ -85319,7 +85596,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gi-gtkosxapplication" = callPackage @@ -85366,27 +85642,6 @@ self: { }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , webkitgtk - }: - mkDerivation { - pname = "gi-javascriptcore"; - version = "4.0.15"; - sha256 = "07dz5kisis93x0ywb207w8nv54bfdgsahq325dyvbfvlgkqrxsh3"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; - description = "JavaScriptCore bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; - - "gi-javascriptcore_4_0_16" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers, webkitgtk @@ -85945,8 +86200,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20181031"; - sha256 = "02h3c77mdlr4c6l7c14ai0i2kq8c7pawvsf33my449b1srviazlm"; + version = "7.20181105"; + sha256 = "0jh49bfgsccrvhdgyp1xp5rj0vp9iz8kkmh1x5cmrsjajs8qdpw3"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -86515,6 +86770,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-release_1_2_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers, uri-templater + }: + mkDerivation { + pname = "github-release"; + version = "1.2.3"; + sha256 = "14jb82gybm2zwri05bqxsibwr29lhghcaj3n0171nbndqs0dyl0y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; + executableHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; + description = "Upload files to GitHub releases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -89748,6 +90027,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-isbn" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , http-conduit, text + }: + mkDerivation { + pname = "google-isbn"; + version = "1.0.2"; + sha256 = "1vba9czx73b9xqr3cp5gz9r7qp458wdzzb4sqds4hzridchjf3ry"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-conduit text + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "google-mail-filters" = callPackage ({ mkDerivation, base, containers, google-search, text, time , xml-conduit @@ -91034,8 +91327,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.1.0.7"; - sha256 = "13fbx5vzg2fq9883hdf8djbc47lyia6n4sshwz3dhg5bjpni7l1x"; + version = "0.3.0.0"; + sha256 = "11mf250vg2yvknnvbsc7h7m5xfxfsm4mia7by735ndhxzxb65jy9"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -92509,8 +92802,8 @@ self: { }) {gtk-mac-integration-gtk3 = null;}; "gtkglext" = callPackage - ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools - , gtkglext, pango + ({ mkDerivation, base, Cabal, glib, gtk, gtk2, gtk2hs-buildtools + , gtkglext, libGLU, libICE, libSM, libXmu, libXt, pango }: mkDerivation { pname = "gtkglext"; @@ -92519,12 +92812,16 @@ self: { enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; + librarySystemDepends = [ gtk2 libGLU libICE libSM libXmu libXt ]; libraryPkgconfigDepends = [ gtkglext ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gtkglext;}; + }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; + inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; + inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; + inherit (pkgs.xorg) libXt;}; "gtkimageview" = callPackage ({ mkDerivation, array, base, containers, glib, gtk @@ -98573,8 +98870,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.3"; - sha256 = "1gr5sxjjkf7faiyc4y1sbiv06c5fiz7w5s8sxz7hh5k54w8nhs4c"; + version = "0.9.4"; + sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -100252,8 +100549,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.8.1"; - sha256 = "0wlsxxrb4a7dn19412gxkwlayrjzpawkpxxy7mww279i159zl7k8"; + version = "0.8.2"; + sha256 = "1scd87ivzmrf8ar44wkijcgpr40c996dvq5rx1py2bxw0zdd1ibq"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite entropy hashable memory mtl murmur3 network @@ -100374,8 +100671,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.6.0"; - sha256 = "1qzxx1rbwv792f96wcsqmbsshd6qf34fqj6byi17la51s900zr09"; + version = "0.6.1"; + sha256 = "0jgsf4f3qyq60dbyyni0d1cdphabf8ix4l0y1iiql5ii2fy50dw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100677,6 +100974,8 @@ self: { pname = "hasktorch-codegen"; version = "0.0.1.1"; sha256 = "0yygx1w7i9mnyxrqzz94vrni5y7rkn92yycax7rqg2r5cds2xb6g"; + revision = "1"; + editedCabalFile = "07y9iwmxyvixbvy3mmyxrk95kh8nycazqzv5449pfx2rvry6m6ph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100702,6 +101001,8 @@ self: { pname = "hasktorch-ffi-tests"; version = "0.0.1.0"; sha256 = "0850v3wqf0x5hkk5py7k1glh591p59fs1y1kn2jf2giqmy05qzlc"; + revision = "1"; + editedCabalFile = "0jpymss55rj2kmfnp3gv5idlvsg0ckh7pfsm5rmfq9hvisivbv9q"; libraryHaskellDepends = [ base hasktorch-types-th hspec QuickCheck text ]; @@ -100845,6 +101146,8 @@ self: { pname = "hasktorch-signatures-types"; version = "0.0.1.0"; sha256 = "0zaa0ihgbsiwqla46dixmxki75miy5dz91agvvd147rmr2khx1j2"; + revision = "1"; + editedCabalFile = "0da2sv2cahv05cymh4285s35y4b6snrab62zaibnnqbd0nk55qka"; libraryHaskellDepends = [ base deepseq ]; doHaddock = false; description = "Core types for Hasktorch backpack signatures"; @@ -100857,6 +101160,8 @@ self: { pname = "hasktorch-types-th"; version = "0.0.1.0"; sha256 = "0irlf1lvadnr3j3zjakvkvrwdw8gpg5smk69w9l54idwsi6yvhdd"; + revision = "1"; + editedCabalFile = "0zgz7l8nawpjrc4p43xxfh9brl0mpszdxgahsn9977q5z08h4wnd"; libraryHaskellDepends = [ base inline-c ]; libraryToolDepends = [ c2hs ]; description = "C-types for Torch"; @@ -100966,6 +101271,8 @@ self: { pname = "haskus-utils-data"; version = "1.1"; sha256 = "1001apph6i956rkb6dpfhg8cgk870s44jgaaiv8ccxivkv45y7di"; + revision = "2"; + editedCabalFile = "0ahwmqlbpvgsd6c5rzq97q00ygsw69k4hvs46f5v20100cdj3496"; libraryHaskellDepends = [ base containers extra haskus-utils-types mtl recursion-schemes transformers @@ -100978,8 +101285,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskus-utils-types"; - version = "1.1"; - sha256 = "1fihf61z5078l73a08fvm5qb67dr3yc32nhgakkldd0fbh7clyrz"; + version = "1.2"; + sha256 = "0q7i2z1l55x9pgf9bd5xng0bdx4v74356gayhdxws1gfmghgf7f0"; + revision = "1"; + editedCabalFile = "07r524gxdr3alwyns96rv2rmha96s89l2216hzrbvw6c6pqg401a"; libraryHaskellDepends = [ base ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; @@ -100991,8 +101300,8 @@ self: { }: mkDerivation { pname = "haskus-utils-variant"; - version = "2.0.3"; - sha256 = "0yxlpznmc5yyv9ibx38f2slcj8r70qcz963j2fsbi5xr88ih7and"; + version = "2.2"; + sha256 = "1h3rpk04dkqppfbw7pilc4sw0pkdxxr70zggsfn63ay4zqk6s5r7"; libraryHaskellDepends = [ base haskus-utils-data haskus-utils-types template-haskell ]; @@ -105052,33 +105361,31 @@ self: { "hgeometry" = callPackage ({ mkDerivation, aeson, approximate-equality, array, base , bifunctors, bytestring, colour, containers, contravariant - , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest - , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens - , linear, mtl, optparse-applicative, parsec, QuickCheck - , quickcheck-instances, random, reflection, semigroupoids - , semigroups, singletons, template-haskell, text, vector, vinyl - , yaml + , criterion, data-clist, deepseq, deepseq-generics, directory + , dlist, doctest, filepath, fingertree, fixed-vector, hexpat, hspec + , hspec-discover, lens, linear, mtl, optparse-applicative, parsec + , profunctors, QuickCheck, quickcheck-instances, random, reflection + , semigroupoids, semigroups, singletons, template-haskell, text + , vector, vinyl, yaml }: mkDerivation { pname = "hgeometry"; - version = "0.7.0.0"; - sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz"; - revision = "1"; - editedCabalFile = "1wjwpfiic3jbhg77qm2nzgvybnpk0h3wwpywkpfxz8sv1yhb8pa2"; + version = "0.8.0.0"; + sha256 = "0hypd5936kssw435lcvqj9d7whdzfdfbhvi5hhbi90k5x89xfx6f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring colour containers contravariant data-clist deepseq dlist fingertree fixed-vector hexpat lens linear - mtl parsec QuickCheck quickcheck-instances random reflection - semigroupoids semigroups singletons template-haskell text vector - vinyl yaml + mtl parsec profunctors QuickCheck quickcheck-instances random + reflection semigroupoids semigroups singletons template-haskell + text vector vinyl yaml ]; testHaskellDepends = [ approximate-equality array base bytestring colour containers - data-clist doctest hspec lens linear QuickCheck - quickcheck-instances random semigroups singletons vector vinyl + data-clist directory doctest filepath hspec lens linear QuickCheck + quickcheck-instances random semigroups singletons vector vinyl yaml ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -106187,20 +106494,20 @@ self: { "hinterface" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers - , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory - , monad-control, monad-logger, mtl, network, QuickCheck, random - , resourcet, safe-exceptions, stm, text, transformers + , cryptonite, deepseq, exceptions, hspec, lifted-async, lifted-base + , memory, monad-control, monad-logger, mtl, network, QuickCheck + , random, resourcet, safe-exceptions, stm, text, transformers , transformers-base, vector }: mkDerivation { pname = "hinterface"; - version = "0.5.0.2"; - sha256 = "1ib8wnpkd8ng6w0wb8hhn1122rqdq4q961b10rvw4jl6bfzkwasb"; + version = "0.7.0"; + sha256 = "1n4w8mwx09i8f1h96p7nqls7r22xscy4z9fviwgivp0y59qfbdsx"; libraryHaskellDepends = [ - array async base binary bytestring containers cryptonite exceptions - lifted-async lifted-base memory monad-control monad-logger mtl - network QuickCheck random resourcet safe-exceptions stm text - transformers transformers-base vector + array async base binary bytestring containers cryptonite deepseq + exceptions lifted-async lifted-base memory monad-control + monad-logger mtl network QuickCheck random resourcet + safe-exceptions stm text transformers transformers-base vector ]; testHaskellDepends = [ async base binary bytestring hspec monad-logger QuickCheck @@ -106883,6 +107190,8 @@ self: { pname = "hledger"; version = "1.11.1"; sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9"; + revision = "1"; + editedCabalFile = "1g8jfjsfddpiifgv39gi985lsz8fsysf6qni34b0kb44wpd67pfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107325,8 +107634,8 @@ self: { }: mkDerivation { pname = "hlrdb-core"; - version = "0.1.2.0"; - sha256 = "1j3ds4kkr1ns7y46b3s29bhi63n31ggvcq4mlyp2xafw2z4nbyl3"; + version = "0.1.2.2"; + sha256 = "0qh4p354xzmcd6d6imv9qyflxj9g80rmbdyhf9bscjrqam0dy24b"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -109881,14 +110190,14 @@ self: { "hpack-dhall" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal - , dhall, dhall-json, Diff, filepath, hpack, megaparsec, microlens - , optparse-applicative, prettyprinter, tasty, tasty-golden, text - , transformers, utf8-string, yaml + , dhall, dhall-json, Diff, directory, filepath, hpack, megaparsec + , microlens, optparse-applicative, prettyprinter, tasty + , tasty-golden, text, transformers, utf8-string, yaml }: mkDerivation { pname = "hpack-dhall"; - version = "0.4.0"; - sha256 = "04bjhfc5xqkvp58y28cifsq58l2rbc8xa7ywvzmk9hvw7acbixca"; + version = "0.5.0"; + sha256 = "0nqvcs9ch2knlllb0r0j0aqwab7h3yxh5iay377gyq8xc0m4l8w6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109902,7 +110211,7 @@ self: { ]; testHaskellDepends = [ aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff - filepath hpack megaparsec microlens prettyprinter tasty + directory filepath hpack megaparsec microlens prettyprinter tasty tasty-golden text transformers utf8-string yaml ]; description = "hpack's dhalling"; @@ -112257,8 +112566,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.2.1"; - sha256 = "01sfpd2dsqbbkxq5arb0gzllfyfcmjwcln91v02f5x1f6ksjlpzp"; + version = "0.3.2.2"; + sha256 = "0b4xjkj1qc6mbsp0sn7gqmhys3h39rbfam8qwvhjmgd7d1cbl69p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112664,18 +112973,19 @@ self: { license = stdenv.lib.licenses.isc; }) {}; - "hsinstall_2_1" = callPackage + "hsinstall_2_2" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process + , safe-exceptions }: mkDerivation { pname = "hsinstall"; - version = "2.1"; - sha256 = "1azbzkslszq9pw4h91mp1zr6g6ad2haaf3g5146naf1f456z9zjg"; + version = "2.2"; + sha256 = "14c98wysvsq4k581s3f5zw44grm6f0wvbmgdda8sshhg7v2059r3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; executableHaskellDepends = [ - base Cabal directory filepath heredoc process + base Cabal directory filepath heredoc process safe-exceptions ]; description = "Install Haskell software"; license = stdenv.lib.licenses.isc; @@ -116569,36 +116879,6 @@ self: { }) {}; "http2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, case-insensitive, containers, criterion - , directory, doctest, filepath, Glob, hashtables, heaps, hex, hspec - , mwc-random, psqueues, stm, text, unordered-containers, vector - , word8 - }: - mkDerivation { - pname = "http2"; - version = "1.6.3"; - sha256 = "0hww0rfsv6lqx62qzycbcqy5q6rh9k09qkyjkdm5m1sp1z50wqk1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring bytestring-builder case-insensitive - containers psqueues stm - ]; - testHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - case-insensitive containers directory doctest filepath Glob hex - hspec psqueues stm text unordered-containers vector word8 - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion - hashtables heaps mwc-random psqueues stm - ]; - description = "HTTP/2 library including frames, priority queues and HPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http2_1_6_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , case-insensitive, containers, criterion, directory, doctest , filepath, Glob, heaps, hex, hspec, mwc-random, network-byte-order @@ -116626,7 +116906,6 @@ self: { ]; description = "HTTP/2 library including frames, priority queues and HPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http2-client" = callPackage @@ -117920,8 +118199,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.17"; - sha256 = "184ymryvfj3s6bc3igahfyd8k9cqf59vmpb9g3afh8xpicpmmiv6"; + version = "0.6.2.18"; + sha256 = "1sm6rji0vv3ddi4sjp1q8nz271a084xpnv86n0adqzvd7b7sihip"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -117936,15 +118215,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_6_2_18" = callPackage + "hw-prim_0_6_2_19" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.18"; - sha256 = "1sm6rji0vv3ddi4sjp1q8nz271a084xpnv86n0adqzvd7b7sihip"; + version = "0.6.2.19"; + sha256 = "06d124i6y1kai14yfpwbys3fvpqxf7wrvyhhlihqdvpqfksll1dv"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -118108,8 +118387,8 @@ self: { }: mkDerivation { pname = "hw-streams"; - version = "0.0.0.6"; - sha256 = "1pfzg1xq39x1mw91nkmswc3sprjh58cygblsqi69x7msgfjdl116"; + version = "0.0.0.8"; + sha256 = "08pj20r1is6kyinj60xrl0wz7kcjlcc5xivzrhwmjws5qbscimgw"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -126232,6 +126511,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "json-feed_1_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "1.0.4"; + sha256 = "07xj9h2zdiyvrib93d99xi179nbzir96yylwkxajpfckfgyi4xmp"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -129347,6 +129646,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_1_0_6" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "1.0.6"; + sha256 = "1z8ipsf78l57jbkcyhjfwbgvj5gmna46x1jvcrin01rpg8xy97q4"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -131834,6 +132146,8 @@ self: { pname = "lazy-hash"; version = "0.1.0.0"; sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa"; + revision = "1"; + editedCabalFile = "07sn3q7q29zkxpillprx2d05pybjpvpglz8s7jq07akdhwmwx9mk"; libraryHaskellDepends = [ base constrained-categories hashable haskell-src-meta tagged template-haskell vector-space @@ -140855,8 +141169,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40901.0.0"; - sha256 = "1ra1ikivf5y17mzwjvfsvg1kz4438wllv2qwxzaigb9cirrz0n4r"; + version = "50200.0.0"; + sha256 = "07zbkkbn5cn8rcbc0xznlldcflhfp4szx6phlh7xpgf2hrcyc3g6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -140892,8 +141206,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40900.1.0"; - sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad"; + version = "50200.0.0"; + sha256 = "09jpgkz2hcybrrpkdn2x5lf2wnjzlinzxxsfrqvh7hgkga4gb7q8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140917,8 +141231,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40900.1.0"; - sha256 = "0mdwi6130hz508bxbhriyg7fr6rqpbalmjwwizvj9nb7cz1dmrsl"; + version = "50200.0.0"; + sha256 = "12m7r98qpd2i5d5dv60ibd0v1pxwfnx58v77k8y55dyd1d0m96v0"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -141688,7 +142002,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_3" = callPackage + "megaparsec_7_0_4" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -141696,8 +142010,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.3"; - sha256 = "1zngs6x7d1yp192pg8b0j5banq4y1vr1fwh1mxrxx0834bmqrll0"; + version = "7.0.4"; + sha256 = "1hg83m85f4v78mqdkznd1ddk9y32hnrv0bgva7ir3vydx37aanrj"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -142108,8 +142422,8 @@ self: { }: mkDerivation { pname = "menoh"; - version = "0.2.0"; - sha256 = "0n6wl03d8gyvmdjmxz0hrbvwvbyzc4qyz7qr5ydgxyxj56pg2cb4"; + version = "0.3.0"; + sha256 = "0w2p2g5zk4n3k84yrk7hs7kgk82w6avd2i0zk6iczjhhkihh1c6m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142121,7 +142435,8 @@ self: { base filepath JuicyPixels optparse-applicative vector ]; testHaskellDepends = [ - async base filepath JuicyPixels tasty tasty-hunit tasty-th vector + async base bytestring filepath JuicyPixels tasty tasty-hunit + tasty-th vector ]; description = "Haskell binding for Menoh DNN inference library"; license = stdenv.lib.licenses.mit; @@ -144369,6 +144684,8 @@ self: { pname = "modern-uri"; version = "0.3.0.1"; sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78"; + revision = "1"; + editedCabalFile = "13q0lapxk1v3ci3bqv21942jf2fw87frbbam53apd3i2iv69bqyr"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -144435,8 +144752,8 @@ self: { ({ mkDerivation, base, ghc-typelits-knownnat }: mkDerivation { pname = "modular"; - version = "0.1.0.0"; - sha256 = "1md01c9rzw24nymllkabckv46l7076kac6c317h5jindsncm7b8i"; + version = "0.1.0.8"; + sha256 = "1igg7am4z1kfvpyp5a53rsqan5i209rp1s0z9xamqydx60ilc2s3"; libraryHaskellDepends = [ base ghc-typelits-knownnat ]; description = "Type-safe modular arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -152226,14 +152543,13 @@ self: { }: mkDerivation { pname = "newsynth"; - version = "0.3.0.3"; - sha256 = "1vbh9d17mibzjkakqwda2dcmqkamaq48zv0dcd104xmgkgmqzvw2"; + version = "0.3.0.4"; + sha256 = "0w31h7xqv9sk0jb1mdviv107w8y7v018bzdvdw8gcrjyvp47307q"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base containers fixedprec random superdoc - ]; - executableHaskellDepends = [ base random superdoc time ]; + setupHaskellDepends = [ base superdoc ]; + libraryHaskellDepends = [ base containers fixedprec random ]; + executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -152664,18 +152980,18 @@ self: { }) {}; "nix-delegate" = callPackage - ({ mkDerivation, base, foldl, managed, neat-interpolation - , optparse-applicative, text, turtle + ({ mkDerivation, base, bytestring, foldl, managed + , neat-interpolation, optparse-applicative, text, turtle }: mkDerivation { pname = "nix-delegate"; - version = "1.0.0"; - sha256 = "1fzk6a2izs8sf2gq93m91m6l7h8i3374as8979h106588ww2ghhb"; + version = "1.0.1"; + sha256 = "00wyzj4xck0kjn3151q9crsycgh26nvg56567c0ifdr0s5h5f00w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base foldl managed neat-interpolation optparse-applicative text - turtle + base bytestring foldl managed neat-interpolation + optparse-applicative text turtle ]; executableHaskellDepends = [ base ]; description = "Convenient utility for distributed Nix builds"; @@ -154516,6 +154832,31 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "oauth2-jwt-bearer" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cryptonite + , hedgehog, http-client, http-client-tls, http-types, jose, lens + , mmorph, network, Spock-core, streaming-commons, text, time + , transformers, transformers-bifunctors, unordered-containers, warp + , x509, x509-store + }: + mkDerivation { + pname = "oauth2-jwt-bearer"; + version = "0.0.1"; + sha256 = "0fcq0ggzhjpr8v2s0k6izjs1pp0lcbf7kb12vmclyy5bzby8vkcn"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types jose + lens text time transformers transformers-bifunctors + unordered-containers + ]; + testHaskellDepends = [ + aeson async base bytestring cryptonite hedgehog http-client + http-client-tls http-types jose mmorph network Spock-core + streaming-commons text warp x509 x509-store + ]; + description = "OAuth2 jwt-bearer client flow as per rfc7523"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, cryptonite, exceptions, hspec @@ -161430,16 +161771,14 @@ self: { }) {}; "persist" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2, text + ({ mkDerivation, base, bytestring, containers, QuickCheck + , test-framework, test-framework-quickcheck2, text }: mkDerivation { pname = "persist"; - version = "0.1"; - sha256 = "0akiy8qrx71nj8l80hc7llxy7vnpcvjg01dhk499pl5mjaiqz2sq"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim text - ]; + version = "0.1.1.0"; + sha256 = "1rk0pgy3dk9aq17p1kn2pzhppvpjzcs9righ3n7xchmsmiqqs2ji"; + libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring QuickCheck test-framework test-framework-quickcheck2 text @@ -164545,10 +164884,8 @@ self: { }: mkDerivation { pname = "pixela"; - version = "0.1.0.0"; - sha256 = "02ab3n56j3y93wrwdj8rd3ff9zw9kskily1s9j2yq49zwpjnilpj"; - revision = "3"; - editedCabalFile = "0kndzh00saxdinyz5hbqkir9n578fz8db291nqynqpymw6lwkyc3"; + version = "0.2.1.0"; + sha256 = "15bzvwd1dh27p1gs6kfilk34gfkbczz43w70xagk60hvf1mdlcxl"; libraryHaskellDepends = [ aeson base bytestring data-default http-client http-client-tls http-types split text unordered-containers uri-encode vector @@ -174619,6 +174956,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rank2classes_1_2" = callPackage + ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.2"; + sha256 = "1qaqsg4xfvhdvffr42y1r95lkvm2spj27pwxz4vrhkxq56fkbj2p"; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -174935,6 +175291,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_1_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "1.0.6"; + sha256 = "0bqgkijadr3zhmnq787k6bkqg96di3fbrb3ywlypns624mhwcw37"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types text uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -174950,6 +175328,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_1_0_4" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "1.0.4"; + sha256 = "1cri461f40xa43kwg3wq5k98irfqypsi97xdk9n60yqhc8msca4m"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rating-systems" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -175002,15 +175396,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rattletrap_6_0_1" = callPackage + "rattletrap_6_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, template-haskell, temporary, text, transformers + , bytestring, clock, containers, filepath, http-client + , http-client-tls, HUnit, template-haskell, temporary, text + , transformers }: mkDerivation { pname = "rattletrap"; - version = "6.0.1"; - sha256 = "1chpivz9iprnj5p3kbqsgpviqg5d3dx41596ki1dydm1wmpn3bcj"; + version = "6.0.2"; + sha256 = "1904g1s61zazhg6zn189m7y9v5aap39zd0gfypzd9jrk6489aqi1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175024,9 +175419,9 @@ self: { transformers ]; testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit template-haskell - temporary text transformers + aeson aeson-pretty base binary binary-bits bytestring clock + containers filepath http-client http-client-tls HUnit + template-haskell temporary text transformers ]; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; @@ -178287,25 +178682,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "relude_0_3_0" = callPackage + "relude_0_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty , tasty-hedgehog, text, transformers, unordered-containers - , utf8-string }: mkDerivation { pname = "relude"; - version = "0.3.0"; - sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j"; - revision = "1"; - editedCabalFile = "04jfgc38pwrqir1j91l8jfzsp0hzggxr7kmbnfqcgrlpqidpj7mh"; + version = "0.4.0"; + sha256 = "03z8ji8hssb811d1xvmv2zlnq7h7dsr801x05xydhfl1srbg5i9f"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers utf8-string + transformers unordered-containers ]; testHaskellDepends = [ base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - utf8-string ]; benchmarkHaskellDepends = [ base containers gauge unordered-containers @@ -181372,6 +181763,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ron" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , containers, criterion, data-default, deepseq, Diff, errors, extra + , hashable, mtl, safe, stringsearch, template-haskell, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "ron"; + version = "0.1"; + sha256 = "1dwi0yyqzrwsl3x359hdpa5x77jqmbdidy0lx2wx2xlg0yzf5cfv"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring containers data-default + deepseq Diff errors extra hashable mtl safe stringsearch + template-haskell text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "RON, RON-RDT, and RON-Schema"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "roots" = callPackage ({ mkDerivation, base, tagged }: mkDerivation { @@ -183451,26 +183862,6 @@ self: { }) {}; "sandi" = callPackage - ({ mkDerivation, base, bytestring, conduit, criterion, exceptions - , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck - , tasty-th - }: - mkDerivation { - pname = "sandi"; - version = "0.4.2"; - sha256 = "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b"; - libraryHaskellDepends = [ - base bytestring conduit exceptions stringsearch - ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Data encoding library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sandi_0_4_3" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, exceptions , tasty, tasty-hunit, tasty-quickcheck, tasty-th }: @@ -183485,7 +183876,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sandlib" = callPackage @@ -186312,8 +186702,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.6.0.2"; - sha256 = "1lxz3cr04f4bqlm4jph66ckab494vqlaf6jc67dbmmwia6if2fpw"; + version = "0.6.0.3"; + sha256 = "0zipxs3l99ppaxwsvidjycm7mfyvqll88vrn6ajdpdcbmv1c5vc4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186887,6 +187277,8 @@ self: { pname = "servant-auth"; version = "0.3.2.0"; sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v"; + revision = "1"; + editedCabalFile = "10ss4v45lclf5n0k6rch22zzs59v7p5ppd04dbc97pqxiygpbnd9"; libraryHaskellDepends = [ base ]; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; @@ -186903,6 +187295,8 @@ self: { pname = "servant-auth-client"; version = "0.3.3.0"; sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9"; + revision = "1"; + editedCabalFile = "0jd1frgvghd9zp0rzzar9xxvj6qwg1l7f0zv7977rf6v930fqhw9"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -186957,8 +187351,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "1"; - editedCabalFile = "0rg38ibrw110c3dllqda7badbf6y89g2ilqybkzipyprwkg8s69x"; + revision = "2"; + editedCabalFile = "0309a6pc8jj24xwqmzj1yslgij9g212hnaqh2qkcvlm6k6riffil"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -187040,7 +187434,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-server_0_4_1_0" = callPackage + "servant-auth-server_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, bytestring-conversion, case-insensitive, cookie , crypto-api, data-default-class, entropy, hspec, hspec-discover @@ -187051,8 +187445,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.1.0"; - sha256 = "1fxh50fjrdi5j88qs2vsrflqdwq3pc8s5h424nhjrpc24w277bqi"; + version = "0.4.2.0"; + sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api @@ -187079,6 +187473,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.0"; sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh"; + revision = "1"; + editedCabalFile = "105rniz4cmmwr0ynyv75s4ap1fgfwxy2k5mvvj66gwpvzmj55cnx"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -190191,6 +190587,8 @@ self: { pname = "shannon-fano"; version = "0.1.0.1"; sha256 = "11xpz5mi1yk9zcy22fhn6j4xnyifxgn07nd6nrx588h1g6w8r2df"; + revision = "1"; + editedCabalFile = "1da8hsqrv7nz9nlkdlqvjcssfzf4r6fxdhv8lryz92d7jjjxyjcc"; libraryHaskellDepends = [ base bytestring split ]; testHaskellDepends = [ base QuickCheck ]; description = "Shannon-fano compression algorithm implementation in Haskell"; @@ -190736,8 +191134,8 @@ self: { }: mkDerivation { pname = "shine"; - version = "0.2.0.2"; - sha256 = "0r0rl65rkcdg8c8lzli87nfad8bk4xypiqvb2qs68fhhzwx1zfg2"; + version = "0.2.0.3"; + sha256 = "16h5igycgas28qk22yg08qkfwsrar9g4bw7q8p94vmf993p4542k"; libraryHaskellDepends = [ base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; @@ -191419,17 +191817,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process }: - mkDerivation { - pname = "simple-cmd"; - version = "0.1.1"; - sha256 = "0y9ga7m3zykrmgfzys6g7k1z79spp2319ln4sayw8i0abpwh63m9"; - libraryHaskellDepends = [ base directory filepath process ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_1_2" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "simple-cmd"; @@ -191438,7 +191825,6 @@ self: { libraryHaskellDepends = [ base directory filepath process ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-conduit" = callPackage @@ -191656,8 +192042,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.8"; - sha256 = "1yn2nnvmzfw4v7bi6jchsd8y27vpd8m4in0shydyyglpjmaq751k"; + version = "0.9.9"; + sha256 = "0pmamadkiyryl3mdvnq1gc7yx0bm4qspvj489ac27hrlr9d1d7j7"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -192060,24 +192446,6 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-driver-gen - , QuickCheck, tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "simple-vec3"; - version = "0.4.0.8"; - sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a"; - libraryHaskellDepends = [ base QuickCheck vector ]; - testHaskellDepends = [ - base doctest doctest-driver-gen tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Three-dimensional vectors of doubles with basic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "simple-vec3_0_4_0_9" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: @@ -193109,6 +193477,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slack-web_0_2_0_8" = callPackage + ({ mkDerivation, aeson, base, containers, errors, hspec + , http-api-data, http-client, http-client-tls, megaparsec, mtl + , servant, servant-client, servant-client-core, text, time + , transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.2.0.8"; + sha256 = "00sm4sh8ik472l5hk1yifczppr6nxx9b68byilg0zwzy1c4mq9kg"; + libraryHaskellDepends = [ + aeson base containers errors http-api-data http-client + http-client-tls megaparsec mtl servant servant-client + servant-client-core text time transformers + ]; + testHaskellDepends = [ + aeson base containers errors hspec http-api-data megaparsec text + time + ]; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "slate" = callPackage ({ mkDerivation, base, directory, filepath, htoml , optparse-applicative, process, string-conversions @@ -193157,21 +193549,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "slave-thread_1_0_2_3" = callPackage - ({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph - , partial-handler, QuickCheck, quickcheck-instances, rerebase - , SafeSemaphore, stm-containers, transformers + "slave-thread_1_0_2_6" = callPackage + ({ mkDerivation, base, deferred-folds, foldl, QuickCheck + , quickcheck-instances, rerebase, SafeSemaphore, stm-containers + , tasty, tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "slave-thread"; - version = "1.0.2.3"; - sha256 = "131zq1lb38mmavzdb2ysmnifmhvglb438q1p31pp5x4pmhdhnglj"; + version = "1.0.2.6"; + sha256 = "014j8rsbkrkabpvq5sxp6i2d3gpzn4ddnfwl1p5cg3xlmr950ksn"; libraryHaskellDepends = [ - base deferred-folds foldl mmorph partial-handler stm-containers - transformers + base deferred-folds foldl stm-containers transformers ]; testHaskellDepends = [ - HTF QuickCheck quickcheck-instances rerebase SafeSemaphore + QuickCheck quickcheck-instances rerebase SafeSemaphore tasty + tasty-hunit tasty-quickcheck ]; description = "A fundamental solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; @@ -200191,6 +200583,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storable-complex_0_2_3_0" = callPackage + ({ mkDerivation, base, base-orphans }: + mkDerivation { + pname = "storable-complex"; + version = "0.2.3.0"; + sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s"; + libraryHaskellDepends = [ base base-orphans ]; + description = "Storable instance for Complex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storable-endian" = callPackage ({ mkDerivation, base, byteorder }: mkDerivation { @@ -201341,6 +201745,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-tuple" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "strict-tuple"; + version = "0.1.1"; + sha256 = "13r72i95d0aal7i6v1mrviin2i5c6j9zs0f3qvc66wyy7mkr1h5n"; + libraryHaskellDepends = [ base ]; + description = "Strict tuples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-types" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , hashable, text, unordered-containers, vector @@ -201838,6 +202253,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_5_0_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "5.0.7"; + sha256 = "0hxy5znrfcls6bd8hjil97mya3w8zkppfd4jrz0ayz7zidbws5kg"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types markdown-unlit template-haskell text + time transformers + ]; + testToolDepends = [ markdown-unlit ]; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -205375,21 +205814,22 @@ self: { "tailfile-hinotify" = callPackage ({ mkDerivation, async, base, bytestring, conceit, directory - , filepath, foldl, hinotify, pipes, process-streaming, streaming - , streaming-eversion, tasty, tasty-hunit + , filepath, foldl, hinotify, pipes, pipes-transduce + , process-streaming, streaming, streaming-eversion, tasty + , tasty-hunit, text }: mkDerivation { pname = "tailfile-hinotify"; - version = "1.0.0.3"; - sha256 = "0czw1ahm4zcxhyhzg6by3rfbirkhv9jlcw9yzp7q1zrxb3schbyz"; + version = "2.0.0.0"; + sha256 = "0qnpikj8fbjnks95wwza8m773j0b9sg7fn16dvpfps189icm85gi"; libraryHaskellDepends = [ async base bytestring foldl hinotify pipes streaming - streaming-eversion + streaming-eversion text ]; testHaskellDepends = [ async base bytestring conceit directory filepath foldl hinotify - pipes process-streaming streaming streaming-eversion tasty - tasty-hunit + pipes pipes-transduce process-streaming streaming + streaming-eversion tasty tasty-hunit text ]; description = "Tail files in Unix, using hinotify"; license = stdenv.lib.licenses.mit; @@ -212655,8 +213095,8 @@ self: { }: mkDerivation { pname = "toodles"; - version = "0.1.2"; - sha256 = "0s4smdh8y308a6bwp21k070qc1xnzabab6hv2wrrmdkmmc36wfws"; + version = "0.1.3"; + sha256 = "09ph9jmhma211r16fyvib8fwv3jm8v526swjgwrzsl9c97xfpzjg"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -220462,12 +220902,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity_0_8_0_0" = callPackage + "validity_0_9_0_0" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.8.0.0"; - sha256 = "0yr342gd8ylji7nqa8w3ssik8qcgb4v3h3j30qf5nbzg900k5rsn"; + version = "0.9.0.0"; + sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -221178,23 +221618,6 @@ self: { }) {}; "vector-binary-instances" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-binary-instances"; - version = "0.2.5"; - sha256 = "0l9zj58a4sbpic1dc9if7iwv4rihya2bj4zb4qfna5fb3pf6plwc"; - libraryHaskellDepends = [ base binary vector ]; - testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; - benchmarkHaskellDepends = [ - base binary bytestring criterion deepseq vector - ]; - description = "Instances of Data.Binary for vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-binary-instances_0_2_5_1" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, gauge, tasty , tasty-quickcheck, vector }: @@ -221209,7 +221632,6 @@ self: { ]; description = "Instances of Data.Binary for vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-buffer" = callPackage @@ -221465,6 +221887,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_1_0_0" = callPackage + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , finite-typelits, indexed-list-literals, primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.1.0.0"; + sha256 = "0y11ggayk4l61i50m0gxv6qm7z1pscmagj5nyrz3q47j31pv5vkl"; + libraryHaskellDepends = [ + adjunctions base comonad deepseq distributive finite-typelits + indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -221748,8 +222187,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { pname = "versioning"; - version = "0.3.0.0"; - sha256 = "12d5xxc8i0ldbsb6y22f9gvk0d61nrgjz3yf7ppvqrzhilgs6yyf"; + version = "0.3.0.1"; + sha256 = "08072xwz094qdawczggxx8gk734cas8767zcah84q30qdb5ywzwf"; libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; @@ -221763,8 +222202,8 @@ self: { }: mkDerivation { pname = "versioning-servant"; - version = "0.1.0.0"; - sha256 = "14a1fk2mgcjjlb1z01xb5ngf496kpfr2y588265zn72q54a7l08k"; + version = "0.1.0.1"; + sha256 = "0hk30p8wjn00dzxyd45hf7r1qhn944j12km00birgqhf4vcmw7c4"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-media servant versioning ]; @@ -222766,8 +223205,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.1.0.0"; - sha256 = "0y3h1kgh7n639h714ji4fycj6b8vcsa79jfv36w995p9gbjxxdjc"; + version = "0.2.0.0"; + sha256 = "1qk4wg2jqzylaqq0yjq9byj3k5vj23jqvdshvyj7r9fl0f3hynni"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors bytestring containers contravariant digit @@ -224832,8 +225271,8 @@ self: { pname = "wave"; version = "0.1.5"; sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; - revision = "1"; - editedCabalFile = "1wvgxay0r5rpcc7yxkznxxcp1za0ifxvk87w0xrilxgb35r3izz8"; + revision = "2"; + editedCabalFile = "0zs0mw42z9xzs1r935pd5dssf0x10qbkhxlpfknv0x75n2k0azzj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers @@ -226007,6 +226446,8 @@ self: { pname = "wedged"; version = "2"; sha256 = "1aw29dk0h25zw60m288423bakz36k0jpmzdhy7kq2wns3l5k6jqs"; + revision = "1"; + editedCabalFile = "0b3wq7pcz0m5qz7d9np5lhi3yh76ksx1v14bvsd6krr49p742zg5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228050,6 +228491,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_11" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.11"; + sha256 = "1mlqgi80r5db0j58r0laiwp1044n4insq89bv1v3y26j726yjvp0"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -228283,29 +228739,6 @@ self: { }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base - , bytestring, containers, cryptonite, hourglass, memory, mtl, pem - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "x509"; - version = "1.7.4"; - sha256 = "1vm1ir0q7nxcyq65bmw7hbwlmf3frya077v9jikcrh8igg18m717"; - revision = "1"; - editedCabalFile = "0p9zzzj118n8ymacj6yp7nkf22d09mj31wnzc1alq26w2ybcrifz"; - libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring containers - cryptonite hourglass memory mtl pem - ]; - testHaskellDepends = [ - asn1-types base bytestring cryptonite hourglass mtl tasty - tasty-quickcheck - ]; - description = "X509 reader and writer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "x509_1_7_5" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -228324,28 +228757,9 @@ self: { ]; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-store" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, directory, filepath, mtl, pem, tasty - , tasty-hunit, x509 - }: - mkDerivation { - pname = "x509-store"; - version = "1.6.6"; - sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - directory filepath mtl pem x509 - ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; - description = "X.509 collection accessing and storing methods"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "x509-store_1_6_7" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, mtl, pem, tasty , tasty-hunit, x509 @@ -228361,7 +228775,6 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; description = "X.509 collection accessing and storing methods"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-system" = callPackage @@ -228401,29 +228814,6 @@ self: { }) {}; "x509-validation" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, data-default-class, hourglass, memory - , mtl, pem, tasty, tasty-hunit, x509, x509-store - }: - mkDerivation { - pname = "x509-validation"; - version = "1.6.10"; - sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n"; - revision = "1"; - editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - data-default-class hourglass memory mtl pem x509 x509-store - ]; - testHaskellDepends = [ - asn1-encoding asn1-types base bytestring cryptonite - data-default-class hourglass tasty tasty-hunit x509 x509-store - ]; - description = "X.509 Certificate and CRL validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "x509-validation_1_6_11" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, data-default-class, hourglass, memory , mtl, pem, tasty, tasty-hunit, x509, x509-store @@ -228443,7 +228833,6 @@ self: { ]; description = "X.509 Certificate and CRL validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x86-64bit" = callPackage @@ -234224,8 +234613,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "yoda"; - version = "0.1.0.0"; - sha256 = "1p8zvxf63fbj2dpp3pa9awq1jc0makyka42j1aqsljfp08nx4pzn"; + version = "0.1.3.0"; + sha256 = "0qkg8aykr8whjrkwfnsds3bjbrb51r83rd60mpdwcs12zyqlpi0d"; libraryHaskellDepends = [ base ]; description = "Parser combinators for young padawans"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 942163ea2096..3d67ac213993 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -355,10 +355,24 @@ rec { in builtins.listToAttrs (map toKeyVal haskellPaths); - # Modify a Haskell package to add completion scripts for the given executable - # produced by it. These completion scripts will be picked up automatically if - # the resulting derivation is installed, e.g. by `nix-env -i`. - addOptparseApplicativeCompletionScripts = exeName: pkg: overrideCabal pkg (drv: { + addOptparseApplicativeCompletionScripts = exeName: pkg: + builtins.trace "addOptparseApplicativeCompletionScripts is deprecated in favor of generateOptparseApplicativeCompletion. Please change ${pkg.name} to use the latter or its plural form." + (generateOptparseApplicativeCompletion exeName pkg); + + /* + Modify a Haskell package to add shell completion scripts for the + given executable produced by it. These completion scripts will be + picked up automatically if the resulting derivation is installed, + e.g. by `nix-env -i`. + + Invocation: + generateOptparseApplicativeCompletions command pkg + + + command: name of an executable + pkg: Haskell package that builds the executables + */ + generateOptparseApplicativeCompletion = exeName: pkg: overrideCabal pkg (drv: { postInstall = (drv.postInstall or "") + '' bashCompDir="$out/share/bash-completion/completions" zshCompDir="$out/share/zsh/vendor-completions" @@ -367,6 +381,28 @@ rec { "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}" "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}" "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish" + + # Sanity check + grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || { + echo 'Could not find ${exeName} in completion script.' + exit 1 + } ''; }); + + /* + Modify a Haskell package to add shell completion scripts for the + given executables produced by it. These completion scripts will be + picked up automatically if the resulting derivation is installed, + e.g. by `nix-env -i`. + + Invocation: + generateOptparseApplicativeCompletions commands pkg + + + commands: name of an executable + pkg: Haskell package that builds the executables + */ + generateOptparseApplicativeCompletions = commands: pkg: + pkgs.lib.foldr generateOptparseApplicativeCompletion pkg commands; } diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix new file mode 100644 index 000000000000..40276cf3c42b --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -0,0 +1,257 @@ +{ stdenv, lib, fetchurl, clojure, + nodejs, jre, unzip, nodePackages, + python, openssl }: + +let # packageJSON=./package.json; + version = "1.9.0"; + nodeVersion = "10.9.0"; + nodeSources = fetchurl { + url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; + sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy"; + }; + lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; + + # as found in cljs/snapshot/lumo/repl.cljs + requireDeps = '' \ + cljs.analyzer \ + cljs.compiler \ + cljs.env \ + cljs.js \ + cljs.reader \ + cljs.repl \ + cljs.source-map \ + cljs.source-map.base64 \ + cljs.source-map.base64-vlq \ + cljs.spec.alpha \ + cljs.spec.gen.alpha \ + cljs.tagged-literals \ + cljs.tools.reader \ + cljs.tools.reader.reader-types \ + cljs.tools.reader.impl.commons \ + cljs.tools.reader.impl.utils \ + clojure.core.rrb-vector \ + clojure.core.rrb-vector.interop \ + clojure.core.rrb-vector.nodes \ + clojure.core.rrb-vector.protocols \ + clojure.core.rrb-vector.rrbt \ + clojure.core.rrb-vector.transients \ + clojure.core.rrb-vector.trees \ + clojure.string \ + clojure.set \ + clojure.walk \ + cognitect.transit \ + fipp.visit \ + fipp.engine \ + fipp.deque \ + lazy-map.core \ + lumo.pprint.data \ + lumo.repl \ + lumo.repl-resources \ + lumo.js-deps \ + lumo.common ''; + + compileClojurescript = (simple: '' + (require '[cljs.build.api :as cljs]) + (cljs/build \"src/cljs/snapshot\" + {:optimizations ${if simple then ":simple" else ":none"} + :main 'lumo.core + :cache-analysis true + :source-map false + :dump-core false + :static-fns true + :optimize-constants false + :npm-deps false + :verbose true + :closure-defines {'cljs.core/*target* \"nodejs\" + 'lumo.core/*lumo-version* \"${version}\"} + :compiler-stats true + :process-shim false + :fn-invoke-direct true + :parallel-build false + :browser-repl false + :target :nodejs + :hashbang false + ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] + :output-dir ${if simple + then ''\"cljstmp\"'' + else ''\"target\"''} + :output-to ${if simple + then ''\"cljstmp/main.js\"'' + else ''\"target/deleteme.js\"'' }}) + ''); + + + cacheToJsons = '' + (import [java.io ByteArrayOutputStream FileInputStream]) + (require '[cognitect.transit :as transit] + '[clojure.edn :as edn] + '[clojure.string :as str]) + + (defn write-transit-json [cache] + (let [out (ByteArrayOutputStream. 1000000) + writer (transit/writer out :json)] + (transit/write writer cache) + (.toString out))) + + (defn process-caches [] + (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" + cache-aot-edn (edn/read-string (slurp cache-aot-path)) + cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" + cache-macros-stream (FileInputStream. cache-macros-path) + cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) + caches [[cache-aot-path cache-aot-edn] + [cache-macros-path cache-macros-edn]]] + (doseq [[path cache-edn] caches] + (doseq [key (keys cache-edn)] + (let [out-path (str/replace path #\"(\.json|\.edn)\$\" + (str \".\" (munge key) \".json\")) + tr-json (write-transit-json (key cache-edn))] + (spit out-path tr-json)))))) + + (process-caches) + ''; + + trimMainJsEnd = '' + (let [string (slurp \"target/main.js\")] + (spit \"target/main.js\" + (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) + ''; + + + cljdeps = import ./deps.nix; + cljpaths = cljdeps.makePaths {}; + classp = cljdeps.makeClasspaths { + extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; + }; + + + getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; + +in stdenv.mkDerivation rec { + inherit version; + name = "lumo-${version}"; + + src = fetchurl { + url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; + sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw"; + }; + + + buildInputs = [ nodejs clojure jre unzip python openssl + nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ]; + + buildPhase = '' + # Copy over lumo-build-deps environment + rm yarn.lock + cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ + + # configure clojure-cli + mkdir ./.cpcache + export CLJ_CONFIG=`pwd` + export CLJ_CACHE=`pwd`/.cpcache + + # require more namespaces for cljs-bundle + sed -i "s!ns lumo.core! \ + ns lumo.core \ + (:require ${requireDeps}) \ + (:require-macros [clojure.template :as temp] \ + [cljs.test :as test])!g" \ + ./src/cljs/snapshot/lumo/core.cljs + + # Step 1: compile clojurescript with :none and :simple + ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" + ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}" + cp -f cljstmp/main.js target/main.js + ${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}" + + # Step 2: sift files + unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target + unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure + unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target + unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target + unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target + unzip -o ${getJarPath "org.clojure/test.check"} -d ./target + cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/ + cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/ + # cleanup + mv ./target/main.js ./target/main + rm ./target/*\.js + mv ./target/main ./target/main.js + rm ./target/AUTHORS + rm ./target/LICENSE + rm ./target/*.edn + rm ./target/*.md + rm -rf ./target/css + rm -rf ./target/META-INF + rm -rf ./target/com + rm -rf ./target/cljs/build + rm -rf ./target/cljs/repl + rm ./target/cljs/core\.cljs\.cache.aot\.json + rm ./target/cljs/source_map\.clj + rm ./target/cljs/repl\.cljc + rm ./target/cljs/externs\.clj + rm ./target/cljs/closure\.clj + rm ./target/cljs/util\.cljc + rm ./target/cljs/js_deps\.cljc + rm ./target/cljs/analyzer/utils\.clj + rm ./target/cljs/core/macros\.clj + rm ./target/cljs/compiler/api.clj + rm ./target/goog/test_module* + rm ./target/goog/transpile\.js + rm ./target/goog/base_* + find ./target -type f -name '*.class' -delete + find ./target -type d -empty -delete + + # Step 3: generate munged cache jsons + ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" + rm ./target/cljs/core\$macros\.cljc\.cache\.json + + + # Step 4: Bunde javascript + NODE_ENV=production node scripts/bundle.js + node scripts/bundleForeign.js + + # Step 5: Backup resources + cp -R target resources_bak + + # Step 6: Package executeable 1st time + # fetch node sources and copy to palce that nexe will find + mkdir -p tmp/${nodeVersion} + cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz + tar -C ./tmp/${nodeVersion} -xf ${nodeSources} + mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/ + rm -rf ${lumo-internal-classpath} + mv target ${lumo-internal-classpath} + node scripts/package.js ${nodeVersion} + rm -rf ${lumo-internal-classpath} + + # Step 7: AOT Macros + sh scripts/aot-bundle-macros.sh + + # Step 8: Package executeable 2nd time + rm -rf ${lumo-internal-classpath} + mv target ${lumo-internal-classpath} + node scripts/package.js ${nodeVersion} + ''; + + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + cp build/lumo $out/bin + ''; + + meta = { + description = "Fast, cross-platform, standalone ClojureScript environment"; + longDescription = '' + Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8. + Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, + making it the fastest Clojure REPL in existence. + ''; + homepage = https://github.com/anmonteiro/lumo; + license = stdenv.lib.licenses.epl10; + maintainers = [ stdenv.lib.maintainers.hlolli ]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn new file mode 100644 index 000000000000..e1563599a8cc --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn @@ -0,0 +1,12 @@ +{:deps + {org.clojure/clojure {:mvn/version "1.10.0-beta5"} + org.clojure/clojurescript {:mvn/version "1.10.439"} + org.clojure/test.check {:mvn/version "0.10.0-alpha3"} + org.clojure/tools.reader {:mvn/version "1.3.2" + :exclusions [org.clojure/clojure org.clojure/clojurescript]} + com.cognitect/transit-cljs {:mvn/version "0.8.256" + :exclusions [org.clojure/clojure org.clojure/clojurescript]} + malabarba/lazy-map {:mvn/version "1.3" + :exclusions [org.clojure/clojure org.clojure/clojurescript]} + fipp {:mvn/version "0.6.14" + :exclusions [org.clojure/clojure org.clojure/clojurescript]}}} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix new file mode 100644 index 000000000000..b73c41b8f3d7 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix @@ -0,0 +1,392 @@ +# generated by clj2nix +let repos = [ + "https://repo.clojars.org/" + "https://repo1.maven.org/" + "http://central.maven.org/maven2/" + "http://oss.sonatype.org/content/repositories/releases/" + "http://oss.sonatype.org/content/repositories/public/" + "http://repo.typesafe.com/typesafe/releases/" + ]; + pkgs = import {}; + in rec { + makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; + makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); + + packages = [ + { + name = "com.cognitect/transit-java"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-java"; + groupId = "com.cognitect"; + sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; + version = "0.8.332"; + }; + } + + { + name = "org.clojure/data.json"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.json"; + groupId = "org.clojure"; + sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; + version = "0.2.6"; + }; + } + + { + name = "org.clojure/clojure"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojure"; + groupId = "org.clojure"; + sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4"; + version = "1.10.0-beta5"; + }; + } + + { + name = "commons-codec/commons-codec"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-codec"; + groupId = "commons-codec"; + sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; + version = "1.10"; + }; + } + + { + name = "com.google.errorprone/error_prone_annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "error_prone_annotations"; + groupId = "com.google.errorprone"; + sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; + version = "2.1.3"; + }; + } + + { + name = "org.clojure/core.specs.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.specs.alpha"; + groupId = "org.clojure"; + sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; + version = "0.2.44"; + }; + } + + { + name = "org.clojure/spec.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "spec.alpha"; + groupId = "org.clojure"; + sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; + version = "0.2.176"; + }; + } + + { + name = "org.codehaus.mojo/animal-sniffer-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "animal-sniffer-annotations"; + groupId = "org.codehaus.mojo"; + sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; + version = "1.14"; + }; + } + + { + name = "com.googlecode.json-simple/json-simple"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "json-simple"; + groupId = "com.googlecode.json-simple"; + sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; + version = "1.1.1"; + }; + } + + { + name = "com.cognitect/transit-cljs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-cljs"; + groupId = "com.cognitect"; + sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; + version = "0.8.256"; + }; + } + + { + name = "org.clojure/google-closure-library"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library"; + groupId = "org.clojure"; + sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "fipp"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "fipp"; + groupId = "fipp"; + sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5"; + version = "0.6.14"; + }; + } + + { + name = "org.clojure/clojurescript"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojurescript"; + groupId = "org.clojure"; + sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58"; + version = "1.10.439"; + }; + } + + { + name = "com.google.jsinterop/jsinterop-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsinterop-annotations"; + groupId = "com.google.jsinterop"; + sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; + version = "1.0.0"; + }; + } + + { + name = "com.fasterxml.jackson.core/jackson-core"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-core"; + groupId = "com.fasterxml.jackson.core"; + sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; + version = "2.8.7"; + }; + } + + { + name = "malabarba/lazy-map"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "lazy-map"; + groupId = "malabarba"; + sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; + version = "1.3"; + }; + } + + { + name = "com.cognitect/transit-js"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-js"; + groupId = "com.cognitect"; + sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; + version = "0.8.846"; + }; + } + + { + name = "org.mozilla/rhino"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "rhino"; + groupId = "org.mozilla"; + sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; + version = "1.7R5"; + }; + } + + { + name = "org.clojure/google-closure-library-third-party"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library-third-party"; + groupId = "org.clojure"; + sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "com.google.javascript/closure-compiler-externs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "closure-compiler-externs"; + groupId = "com.google.javascript"; + sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; + version = "v20180805"; + }; + } + + { + name = "org.javassist/javassist"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "javassist"; + groupId = "org.javassist"; + sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f"; + version = "3.18.1-GA"; + }; + } + + { + name = "com.google.guava/guava"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "guava"; + groupId = "com.google.guava"; + sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee"; + version = "25.1-jre"; + }; + } + + { + name = "org.msgpack/msgpack"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "msgpack"; + groupId = "org.msgpack"; + sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449"; + version = "0.6.12"; + }; + } + + { + name = "com.google.j2objc/j2objc-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "j2objc-annotations"; + groupId = "com.google.j2objc"; + sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0"; + version = "1.1"; + }; + } + + { + name = "com.cognitect/transit-clj"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-clj"; + groupId = "com.cognitect"; + sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba"; + version = "0.8.309"; + }; + } + + { + name = "args4j/args4j"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "args4j"; + groupId = "args4j"; + sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb"; + version = "2.0.26"; + }; + } + + { + name = "org.clojure/core.rrb-vector"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.rrb-vector"; + groupId = "org.clojure"; + sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796"; + version = "0.0.13"; + }; + } + + { + name = "org.checkerframework/checker-qual"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "checker-qual"; + groupId = "org.checkerframework"; + sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7"; + version = "2.0.0"; + }; + } + + { + name = "org.clojure/tools.reader"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.reader"; + groupId = "org.clojure"; + sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6"; + version = "1.3.2"; + }; + } + + { + name = "com.google.javascript/closure-compiler-unshaded"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "closure-compiler-unshaded"; + groupId = "com.google.javascript"; + sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d"; + version = "v20180805"; + }; + } + + { + name = "org.clojure/test.check"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "test.check"; + groupId = "org.clojure"; + sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6"; + version = "0.10.0-alpha3"; + }; + } + + { + name = "com.google.protobuf/protobuf-java"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "protobuf-java"; + groupId = "com.google.protobuf"; + sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998"; + version = "3.0.2"; + }; + } + + { + name = "com.google.code.findbugs/jsr305"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsr305"; + groupId = "com.google.code.findbugs"; + sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804"; + version = "3.0.2"; + }; + } + + { + name = "com.google.code.gson/gson"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "gson"; + groupId = "com.google.code.gson"; + sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a"; + version = "2.7"; + }; + } + + ]; + } + \ No newline at end of file diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json new file mode 100644 index 000000000000..358595ef1eb8 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -0,0 +1,42 @@ +{ + "name": "lumo-build-deps", + "version": "1.9.0", + "dependencies": { + "@babel/core": "^7.1.5", + "@babel/plugin-external-helpers": "7.0.0", + "@babel/plugin-proposal-class-properties": "^7.1.0", + "@babel/plugin-proposal-object-rest-spread": "^7.0.0", + "@babel/plugin-transform-runtime": "^7.1.0", + "@babel/preset-env": "^7.1.5", + "@babel/preset-stage-2": "7.0.0", + "@babel/runtime": "^7.1.5", + "async-retry": "^1.2.3", + "babel-core": "^7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "^23.6.0", + "babel-loader": "^8.0.4", + "babel-plugin-transform-flow-strip-types": "6.22.0", + "chalk": "^2.4.1", + "cross-env": "5.2.0", + "death": "^1.1.0", + "flow-bin": "0.85.0", + "google-closure-compiler-js": "20170910.0.1", + "jszip": "github:anmonteiro/jszip#patch-1", + "nexe": "3.0.0-beta.7", + "node-fetch": "^2.2.1", + "paredit.js": "0.3.4", + "posix-getopt": "github:anmonteiro/node-getopt#master", + "prettier": "1.15.1", + "progress": "^2.0.0", + "read-pkg": "^4.0.1", + "rollup": "0.67.0", + "rollup-plugin-babel": "4.0.3", + "rollup-plugin-babel-minify": "6.1.1", + "rollup-plugin-commonjs": "9.2.0", + "rollup-plugin-node-resolve": "3.4.0", + "rollup-plugin-replace": "2.1.0", + "webpack": "^4.25.1", + "webpack-cli": "^3.1.2", + "which-promise": "^1.0.0" + } +} diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 1342d6c34d2e..21a7cfba4064 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.9.7"; + version = "0.10.1"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "0fl04xdpqmr5xpd4pvj72gdy3v1fr9z6h3ja7dmkama8fw2x4diz"; + sha256 = "1c3p61jmlljljbiwsylmfa75pi00y7yj5wabx1rxmpswc41g5mab"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix index ee99aeab69f8..4eff988796b3 100644 --- a/pkgs/development/interpreters/joker/deps.nix +++ b/pkgs/development/interpreters/joker/deps.nix @@ -8,6 +8,15 @@ sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; }; } + { + goPackagePath = "github.com/pkg/profile"; + fetch = { + type = "git"; + url = "https://github.com/pkg/profile"; + rev = "5b67d428864e92711fcbd2f8629456121a56d91f"; + sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; + }; + } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index c67fae936ce7..81b71d721b84 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.2.0.0"; + version = "9.2.1.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1106s1vmcm36gm3vrl1sjrrr2wj6splgik1zrfb7c2y9bzm8swa2"; + sha256 = "0d98ydiavdr811xsrz9zbw9yjpn0acc2ycakqpfg1vs4n5w7764c"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 2609c053d95b..00a1cfc5bd0e 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -74,6 +74,12 @@ let url = "file://${./type_getattro.patch}"; sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd"; }) + + (fetchpatch { + name = "CVE-2018-1000802.patch"; + url = "https://github.com/python/cpython/pull/8985.patch"; + sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97"; + }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 7bbb1a5e1c92..7ef3c4c89686 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,15 +1,16 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv -, openglSupport ? false, libGL, libGLU -, alsaSupport ? true, alsaLib -, x11Support ? stdenv.hostPlatform == stdenv.buildPlatform, libXext, libICE, libXrandr -, pulseaudioSupport ? true, libpulseaudio +{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv +, openglSupport ? libGLSupported, libGL, libGLU +, alsaSupport ? stdenv.isLinux, alsaLib +, x11Support ? !stdenv.isCygwin, libXext, libICE, libXrandr +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa +, cf-private }: # NOTE: When editing this expression see if the same change applies to # SDL2 expression too -with lib; +with stdenv.lib; assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null); @@ -41,7 +42,11 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional (!stdenv.hostPlatform.isMinGW) audiofile - ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + ++ optionals stdenv.isDarwin [ + AudioUnit CoreAudio CoreServices Kernel OpenGL + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; configureFlags = [ "--disable-oss" @@ -109,7 +114,7 @@ stdenv.mkDerivation rec { postFixup = '' for lib in $out/lib/*.so* ; do if [[ -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib" + patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib" fi done ''; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7d8f5b2caee6..07a63a366f1b 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,31 +1,31 @@ -{ stdenv, lib, fetchurl, pkgconfig, pruneLibtoolFiles -, openglSupport ? false, libGL -, alsaSupport ? true, alsaLib -, x11Support ? true, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr -, waylandSupport ? true, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? false, dbus +{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles +, openglSupport ? libGLSupported, libGL +, alsaSupport ? stdenv.isLinux, alsaLib +, x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon +, dbusSupport ? stdenv.isLinux, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL -, audiofile, libiconv +, audiofile, cf-private, libiconv }: # NOTE: When editing this expression see if the same change applies to # SDL expression too -with lib; +with stdenv.lib; assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { url = "https://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"; + sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"; }; outputs = [ "out" "dev" ]; @@ -54,7 +54,11 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus - ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + ++ optionals stdenv.isDarwin [ + AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; # /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error: # pointer-constraints-unstable-v1-client-protocol.h: No such file or directory diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 17a2dd14b272..5ab4a0dc6c7f 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m"; + sha256 = "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7"; }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ] diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 3819aeb3c316..61e15d621bcd 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; - sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; + sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; preAutoreconf = '' diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 2a009a3b7104..0e717c530357 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }: +{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { name = "SDL_sound-${version}"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libvorbis flac libmikmod ]; - meta = with stdenv.lib; { + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + + meta = with lib; { description = "SDL sound library"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; homepage = https://www.icculus.org/SDL_sound/; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 2aacfd07364f..831d0cc0f713 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -4,7 +4,7 @@ , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.13"; + name = "appstream-glib-0.7.14"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "0r1gb806p68axspzwvpn1ygmd6pfc17mncg3i6yazk3n10k5cl06"; + sha256 = "1908ilra1l0m2a224azmj6p4yglzdwwk41rr6rhby959sgw3iaky"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 5e4218852e51..19b82fcffa38 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; + sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 16ba6b32382a..7685a0d9eb4f 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.100.5"; + version = "9.200.4"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"; + sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 027b86a97747..4c942cac3f69 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.58"; + name = "babl-0.1.60"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0mgdii9v89ay0nra36cz9i0q7cqv8wi8hk01jsc4bf0rc1bsxjbr"; + sha256 = "0kv0y12j4k9khrxqa7rryfb4ikcnrax6x4nwi70wnz05nv6fxld3"; }; doCheck = true; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 3fcdbca34f5f..b2c7bf5d6449 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -3,14 +3,15 @@ , xorgserver, dbus, python2 }: stdenv.mkDerivation rec { - name = "bamf-2018-02-07"; + name = "bamf-${version}"; + version = "0.5.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = https://git.launchpad.net/~unity-team/bamf; - rev = "0.5.3+18.04.20180207.2-0ubuntu1"; - sha256 = "0hvbgzi0mzzzvcamd9mi1ykbk2l6zxffspyk5fpik8bij56nhzym"; + rev = version; + sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 09c1560d6f60..f1cad37d438f 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "01i6sclxwa7k91ngi7jw9vlss8wjpv1hz4y5934jq0lx8hdf7s02"; + sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index a14dec370479..004c01a5b69e 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib ]; - cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ]; + cmakeFlags = [ + "-DBUILD_CONTRIBS=ON" + "-DBUILD_CONTRIBS_LIB=ON" + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ]; patches = # From debian [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch @@ -20,13 +24,9 @@ stdenv.mkDerivation rec { ./Install-contribs-lib.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libclucene-shared.1.dylib \ - $out/lib/libclucene-shared.1.dylib \ - $out/lib/libclucene-core.1.dylib - ''; - - doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test" + # fails with "Unable to find executable: + # /build/clucene-core-2.3.3.4/build/bin/cl_test" + doCheck = false; meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index f08077a9a3cf..c2f3ce9b9b4a 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { - sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i"; + sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 405d80031e37..b1c798476ead 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng -, darwin, libtiff, freetype +, libtiff, freetype, cf-private, Cocoa, AGL, GLUT }: let @@ -35,7 +35,7 @@ in stdenv.mkDerivation { propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin - then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff]) + then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] else [ xlibsWrapper libXi freeglut ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 42313fc4e5e9..03324d548991 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig , openssl -, odbcSupport ? false, unixODBC ? null }: +, odbcSupport ? true, unixODBC ? null }: assert odbcSupport -> unixODBC != null; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index cba31f45d557..91c384b249a4 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.7"; + version = "2.8.8"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62"; + sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c8b7b3b8eca5..cb7f2621353d 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,7 +3,7 @@ , libwebp, gnome3, libintl }: let - version = "0.4.8"; + version = "0.4.12"; in stdenv.mkDerivation rec { name = "gegl-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"; + sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 339e0d8d60b9..60778df663a0 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "glbinding"; - version = "2.1.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "cginternals"; repo = pname; rev = "v${version}"; - sha256 = "1yic3p2iqzxc7wrjnqclx7vcaaqx5fiysq9rqbi6v390jqkg3zlz"; + sha256 = "1lvcps0n0p8gg0p2bkm5aq4b4kv8bvxlaaf4fcham2pgbgzil9d4"; }; buildInputs = [ cmake libGLU xlibsWrapper ]; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 8d4d4d10038a..9cbc60dcef5a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 -, darwin, fixDarwinDylibNames +, cf-private, Cocoa, Kernel, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr libXinerama libXcursor - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa Kernel fixDarwinDylibNames + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 16e9f213ed48..e8e23ed5ffbb 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,29 +1,48 @@ -{ stdenv, fetchFromGitLab, autoconf, automake, glib -, gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobjectIntrospection }: -let version = "1.23"; in stdenv.mkDerivation rec { name = "libaccounts-glib-${version}"; + version = "1.24"; + + outputs = [ "out" "dev" "devdoc" "py" ]; src = fetchFromGitLab { - sha256 = "11cvl3ch0y93756k90mw1swqv0ylr8qgalmvcn5yari8z4sg6cgg"; - rev = "VERSION_${version}"; - repo = "libaccounts-glib"; owner = "accounts-sso"; + repo = "libaccounts-glib"; + rev = version; + sha256 = "0y8smg1rd279lrr9ad8b499i8pbkajmwd4xn41rdh9h93hs9apn7"; }; - buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ]; + # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 + patches = [ ./py-override.patch ]; - postPatch = '' - NOCONFIGURE=1 ./autogen.sh - ''; + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + vala + ]; - configurePhase = '' - HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out - ''; + buildInputs = [ + glib + libxml2 + libxslt + python3.pkgs.pygobject3 + sqlite + ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46 + LC_ALL = "en_US.UTF-8"; + + mesonFlags = [ + "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + ]; meta = with stdenv.lib; { description = "Library for managing accounts which can be used from GLib applications"; diff --git a/pkgs/development/libraries/libaccounts-glib/py-override.patch b/pkgs/development/libraries/libaccounts-glib/py-override.patch new file mode 100644 index 000000000000..4179f4fa0af0 --- /dev/null +++ b/pkgs/development/libraries/libaccounts-glib/py-override.patch @@ -0,0 +1,38 @@ +diff --git a/libaccounts-glib/pygobject/meson.build b/libaccounts-glib/pygobject/meson.build +index fa1f4a0..588c4ce 100644 +--- a/libaccounts-glib/pygobject/meson.build ++++ b/libaccounts-glib/pygobject/meson.build +@@ -1,11 +1,19 @@ +-python3 = import('python3') +-python_exec = python3.find_python() +-python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))']) ++py_override = get_option('py-overrides-dir') + +-if python_exec_result.returncode() != 0 +- error('Failed to retreive the python GObject override directory') ++if py_override == '' ++ python3 = import('python3') ++ python_exec = python3.find_python() ++ ++ python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))']) ++ ++ if python_exec_result.returncode() != 0 ++ error('Failed to retreive the python GObject override directory') ++ endif ++ ++ py_override = python_exec_result.stdout().strip() + endif + +-install_data('Accounts.py', +- install_dir: join_paths(python_exec_result.stdout().strip()) ++install_data( ++ 'Accounts.py', ++ install_dir: py_override + ) +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..2c33804 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option('py-overrides-dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 3df820bc1263..e3172c2fc1f8 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.13.6"; + version = "3.13.7"; name = "libdigidocpp-${version}"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj"; + sha256 = "1d8yx8avijp55p53fz4pd4ihjz6nyap0g8dq23bwg33411mdiqff"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 649541e22627..edd84d5a9515 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf }: let - version = "20180809"; + version = "20181024"; src = fetchurl { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 96de7eb7b3c2..df67b849cd3f 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libestr-0.1.10"; + name = "libestr-0.1.11"; src = fetchurl { url = "http://libestr.adiscon.com/files/download/${name}.tar.gz"; - sha256 = "0g3hmh3wxgjbn5g6cgy2l0ja806jd0ayp22bahcds3kmdq95wrdx"; + sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix deleted file mode 100644 index 2243f832b7a6..000000000000 --- a/pkgs/development/libraries/libibverbs/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl }: - -let - - verbs = rec { - version = "1.1.8"; - name = "libibverbs-${version}"; - url = "http://downloads.openfabrics.org/verbs/${name}.tar.gz"; - sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw"; - }; - - drivers = { - libmlx4 = rec { - version = "1.0.6"; - name = "libmlx4-${version}"; - url = "http://downloads.openfabrics.org/mlx4/${name}.tar.gz"; - sha256 = "f680ecbb60b01ad893490c158b4ce8028a3014bb8194c2754df508d53aa848a8"; - }; - libmthca = rec { - version = "1.0.6"; - name = "libmthca-${version}"; - url = "http://downloads.openfabrics.org/mthca/${name}.tar.gz"; - sha256 = "cc8ea3091135d68233d53004e82b5b510009c821820494a3624e89e0bdfc855c"; - }; - }; - -in stdenv.mkDerivation rec { - - inherit (verbs) name version ; - - srcs = [ - ( fetchurl { inherit (verbs) url sha256 ; } ) - ( fetchurl { inherit (drivers.libmlx4) url sha256 ; } ) - ( fetchurl { inherit (drivers.libmthca) url sha256 ; } ) - ]; - - sourceRoot = name; - - # Install userspace drivers - postInstall = '' - for dir in ${drivers.libmlx4.name} ${drivers.libmthca.name} ; do - cd ../$dir - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include" - export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS -L$out/lib" - ./configure $configureFlags - make -j$NIX_BUILD_CORES - make install - done - - mkdir -p $out/lib/pkgconfig - cat >$out/lib/pkgconfig/ibverbs.pc <$out/lib/pkgconfig/rdmacm.pc < # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "19720"; - gittap = "3.0.0"; - gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa"; - rev = "3.0.0"; - version = "3.0.0"; - sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40"; + version_commit = "19915"; + gittap = "3.0.1"; + gittip = "addb7f21e73073600fd6205e385fa096084701f5"; + rev = "3.0.1"; + version = "3.0.1"; + sha256 = "0da4ns11valy305074cri3in5zcafjw3vxc53b4yg37114ly433h"; cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 19836b412c04..966c91028ded 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -192,13 +192,51 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - mv output/bazel $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-real + cp scripts/packages/bazel.sh $out/bin/bazel + mv output/bazel $out/bin/bazel-real + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}" + + # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ ''; + doInstallCheck = true; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test --test_output=errors \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${stdenv.shell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${stdenv.shell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-real + hello_test + ''; + # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 566694e06b04..a369df68f050 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.10"; + name = "gradle-4.10.2"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "064zyli00cj3clbn631kivg5izhkyyf31f6x65a2rqac229gv314"; + sha256 = "0a9s2iisivgaapsz4vq1l8fa2w0wnlq0cj67yv5a0rybnahnv75l"; }; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 152c771853b2..7eff35e224c0 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, stdenv, writeTextDir, substituteAll, fetchpatch, targetPackages }: +{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages, fetchpatch }: python3Packages.buildPythonApplication rec { version = "0.46.1"; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index dc2d545a7654..99fb9090c0d5 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -1,41 +1,29 @@ -{ stdenv, qt5, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.8"; + version = "1.12.1"; src = fetchFromGitHub { - owner = "qt-labs"; + owner = "qbs"; repo = "qbs"; - rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a"; - sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g"; + rev = "v${version}"; + sha256 = "14b7bz07yfrmbry57n3xh8w4nbapm6aknk45fgi7ljvsfzp85fzl"; }; + nativeBuildInputs = [ qmake ]; + + qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ]; + + buildInputs = [ qtbase qtscript ]; + enableParallelBuilding = true; - buildInputs = with qt5; [ - qtbase - qtscript - ]; - - installFlags = [ "INSTALL_ROOT=$(out)" ]; - - buildPhase = '' - # From http://doc.qt.io/qbs/building.html - qmake -r qbs.pro - make - ''; - - postInstall = '' - mv $out/usr/local/* "$out" - ''; - meta = with stdenv.lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; - license = licenses.lgpl21; + license = licenses.lgpl3; maintainers = with maintainers; [ expipiplus1 ]; - inherit version; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 139649b78f14..545375d87805 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -252,7 +252,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.1) - rack (2.0.3) + rack (2.0.6) rainbow (2.2.2) rake rake (12.3.0) @@ -397,4 +397,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.14.6 + 1.16.4 diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index d4e97deea8dc..228b3cd85135 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -791,10 +791,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kczgp2zwcrvp257dl8j4y3mnyqflxr7rn4vl9w1rwblznx9n74c"; + sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.6"; }; rainbow = { dependencies = ["rake"]; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index bc1c2515bfa7..73e343833383 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,27 +1,25 @@ { lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { - name = "pgcli-${version}"; - version = "1.11.0"; + pname = "pgcli"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "dbcli"; - repo = "pgcli"; - rev = "v${version}"; - sha256 = "01qcvl0iwabinq3sb4340js8v3sbwkbxi64sg4xy76wj8xr6kgsk"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi"; }; - buildInputs = with pythonPackages; [ pytest mock ]; - checkPhase = '' - mkdir /tmp/homeless-shelter - HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' - ''; - propagatedBuildInputs = with pythonPackages; [ - cli-helpers click configobj humanize prompt_toolkit psycopg2 + cli-helpers click configobj humanize prompt_toolkit_2 psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; + checkInputs = with pythonPackages; [ pytest mock ]; + + checkPhase = '' + py.test + ''; + meta = with lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 70f6d8021ff8..7386dc0eeeba 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.1.4"; + version = "5.2.1"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.4/flyway-commandline-${version}.tar.gz"; - sha256 = "1raz125k55v6xa8gp6ylcjxz77r5364xqp9di46rayx3z2282f7q"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; + sha256 = "0lm536qc8pqj4s21dd47gi99nwwflk17gqzfwaflghw3fnhn7i1s"; }; buildInputs = [ makeWrapper ]; dontBuild = true; dontStrip = true; installPhase = '' mkdir -p $out/bin $out/share/flyway - cp -r sql jars lib drivers $out/share/flyway + cp -r sql jars drivers conf $out/share/flyway + cp -r lib/community $out/share/flyway/lib makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ - --add-flags "-cp '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ + --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ --add-flags "org.flywaydb.commandline.Main" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix new file mode 100644 index 000000000000..b0069d3488e0 --- /dev/null +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -0,0 +1,50 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gocode-gomod-unstable-${version}"; + version = "2018-10-16"; + rev = "12640289f65065d652cc942ffa01a52bece1dd53"; + + goPackagePath = "github.com/stamblerre/gocode"; + + # we must allow references to the original `go` package, + # because `gocode` needs to dig into $GOROOT to provide completions for the + # standard packages. + allowGoReference = true; + + excludedPackages = ''internal/suggest/testdata''; + + src = fetchFromGitHub { + inherit rev; + + owner = "stamblerre"; + repo = "gocode"; + sha256 = "1avv0b5p2l8pv38m5gg97k57ndr5k9yy0rfkmmwjq96pa221hs1q"; + }; + + goDeps = ./deps.nix; + + postInstall = '' + mv $bin/bin/gocode $bin/bin/gocode-gomod + ''; + + meta = with stdenv.lib; { + description = "An autocompletion daemon for the Go programming language"; + longDescription = '' + Gocode is a helper tool which is intended to be integrated with your + source code editor, like vim, neovim and emacs. It provides several + advanced capabilities, which currently includes: + + - Context-sensitive autocompletion + + It is called daemon, because it uses client/server architecture for + caching purposes. In particular, it makes autocompletions very fast. + Typical autocompletion time with warm cache is 30ms, which is barely + noticeable. + ''; + homepage = https://github.com/stamblerre/gocode; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/development/tools/gocode-gomod/deps.nix b/pkgs/development/tools/gocode-gomod/deps.nix new file mode 100644 index 000000000000..ac9662697063 --- /dev/null +++ b/pkgs/development/tools/gocode-gomod/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25"; + sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9"; + }; + } +] diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index bb44074dfc75..3351c0e986b3 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -2,10 +2,11 @@ buildGoPackage rec { name = "gocode-unstable-${version}"; - version = "2018-10-22"; - rev = "e893215113e5f7594faa3a8eb176c2700c921276"; + version = "2018-11-05"; + rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898"; goPackagePath = "github.com/mdempsky/gocode"; + excludedPackages = ''internal/suggest/testdata''; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the @@ -17,17 +18,11 @@ buildGoPackage rec { owner = "mdempsky"; repo = "gocode"; - sha256 = "1zsll7yghv64890k7skl0g2lg9rsaiisgrfnb8kshsxrcxi1kc2l"; + sha256 = "0fxqn0v6dbwarn444lc1xrx5vfkcidi73f4ba7l4clsb9qdqgyam"; }; goDeps = ./deps.nix; - preBuild = '' - # getting an error building the testdata because they contain invalid files - # on purpose as part of the testing. - rm -r go/src/$goPackagePath/internal/suggest/testdata - ''; - meta = with stdenv.lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix index 4eefdd9c6d04..ac9662697063 100644 --- a/pkgs/development/tools/gocode/deps.nix +++ b/pkgs/development/tools/gocode/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "6fe81c087942f588f40c3f67b41ce284f2f70eee"; - sha256 = "04yl7rk2lf94bxz74ja5snh7ava9gcnf2yx6y002pfkk538r6w5d"; + rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25"; + sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9"; }; } ] diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix new file mode 100644 index 000000000000..a82c21b72e9e --- /dev/null +++ b/pkgs/development/tools/kexpand/default.nix @@ -0,0 +1,18 @@ +{ buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kexpand-unstable-2017-05-12"; + + goPackagePath = "github.com/kopeio/kexpand"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "kopeio"; + repo = "kexpand"; + rev = "c508a43a4e84410dfd30827603e902148c5c1f3c"; + sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p"; + }; + + goDeps = ./deps.nix; +} diff --git a/pkgs/development/tools/kexpand/deps.nix b/pkgs/development/tools/kexpand/deps.nix new file mode 100644 index 000000000000..c049d9683cce --- /dev/null +++ b/pkgs/development/tools/kexpand/deps.nix @@ -0,0 +1,63 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3205366f80eb..54f9b5e4031f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index a952475b9673..d8deb75d2d41 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { description = "Literate Programming in C/C++"; platforms = with platforms; unix; maintainers = with maintainers; [ vrthra ]; + license = licenses.abstyles; }; } diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 3b1c70b4ac33..7c7e53404343 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { name = "eggdbus-0.6"; - + src = fetchurl { url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib dbus dbus-glib ]; - meta = { + meta = with stdenv.lib; { homepage = https://hal.freedesktop.org/releases/; description = "D-Bus bindings for GObject"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index 37bc73172da2..5fd0fe8be2f2 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4"; }; - + buildInputs = [perl XMLSimple librsvg]; postInstall = @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 15eac37a53a9..77d4c5771f90 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library call tracer"; homepage = https://www.ltrace.org/; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 1ae8a32b6405..81fb7f8b13ff 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { description = "A tool that allows packages to find out information about other packages"; homepage = http://pkg-config.freedesktop.org/wiki/; platforms = platforms.all; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 8328433a823f..a077367622eb 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + inherit (sqitchModule.meta) license; }; } diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index c73dbfce8f87..c380243a898b 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Allow multiple web change files"; platforms = with platforms; unix; maintainers = with maintainers; [ vrthra ]; + license = licenses.abstyles; }; } diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 6a34c1c130d9..07005131fb5e 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,39 +1,37 @@ { stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let - version = "0.9.1"; + version = "1.0.0"; nailgun-server = fetchMavenArtifact { - groupId = "com.martiansoftware"; + groupId = "com.facebook"; artifactId = "nailgun-server"; inherit version; - sha256 = "09ggkkd1s58jmpc74s6m10d3hyf6bmif31advk66zljbpykgl625"; + sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95"; }; in stdenv.mkDerivation rec { name = "nailgun-${version}"; src = fetchFromGitHub { - owner = "martylamb"; + owner = "facebook"; repo = "nailgun"; - rev = "1ad9ad9d2d17c895144a9ee0e7acb1d3d90fb66f"; - sha256 = "1f8ac5kg7imhix9kqdzwiav1bxh8vljv2hb1mq8yz4rqsrx2r4w3"; + rev = "nailgun-all-v${version}"; + sha256 = "1syyk4ss5vq1zf0ma00svn56lal53ffpikgqgzngzbwyksnfdlh6"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = [ makeWrapper ]; - - installPhase = '' - install -D ng $out/bin/ng + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' makeWrapper ${jre}/bin/java $out/bin/ng-server \ - --add-flags '-cp ${nailgun-server.jar}:$CLASSPATH com.martiansoftware.nailgun.NGServer' + --add-flags '-classpath ${nailgun-server.jar}:$CLASSPATH com.facebook.nailgun.NGServer' ''; meta = with stdenv.lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; - homepage = http://martiansoftware.com/nailgun/; - license = licenses.apsl20; + homepage = http://www.martiansoftware.com/nailgun/; + license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; }; diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 6d0754da04d0..62493ee83a6f 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1fz1jx1d48yb40qan4hw25h8ia55vs7mp94a3rr7cf5gb5ap2zkj"; + sha256 = "1dbf7wwhr7b41g3p24qb9v5r1vvgrk6i9w8f7y7k5k527xy9jk5w"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -14,10 +14,14 @@ stdenv.mkDerivation rec { dontAddPrefix = true; - installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; + installPhase = '' + runHook preInstall + ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR + runHook postInstall + ''; meta = { - homepage = "https://github.com/ocaml/dune"; + homepage = https://github.com/ocaml/dune; description = "A composable build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index c15970d3f3e6..e059a5d6a76c 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchzip, ocaml, findlib, dune, yojson }: +{ stdenv, fetchzip, buildDunePackage, yojson }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; - -let +buildDunePackage rec { + pname = "merlin"; version = "3.2.2"; -in -stdenv.mkDerivation { - - name = "merlin-${version}"; + minimumOCamlVersion = "4.02"; src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"; }; - buildInputs = [ ocaml findlib dune yojson ]; - - inherit (dune) installPhase; + buildInputs = [ yojson ]; meta = with stdenv.lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index ddea2aa9784b..7336439240d5 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchzip, ncurses -, ocamlPackages -, dune -}: +{ stdenv, fetchzip, ncurses, ocamlPackages }: -stdenv.mkDerivation rec { +with ocamlPackages; buildDunePackage rec { + pname = "ocaml-top"; version = "1.1.5"; - name = "ocaml-top-${version}"; + src = fetchzip { url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz"; sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv"; }; - buildInputs = [ ncurses dune ] - ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]); + buildInputs = [ ncurses ocp-build lablgtk ocp-index ]; configurePhase = '' export TERM=xterm ocp-build -init ''; - buildPhase = "jbuilder build"; - - inherit (dune) installPhase; - meta = { homepage = https://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; - platforms = ocamlPackages.ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index e0b744c83593..694f4b6e89a0 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,15 +1,10 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, dune }: +{ stdenv, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; - -if !stdenv.lib.versionAtLeast ocaml.version "4.05" -then throw "ocamlformat is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.8"; +with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - name = "${pname}-${version}"; + version = "0.8"; + + minimumOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "ocaml-ppx"; @@ -19,9 +14,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ocaml - dune - findlib base cmdliner fpath @@ -34,17 +26,10 @@ stdenv.mkDerivation rec { tools/gen_version.sh src/Version.ml version ''; - buildPhase = '' - dune build -p ocamlformat - ''; - - inherit (dune) installPhase; - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; + inherit (src.meta) homepage; description = "Auto-formatter for OCaml code"; maintainers = [ stdenv.lib.maintainers.Zimmi48 ]; license = stdenv.lib.licenses.mit; - inherit (ocamlPackages.ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix index 9424196cf466..616a2049c778 100644 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ b/pkgs/development/tools/parse-cli-bin/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { description = "Parse Command Line Interface"; homepage = "https://parse.com"; platforms = platforms.linux; + license = licenses.bsd3; }; phases = "installPhase"; @@ -22,4 +23,4 @@ stdenv.mkDerivation rec { cp "$src" "$out/bin/parse" chmod +x "$out/bin/parse" ''; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index 3a273e1ddbfa..5b8b16ef1922 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { preBuild="makeFlagsArray+=( PREFIX=$out )"; - meta = { + meta = with stdenv.lib; { homepage = http://piumarta.com/software/peg/; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 7be1a9777c02..8474f99bc8b9 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, rustup, substituteAll }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll }: rustPlatform.buildRustPackage rec { name = "racer-${version}"; @@ -13,8 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk"; - # rustup is required for test - buildInputs = [ makeWrapper rustup ]; + buildInputs = [ makeWrapper ]; preCheck = '' export RUST_SRC_PATH="${rustPlatform.rustcSrc}" diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index b19bd67c307f..4ba5abc65e30 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "10phyz7ffzzx5ysbpyidssvwjdrcyszxf3lnba8qsrcajzm21nff"; + sha256 = "0x45d2fq01w5v28vipvl4g37ld7d9m8rij9dnwq2zcvyz0rfdfmk"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.42"; + version = "2.43"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index 3d8027a12994..dd0fa2461d89 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { - name = "sigrok-cli-0.7.0"; + name = "sigrok-cli-0.7.1"; src = fetchurl { url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; - sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"; + sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0e3a9706d24d..7f39376dc069 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,18 +5,18 @@ with stdenv.lib; let - version = "0.1.31"; + version = "0.1.32"; src = fetchFromGitHub { rev = "v${version}"; - owner = "projectatomic"; + owner = "containers"; repo = "skopeo"; - sha256 = "02z46wxhms8yph03ksl7i4hbqy15v3y1r43js9dxn0a45vxkm7lb"; + sha256 = "0pyii4z9xf23lsdx4d3m5pkdyrsi4v1pbjj8l7fjgyfv8ncrjyn8"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; - goPackagePath = "github.com/projectatomic/skopeo"; + goPackagePath = "github.com/containers/skopeo"; in buildGoPackage rec { @@ -32,8 +32,8 @@ buildGoPackage rec { buildFlagsArray = '' -ldflags= - -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp + -X github.com/containers/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile} + -X github.com/containers/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp ''; preBuild = '' diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index 8cde662b14c3..64a97ad00873 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { preConfigure = "autoconf"; patches = [ ./tradcpp-configure.patch ]; - meta = { + meta = with stdenv.lib; { description = "A traditional (K&R-style) C macro preprocessor"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.bsd2; }; } diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index ecc1a2d00946..74992560f3fc 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText }: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true, libvirt, pkgconfig }: let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.1.2"; + version = "2.2.0"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0fb90v43d30whhyjlgb9mmy93ccbpr01pz97kp5hrg3wfd7703b1"; + sha256 = "1wa8l3j6hpy0m0snz7wvfcf0wsjikp22c2z29crpk10f7xl7c56b"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -15,7 +15,7 @@ let inherit ruby; gemfile = writeText "Gemfile" ""; lockfile = writeText "Gemfile.lock" ""; - gemset = lib.recursiveUpdate (import ./gemset.nix) { + gemset = lib.recursiveUpdate (import ./gemset.nix) ({ vagrant = { source = { type = "url"; @@ -23,7 +23,7 @@ let }; inherit version; }; - }; + } // lib.optionalAttrs withLibvirt (import ./gemset_libvirt.nix)); }; in buildRubyGem rec { @@ -35,6 +35,8 @@ in buildRubyGem rec { dontBuild = false; src = fetchurl { inherit url sha256; }; + buildInputs = lib.optional withLibvirt [ libvirt pkgconfig ]; + patches = [ ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch @@ -45,7 +47,12 @@ in buildRubyGem rec { postInstall = '' wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' "${lib.getBin libarchive}/bin" + --prefix PATH ':' "${lib.getBin libarchive}/bin" \ + ${lib.optionalString withLibvirt '' + --prefix PATH ':' "${pkgconfig}/bin" \ + --prefix PKG_CONFIG_PATH ':' \ + "${lib.makeSearchPath "lib/pkgconfig" [ libvirt ]}" + ''} ''; installCheckPhase = '' diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 598f5cc67235..39eeb02ce55c 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -70,10 +70,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; gssapi = { dependencies = ["ffi"]; @@ -172,18 +172,18 @@ dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; type = "gem"; }; - version = "3.1"; + version = "3.2.2"; }; mime-types-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; type = "gem"; }; - version = "3.2016.0521"; + version = "3.2018.0812"; }; multi_json = { source = { @@ -214,10 +214,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; + sha256 = "0qfanf71yv8w7yl9l9wqcy68i2x1ghvnf8m581yy4pl0anfdhqw8"; type = "gem"; }; - version = "4.2.0"; + version = "5.0.2"; }; netrc = { source = { @@ -238,10 +238,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.3"; }; rake = { source = { @@ -358,10 +358,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; safe_yaml = { source = { @@ -397,19 +397,28 @@ version = "0.0.7.5"; }; vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; source = { fetchSubmodules = false; - rev = "9413ab298407114528766efefd1fb1ff24589636"; - sha256 = "1z77m3p6x82hipa7y4i71zafy0rdfajw2vhqdxczjmrlwp0pvisl"; + rev = "abfc34474d122235d56e4c6b6fb5d3e35bedfa90"; + sha256 = "08xy2c82lrxkwjlvrbx1v32968a6psni3952y3knriqgygv2kzbn"; type = "git"; url = "https://github.com/hashicorp/vagrant-spec.git"; }; version = "0.0.1"; }; + vagrant_cloud = { + dependencies = ["rest-client"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k325a1cblj3jd2av8a6j3xsjjm36g578gpbmxw7h5dbffp49il1"; + type = "gem"; + }; + version = "2.0.1"; + }; wdm = { source = { remotes = ["https://rubygems.org"]; @@ -431,10 +440,10 @@ dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02lzbixdbjvhmb0byqx9rl9x4xx9pqc8jwm7y6mmp7w7mri72zh6"; + sha256 = "05c1xji4afwxx4vgim5n4nj62zbyppmm67ci3kwi0jjrqaj9y11q"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; winrm-elevated = { dependencies = ["winrm" "winrm-fs"]; @@ -449,9 +458,9 @@ dependencies = ["erubis" "logging" "rubyzip" "winrm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3w2j2rmhjqj8lynca2m1dm1m5fv1x35xwhk3vyr15dn260z56g"; + sha256 = "12g9grzp03knh1nxcicnm93pmlf4r264lhvl5yviyri8swmqlbz5"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix new file mode 100644 index 000000000000..aeaf42341a87 --- /dev/null +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -0,0 +1,19 @@ +{ + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "2.3.0"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + type = "gem"; + }; + version = "1.8.5"; + }; +} diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 3f7b21be005d..e71375402c70 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -62,5 +62,6 @@ in stdenv.mkDerivation rec { homepage = https://github.com/facebook/xcbuild; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin matthewbauer ]; + license = with licenses; [ bsd2 bsd3 ]; }; } diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index be2b0689f925..e2e115992bc6 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.12.1"; + version = "1.12.3"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "084xci8y5na2765sh8flc8c5z7fik62filf1p58aqrb2000vna1j"; + sha256 = "0izn7lfvfw046qlxdgiiiyqj24sl2yclm6v8bzy8ilsr00csbrm2"; }; buildInputs = [ nodejs ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://yarnpkg.com/; description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.screendriver ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 9a4969c11676..c953a311077e 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -16,7 +16,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - rack (1.6.8) + rack (1.6.11) rack-protection (1.5.3) rack sinatra (1.4.8) @@ -40,4 +40,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 1.14.4 + 1.16.4 diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix index d9e95454a500..75e1336b1c3c 100644 --- a/pkgs/development/web/mailcatcher/gemset.nix +++ b/pkgs/development/web/mailcatcher/gemset.nix @@ -16,6 +16,7 @@ version = "1.0.9.1"; }; mail = { + dependencies = ["mime-types"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; @@ -24,6 +25,7 @@ version = "2.6.6"; }; mailcatcher = { + dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6gk8n18i5f651f244al1hscjzl27fpma4vqw0qhszqqpd5p3bx"; @@ -32,6 +34,7 @@ version = "0.6.5"; }; mime-types = { + dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; @@ -50,12 +53,13 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.11"; }; rack-protection = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; @@ -64,6 +68,7 @@ version = "1.5.3"; }; sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -72,6 +77,7 @@ version = "1.4.8"; }; skinny = { + dependencies = ["eventmachine" "thin"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9"; @@ -88,6 +94,7 @@ version = "1.3.13"; }; thin = { + dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga"; diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 911e03daa371..0af669ff0699 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "11.4.6"; + version = "11.5.2"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "1bl0yrzxdfy6sks674qlfch8mg3b0x1wj488v83glags8ibsg3cl"; + sha256 = "1aavhslff2v5ap11s3xxrmdgs4n9yyp74sj3kbw6kwxd4cq1cfxz"; }; sourceRoot = "."; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 4b874c954b0a..bf58b523e76e 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "blackshades-svn-110"; src = fetchsvn { url = svn://svn.icculus.org/blackshades/trunk; - rev = 110; + rev = "110"; sha256 = "0kbrh1dympk8scjxr6av24qs2bffz44l8qmw2m5gyqf4g3rxf6ra"; }; diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 2f503e02ec20..25b9321bec39 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "blackshades-elite-svn-29"; src = fetchsvn { url = svn://svn.gna.org/svn/blackshadeselite/trunk; - rev = 29; + rev = "29"; sha256 = "1lkws5pqpgcgdlar11waikp6y41z678457n9jcik7nhn53cjjr1s"; }; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index c8618c13347d..c114443e1e72 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.16"; + version = "2.4.18"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "00y2ifjgl4yz1pb2fgkg00vrfb6yk5cfxwjbx3fw2alnsaw6cqgg"; + sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 058bb5f72ae6..8672de3af84f 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -33,10 +33,13 @@ let ++ lib.optional enableTWBT twbt.art ++ [ dwarf-fortress ]; - fixup = lib.singleton (runCommand "fixup" {} '' + fixup = lib.singleton (runCommand "fixup" {} ('' mkdir -p $out/data/init + '' + (if (theme != null) then '' + cp ${lib.head themePkg}/data/init/init.txt $out/data/init/init.txt + '' else '' cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt - '' + lib.optionalString enableDFHack '' + '') + lib.optionalString enableDFHack '' mkdir -p $out/hack # Patch the MD5 @@ -60,7 +63,7 @@ let --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' - ''); + '')); env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}"; diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch index 230f453acad7..6958fe495d26 100644 --- a/pkgs/games/gargoyle/darwin.patch +++ b/pkgs/games/gargoyle/darwin.patch @@ -1,33 +1,3 @@ -diff --git a/Jamshared b/Jamshared -index 13db835..fd42928 100644 ---- a/Jamshared -+++ b/Jamshared -@@ -79,7 +79,7 @@ if $(OS) = MACOSX - { - actions together SharedLink bind NEEDLIBS - { -- $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) -+ $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) - } - } - else -diff --git a/tads/Jamfile b/tads/Jamfile -index 1f8829d..d8455eb 100644 ---- a/tads/Jamfile -+++ b/tads/Jamfile -@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS - - if $(OS) = MACOSX - { -- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -+ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; -+ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; - } - - SEARCH_SOURCE = -diff --git a/garglk/fontmac.m b/garglk/fontmac.m -index d6e1426..72304a3 100644 --- a/garglk/fontmac.m +++ b/garglk/fontmac.m @@ -167,7 +167,7 @@ static void propfont(char *file, int style) @@ -48,15 +18,6 @@ index d6e1426..72304a3 100644 [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil]; for (NSFontDescriptor * sysfont in fontMatches) -@@ -197,7 +197,7 @@ void fontreplace(char *font, int type) - - else if ([sysfont symbolicTraits] & NSFontItalicTrait) - style = FONTI; -- -+ - /* find path for font */ - CFURLRef urlRef = CTFontDescriptorCopyAttribute((CTFontDescriptorRef)sysfont, kCTFontURLAttribute); - if (!urlRef) @@ -259,7 +259,7 @@ void fontload(void) // obtain a list of all files in the Fonts directory @@ -66,47 +27,9 @@ index d6e1426..72304a3 100644 // create a collection to hold the registered font URLs gli_registered_fonts = [NSMutableArray new]; -diff --git a/garglk/launchmac.m b/garglk/launchmac.m -index 68deca5..9f752ac 100644 --- a/garglk/launchmac.m +++ b/garglk/launchmac.m -@@ -72,14 +72,14 @@ char *winfilters[] = - height: (unsigned int) height - { - [[self openGLContext] makeCurrentContext]; -- -+ - /* allocate new texture */ - glDeleteTextures(1, &output); - glGenTextures(1, &output); - - /* bind target to texture */ -- glEnable(GL_TEXTURE_RECTANGLE_ARB); -- glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); -+ glEnable(GL_TEXTURE_RECTANGLE_ARB); -+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); - - /* set target parameters */ - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); -@@ -460,7 +460,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) - if (filter != FILTER_ALL) - { - NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] -- encoding: NSUTF8StringEncoding]]; -+ encoding: NSUTF8StringEncoding]]; - [openDlg setAllowedFileTypes: filterTypes]; - [openDlg setAllowsOtherFileTypes: NO]; - } -@@ -485,7 +485,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) - if (filter != FILTER_ALL) - { - NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] -- encoding: NSUTF8StringEncoding]]; -+ encoding: NSUTF8StringEncoding]]; - [saveDlg setAllowedFileTypes: filterTypes]; - [saveDlg setAllowsOtherFileTypes: NO]; - } -@@ -518,7 +518,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) +@@ -556,7 +556,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) { BOOL openedFirstGame; @@ -115,34 +38,6 @@ index 68deca5..9f752ac 100644 NSConnection * link; } - (BOOL) launchFile: (NSString *) file; -@@ -760,20 +760,20 @@ static BOOL isTextbufferEvent(NSEvent * evt) - - (BOOL) launchFileDialog - { - int result; -- -+ - NSOpenPanel * openDlg = [NSOpenPanel openPanel]; - - [openDlg setCanChooseFiles: YES]; - [openDlg setCanChooseDirectories: NO]; - [openDlg setAllowsMultipleSelection: NO]; - [openDlg setTitle: [NSString stringWithCString: AppName encoding: NSUTF8StringEncoding]]; -- -+ - NSMutableArray *filterTypes = [NSMutableArray arrayWithCapacity:100]; -- -- NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] -+ -+ NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] - objectForKey:@"CFBundleDocumentTypes"] objectEnumerator]; - NSDictionary *docType; -- -+ - while (docType = [docTypeEnum nextObject]) - { - [filterTypes addObjectsFromArray:[docType objectForKey: @"CFBundleTypeExtensions"]]; -diff --git a/garglk/ttsmac.m b/garglk/ttsmac.m -index 9f6ab0e..de3d6fe 100644 --- a/garglk/ttsmac.m +++ b/garglk/ttsmac.m @@ -30,7 +30,7 @@ @@ -167,29 +62,3 @@ index 9f6ab0e..de3d6fe 100644 if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]]) { [synth setVoice: voice]; -diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp -index 5e193a1..dce46f7 100644 ---- a/tads/tads3/vmtz.cpp -+++ b/tads/tads3/vmtz.cpp -@@ -1985,5 +1985,5 @@ void CVmTimeZone::query(vmtzquery *result, int32_t dayno, int32_t daytime, - * up until that moment - */ -- result->set(tcur > 0 ? tcur - 1 : tcur); -+ result->set(tcur != 0 ? tcur - 1 : tcur); - return; - } -diff --git a/terps/Jamfile b/terps/Jamfile -index b5f6d52..2d1ccdb 100644 ---- a/terps/Jamfile -+++ b/terps/Jamfile -@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes - - if $(OS) = MACOSX - { -- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -+ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; -+ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; - } - - SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index fc02bdffcad8..5bf0ae1c814a 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, jam, libtool, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: +{ stdenv, lib, fetchFromGitHub, jam, cctools, pkgconfig +, SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }: let @@ -19,28 +20,22 @@ let in stdenv.mkDerivation { - name = "gargoyle-2017-08-27"; + name = "gargoyle-2018-10-06"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = "65c95166f53adaa2e5e1a5e0d8a34e9219d06de6"; - sha256 = "1agnap38qdf2n1v37ka3ky44j56yhvln4lzf13diyqhjmh9lvfq5"; + rev = "d03391563fa75942fbf8f8deeeacf3a8be9fc3b0"; + sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin libtool; + nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; - buildInputs = [ gtk2 SDL SDL_mixer ] ++ ( - if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ] - ); + buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; patches = [ ./darwin.patch ]; - postPatch = '' - substituteInPlace Jamrules \ - --replace -mmacosx-version-min=10.7 -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET - ''; - buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' @@ -57,7 +52,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://ccxvii.net/gargoyle/; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index f6f3e6001825..301249789dad 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchsvn { #url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin"; url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine"; - rev = 294; + rev = "294"; sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; }; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 2762155d63ce..c31b8b222168 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -180,6 +180,15 @@ in buildFHSUserEnv rec { ''; profile = '' + # Workaround for issue #44254 (Steam cannot connect to friends network) + # https://github.com/NixOS/nixpkgs/issues/44254 + if [ -z ''${TZ+x} ]; then + new_TZ="$(readlink -f /etc/localtime | grep -P -o '(?<=/zoneinfo/).*$')" + if [ $? -eq 0 ]; then + export TZ="$new_TZ" + fi + fi + export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"} '' + extraProfile; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 7e43fbf2c880..6c571da561c5 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -3,7 +3,7 @@ , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; - rev = 1386; + rev = "1386"; sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; } }: diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 012b37959d8f..e227de086de6 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchsvn, fetchurl, cups, cups-filters, jbigkit, zlib }: let - rev = "315"; color-profiles = stdenv.mkDerivation { name = "splix-color-profiles-20070625"; @@ -19,14 +18,15 @@ let ''; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { name = "splix-svn-${rev}"; + rev = "315"; src = fetchsvn { # We build this from svn, because splix hasn't been in released in several years # although the community has been adding some new printer models. url = "svn://svn.code.sf.net/p/splix/code/splix"; - rev = "r${rev}"; + inherit rev; sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 57e76a964376..878e98fa1665 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,31 +1,16 @@ -{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }: stdenv.mkDerivation rec { - name = "dosbox-0.74"; + name = "dosbox-0.74-2"; src = fetchurl { url = "mirror://sourceforge/dosbox/${name}.tar.gz"; - sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk"; + sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh"; }; - patches = - [ # Fix building with GCC 4.6. - (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1"; - sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9"; - }) - (fetchurl { - url = "https://svnweb.freebsd.org/ports/head/emulators/dosbox/files/patch-src_gui_sdlmain.cpp?revision=435580&view=co&pathrev=435580"; - sha256 = "1mbj5wrn53k0zds2adys34949vzsbfgm0pmsyx14v9j0cxi7drca"; - name = "patch-src_gui_sdlmain.cpp"; - }) - ]; - - patchFlags = "-p0"; - hardeningDisable = [ "format" ]; - buildInputs = [ SDL libGLU_combined ]; + buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -43,6 +28,8 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications ''; + enableParallelBuilding = true; + meta = with lib; { homepage = http://www.dosbox.com/; description = "A DOS emulator"; diff --git a/pkgs/misc/lollypop-portal/default.nix b/pkgs/misc/lollypop-portal/default.nix deleted file mode 100644 index dfcdebace3b0..000000000000 --- a/pkgs/misc/lollypop-portal/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig -, python3, gnome3, gst_all_1, gtk3, libnotify -, kid3, easytag, gobjectIntrospection, wrapGAppsHook }: - -python3.pkgs.buildPythonApplication rec { - name = "lollypop-portal-${version}"; - version = "0.9.7"; - - format = "other"; - doCheck = false; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "gnumdk"; - repo = name; - rev = version; - sha256 = "0rn5xmh6391i9l69y613pjad3pzdilskr2xjfcir4vpk8wprvph3"; - }; - - nativeBuildInputs = [ - gobjectIntrospection - meson - ninja - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - gnome3.gnome-settings-daemon - gnome3.libsecret - gnome3.totem-pl-parser - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk3 - libnotify - python3 - ]; - - pythonPath = with python3.pkgs; [ - pycairo - pydbus - pygobject3 - ]; - - preFixup = '' - buildPythonPath "$out/libexec/lollypop-portal $pythonPath" - patchPythonScript "$out/libexec/lollypop-portal" - - gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ easytag kid3 ]}" - ) - ''; - - meta = with stdenv.lib; { - description = "DBus Service for Lollypop"; - homepage = https://gitlab.gnome.org/gnumdk/lollypop-portal; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 0c144b567418..cb281e68dfd7 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.95.0.1"; + version = "3.95.0.11"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0hc3ar55wjg51qf8c7h0nix0lyqs16mk1d4hhxyv102zq4l5fz97"; + sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04"; }; preferLocalBuild = true; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d9ceb20e9412..0c30c92722c8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -92,6 +92,16 @@ }; }; + autoload_cscope-vim = buildVimPluginFrom2Nix { + name = "autoload_cscope-vim-2011-01-28"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "autoload_cscope.vim"; + rev = "26f428f400d96d25a9d633e6314f6e1760923db1"; + sha256 = "150h6k4nd1msa21c0zxl68nwwq3qdmqi0d8h4as98rrz0b0lghn7"; + }; + }; + awesome-vim-colorschemes = buildVimPluginFrom2Nix { name = "awesome-vim-colorschemes-2018-10-30"; src = fetchFromGitHub { @@ -436,6 +446,16 @@ }; }; + direnv-vim = buildVimPluginFrom2Nix { + name = "direnv-vim-2017-12-29"; + src = fetchFromGitHub { + owner = "direnv"; + repo = "direnv.vim"; + rev = "4d6271f0facd57a478c0d02895775dc01f577c5c"; + sha256 = "1vfg4hrxbqc96w694cn9gzjvwkscd111fp6dqlh7wpd2z3ciw07h"; + }; + }; + echodoc-vim = buildVimPluginFrom2Nix { name = "echodoc-vim-2018-10-20"; src = fetchFromGitHub { @@ -467,6 +487,17 @@ }; }; + emmet-vim = buildVimPluginFrom2Nix { + name = "emmet-vim-2018-10-06"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "emmet-vim"; + rev = "7a4bf3463ef1e2c08393218fc67a8729c00948a5"; + sha256 = "15y5h7b6ll7nngaq9i44xb88rw2jg5ahbvybdn7kdf0nq1m3z409"; + fetchSubmodules = true; + }; + }; + ensime-vim = buildVimPluginFrom2Nix { name = "ensime-vim-2018-10-10"; src = fetchFromGitHub { @@ -1129,6 +1160,16 @@ }; }; + pig-vim = buildVimPluginFrom2Nix { + name = "pig-vim-2017-06-08"; + src = fetchFromGitHub { + owner = "motus"; + repo = "pig.vim"; + rev = "60d8a0883d3e474e61af46b581a5ce3af65e9bb5"; + sha256 = "0az48a3slpzljb69d60cpahkshmdbss0snc8lmvf4yrc1gx8yncv"; + }; + }; + pony-vim-syntax = buildVimPluginFrom2Nix { name = "pony-vim-syntax-2017-09-26"; src = fetchFromGitHub { @@ -1139,6 +1180,16 @@ }; }; + PreserveNoEOL = buildVimPluginFrom2Nix { + name = "PreserveNoEOL-2013-06-14"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "PreserveNoEOL"; + rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62"; + sha256 = "1726jpr2zf6jrb00pp082ikbx4mll3a877pnzs6i18f9fgpaqqgd"; + }; + }; + psc-ide-vim = buildVimPluginFrom2Nix { name = "psc-ide-vim-2018-03-11"; src = fetchFromGitHub { @@ -1479,6 +1530,16 @@ }; }; + traces-vim = buildVimPluginFrom2Nix { + name = "traces-vim-2018-10-14"; + src = fetchFromGitHub { + owner = "markonm"; + repo = "traces.vim"; + rev = "9520ed3837340028b871a9e497dd0d0b07cb4953"; + sha256 = "0dfm04c4v0qk2f7fycpkwhbws0m5q383bizyaslflb1mmx3jnc48"; + }; + }; + tslime-vim = buildVimPluginFrom2Nix { name = "tslime-vim-2018-07-23"; src = fetchFromGitHub { @@ -1829,6 +1890,16 @@ }; }; + vim-better-whitespace = buildVimPluginFrom2Nix { + name = "vim-better-whitespace-2018-06-11"; + src = fetchFromGitHub { + owner = "ntpeters"; + repo = "vim-better-whitespace"; + rev = "70a38fa9683e8cd0635264dd1b69c6ccbee4e3e7"; + sha256 = "1w16mrvydbvj9msi8p4ym1vasjx6kr4yd8jdhndz0pr3qasn2ix9"; + }; + }; + vim-buffergator = buildVimPluginFrom2Nix { name = "vim-buffergator-2018-05-02"; src = fetchFromGitHub { @@ -1879,6 +1950,16 @@ }; }; + vim-colemak = buildVimPluginFrom2Nix { + name = "vim-colemak-2016-10-16"; + src = fetchFromGitHub { + owner = "kalbasit"; + repo = "vim-colemak"; + rev = "6ac1c0bf362845355c65dfeab9a9987c1b4dc7ec"; + sha256 = "1li7yc5vglrhf7w7i7gs2i7ihdb1bhx85basmpgqlf7790lv1599"; + }; + }; + vim-colors-solarized = buildVimPluginFrom2Nix { name = "vim-colors-solarized-2011-05-09"; src = fetchFromGitHub { @@ -3080,6 +3161,16 @@ }; }; + vim-terraform = buildVimPluginFrom2Nix { + name = "vim-terraform-2018-08-02"; + src = fetchFromGitHub { + owner = "hashivim"; + repo = "vim-terraform"; + rev = "7c11252da45c6508524e022d1f2588134902d8d1"; + sha256 = "1qnjjcin934i7yd2fd0xapraindrpavnik1fasv10x5dw8yzxyrs"; + }; + }; + vim-test = buildVimPluginFrom2Nix { name = "vim-test-2018-10-24"; src = fetchFromGitHub { @@ -3320,6 +3411,16 @@ }; }; + vissort-vim = buildVimPluginFrom2Nix { + name = "vissort-vim-2014-01-31"; + src = fetchFromGitHub { + owner = "navicore"; + repo = "vissort.vim"; + rev = "75a5b08b64d2f762206bffd294066533891fa03c"; + sha256 = "0a71b22apkhicca9nkd06jlcnqkf583mlpfh2mvl4d474viavqfn"; + }; + }; + vundle = buildVimPluginFrom2Nix { name = "vundle-2018-02-03"; src = fetchFromGitHub { @@ -3400,6 +3501,17 @@ }; }; + yats-vim = buildVimPluginFrom2Nix { + name = "yats-vim-2018-10-17"; + src = fetchFromGitHub { + owner = "HerringtonDarkholme"; + repo = "yats.vim"; + rev = "4675d7ff4b04aa5c5eabd5a1d862fcf78a7cd759"; + sha256 = "1hb36d4lb79dzn4idmar8zq1w4ya4a52a5gpzksj9x9k4fx6gakr"; + fetchSubmodules = true; + }; + }; + youcompleteme = buildVimPluginFrom2Nix { name = "youcompleteme-2018-10-14"; src = fetchFromGitHub { @@ -3450,4 +3562,14 @@ sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g"; }; }; + + zoomwintab-vim = buildVimPluginFrom2Nix { + name = "zoomwintab-vim-2018-04-14"; + src = fetchFromGitHub { + owner = "troydm"; + repo = "zoomwintab.vim"; + rev = "5bbbd1f79e40839a34803627e11f9e662f639fe0"; + sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6"; + }; + }; } \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index c1bd45a6b789..39b0246d0d38 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -14,7 +14,7 @@ , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, motion , gnused, reftools, gogetdoc, gometalinter -, impl, iferr +, impl, iferr, gocode, gocode-gomod, go-tools }: let @@ -162,6 +162,10 @@ with generated; dependencies = ["self"]; }); + gist-vim = gist-vim.overrideAttrs(old: { + dependencies = ["webapi-vim"]; + }); + gitv = gitv.overrideAttrs(old: { dependencies = ["gitv"]; }); @@ -261,6 +265,9 @@ with generated; asmfmt delve errcheck + go-tools + gocode + gocode-gomod godef gogetdoc golint @@ -276,8 +283,8 @@ with generated; in { postPatch = '' ${gnused}/bin/sed \ - -Ee 's@let go_bin_path = go#path#BinPath\(\)@let go_bin_path = "${binPath}"@g' \ - -i autoload/go/path.vim + -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ + -i autoload/go/config.vim ''; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 33049c834a26..113993cee737 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -42,6 +42,7 @@ derekelkins/agda-vim derekwyatt/vim-scala dhruvasagar/vim-table-mode digitaltoad/vim-jade +direnv/direnv.vim dleonard0/pony-vim-syntax dracula/vim drmingdrmer/xptemplate @@ -77,10 +78,12 @@ google/vim-jsonnet google/vim-maktaba gregsexton/gitv guns/xterm-color-table.vim +hashivim/vim-terraform haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim heavenshell/vim-jsdoc hecal3/vim-leader-guide +HerringtonDarkholme/yats.vim honza/vim-snippets hsanson/vim-android ianks/vim-tsx @@ -118,6 +121,7 @@ junegunn/vim-plug justincampbell/vim-eighties justinmk/vim-dirvish KabbAmine/zeavim.vim +kalbasit/vim-colemak kana/vim-niceblock kana/vim-operator-replace kana/vim-operator-user @@ -164,7 +168,9 @@ MarcWeber/vim-addon-sql MarcWeber/vim-addon-syntax-checker MarcWeber/vim-addon-toggle-buffer MarcWeber/vim-addon-xdebug +markonm/traces.vim martinda/Jenkinsfile-vim-syntax +mattn/emmet-vim mattn/gist-vim mattn/webapi-vim mbbill/undotree @@ -181,8 +187,10 @@ mileszs/ack.vim mindriot101/vim-yapf mkasa/lushtags morhetz/gruvbox +motus/pig.vim mpickering/hlint-refactor-vim nathanaelkane/vim-indent-guides +navicore/vissort.vim nbouscal/vim-stylish-haskell ncm2/ncm2 ncm2/ncm2-bufword @@ -196,6 +204,7 @@ neutaaaaan/iosvkem nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script +ntpeters/vim-better-whitespace nvie/vim-flake8 osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -295,6 +304,7 @@ tpope/vim-tbone tpope/vim-unimpaired tpope/vim-vinegar travitch/hasksyn +troydm/zoomwintab.vim twinside/vim-haskellconceal Twinside/vim-hoogle tyru/caw.vim @@ -311,6 +321,7 @@ vim-pandoc/vim-pandoc-syntax vim-ruby/vim-ruby vim-scripts/align vim-scripts/argtextobj.vim +vim-scripts/autoload_cscope.vim vim-scripts/a.vim vim-scripts/bats.vim vim-scripts/changeColorScheme.vim @@ -318,6 +329,7 @@ vim-scripts/Colour-Sampler-Pack vim-scripts/Improved-AnsiEsc vim-scripts/matchit.zip vim-scripts/mayansmoke +vim-scripts/PreserveNoEOL vim-scripts/random.vim vim-scripts/Rename vim-scripts/ReplaceWithRegister diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 9e47b8d02fdf..aab2852c1689 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -34,7 +34,7 @@ with frameworks; with libs; { CoreMIDIServer = []; CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ]; CoreMediaIO = [ CF CoreMedia ]; - CoreText = [ CF CoreGraphics cf-private ]; + CoreText = [ CF CoreGraphics ]; CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; CoreWLAN = [ SecurityFoundation ]; DVComponentGlue = [ CoreServices QuickTime ]; @@ -48,8 +48,7 @@ with frameworks; with libs; { ExceptionHandling = []; FWAUserLib = []; ForceFeedback = [ CF IOKit ]; - # cf-private was moved first in list because of https://github.com/NixOS/nixpkgs/pull/28635 - Foundation = [ cf-private CF libobjc Security ApplicationServices SystemConfiguration ]; + Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ]; GLKit = [ CF ]; GLUT = [ OpenGL ]; GSS = []; diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 7f327fcf3d7a..e1606383c0dc 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, frameworks, perl } : +{ stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }: + stdenv.mkDerivation rec { version = "0.9.1"; name = "trash-${version}"; @@ -10,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; }; - buildInputs = with frameworks; [ - Cocoa - AppKit - ScriptingBridge + buildInputs = [ perl + Cocoa AppKit ScriptingBridge + # Neded for OBJC_CLASS_$_NSMutableArray symbols. + cf-private ]; patches = [ ./trash.diff ]; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 60ccad04eea4..38e2fa9bd344 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -2,14 +2,14 @@ , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let - version = "5.1.4"; + version = "5.1.5"; name = "autofs-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz"; - sha256 = "08hpphawzcdibwbhw0r3y7hnfczlazpp90sf3bz2imgza7p31klg"; + sha256 = "1nn0z60f49zchpv8yw67fk8hmbjszpnczs0bj2ql2vgxwbcxmbr3"; }; preConfigure = '' @@ -40,8 +40,8 @@ in stdenv.mkDerivation { meta = { description = "Kernel-based automounter"; - homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html; - license = stdenv.lib.licenses.gpl2; + homepage = https://www.kernel.org/pub/linux/daemons/autofs/; + license = stdenv.lib.licenses.gpl2Plus; executables = [ "automount" ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix index de8865ba3acc..c2d82ebc487a 100644 --- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -3,7 +3,7 @@ # Minimal shell for use as basic /bin/sh in sandbox builds busybox.override { # musl roadmap has RISC-V support projected for 1.1.20 - useMusl = !stdenv.hostPlatform.isRiscV; + useMusl = !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"; enableStatic = true; enableMinimal = true; extraConfig = '' diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix new file mode 100644 index 000000000000..5791145d52af --- /dev/null +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, python2Packages +}: + +python2Packages.buildPythonApplication rec { + pname = "cpuset"; + version = "1.5.8"; + + propagatedBuildInputs = [ ]; + + makeFlags = [ "prefix=$(out)" ]; + + src = fetchFromGitHub { + owner = "wykurz"; + repo = "cpuset"; + rev = "v${version}"; + sha256 = "19fl2sn470yrnm2q508giggjwy5b6r2gd94gvwfbdlhf0r9dsbbm"; + }; + + meta = with stdenv.lib; { + description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier."; + homepage = https://github.com/wykurz/cpuset; + license = licenses.gpl2; + maintainers = with maintainers; [ wykurz ]; + }; +} diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 4eec4754ca9a..ea255181e016 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,13 +5,13 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.4"; + name = "cryptsetup-2.0.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; + sha256 = "079hzvjyzbzaakzvqc1fmciwlzllzqyl2949viasb994r2i2rxx0"; }; # Disable 4 test cases that fail in a sandbox diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 0c2f1a872fd9..5154f68cde4e 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "earlyoom-${VERSION}"; # This environment variable is read by make to set the build version. - VERSION = "1.1"; + VERSION = "1.2"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${VERSION}"; - sha256 = "1hczn59mmx287hnlhcmpxrf3jy3arllif165dq7b2ha6w3ywngww"; + sha256 = "0bpqlbsjcmcizgw75j1zyw1sp2cgwhaar9y70sibw1km011yqbzd"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 771f012c2c21..7e8c9e413380 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.6"; + version = "3.2.7"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1qdpnvsv3qqwy6jl4i4b1dn212y6nvawpaladb7plfping9p2n46"; + sha256 = "0qphgfw1vh2f73yjggkh5icxfq5gg811a0j6b22zkhaks95n211h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 8d96a503c766..cf3522b5f2fa 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.04.04"; + version = "0.04.05"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "034xpdr3ip4w9k713wjc45x66k3nz6wg9wkzmchrjifxk4dldbd8"; + sha256 = "1s9d6wl7f8cyn21fwj894dhfvl6f6f2h5xv26hg1yk3zfb5rmyn7"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index e3313a676c99..5394edf28773 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.2.6"; - sha256Hash = "0harsla45b0pj3khgxkcwfr2qd8pahg70ygki9i0a8pzscy64sl2"; + version = "3.3.0"; + sha256Hash = "1pwrnfm8jkxxqhrjz0v1gaw36hshgznchyj961qdk2y697y4zp19"; }; } diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index cbdbefeb2a0e..542d99eeabe8 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.56"; + name = "hdparm-9.58"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1np42qyhb503khvacnjcl3hb1dqly68gj0a1xip3j5qhbxlyvybg"; + sha256 = "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws"; }; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 439b2aff6afc..c4a29d2d601d 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "irqbalance-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm"; + sha256 = "1wdwch4nb479xhinin4yqvcjah6h09i4nh8fhnsfbn1mzl0hiv09"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index f30eac588a2f..762b46bb5526 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, coreutils, readline, python3Packages }: let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.11"; - sha256 = "0nifa5w6fxy7cagyas2a0zhcppi83yrcsnnp70ls2rc90x4r1ip8"; + rev = "0.14"; + sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.9"; + version = "0.11"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1l1jbwsshjbz32s4rf0zfcn3fd16si4y9qa0zaxp00bfzflnpcd4"; + sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j"; }; nativeBuildInputs = [ autoreconfHook + pkgconfig python3Packages.wrapPython ]; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index dafe9069b5a8..e037ad98226d 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "${package}-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { repo = "JFBView"; owner = "jichu4n"; rev = version; - sha256 = "1w844ha9lp49ik79yfislib34455nl9gcksbx22hiz30gmqwzakz"; + sha256 = "09rcmlf04aka0yzr25imadi0fl4nlbsxcahs7fhvzx4nql4halqw"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a5170edfa261..61afe092f722 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.79"; + version = "4.14.80"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0flkkgfjzs6z7hkr15lga8jvxgwn6wi885yf5wyr0zxjrqg0f6an"; + sha256 = "1lnp7qnlbj8mrc6iwnffpq3dbms3l40qxwdbqmd4g9my3k0ppp4x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index add98cfb2faa..7859a32aeaf4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.17"; + version = "4.18.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0353ns09i5y0fcygvly20z0qrp6gcqd453186ihm4r7ajgh43bz2"; + sha256 = "0g83i1ai0z0gpjw1rm8a8wdipjjxhfdvp798nrl14l5d2pw63crl"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index f4ef5c6eb1cf..7cd431ea1050 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.162"; + version = "4.4.163"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l2agmxzmq89jbh7r00qg4msvmhny40m2jar96fibwpklwd44kki"; + sha256 = "1x1fixnz41q6pq1cms9z48mrac984r675m94fdm08m8ajqxddcv1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 89702c44ccbc..666e69f2509c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.135"; + version = "4.9.136"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kjly5ynsg2jy5nj41z21s8f18wfs4nk843jlmmcazzax6xv08z0"; + sha256 = "1j1f4v3m0gggarz0r33pk907gf8dy633s9x5k3ww3khkvzi335fk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 2195bb7a29ce..31cad2589217 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/"; - rev = "r15295"; + rev = "15295"; sha256 = "03kqbjy7w9zg6ry86h9sxa33z0rblznhba109lwmjwy0wx7yk1cs"; } , ... diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix deleted file mode 100644 index dbc69144c4da..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-riscv.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: - -buildLinux (args // rec { - version = "4.16-rc6"; - modDirVersion = "4.16.0-rc6"; - extraMeta.branch = "4.16"; - - src = fetchFromGitHub { - owner = "shlevy"; - repo ="riscv-linux"; - rev = "a54f259c2adce68e3bd7600be8989bf1ddf9ea3a"; - sha256 = "140w6mj4hm1vf4zsmcr2w5cghcaalbvw5d4m9z57dmq1z5plsl4q"; - }; - - # Should the testing kernels ever be built on Hydra? - extraMeta.hydraPlatforms = []; - -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index e989a7837f9e..fc9e6ab00dd9 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, kernel, perl, kmod }: - +{ stdenv, fetchFromGitHub, kernel, perl, kmod, libelf }: +let + version = "1.62-pre"; +in stdenv.mkDerivation { - name = "ndiswrapper-1.59-${kernel.version}"; + name = "ndiswrapper-${version}-${kernel.version}"; + inherit version; hardeningDisable = [ "pic" ]; patches = [ ./no-sbin.patch ]; - # need at least .config and include + # need at least .config and include kernel = kernel.dev; buildPhase = " + cd ndiswrapper echo make KBUILD=$(echo \$kernel/lib/modules/*/build); echo -n $kernel/lib/modules/*/build > kbuild_path export PATH=${kmod}/sbin:$PATH @@ -26,18 +30,20 @@ stdenv.mkDerivation { patchShebangs $out/sbin ''; - # should we use unstable? - src = fetchurl { - url = mirror://sourceforge/ndiswrapper/ndiswrapper-1.59.tar.gz; - sha256 = "1g6lynccyg4m7gd7vhy44pypsn8ifmibq6rqgvc672pwngzx79b6"; + # should we use unstable? + src = fetchFromGitHub { + owner = "pgiri"; + repo = "ndiswrapper"; + rev = "f4d16afb29ab04408d02e38d4ea1148807778e21"; + sha256 = "0iaw0vhchmqf1yh14v4a6whnbg4sx1hag8a4hrsh4fzgw9fx0ij4"; }; - buildInputs = [ perl ]; + buildInputs = [ perl libelf ]; - meta = { + meta = { description = "Ndis driver wrapper for the Linux kernel"; homepage = https://sourceforge.net/projects/ndiswrapper; license = "GPL"; - broken = true; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch index cfc048d772bd..34965540d248 100644 --- a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch +++ b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch @@ -1,7 +1,8 @@ -diff -Naur ndiswrapper-1.59-orig/driver/Makefile ndiswrapper-1.59/driver/Makefile ---- ndiswrapper-1.59-orig/driver/Makefile 2013-11-28 14:42:35.000000000 -0500 -+++ ndiswrapper-1.59/driver/Makefile 2014-01-04 18:31:43.242377375 -0500 -@@ -191,7 +191,7 @@ +diff --git a/ndiswrapper/driver/Makefile b/ndiswrapper/driver/Makefile +index bf42f7bc..ad23aa2d 100644 +--- a/ndiswrapper/driver/Makefile ++++ b/ndiswrapper/driver/Makefile +@@ -191,7 +191,7 @@ clean: rm -rf .tmp_versions install: config_check $(MODULE) diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index ede8d425f12d..de12b3719af3 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,31 +1,26 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "smem-1.4"; + name = "smem-${version}"; + version = "1.5"; src = fetchurl { - url = "https://www.selenic.com/smem/download/${name}.tar.gz"; - sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f"; + url = "https://selenic.com/repo/smem/archive/${version}.tar.bz2"; + sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; buildInputs = [ python ]; - buildPhase = - '' - gcc -O2 smemcap.c -o smemcap - ''; + makeFlags = [ "smemcap" ]; installPhase = '' - mkdir -p $out/bin - cp smem smemcap $out/bin/ - - mkdir -p $out/share/man/man8 - cp smem.8 $out/share/man/man8/ + install -Dm555 -t $out/bin/ smem smemcap + install -Dm444 -t $out/share/man/man8/ smem.8 ''; meta = { - homepage = http://www.selenic.com/smem/; + homepage = https://www.selenic.com/smem/; description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b2b681bcc8bd..37f93c8e87e8 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -76,7 +76,7 @@ let mp3-202 = fetchsvn { url = http://svn.digium.com/svn/thirdparty/mp3/trunk; - rev = 202; + rev = "202"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 720898196c85..88907231d6ed 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.12.17"; + version = "18.14.9"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0gkad6x6jlih30wal8nilhfqr3z22dzgz6m22pza3bhaba2ikk53"; + sha256 = "1dsqwihh48fgsjy3jmfjk5271dw3052agw5wpfdm054nkkych86i"; }; nativeBuildInputs = [ cmake libtool ninja ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 10236ee55e8c..49d11a51617c 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.2-P2"; in +let version = "9.12.3"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0gk9vwqlbdmn10m21f2awvmiccfbadvcwi8zsgm91awbx4k7h0l7"; + sha256 = "0f5rjs6zsq8sp6iv5r4q5y65xv05dk2sgvsj6lcir3i564k7d00f"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 933609ac268a..1f8429a60d1b 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.4"; + version = "4.1.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0l5mf45r3x1z5mg95zpbyms88zv307hsrrx4h6jm9zm3pr9l77xi"; + sha256 = "0syvxlfxy3h2x1kvqkj7qqk8k85y42qjq30pcqqmy69v3pymq14s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 9d3db625d660..f9f94f002a36 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1m9yhzrxh315gv855c590b2qc8bx31rrnl72pqxrnlix701qch79"; + sha256 = "12jgkdsh6hzaznq6y9y7hfdpjhnn7ar2qn7x706k9iyqcq55faf3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index c35177e6aa90..02bf714a42bf 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.9"; + version = "5.0"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d"; + sha256 = "1qagqsbg7zblkhg3vrj47k5f1q09r4az7gna86rxf253kmg90yqp"; }; preConfigure = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 01232bd94704..7f16e24a1f72 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -676,7 +676,7 @@ "media_player.russound_rnet" = ps: with ps; [ ]; "media_player.samsungtv" = ps: with ps; [ wakeonlan ]; "media_player.sisyphus" = ps: with ps; [ ]; - "media_player.snapcast" = ps: with ps; [ ]; + "media_player.snapcast" = ps: with ps; [ snapcast ]; "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ ]; "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 643e7ed719a4..25ff20635aff 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation { inherit sha256; }; - - buildInputs = - [ openssl zlib pcre libxml2 libxslt gd geoip ] + buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] ++ concatMap (mod: mod.inputs or []) modules; configureFlags = [ diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 15822a0387b9..6b4510bfe824 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -131,6 +131,15 @@ }; }; + ngx_aws_auth = { + src = fetchFromGitHub { + owner = "anomalizer"; + repo = "ngx_aws_auth"; + rev = "2.1.1"; + sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; + }; + }; + opentracing = { src = let src' = fetchFromGitHub { @@ -226,7 +235,7 @@ rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs"; }; - }; + }; statsd = { src = fetchFromGitHub { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 100bc4709bf1..bb8732f3aaec 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.365"; + version = "0.10.420"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1wq4by10wxhcz72fappb7isw0850laf2yk5bgpx8nrjxigmv4ik0"; + sha256 = "192nj5k3ad8k4xdipr052sb3y3hi9csmyhjadlyy6xl8m2zz6win"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 3e628f876dd7..8f60929e2f7c 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl +, nixosTests # Auth modules , withMySQL ? false, mysql , withPgSQL ? false, postgresql @@ -33,13 +34,6 @@ stdenv.mkDerivation rec { postInstall = '' cp -r $out/$out/* $out rm -rf $out/$(echo "$out" | cut -d "/" -f2) - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change libclucene-shared.1.dylib \ - ${clucene_core_2}/lib/libclucene-shared.1.dylib \ - $out/lib/dovecot/lib21_fts_lucene_plugin.so - install_name_tool -change libclucene-core.1.dylib \ - ${clucene_core_2}/lib/libclucene-core.1.dylib \ - $out/lib/dovecot/lib21_fts_lucene_plugin.so ''; patches = [ @@ -74,5 +68,8 @@ stdenv.mkDerivation rec { description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz ]; platforms = stdenv.lib.platforms.unix; + tests = { + opensmtpd-interaction = nixosTests.opensmtpd; + }; }; } diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index d55804504442..0ee1c92acbdc 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison -, libasr, libevent, zlib, libressl, db, pam +, libasr, libevent, zlib, libressl, db, pam, nixosTests }: stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.4.0p1"; + version = "6.4.0p2"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "1qxxhnlsmpfh9v4azgl0634955r085gsic1c66jdll21bd5w2mq8"; + sha256 = "1y7snhsrcdi56vaa23iwjpybhyrnnh2f6dxrfnacn7xgy5xwzbvn"; }; patches = [ @@ -61,5 +61,8 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ rickynils obadz ekleog ]; + tests = { + basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; + }; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e0c666b002a9..ba89dc7bdb79 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,47 +1,54 @@ -{ lib, stdenv, python2Packages, fetchurl, fetchFromGitHub +{ lib, stdenv, python2 , enableSystemd ? true }: + +with python2.pkgs; + let - matrix-angular-sdk = python2Packages.buildPythonPackage rec { - name = "matrix-angular-sdk-${version}"; + matrix-angular-sdk = buildPythonPackage rec { + pname = "matrix-angular-sdk"; version = "0.6.8"; - src = fetchurl { - url = "mirror://pypi/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; + + # no checks from Pypi but as this is abandonware, there will be no + # new version anyway + doCheck = false; }; - matrix-synapse-ldap3 = python2Packages.buildPythonPackage rec { + + matrix-synapse-ldap3 = buildPythonPackage rec { pname = "matrix-synapse-ldap3"; version = "0.1.3"; - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "matrix-synapse-ldap3"; - rev = "v${version}"; - sha256 = "0ss7ld3bpmqm8wcs64q1kb7vxlpmwk9lsgq0mh21a9izyfc7jb2l"; + src = fetchPypi { + inherit pname version; + sha256 = "0a0d1y9yi0abdkv6chbmxr3vk36gynnqzrjhbg26q4zg06lh9kgn"; }; - propagatedBuildInputs = with python2Packages; [ service-identity ldap3 twisted ]; + propagatedBuildInputs = [ service-identity ldap3 twisted ]; - checkInputs = with python2Packages; [ ldaptor mock ]; + # ldaptor is not ready for py3 yet + doCheck = !isPy3k; + checkInputs = [ ldaptor mock ]; }; -in python2Packages.buildPythonApplication rec { - name = "matrix-synapse-${version}"; + +in buildPythonApplication rec { + pname = "matrix-synapse"; version = "0.33.8"; - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "synapse"; - rev = "v${version}"; - sha256 = "122ba09xkc1x35qaajcynkjikg342259rgy81m8abz0l8mcg4mkm"; + src = fetchPypi { + inherit pname version; + sha256 = "0j8knnqpkidkmpwr2i1k9cwlnwfqpzn3q6ysjvrwpa76hpfcg40l"; }; patches = [ ./matrix-synapse.patch ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ bcrypt bleach canonicaljson @@ -75,12 +82,12 @@ in python2Packages.buildPythonApplication rec { unpaddedbase64 ] ++ lib.optional enableSystemd systemd; + # tests fail under py3 for now, but version 0.34.0 will use py3 by default + # https://github.com/matrix-org/synapse/issues/4036 doCheck = true; checkPhase = "python -m twisted.trial test"; - buildInputs = with python2Packages; [ - mock setuptoolsTrial - ]; + checkInputs = [ mock setuptoolsTrial ]; meta = with stdenv.lib; { homepage = https://matrix.org; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index dc66c710a5d4..f35b8ff01884 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.11"; + version = "1.5.12"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "0ajql8qs3w1lpw41vxkq2xabkxmmdk2nwg3i4lkclraq8pw92yk9"; + sha256 = "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index 92bbc309ed3d..1f5c6a20843a 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,17 +1,16 @@ { mkDerivation, fetchFromGitHub, base, bytestring, network, stdenv }: mkDerivation { pname = "client-ip-echo"; - version = "0.1.0.1"; + version = "0.1.0.3"; src = fetchFromGitHub { owner = "jerith666"; repo = "client-ip-echo"; - rev = "f6e3e115a1e61a387cf79956ead36d7ac25a2901"; - sha256 = "0irxcaiwxxn4ggd2dbya1mvpnyfanx0x06whp8ccrha141cafwqp"; + rev = "8d1a79d94a962b3266c1db51200913c2295d8922"; + sha256 = "1g1s7i68n3906m3yjfygw96j64n8nh88lmf77blnz0xzrq4y3bgf"; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring network ]; description = "accepts TCP connections and echoes the client's IP address back to it"; license = stdenv.lib.licenses.lgpl3; - broken = true; # 2018-04-10 } diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix new file mode 100644 index 000000000000..03ed37b8b3f5 --- /dev/null +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: + +with stdenv.lib; + +buildGoPackage rec { + name = "reporter-${version}"; + version = "2.0.1"; + rev = "v${version}"; + + goPackagePath = "github.com/IzakMarais/reporter"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + inherit rev; + owner = "IzakMarais"; + repo = "reporter"; + sha256 = "0yi7nx8ig5xgkwizddl0gdicnmcdp4qgg1fdxyq04l2y3qs176sg"; + }; + + postInstall = '' + wrapProgram $bin/bin/grafana-reporter \ + --prefix PATH : ${makeBinPath [ tetex ]} + ''; + + meta = { + description = "PDF report generator from a Grafana dashboard"; + homepage = https://github.com/IzakMarais/reporter; + license = licenses.mit; + maintainers = with maintainers; [ disassembler ]; + }; +} diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index b8649715eb37..a7747d1a256e 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "check_ssl_cert-${version}"; - version = "1.73.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "0ymaypsv1s5pmk8fg9d67khcjy5h7vjbg6hd1fgslp92qcw90dqa"; + sha256 = "0in52vcygscpf79938yfkf2yni49hbkvfkfhwpwyqr7qz9gd8c6j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index 1bfd80a897d3..00375fa4e30f 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: erubis (2.7.0) multi_json (1.3.6) - rack (1.6.4) + rack (1.6.11) rack-protection (1.5.3) rack riemann-dash (0.2.12) @@ -27,4 +27,4 @@ DEPENDENCIES riemann-dash (= 0.2.12) BUNDLED WITH - 1.11.2 + 1.16.4 diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix index 8a4d3ba58cb1..9298312f90e0 100644 --- a/pkgs/servers/monitoring/riemann-dash/gemset.nix +++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix @@ -16,10 +16,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.4"; + version = "1.6.11"; }; rack-protection = { dependencies = ["rack"]; @@ -30,6 +30,7 @@ version = "1.5.3"; }; riemann-dash = { + dependencies = ["erubis" "multi_json" "sass" "sinatra" "webrick"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1y2vh9vcl21b6k2wqgz1y8bbcrl07r43s6q2vkgp35z1b28xcszy"; @@ -46,6 +47,7 @@ version = "3.4.22"; }; sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index d965485356c8..63b222529a86 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.8.0"; + version = "3.9.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "0jca96996zl3f1qc15sfv45n09rnnv24qxv87y16dnwnyc1ism0a"; + sha256 = "1kf524j7wmvbjrr3grrhfddv3c3niddhj2f6m7hz9pqvf7nykvi4"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index afa0c6c0f938..a7370847be15 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.0.1"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "194rvj3wzdil2rny93vq9g9vlqnb7gv4vnwaklybgcj00qnqpjbh"; + sha256 = "1jxbjmsxn0lgh0y3k5j57rxf2sdjj71hxhw4jcvsvycpxh77r9l2"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 1d8d97f4bde5..90e27b2907e5 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "Radicale"; - version = "2.1.10"; + version = "2.1.11"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - sha256 = "0ik9gvljxhmykkzzcv9kmkp4qjwgdrl9f7hp6300flx5kmqlcjb1"; + sha256 = "1k32iy55lnyyp1r75clarhwdqvw6w8mxb5v0l5aysga07fg2mix4"; }; # We only want functional tests diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 861bd7fe5ed5..c692cee08bd6 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.7"; + version = "8.0.8"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "040q525qdlxlypgs7jzklndshdvd5shzss67lcs6xhkbs0f977cc"; + sha256 = "1fl5s0a5ncw8lj3ild2qqqxa3h4d3k98dmyki760c54kw6p6bycv"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 75fff3715edc..8111991cd38a 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "197bi3il0c1vldw35ijx3zqyfj738nvfvr7yr4cwrbv40p3ascaq"; + sha256 = "1bdz3dic12lwl3rfczd9bxpgjbpw2g7yap2zddz6dvgkqvyjjf1h"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 7517560a521c..e447035e32aa 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -47,8 +47,8 @@ in sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; }; varnish6 = common { - version = "6.1.0"; - sha256 = "0zg2aqkg7a4zsjpxj0s7mphxv5f9xy279hjwln30h901k18r46qn"; + version = "6.1.1"; + sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0"; extraBuildInputs = [ python2.pkgs.sphinx ]; }; } diff --git a/pkgs/servers/web-apps/frab/Gemfile.lock b/pkgs/servers/web-apps/frab/Gemfile.lock index 06502ef59ad5..dc18be7a33db 100644 --- a/pkgs/servers/web-apps/frab/Gemfile.lock +++ b/pkgs/servers/web-apps/frab/Gemfile.lock @@ -181,7 +181,7 @@ GEM pry-rails (0.3.4) pry (>= 0.9.10) puma (3.9.1) - rack (1.6.4) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) rails (4.2.7.1) diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix index 449fbf1a5b6b..c3259a2709c9 100644 --- a/pkgs/servers/web-apps/frab/gemset.nix +++ b/pkgs/servers/web-apps/frab/gemset.nix @@ -1,5 +1,6 @@ { actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lw1pss1mrjm7x7qcg9pvxv55rz3d994yf3mwmlfg1y12fxq00n3"; @@ -8,6 +9,7 @@ version = "4.2.7.1"; }; actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1ray5bvlmkimjax011zsw0mz9llfkqrfm7q1avjlp4i0kpcz8zlh"; @@ -16,6 +18,7 @@ version = "4.2.7.1"; }; actionview = { + dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11m2x5nlbqrw79fh6h7m444lrka7wwy32b0dvgqg7ilbzih43k0c"; @@ -24,6 +27,7 @@ version = "4.2.7.1"; }; activejob = { + dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ish5wd8nvmj7f6x1i22aw5ycizy5n1z1c7f3kyxmqwhw7lb0gaz"; @@ -32,6 +36,7 @@ version = "4.2.7.1"; }; activemodel = { + dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0acz0mbmahsc9mn41275fpfnrqwig5k09m3xhz3455kv90fn79v5"; @@ -40,6 +45,7 @@ version = "4.2.7.1"; }; activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lk8l6i9p7qfl0pg261v5yph0w0sc0vysrdzc6bm5i5rxgi68flj"; @@ -48,6 +54,7 @@ version = "4.2.7.1"; }; activeresource = { + dependencies = ["activemodel" "activesupport" "rails-observers"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0nr5is20cx18s7vg8bdrdc996s2abl3h7fsi1q6mqsrzw7nrv2fa"; @@ -56,6 +63,7 @@ version = "4.1.0"; }; activesupport = { + dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1gds12k7nxrcc09b727a458ndidy1nfcllj9x22jcaj7pppvq6r4"; @@ -80,6 +88,7 @@ version = "2.4.0"; }; airbrussh = { + dependencies = ["sshkit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0pv22d2kjdbsg9q45jca3f5gsylr2r1wfpn58g58xj4s4q4r95nx"; @@ -112,6 +121,7 @@ version = "3.2.2"; }; bullet = { + dependencies = ["activesupport" "uniform_notifier"]; source = { remotes = ["https://rubygems.org"]; sha256 = "06pba7bdjnazbl0yhhvlina08nkawnm76zihkaam4k7fm0yrq1k0"; @@ -136,6 +146,7 @@ version = "1.15.0"; }; capistrano = { + dependencies = ["i18n" "rake" "sshkit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0f73w6gpml0ickmwky1cn6d8392q075zy10a323f3vmyvxyhr0jb"; @@ -144,6 +155,7 @@ version = "3.4.1"; }; capistrano-bundler = { + dependencies = ["capistrano" "sshkit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1f4iikm7pn0li2lj6p53wl0d6y7svn0h76z9c6c582mmwxa9c72p"; @@ -152,6 +164,7 @@ version = "1.1.4"; }; capistrano-rails = { + dependencies = ["capistrano" "capistrano-bundler"]; source = { remotes = ["https://rubygems.org"]; sha256 = "03lzihrq72rwcqq7jiqak79wy0xbdnymn5gxj0bfgfjlg5kpgssw"; @@ -160,6 +173,7 @@ version = "1.1.8"; }; capistrano-rvm = { + dependencies = ["capistrano" "sshkit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15sy8zcal041yy5kb7fcdqnxvndgdhg3w1kvb5dk7hfjk3ypznsa"; @@ -168,6 +182,7 @@ version = "0.1.2"; }; capistrano3-puma = { + dependencies = ["capistrano" "puma"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ynz1arnr07kcl0vsaa1znhp2ywhhs4fwndnkw8sasr9bydksln8"; @@ -184,6 +199,7 @@ version = "1.3.7"; }; climate_control = { + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0krknwk6b8lwv1j9kjbxib6kf5zh4pxkf3y2vcyycx5d6nci1s55"; @@ -192,6 +208,7 @@ version = "0.0.3"; }; cocaine = { + dependencies = ["climate_control"]; source = { remotes = ["https://rubygems.org"]; sha256 = "01kk5xd7lspbkdvn6nyj0y51zhvia3z6r4nalbdcqw5fbsywwi7d"; @@ -216,6 +233,7 @@ version = "1.1.1"; }; coffee-rails = { + dependencies = ["coffee-script" "railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1mv1kaw3z4ry6cm51w8pfrbby40gqwxanrqyqr0nvs8j1bscc1gw"; @@ -224,6 +242,7 @@ version = "4.1.1"; }; coffee-script = { + dependencies = ["coffee-script-source" "execjs"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; @@ -264,6 +283,7 @@ version = "2.1.1"; }; dotenv-rails = { + dependencies = ["dotenv" "railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "17s6c0yqaz01xd5wywjscbvv0pa3grak2lhwby91j84qm6h95vxz"; @@ -280,6 +300,7 @@ version = "2.7.0"; }; exception_notification = { + dependencies = ["actionmailer" "activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vclsr0rjfy1khvqyj67lgpa0v14nb542vvjkyaswn367nnmijhw"; @@ -296,6 +317,7 @@ version = "2.7.0"; }; factory_girl = { + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i"; @@ -304,6 +326,7 @@ version = "4.7.0"; }; factory_girl_rails = { + dependencies = ["factory_girl" "railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r"; @@ -312,6 +335,7 @@ version = "4.7.0"; }; faker = { + dependencies = ["i18n"]; source = { remotes = ["https://rubygems.org"]; sha256 = "09amnh5d0m3q2gpb0vr9spbfa8l2nc0kl3s79y6sx7a16hrl4vvc"; @@ -328,6 +352,7 @@ version = "0.6.9"; }; globalid = { + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak"; @@ -336,6 +361,7 @@ version = "0.3.7"; }; haml = { + dependencies = ["tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; @@ -344,6 +370,7 @@ version = "4.0.7"; }; httparty = { + dependencies = ["multi_xml"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1msa213hclsv14ijh49i1wggf9avhnj2j4xr58m9jx6fixlbggw6"; @@ -360,6 +387,7 @@ version = "0.7.0"; }; jbuilder = { + dependencies = ["activesupport" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jbh1296imd0arc9nl1m71yfd7kg505p8srr1ijpsqv4hhbz5qci"; @@ -376,6 +404,7 @@ version = "1.2.1"; }; jquery-rails = { + dependencies = ["rails-dom-testing" "railties" "thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0prqyixv7j2qlq67qdr3miwcyvi27b9a82j51gbpb6vcl0ig2rik"; @@ -384,6 +413,7 @@ version = "4.2.1"; }; jquery-ui-rails = { + dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77"; @@ -400,6 +430,7 @@ version = "1.8.3"; }; launchy = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; @@ -408,6 +439,7 @@ version = "2.4.3"; }; letter_opener = { + dependencies = ["launchy"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21"; @@ -416,6 +448,7 @@ version = "1.4.1"; }; localized_language_select = { + dependencies = ["rails"]; source = { fetchSubmodules = false; rev = "85df6b97789de6e29c630808b630e56a1b76f80c"; @@ -426,6 +459,7 @@ version = "0.3.0"; }; loofah = { + dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; @@ -434,6 +468,7 @@ version = "2.0.3"; }; mail = { + dependencies = ["mime-types"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0c9vqfy0na9b5096i5i4qvrvhwamjnmajhgqi3kdsdfl8l6agmkp"; @@ -450,6 +485,7 @@ version = "0.8.2"; }; mime-types = { + dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; @@ -514,6 +550,7 @@ version = "0.4.4"; }; net-scp = { + dependencies = ["net-ssh"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; @@ -530,6 +567,7 @@ version = "3.2.0"; }; nokogiri = { + dependencies = ["mini_portile2" "pkg-config"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; @@ -538,6 +576,7 @@ version = "1.6.7.2"; }; paper_trail = { + dependencies = ["activerecord" "request_store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1w3y2h1w0kml2fmzx4sdcrhnbj273npwrs0cx91xdgy2qfjj6hmr"; @@ -546,6 +585,7 @@ version = "5.2.2"; }; paperclip = { + dependencies = ["activemodel" "activesupport" "cocaine" "mime-types" "mimemagic"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0r8krh5xg790845wzlc2r7l0jwskw4c4wk9xh4bpprqykwaghg0r"; @@ -578,6 +618,7 @@ version = "1.1.7"; }; polyamorous = { + dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1501y9l81b2lwb93fkycq8dr1bi6qcdhia3qv4fddnmrdihkl3pv"; @@ -586,6 +627,7 @@ version = "1.3.1"; }; prawn = { + dependencies = ["pdf-core" "ttfunk"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04pxzfmmy8a6bv3zvh1mmyy5zi4bj994kq1v6qnlq2xlhvg4cxjc"; @@ -594,6 +636,7 @@ version = "0.15.0"; }; prawn_rails = { + dependencies = ["prawn" "railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "19m1pv2rsl3rf9rni78l8137dy2sq1r2443biv19wi9nis2pvgdg"; @@ -602,6 +645,7 @@ version = "0.0.11"; }; pry = { + dependencies = ["coderay" "method_source" "slop"]; source = { remotes = ["https://rubygems.org"]; sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar"; @@ -610,6 +654,7 @@ version = "0.10.4"; }; pry-byebug = { + dependencies = ["byebug" "pry"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0pvc94kgxd33p6iz41ghyadq8zfbjhkk07nvz2mbh3yhrc8w7gmw"; @@ -618,6 +663,7 @@ version = "3.4.0"; }; pry-rails = { + dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6"; @@ -636,12 +682,13 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.4"; + version = "1.6.11"; }; rack-test = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; @@ -650,6 +697,7 @@ version = "0.6.3"; }; rails = { + dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1avd16ir7qx23dcnz1b3cafq1lja6rq0w222bs658p9n33rbw54l"; @@ -658,6 +706,7 @@ version = "4.2.7.1"; }; rails-deprecated_sanitizer = { + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; @@ -666,6 +715,7 @@ version = "1.0.3"; }; rails-dom-testing = { + dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8"; @@ -674,6 +724,7 @@ version = "1.0.7"; }; rails-html-sanitizer = { + dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; @@ -682,6 +733,7 @@ version = "1.0.3"; }; rails-observers = { + dependencies = ["activemodel"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy"; @@ -690,6 +742,7 @@ version = "0.1.2"; }; railties = { + dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04rz7cn64zzvq7lnhc9zqmaqmqkq84q25v0ym9lcw75j1cj1mrq4"; @@ -706,6 +759,7 @@ version = "11.3.0"; }; ransack = { + dependencies = ["actionpack" "activerecord" "activesupport" "i18n" "polyamorous"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cya3wygwjhj8rckckkl387bmva4nyfvqcl0qhp9hk3zv8y6wxjc"; @@ -738,6 +792,7 @@ version = "0.8.8"; }; roust = { + dependencies = ["activesupport" "httparty" "mail"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1zdnwxxh34psv0iybcdnk9w4dpgpr07j3w1fvigkpccgz5vs82qk"; @@ -746,6 +801,7 @@ version = "1.8.9"; }; rqrcode = { + dependencies = ["chunky_png"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h1pnnydgs032psakvg3l779w3ghbn08ajhhhw19hpmnfhrs8k0a"; @@ -762,6 +818,7 @@ version = "3.4.22"; }; sass-rails = { + dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; @@ -770,6 +827,7 @@ version = "5.0.6"; }; shoulda = { + dependencies = ["shoulda-context" "shoulda-matchers"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0csmf15a7mcinfq54lfa4arp0f4b2jmwva55m0p94hdf3pxnjymy"; @@ -786,6 +844,7 @@ version = "1.2.1"; }; shoulda-matchers = { + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0"; @@ -794,6 +853,7 @@ version = "2.8.0"; }; simple_form = { + dependencies = ["actionpack" "activemodel"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ii3rkkbj5cc10f5rdiny18ncdh36kijr25cah0ybbr7kigh3v3b"; @@ -810,6 +870,7 @@ version = "3.6.0"; }; sprockets = { + dependencies = ["concurrent-ruby" "rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; @@ -818,6 +879,7 @@ version = "3.7.0"; }; sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44"; @@ -834,6 +896,7 @@ version = "1.3.11"; }; sshkit = { + dependencies = ["net-scp" "net-ssh"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0wpqvr2dyxwp3shwh0221i1ahyg8vd2hyilmjvdi026l00gk2j4l"; @@ -842,6 +905,7 @@ version = "1.11.3"; }; sucker_punch = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0l8b53mlzl568kdl4la8kcjjcnawmbl0q6hq9c3kkyippa5c0x55"; @@ -890,6 +954,7 @@ version = "1.1.1"; }; tzinfo = { + dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; @@ -898,6 +963,7 @@ version = "1.2.2"; }; uglifier = { + dependencies = ["execjs"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0f30s1631k03x4wm7xyc79g92pppzvyysa773zsaq2kcry1pmifc"; @@ -929,4 +995,4 @@ }; version = "0.9.5"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index d724a81debbb..ccb3937ac85f 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin, darwin }: +{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin, cf-private }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,9 +19,11 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig - AppKit Xplugin darwin.apple_sdk.frameworks.Foundation + AppKit Xplugin Foundation + # Needed for CFNotificationCenterAddObserver symbols. + cf-private ]; - meta = with lib; { + meta = with stdenv.lib; { license = licenses.apsl20; platforms = platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4772ac7f7ee2..8f4c251335a9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,10 +2,12 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - python, freetype, apple_sdk, tradcpp, fontconfig, + python, freetype, tradcpp, fontconfig, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6 }: + mcpp, epoxy, openssl, pkgconfig, llvm_6, + cf-private, ApplicationServices, Carbon, Cocoa, Xplugin +}: let inherit (stdenv) lib isDarwin; @@ -108,9 +110,9 @@ self: super: }); libAppleWM = super.libAppleWM.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ apple_sdk.frameworks.ApplicationServices ]; + buildInputs = attrs.buildInputs ++ [ ApplicationServices ]; preConfigure = '' - substituteInPlace src/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices} + substituteInPlace src/Makefile.in --replace -F/System -F${ApplicationServices} ''; }); @@ -466,7 +468,11 @@ self: super: sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include ' -i include/os.h"; meta.platforms = stdenv.lib.platforms.unix; } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; @@ -538,9 +544,7 @@ self: super: nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ]; buildInputs = commonBuildInputs ++ [ bootstrap_cmds automake autoconf - apple_sdk.libs.Xplugin - apple_sdk.frameworks.Carbon - apple_sdk.frameworks.Cocoa + Xplugin Carbon Cocoa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto @@ -582,7 +586,7 @@ self: super: preConfigure = '' mkdir -p $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" - substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices} + substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${ApplicationServices} ''; postInstall = '' rm -fr $out/share/X11/xkb/compiled diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 3fc7aaea9c93..8cb96d0ae39f 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +{ stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby , quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf +, cf-private , shell ? "${bashInteractive}/bin/bash" }: @@ -97,7 +98,11 @@ let in stdenv.mkDerivation { name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}"; - buildInputs = [ ruby makeWrapper ]; + buildInputs = [ + ruby makeWrapper + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; unpackPhase = "sourceRoot=."; @@ -134,7 +139,7 @@ in stdenv.mkDerivation { defaultStartX="$out/bin/startx -- $out/bin/Xquartz" ruby ${./patch_plist.rb} \ - ${lib.escapeShellArg (builtins.toXML { + ${stdenv.lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_SHELL = "${shell}"; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; @@ -179,7 +184,7 @@ in stdenv.mkDerivation { --replace "@FONTCONFIG_FILE@" "$fontsConfPath" ''; - meta = with lib; { + meta = with stdenv.lib; { platforms = platforms.darwin; maintainers = with maintainers; [ cstrahan ]; license = licenses.mit; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 6522985ab864..32dfd56796d6 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils }: +{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }: python3Packages.buildPythonApplication rec { - name = "xonsh-${version}"; - version = "0.6.8"; + pname = "xonsh"; + version = "0.8.3"; + # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { - owner = "scopatz"; - repo = "xonsh"; - rev = version; - sha256= "1a74xpww7k432b2z44388rl31nqvckn2q3fswci04f48698hzs5l"; + owner = "scopatz"; + repo = "xonsh"; + rev = "refs/tags/${version}"; + sha256 = "1qnghqswvqlwv9121r4maibmn2dvqmbr3fhsnngsj3q7plfp7yb2"; }; LC_ALL = "en_US.UTF-8"; postPatch = '' - rm xonsh/winutils.py - sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh @@ -22,15 +21,14 @@ python3Packages.buildPythonApplication rec { ''; checkPhase = '' - HOME=$TMPDIR XONSH_INTERACTIVE=0 \ + HOME=$TMPDIR \ pytest \ - -k 'not test_man_completion and not test_printfile and not test_sourcefile and not test_printname ' \ - tests + -k 'not test_man_completion and not test_indir and not test_xonsh_party and not test_foreign_bash_data and not test_script and not test_single_command_no_windows and not test_redirect_out_to_file and not test_sourcefile and not test_printname and not test_printfile' ''; - checkInputs = with python3Packages; [ pytest glibcLocales ]; + checkInputs = [ python3Packages.pytest glibcLocales git ]; - propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ]; + propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit_2 pygments ]; meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d4082465b19e..552b9b6d7c18 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-09-14"; + version = "2018-11-02"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "489be2452a6410a2c7837910c4cd3c0ed47a7481"; - sha256 = "05svfd2q4w4hnd9rsh57z7rsc50lavg3lqm3nmm6dqak1nnrkhbz"; + rev = "05b617066ba5a37ef0c533385efd6e232a387b8f"; + sha256 = "1pcb3ca5z3nywwnlhhjl4709k69lk4p0kd36l00q37j8p0vf6zr4"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix new file mode 100644 index 000000000000..312b1e79f49c --- /dev/null +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec{ + name = "spaceship-prompt-${version}"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "denysdovhan"; + repo = "spaceship-prompt"; + sha256 = "0laihax18bs254rm2sww5wkjbmkp4m5c8aicgqpi4diz7difxk6z"; + rev = "aaa34aeab9ba0a99416788f627ec9aeffba392f0"; + }; + + installPhase = '' + install -D -m644 LICENSE.md "$out/share/licenses/spaceship-prompt/LICENSE" + install -D -m644 README.md "$out/share/doc/spaceship-prompt/README.md" + find docs -type f -exec install -D -m644 {} "$out/share/doc/spaceship-prompt/{}" \; + find lib -type f -exec install -D -m644 {} "$out/lib/spaceship-prompt/{}" \; + find scripts -type f -exec install -D -m644 {} "$out/lib/spaceship-prompt/{}" \; + find sections -type f -exec install -D -m644 {} "$out/lib/spaceship-prompt/{}" \; + install -D -m644 spaceship.zsh "$out/lib/spaceship-prompt/spaceship.zsh" + install -d "$out/share/zsh/themes/" + ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/themes/spaceship.zsh-theme" + ''; + + meta = with stdenv.lib; { + description = "Zsh prompt for Astronauts"; + homepage = https://github.com/halfo/lambda-mod-zsh-theme/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26cd9f8beb96..0e93df855471 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -165,6 +165,16 @@ let platforms = listOf (either str lib.systems.parsedPlatform.types.system); hydraPlatforms = listOf str; broken = bool; + # TODO: refactor once something like Profpatsch's types-simple will land + tests = attrsOf (mkOptionType { + name = "test"; + check = x: isDerivation x && + x ? meta.timeout && + x ? meta.needsVMSupport; + merge = lib.options.mergeOneOption; + }); + needsVMSupport = bool; + timeout = int; # Weirder stuff that doesn't appear in the documentation? knownVulnerabilities = listOf str; @@ -184,8 +194,6 @@ let isIbusEngine = bool; isGutenprint = bool; badPlatforms = platforms; - # Hydra build timeout - timeout = int; }; checkMetaAttr = k: v: diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5b1fd4b8d158..a2ff42151a05 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -104,7 +104,9 @@ rec { ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; - defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags; + defaultHardeningFlags = if stdenv.targetPlatform.isMusl + then supportedHardeningFlags + else lib.remove "pie" supportedHardeningFlags; enabledHardeningOptions = if builtins.elem "all" hardeningDisable then [] diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix new file mode 100644 index 000000000000..b6ba431da9d6 --- /dev/null +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -0,0 +1,49 @@ +{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick, + gobjectIntrospection, gtk3, wrapGAppsHook, gnome3 }: + +python36Packages.buildPythonApplication rec { + pname = "wpgtk"; + version = "5.7.4"; + + src = fetchFromGitHub { + owner = "deviantfero"; + repo = "wpgtk"; + rev = "${version}"; + sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726"; + }; + + pythonPath = [ + python36Packages.pygobject3 + python36Packages.pillow + pywal + imagemagick + ]; + + buildInputs = [ + wrapGAppsHook + gtk3 + gobjectIntrospection + gnome3.adwaita-icon-theme + libxslt + ]; + + # The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise + preBuild = '' + export HOME=$(pwd) + ''; + + meta = with stdenv.lib; { + description = "Template based wallpaper/colorscheme generator and manager"; + longDescription = '' + In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities. + + wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK+ theme made specifically for wpgtk and custom keywords and values to replace in templates. + + INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. + ''; + homepage = https://github.com/deviantfero/wpgtk; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.melkor333 ]; + }; +} diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 0c64cbefb3ed..5bdab3104a31 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.5.0"; + version = "0.6.0"; doCheck = false; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1qrjwk91i31rww5lwgp84hc4h3b1prm60y45jm1f28g2bbv2qy19"; + sha256 = "0rmc0g5cizyzwpk4yyh7bda70x9ybaivc6iw441k6abxmzbh358g"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index 1570adbcf089..e4bdf5ccf394 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -29,7 +29,7 @@ GEM sinatra (~> 1.4, >= 1.4.6) sinatra-contrib (~> 1.4, >= 1.4.6) puma (3.11.3) - rack (1.6.9) + rack (1.6.11) rack-protection (1.5.5) rack rack-test (1.0.0) @@ -66,4 +66,4 @@ DEPENDENCIES oxidized-web BUNDLED WITH - 1.14.6 + 1.16.4 diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index f472b14e7967..5a8b2ecefdcb 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -103,10 +103,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.9"; + version = "1.6.11"; }; rack-protection = { dependencies = ["rack"]; @@ -203,4 +203,4 @@ }; version = "2.0.8"; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 238ee3646071..edc70e6c601b 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.7"; + name = "cabextract-1.9"; src = fetchurl { url = "https://www.cabextract.org.uk/${name}.tar.gz"; - sha256 = "1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9"; + sha256 = "1hf4zhjxfdgq9x172r5zfdnafma9q0zf7372syn8hcn7hcypkg0v"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index 0edb302b49c3..3febb557bf8b 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "unshield-${version}"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "twogood"; repo = "unshield"; rev = version; - sha256 = "07lmh8vmrbqy4kd6zl5yc1ar3bg33w5cymlzwfijy6arg77hjgq9"; + sha256 = "19wn22vszhci8dfcixx5rliz7phx3lv5ablvhjlclvj75k2vsdqd"; }; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 374122814c50..fd8b1e6c8281 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,20 +1,28 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-5.2.13"; + name = "bacula-9.2.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4"; + sha256 = "1mv6axdlv246yww9g2ra76hir1km36cv8lk2gal8kv71i64vafmf"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ + configureFlags = [ "--with-sqlite3=${sqlite.dev}" "--with-postgresql=${postgresql}" + "--with-logdir=/var/log/bacula" + "--with-working-dir=/var/lib/bacula" + "--mandir=\${out}/share/man" + ]; + + installFlags = [ + "logdir=\${out}/logdir" + "working_dir=\${out}/workdir" ]; postInstall = '' @@ -26,7 +34,7 @@ stdenv.mkDerivation rec { description = "Enterprise ready, Network Backup Tool"; homepage = http://bacula.org/; license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar lovek323 ]; + maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 9fbe05c725ef..cbe02a0593e5 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.18.1"; + version = "0.7.18.2"; src = fetchurl { url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"; + sha256 = "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 336dc785bbfd..c3a0c46d5eca 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "android-file-transfer-${version}"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "036hca41ikgnw4maykjdp53l31rm01mgamy9y56i5qqh84cwmls2"; + sha256 = "0gaj1shmd62ks4cjdcmiqczlr93v8ivjcg0l6s8z73cz9pf8dxmz"; }; buildInputs = [ cmake fuse readline pkgconfig qtbase ]; buildPhase = '' diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 42f27e69f38e..252f25ad8fa8 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.17.1"; + version = "4.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz"; + sha256 = "0jd3bsg3117ysr82n03w33sqw1g9z1ciixcxrwgp90yghvjzp4fm"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 138f727c3d30..07a9015fa28e 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y"; + sha256 = "1y1i7k5mx2pxr9bpijnsjyyw8qd7ak1h48gf6a6ca3dhna9ws6i1"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f4aa9a52fce3..e915cc1c132a 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "3.12.12"; + version = "4.0.0"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1q6rcf9y98w3kvgwdlbhl65phkdl0mfil6y7i3gnpf3d21gfb6nw"; + sha256 = "0af3fwiixddds6gdwhkyq3l214mmjl2wpjc2qayp5rpz79lnclq3"; }; buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline @@ -70,10 +70,13 @@ rec { ''; patches = [ + # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450546 is fixed ./glusterfs-use-PATH-instead-of-hardcodes.patch + # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450593 is fixed ./glusterfs-python-remove-find_library.patch # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch + # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1559130 is fixed ./glusterfs-glusterfind-log-remote-node_cmd-error.patch ]; diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch index 6dd1baad5dff..4757f2fce771 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch @@ -1,21 +1,23 @@ -From d321df349d10f038f0c89b9c11f8059572264f1b Mon Sep 17 00:00:00 2001 +From e6293e367f56833457291e32a4df7b21a52365a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 13 May 2017 18:54:36 +0200 Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593 `find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6. + +Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8 --- api/examples/getvolfile.py | 2 +- geo-replication/syncdaemon/libcxattr.py | 3 +-- - geo-replication/syncdaemon/libgfchangelog.py | 3 +-- + geo-replication/syncdaemon/libgfchangelog.py | 6 ++---- tests/features/ipctest.py | 10 ++-------- tests/utils/libcxattr.py | 5 ++--- tools/glusterfind/src/libgfchangelog.py | 3 +-- .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +-- - 7 files changed, 9 insertions(+), 20 deletions(-) + 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py -index 0c95213..32c2268 100755 +index 0c95213f0..32c2268b3 100755 --- a/api/examples/getvolfile.py +++ b/api/examples/getvolfile.py @@ -3,7 +3,7 @@ @@ -28,7 +30,7 @@ index 0c95213..32c2268 100755 ctypes.c_void_p, ctypes.c_ulong] diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py -index 3671e10..f576648 100644 +index 3671e102c..f576648b7 100644 --- a/geo-replication/syncdaemon/libcxattr.py +++ b/geo-replication/syncdaemon/libcxattr.py @@ -10,7 +10,6 @@ @@ -49,25 +51,28 @@ index 3671e10..f576648 100644 @classmethod def geterrno(cls): diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py -index d87b56c..003c28c 100644 +index 334f5e9ea..093ae157a 100644 --- a/geo-replication/syncdaemon/libgfchangelog.py +++ b/geo-replication/syncdaemon/libgfchangelog.py -@@ -10,12 +10,11 @@ +@@ -9,14 +9,12 @@ + # import os - from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong +-from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \ +- get_errno, byref, c_ulong -from ctypes.util import find_library ++from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong from syncdutils import ChangelogException, ChangelogHistoryNotAvailable class Changes(object): -- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) -+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) +- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, ++ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, + use_errno=True) @classmethod - def geterrno(cls): diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py -index 5aff319..9339248 100755 +index 5aff319b8..933924861 100755 --- a/tests/features/ipctest.py +++ b/tests/features/ipctest.py @@ -1,14 +1,8 @@ @@ -88,7 +93,7 @@ index 5aff319..9339248 100755 api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ] api.glfs_ipc.restype = ctypes.c_int diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py -index 149db72..4e6e6c4 100644 +index 149db72e6..4e6e6c46d 100644 --- a/tests/utils/libcxattr.py +++ b/tests/utils/libcxattr.py @@ -11,7 +11,6 @@ @@ -112,10 +117,10 @@ index 149db72..4e6e6c4 100644 @classmethod def geterrno(cls): diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py -index dd8153e..da822cf 100644 +index 0f6b40d6c..9ca3f326b 100644 --- a/tools/glusterfind/src/libgfchangelog.py +++ b/tools/glusterfind/src/libgfchangelog.py -@@ -12,14 +12,13 @@ +@@ -11,14 +11,13 @@ import os from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref from ctypes import RTLD_GLOBAL @@ -132,7 +137,7 @@ index dd8153e..da822cf 100644 def raise_oserr(): diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py -index 10e73c0..2cdbf11 100644 +index 10e73c02b..2cdbf1152 100644 --- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py +++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py @@ -1,9 +1,8 @@ @@ -147,5 +152,5 @@ index 10e73c0..2cdbf11 100644 @classmethod def geterrno(cls): -- -2.7.4 +2.12.0 diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 279d6adf9a22..725ff3e56dcd 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "11.2"; + version = "11.3"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "01z8fl3x2j5bnm0rybj7hhch18is6dkwqc43yzwc6418spr4imsd"; + sha256 = "08rwz55njkr1w794y3hs8nxc11vzbv4drds9wgxpf6ps8qf9q49f"; }; VERSION = version; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 05aa7b866360..534cefe9bf6c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = 3264; + rev = "3264"; sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf"; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index b75ce90cf29f..86ff8e68fe7a 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { name = "ibus-typing-booster-${version}"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "0qg49d0hsb1mvq33p14nc6mdw6x3km1ax620gphczfmz9ki5bf4g"; + sha256 = "1v9w5ak8ixasny7nkiwf6q058795c349dc2gr7jjpkz94gd4qls5"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 77eae2c55e1d..75670dfe9dfb 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.38"; + version = "2.39"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "1nxvlifag04v56grdwxc3l92kmf51c4w2lq42a3w76yc6p4nxw1m"; + sha256 = "0bzyi55yhr9wyar9mnd09cr6pi88jkkp0f9lndm0a9jwi1xr4bdf"; }; patches = [ ./0001-hardcode-name.patch diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index c9775ac6ae35..ac6f8c97c7b6 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.185"; + version = "1.187"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0i8ppqj6yhdkvjkwfl588f2zpaybj61pq64bhlnmc8c4snwpn1z6"; + sha256 = "05r5jg7n4hbdxcy3kc7038h1r0fkipwld6kd0d49nbkmywl2k1a8"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb-next/default.nix similarity index 56% rename from pkgs/tools/misc/ckb/default.nix rename to pkgs/tools/misc/ckb-next/default.nix index 57be1b89e469..fdb0f008a6cb 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, substituteAll, udev -, pkgconfig, qtbase, qmake, zlib, kmod }: +, pkgconfig, qtbase, cmake, zlib, kmod }: stdenv.mkDerivation rec { - version = "0.2.9"; + version = "0.3.2"; name = "ckb-next-${version}"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "0hl41znyhp3k5l9rcgz0gig36gsg95ivrs1dyngv45q9jkr6fchm"; + sha256 = "0ri5n7r1vhsgk6s64abvqcdrs5fmlwprw0rxiwfy0j8a9qcic1dr"; }; buildInputs = [ @@ -20,29 +20,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - qmake + cmake ]; patches = [ - ./ckb-animations-location.patch + ./install-dirs.patch + ./systemd-service.patch (substituteAll { - name = "ckb-modprobe.patch"; - src = ./ckb-modprobe.patch; + name = "ckb-next-modprobe.patch"; + src = ./modprobe.patch; inherit kmod; }) ]; - doCheck = false; - - installPhase = '' - runHook preInstall - - install -D --mode 0755 --target-directory $out/bin bin/ckb-daemon bin/ckb - install -D --mode 0755 --target-directory $out/libexec/ckb-animations bin/ckb-animations/* - - runHook postInstall - ''; - meta = with stdenv.lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; homepage = https://github.com/ckb-next/ckb-next; diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/tools/misc/ckb-next/install-dirs.patch new file mode 100644 index 000000000000..5545292a65ee --- /dev/null +++ b/pkgs/tools/misc/ckb-next/install-dirs.patch @@ -0,0 +1,32 @@ +diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt +index 09056a7..1bb4595 100644 +--- a/src/daemon/CMakeLists.txt ++++ b/src/daemon/CMakeLists.txt +@@ -456,7 +456,7 @@ endif () + if (LINUX) + install( + FILES "${CMAKE_SOURCE_DIR}/linux/udev/99-ckb-daemon.rules" +- DESTINATION "/etc/udev/rules.d" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ +diff --git a/src/libs/ckb-next/CMakeLists.txt b/src/libs/ckb-next/CMakeLists.txt +index ecc591c..35de563 100644 +--- a/src/libs/ckb-next/CMakeLists.txt ++++ b/src/libs/ckb-next/CMakeLists.txt +@@ -75,12 +75,12 @@ if(NOT MACOS) + NAMESPACE + ${CMAKE_PROJECT_NAME}:: + DESTINATION +- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") ++ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") + + install( + FILES + "cmake/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION +- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") ++ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") + endif() diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/tools/misc/ckb-next/modprobe.patch new file mode 100644 index 000000000000..f2156fc3b23b --- /dev/null +++ b/pkgs/tools/misc/ckb-next/modprobe.patch @@ -0,0 +1,26 @@ +diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c +index 1cedb07..8e0b24b 100644 +--- a/src/daemon/input_linux.c ++++ b/src/daemon/input_linux.c +@@ -58,7 +58,7 @@ int os_inputopen(usbdevice* kb){ + /// First check whether the uinput module is loaded by the kernel. + /// + // Load the uinput module (if it's not loaded already) +- if(system("modprobe uinput") != 0) { ++ if(system("@kmod@/bin/modprobe uinput") != 0) { + ckb_fatal("Failed to load uinput module\n"); + return 1; + } +diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp +index 3601146..3f2f78f 100644 +--- a/src/gui/mainwindow.cpp ++++ b/src/gui/mainwindow.cpp +@@ -251,7 +251,7 @@ void MainWindow::updateVersion(){ + daemonWarning.append(tr("
Warning: System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices.")); + #elif defined(Q_OS_LINUX) + QProcess modprobe; +- modprobe.start("modprobe", QStringList("uinput")); ++ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); + + if(!modprobe.waitForFinished()) + qDebug() << "Modprobe error"; diff --git a/pkgs/tools/misc/ckb-next/systemd-service.patch b/pkgs/tools/misc/ckb-next/systemd-service.patch new file mode 100644 index 000000000000..917bc09627f7 --- /dev/null +++ b/pkgs/tools/misc/ckb-next/systemd-service.patch @@ -0,0 +1,45 @@ +diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt +index 09056a7..72a7249 100644 +--- a/src/daemon/CMakeLists.txt ++++ b/src/daemon/CMakeLists.txt +@@ -249,12 +249,7 @@ elseif (LINUX) + # but it is not enabled by default and systemd is used instead. (Ubuntu 15.04+) + + # A way to check for upstart +- execute_process( +- COMMAND initctl --version +- OUTPUT_VARIABLE initctl_output +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- +- if ("${initctl_output}" MATCHES "upstart") ++ if (FALSE) + message(STATUS "upstart detected") + set(CKB_NEXT_INIT_SYSTEM "upstart" CACHE INTERNAL "") + set(DISALLOW_SYSVINIT TRUE) +@@ -292,7 +287,7 @@ elseif (LINUX) + endif () + + # A way to check for systemd +- if (EXISTS "/run/systemd/system") ++ if (TRUE) + message(STATUS "systemd detected") + set(CKB_NEXT_INIT_SYSTEM "systemd" CACHE INTERNAL "") + set(DISALLOW_SYSVINIT TRUE) +@@ -328,7 +323,7 @@ elseif (LINUX) + endif () + + # A way to check for OpenRC +- if (EXISTS "/run/openrc/softlevel") ++ if (FALSE) + message(STATUS "OpenRC detected") + set(CKB_NEXT_INIT_SYSTEM "OpenRC" CACHE INTERNAL "") + set(DISALLOW_SYSVINIT TRUE) +@@ -419,7 +414,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") + elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd") + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" +- DESTINATION "/usr/lib/systemd/system" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ diff --git a/pkgs/tools/misc/ckb/ckb-animations-location.patch b/pkgs/tools/misc/ckb/ckb-animations-location.patch deleted file mode 100644 index 8e53685e76a6..000000000000 --- a/pkgs/tools/misc/ckb/ckb-animations-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp -index f49a64c..d7a3459 100644 ---- a/src/ckb/animscript.cpp -+++ b/src/ckb/animscript.cpp -@@ -30,7 +30,7 @@ QString AnimScript::path(){ - #ifdef __APPLE__ - return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations"); - #else -- return QDir("/usr/lib").absoluteFilePath("ckb-animations"); -+ return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations"); - #endif - } diff --git a/pkgs/tools/misc/ckb/ckb-modprobe.patch b/pkgs/tools/misc/ckb/ckb-modprobe.patch deleted file mode 100644 index 8024151159cf..000000000000 --- a/pkgs/tools/misc/ckb/ckb-modprobe.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ckb-daemon/usb_linux.c b/src/ckb-daemon/usb_linux.c -index 8673f86..4714305 100644 ---- a/src/ckb-daemon/usb_linux.c -+++ b/src/ckb-daemon/usb_linux.c -@@ -440,7 +440,7 @@ static void udev_enum(){ - - int usbmain(){ - // Load the uinput module (if it's not loaded already) -- if(system("modprobe uinput") != 0) -+ if(system("@kmod@/bin/modprobe uinput") != 0) - ckb_warn("Failed to load uinput module\n"); - - // Create the udev object diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index dc8f776cef66..b262626b1363 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: +{ stdenv, fetchurl, xcbuildHook, cf-private, Foundation, AddressBook }: stdenv.mkDerivation rec { version = "1.1a-3"; @@ -10,16 +10,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ Foundation AddressBook ]; + + buildInputs = [ + Foundation AddressBook + # Needed for OBJC_CLASS_$_NSArray symbols. + cf-private + ]; installPhase = '' mkdir -p $out/bin cp Products/Default/contacts $out/bin ''; - ## FIXME: the framework setup hook isn't adding these correctly - NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; - meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; homepage = http://www.gnufoo.org/contacts/contacts.html; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 9c3db47213ec..1b2cdf0402ae 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.109"; + version = "1.0.110"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "117xgrv6mpszyndmsvkn4ynh57b2s40qc68bpmfmxggw58j42klw"; + sha256 = "11bqy2dbqsy9fyx1i6lj0aj1pvq15y8kkwjfrp18k3nvy74y80ca"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index a8ff34af9757..d322a19c98a3 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "4.0.1"; + version = "4.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1icnjkczy52i3cp1fmsijqny571fz1h4b3wpdzz79cn90fr326pc"; + sha256 = "0zkvmnv6adz0gyqiql8anpxnh8zzpqk0p2n0pf2kxy55010qs4wz"; }; propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 97eedd9be25e..160ea2faab61 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "0kraip4lr3fvcxvvq1dwjw7fyzs6bcjg14xn0g52985krxxn5pdc"; + sha256 = "1rbpa0dcm9w1anz2bhcpmj2b678807s8j43zzkbkwh71aymfwr14"; }; doCheck = true; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index da231c16cc90..edb5973fbb70 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.14"; + version = "4.15"; name = "hebcal-${version}"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "1zq8f7cigh5r31p03az338sbygkx8gbday35c9acppglci3r8fvc"; + sha256 = "1s9iardqyzn42hs0x9p4rig2m87v87jvzcrbb9arcci7nds66y3i"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe7875..43165b4f54bb 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: +{ stdenv, buildGoPackage, fetchFromGitHub, cf-private, Cocoa }: buildGoPackage rec { name = "noti-${version}"; @@ -11,7 +11,7 @@ buildGoPackage rec { sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For OBJC_CLASS_$_NSDate */ ]; # TODO: Remove this when we update apple_sdk NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index ef848bb43f26..f67a8274443c 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -3,7 +3,7 @@ with ocamlPackages; janePackage { - name = "patdiff"; + pname = "patdiff"; hash = "02cdn5j5brbp4n2rpxprzxfakjbl7n2llixg7m632bih3ppmfcq1"; buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ]; meta = { diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix new file mode 100644 index 000000000000..64d290ad89e3 --- /dev/null +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "pgmetrics-${version}"; + version = "1.5.0"; + + goPackagePath = "github.com/rapidloop/pgmetrics"; + + src = fetchFromGitHub { + owner = "rapidloop"; + repo = "pgmetrics"; + rev = "refs/tags/v${version}"; + sha256 = "1l3vd1lvp4a6irx0zpjb5bkskkb9krx9j7pwii8jy9dcjy4gj24f"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://pgmetrics.io/; + description = "Collect and display information and stats from a running PostgreSQL server"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/misc/pgmetrics/deps.nix b/pkgs/tools/misc/pgmetrics/deps.nix new file mode 100644 index 000000000000..63b9492a9820 --- /dev/null +++ b/pkgs/tools/misc/pgmetrics/deps.nix @@ -0,0 +1,84 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "bb3d318650d48840a39aa21a027c6630e198e626"; + sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + { + goPackagePath = "github.com/pborman/getopt"; + fetch = { + type = "git"; + url = "https://github.com/pborman/getopt"; + rev = "7148bc3a4c3008adfcab60cbebfd0576018f330b"; + sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj"; + }; + } + { + goPackagePath = "github.com/rapidloop/pq"; + fetch = { + type = "git"; + url = "https://github.com/rapidloop/pq"; + rev = "f379fd34d14f11337c3945aa665f7718c0213317"; + sha256 = "0svhissh6v1qdj9zypvj6jpjrx9g56gq8sf1pila41mczglmni05"; + }; + } + { + goPackagePath = "github.com/xdg-go/stringprep"; + fetch = { + type = "git"; + url = "https://github.com/xdg-go/stringprep"; + rev = "bd625b8dc1e3b0f57412280ccbcc317f0c69d8db"; + sha256 = "03nard51zgzbaq64p6gsvrz8fps3yazl3ydd115y0bppkdx2i4ji"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "432090b8f568c018896cd8a0fb0345872bbac6ce"; + sha256 = "1i8616qqwih6g5nx8c1hfqhp0kb110ml3xkgsn6qvc36q04amjmq"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; + sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 80b66026848e..ff7518b04dea 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1dm1kf4wrbcaaagxgbc8q0f5j9dq3bmp6ycl7zx8p70s4nv3xnbc"; + sha256 = "1blllmkwh13pnf3hxi1p2az5i77arbm2661n0rd0569s6kf5brb7"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 6e17ce26e0de..ed26895fba6f 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tio-${version}"; - version = "1.31"; + version = "1.32"; src = fetchzip { url = "https://github.com/tio/tio/archive/v${version}.tar.gz"; - sha256 = "1164ida1vxvm0z76nmkk2d5y9i3wj8rni9sl1mid6c09gi4k2slk"; + sha256 = "0lwqdm73kshi9qs8pks1b4by6yb9jf3bbyw3bv52xmggnr5s1hcv"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix new file mode 100644 index 000000000000..c09c5ad12f08 --- /dev/null +++ b/pkgs/tools/misc/up/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "up-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "akavel"; + repo = "up"; + rev = "v${version}"; + sha256 = "171bwbk2c7jbi51xdawzv7qy71492mfs9z5j0a5j52qmnr4vjjgs"; + }; + + goPackagePath = "github.com/akavel/up"; + goDeps = ./deps.nix; + + meta = with lib; { + description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; + homepage = https://github.com/akavel/up; + maintainers = with maintainers; [ ma27 ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/misc/up/deps.nix b/pkgs/tools/misc/up/deps.nix new file mode 100644 index 000000000000..439dc5df9d4d --- /dev/null +++ b/pkgs/tools/misc/up/deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "017915a4d77dabd7af10ab539e618a735d4b9c0a"; + sha256 = "19ymkgcvcp9sz2jrfi7h6l720w5yw9hy3wnw975w2ih45j1ypqdh"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "12d3b2882a08d1abc9488e34f3e1ae35165f2d07"; + sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "3fb116b820352b7f0c281308a4d6250c22d94e27"; + sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "b20a3daf6a39840c202fd42cc23d53607162b045"; + sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9"; + sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; + sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; + }; + } +] diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index e376568d3503..dd3eddf73954 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, CoreFoundation }: rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; @@ -13,11 +13,19 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1li84kq9myaw0zwx69y72f3lx01s7i9p8yays4rwvl1ymr614y1l"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" + ''; + meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; homepage = https://github.com/watchexec/watchexec; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index eaefd6d61aa6..0e88e79eb1ba 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "03h99i59kq8jlmshfwas1qm4y5ksw9lxaf9kr14l2mp028g7930n"; + sha256 = "0jhr4ywn5x5s15sczhdyyaqy3xh5z4zsx3g42ma26prpnr4gjczz"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "1.0.0"; + version = "1.1.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 6a56d23f7490..2e033c6bc821 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1148"; + version = "0.4.1167"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1ypgqaxf5qn5b3c2n4hcsiixyvvpvmpx5gny523cd5igb7h0yja5"; + sha256 = "0lvddm62c0pwx4cksbwh2n0xzz80p26lz1xsvb4z40h7hlwaf41w"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8c08ee65805c..450d5c68245f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2018.10.29"; + version = "2018.11.07"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ndkkpnmjdyz5gjjmvaf18761lxa2c0kypicm9bpqpaj7sdr9s27"; + sha256 = "1rvc2m2kbm2kycqsa7fkcg5gql9f0w3hn1a7jg48zzl06ayggxk9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 56b7320a1b26..db1f383ac026 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { pname = "getmail"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; - sha256 = "1ygv78ihjyrh60657bl8pc17a5dqawdkfh32h8hrd4kwwxlsd5r4"; + sha256 = "0vl4cc733pd9d21y4pr4jc1ly657d0akxj1bdh1xfjggx33l3541"; }; doCheck = false; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix new file mode 100644 index 000000000000..10100b933d4d --- /dev/null +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -0,0 +1,29 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# and modified to add meta and switch to fetchFromGitHub +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "grpcurl-${version}"; + version = "1.0.0"; + rev = "v${version}"; + + goPackagePath = "github.com/fullstorydev/grpcurl"; + + src = fetchFromGitHub { + owner = "fullstorydev"; + repo = "grpcurl"; + rev = "d4d048fade4abcc2f0c3fb6f3e207289401d0a10"; + sha256 = "0v45lwjw2phavhi6m4ql49ri1423m249a6xcf00v9hi2x1y9dh6q"; + }; + + goDeps = if stdenv.isDarwin + then ./deps-darwin.nix + else ./deps-linux.nix; + + meta = { + description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; + homepage = https://github.com/fullstorydev/grpcurl; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ knl ]; + }; +} diff --git a/pkgs/tools/networking/grpcurl/deps-darwin.nix b/pkgs/tools/networking/grpcurl/deps-darwin.nix new file mode 100644 index 000000000000..52afa88708f3 --- /dev/null +++ b/pkgs/tools/networking/grpcurl/deps-darwin.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "ddf22928ea3c56eb4292a0adbbf5001b1e8e7d0d"; + sha256 = "16awkanx2rgxzhwi9vpm4i8jmmsw10gb104ncwfinvb6a9nzm28l"; + }; + } + { + goPackagePath = "github.com/jhump/protoreflect"; + fetch = { + type = "git"; + url = "https://github.com/jhump/protoreflect"; + rev = "b28d968eb345542b430a717dc72a88abf10d0b95"; + sha256 = "0i8k55xx2wyzfz635nbjqma505sn03l75mq6lgbknzwhv1xbx39s"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87"; + sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; + sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "af9cb2a35e7f169ec875002c1829c9b315cddc04"; + sha256 = "1942rw8h7zhbzvxn1rqn8z265sl2i14hm0z4hbfbc93slmml7p7n"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "c195587d96d5ae30321b96a1e2e175fea09e9fda"; + sha256 = "1av4hgaqk0hgji8ycdkgganh6bqajk2ygm4ifrmyzbm1hzwi3gg7"; + }; + } +] diff --git a/pkgs/tools/networking/grpcurl/deps-linux.nix b/pkgs/tools/networking/grpcurl/deps-linux.nix new file mode 100644 index 000000000000..e5e775e50fea --- /dev/null +++ b/pkgs/tools/networking/grpcurl/deps-linux.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "ddf22928ea3c56eb4292a0adbbf5001b1e8e7d0d"; + sha256 = "16awkanx2rgxzhwi9vpm4i8jmmsw10gb104ncwfinvb6a9nzm28l"; + }; + } + { + goPackagePath = "github.com/jhump/protoreflect"; + fetch = { + type = "git"; + url = "https://github.com/jhump/protoreflect"; + rev = "b28d968eb345542b430a717dc72a88abf10d0b95"; + sha256 = "0i8k55xx2wyzfz635nbjqma505sn03l75mq6lgbknzwhv1xbx39s"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "49bb7cea24b1df9410e1712aa6433dae904ff66a"; + sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "4497e2df6f9e69048a54498c7affbbec3294ad47"; + sha256 = "028qmbfmy84pl7wmjgvrv1x7x7nzv3qr9w7vcnrcparr43k7415s"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; + sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "af9cb2a35e7f169ec875002c1829c9b315cddc04"; + sha256 = "1942rw8h7zhbzvxn1rqn8z265sl2i14hm0z4hbfbc93slmml7p7n"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "c195587d96d5ae30321b96a1e2e175fea09e9fda"; + sha256 = "1av4hgaqk0hgji8ycdkgganh6bqajk2ygm4ifrmyzbm1hzwi3gg7"; + }; + } +] diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index ef50c0ce0847..10f57532df10 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "httpie-0.9.9"; + name = "httpie-1.0.0"; src = fetchurl { url = "mirror://pypi/h/httpie/${name}.tar.gz"; - sha256 = "1jsgfkyzzizgfy1b0aicb4cp34d5pwskz9c4a8kf4rq3lrpjw87i"; + sha256 = "09cs2n76318i34vms9pdnbds53pnp1m11gwn444j49na5qnk8l0n"; }; propagatedBuildInputs = with pythonPackages; [ pygments requests ]; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 14f8599f7e97..18a53d02b1ec 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ip2unix-${version}"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "1s6gyrrzgifr6gagcw4vx9xznxvdl14y14r0d1xc72j69b00zc4q"; + sha256 = "0lw4f1p1frfpf5l7faqdd80d6pi9g5sx7g3wpmig9sa50k6pmc0v"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 09fa69dd37c4..27c4590f88b8 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -16,27 +16,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ libsodium mbedtls libev c-ares pcre ]; - nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; + nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 + docbook_xsl libxslt ]; - cmakeFlags = [ "-DWITH_STATIC=OFF" ]; + cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; postInstall = '' cp lib/* $out/lib chmod +x $out/bin/* mv $out/pkgconfig $out/lib - - ${stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libcork.dylib $out/lib/libcork.dylib $out/lib/libipset.dylib - install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $out/lib/libipset.dylib - - for exe in $out/bin/*; do - install_name_tool -change libmbedtls.dylib ${mbedtls}/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedcrypto.dylib ${mbedtls}/lib/libmbedcrypto.dylib $exe - install_name_tool -change libcork.dylib $out/lib/libcork.dylib $exe - install_name_tool -change libipset.dylib $out/lib/libipset.dylib $exe - install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $exe - done - ''} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index ad03e9266c68..1043007e1dd2 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -6,12 +6,12 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.3.3"; + version = "1.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; - sha256 = "0zpqn3jj14grwggzl235smm93d2lm5r5cr6z6wydw1045m5rlvrp"; + sha256 = "0d745w7cy83hw7j950dah4h5qzclcibj16dik2gpsjnw1zq63cna"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index be807e307715..8daf034d4bdd 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "swaks-${version}"; - version = "20170101.0"; + version = "20181104.0"; src = fetchurl { url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; - sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4"; + sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index ce9ed7ef53a1..b2ef684f5895 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -2,7 +2,7 @@ , docbook_xsl }: let - version = "1.0.73"; + version = "1.0.74"; in stdenv.mkDerivation rec { name = "tgt-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "fujita"; repo = "tgt"; rev = "v${version}"; - sha256 = "0alrdrklh5wq8x4xbp30zwnxkp0brx1mjkbp70dhaz0zbzvyydr0"; + sha256 = "1k146w49dda77fd8frmc0nyr07ca1wh5vcw59fjid6knaj9vgck5"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix new file mode 100644 index 000000000000..246a2c5d9917 --- /dev/null +++ b/pkgs/tools/security/acsccid/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb }: + +stdenv.mkDerivation rec { + version = "1.1.6"; + name = "acsccid-${version}"; + + src = fetchFromGitHub { + owner = "acshk"; + repo = "acsccid"; + rev = "26bc84c738d12701e6a7289ed578671d71cbf3cb"; + sha256 = "09k7hvcay092wkyf0hjsvimg1h4qzss1nk7m5yanlib4ldhw5g5c"; + }; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ]; + + postPatch = '' + sed -e s_/bin/echo_echo_g -i src/Makefile.am + patchShebangs src/convert_version.pl + patchShebangs src/create_Info_plist.pl + ''; + + preConfigure = '' + libtoolize --force + aclocal + autoheader + automake --force-missing --add-missing + autoconf + configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers" + ''; + + meta = with stdenv.lib; { + description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers."; + longDescription = '' + acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card + readers. This library provides a PC/SC IFD handler implementation and + communicates with the readers through the PC/SC Lite resource manager (pcscd). + + acsccid is based on ccid. See CCID free software driver for more + information: + https://ccid.apdu.fr/ + + It can be enabled in /etc/nixos/configuration.nix by adding: + services.pcscd.enable = true; + services.pcscd.plugins = [ pkgs.acsccid ]; + ''; + homepage = src.meta.homepage; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ roberth ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix new file mode 100644 index 000000000000..b9e42bb6fa74 --- /dev/null +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig }: + +stdenv.mkDerivation rec { + name = "chrome-token-signing-${version}"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "open-eid"; + repo = "chrome-token-signing"; + rev = "v${version}"; + sha256 = "1icbr5gyf7qqk1qjgcrf6921ws84j5h8zrpzw5mirq4582l5gsav"; + }; + + buildInputs = [ qmake pcsclite pkgconfig ]; + dontUseQmakeConfigure = true; + + patchPhase = '' + substituteInPlace host-linux/ee.ria.esteid.json --replace /usr $out + ''; + + installPhase = '' + install -D -t $out/bin host-linux/chrome-token-signing + # TODO: wire these up + install -D -t $out/etc/chromium/native-messaging-hosts host-linux/ee.ria.esteid.json + install -D -t $out/lib/mozilla/native-messaging-hosts host-linux/ff/ee.ria.esteid.json + ''; +} diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index cc61cce463ce..637d2af9ae31 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.8"; + version = "4.4.9"; src = fetchFromGitHub { - sha256 = "0khpkpfnbin46aqnb9xkhh5d89lvsshgp4kqpdgk95l73lx8kdqp"; + sha256 = "019cfxgffl6z6ilz1w6b531dr8pi63ikflxmkc95glh7cxsaylax"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 555244bc38cd..720c382ebd67 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub -, AVFoundation ? null, AudioToolbox ? null, ImageIO ? null, CoreMedia ? null -, Foundation ? null, CoreGraphics ? null, MediaToolbox ? null }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private +, AVFoundation, AudioToolbox, ImageIO, CoreMedia +, Foundation, CoreGraphics, MediaToolbox +}: buildGoPackage rec { name = "keybase-${version}"; @@ -18,7 +19,11 @@ buildGoPackage rec { sha256 = "1sw6v3vf544vp8grw8p287cx078mr9v0v1wffcj6f9p9shlwj7ic"; }; - buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.isDarwin [ + AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox + # Needed for OBJC_CLASS_$_NSData symbols. + cf-private + ]; buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index ad345afb5fcc..46c2e6f03b0d 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -1,29 +1,26 @@ -{ stdenv, makeWrapper, fetchFromGitHub, gawk, perl }: +{ stdenv, makeWrapper, fetchFromGitHub, gawk }: stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.9"; + version = "2.7.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "125p5vpc2ksn0nab8y4ckfgx13rlv3w95amgighiqkh15ccji5kq"; + sha256 = "0rzc0y8lk22bymf56249jzmllki2lh0rz5in4lkrc5fkmp29c2wv"; }; - nativeBuildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; postPatch = '' grep -rl '/usr/local/lynis' ./ | xargs sed -i "s@/usr/local/lynis@$out/share/lynis@g" - # Don't use predefined binary paths. See https://github.com/CISOfy/lynis/issues/468 - perl -i -p0e 's/BIN_PATHS="[^"]*"/BIN_PATHS=\$\(echo \$PATH\ | sed "s\/:\/ \/g")/sm;' include/consts ''; installPhase = '' - mkdir -p $out/share/lynis + install -d $out/bin $out/share/lynis/plugins cp -r include db default.prf $out/share/lynis/ - mkdir -p $out/bin cp -a lynis $out/bin wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} ''; diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d15df5e56c2b..a84e3d08f438 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -187,7 +187,7 @@ GEM arel (>= 4.0.1) pg_array_parser (~> 0.0.9) public_suffix (2.0.5) - rack (1.6.8) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) rails-deprecated_sanitizer (1.0.3) @@ -292,4 +292,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 1.15.0 + 1.16.4 diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 4262e64efb04..938817cb64f6 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -1,5 +1,6 @@ { actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1kgrq74gp2czzxr0f2sqrc98llz03lgq498300z2z5n4khgznwc4"; @@ -8,6 +9,7 @@ version = "4.2.9"; }; actionview = { + dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04kgp4gmahw31miz8xdq1pns14qmvvzd14fgfv7fg9klkw3bxyyp"; @@ -16,6 +18,7 @@ version = "4.2.9"; }; activemodel = { + dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1qxmivny0ka5s3iyap08sn9bp2bd9wrhqp2njfw26hr9wsjk5kfv"; @@ -24,6 +27,7 @@ version = "4.2.9"; }; activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18i790dfhi4ndypd1pj9pv08knpxr2sayvvwfq7axj5jfwgpmrqb"; @@ -32,6 +36,7 @@ version = "4.2.9"; }; activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1d0a362p3m2m2kljichar2pwq0qm4vblc3njy1rdzm09ckzd45sp"; @@ -40,6 +45,7 @@ version = "4.2.9"; }; addressable = { + dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; @@ -64,6 +70,7 @@ version = "6.0.4"; }; arel-helpers = { + dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1sx4qbzhld3a99175p2krz3hv1npc42rv3sd8x4awzkgplg3zy9c"; @@ -144,6 +151,7 @@ version = "2.7.0"; }; faraday = { + dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; @@ -184,6 +192,7 @@ version = "0.8.6"; }; jsobfu = { + dependencies = ["rkelly-remix"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1hchns89cfj0gggm2zbr7ghb630imxm2x2d21ffx2jlasn9xbkyk"; @@ -200,6 +209,7 @@ version = "2.1.0"; }; loofah = { + dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; @@ -216,6 +226,7 @@ version = "1.0.3"; }; metasploit-concern = { + dependencies = ["activemodel" "activesupport" "railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297"; @@ -224,6 +235,7 @@ version = "2.0.5"; }; metasploit-credential = { + dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1flahrcl5hf4bncqs40mry6pkffvmir85kqzkad22x3dh6crw50i"; @@ -232,6 +244,7 @@ version = "2.0.12"; }; metasploit-framework = { + dependencies = ["actionpack" "activerecord" "activesupport" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "dnsruby" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "rbnacl" "rbnacl-libsodium" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "robots" "ruby_smb" "rubyntlm" "rubyzip" "sqlite3" "sshkey" "tzinfo" "tzinfo-data" "windows_error" "xdr" "xmlrpc"]; source = { fetchSubmodules = false; rev = "dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453"; @@ -242,6 +255,7 @@ version = "4.16.1"; }; metasploit-model = { + dependencies = ["activemodel" "activesupport" "railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw"; @@ -258,6 +272,7 @@ version = "1.3.1"; }; metasploit_data_models = { + dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0j3ijxn6n3ack9572a74cwknijymy41c8rx34njyhg25lx4hbvah"; @@ -338,6 +353,7 @@ version = "6.1.1"; }; nokogiri = { + dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; @@ -346,6 +362,7 @@ version = "1.8.0"; }; octokit = { + dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4"; @@ -370,6 +387,7 @@ version = "0.0.4"; }; packetfu = { + dependencies = ["pcaprub"]; source = { remotes = ["https://rubygems.org"]; sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll"; @@ -394,6 +412,7 @@ version = "0.12.4"; }; pdf-reader = { + dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0nlammdpjy3padmzxhsql7mw31jyqp88n6bdffiarv5kzl4s3y7p"; @@ -418,6 +437,7 @@ version = "0.0.9"; }; postgres_ext = { + dependencies = ["activerecord" "arel" "pg_array_parser"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lbp1qf5s1addhznm7d4bzks9adh7jpilgcsr8k7mbd0a1ailcgc"; @@ -436,12 +456,13 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.11"; }; rack-test = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; @@ -450,6 +471,7 @@ version = "0.6.3"; }; rails-deprecated_sanitizer = { + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; @@ -458,6 +480,7 @@ version = "1.0.3"; }; rails-dom-testing = { + dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r"; @@ -466,6 +489,7 @@ version = "1.0.8"; }; rails-html-sanitizer = { + dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; @@ -474,6 +498,7 @@ version = "1.0.3"; }; railties = { + dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1g5jnk1zllm2fr06lixq7gv8l2cwqc99akv7886gz6lshijpfyxd"; @@ -498,6 +523,7 @@ version = "0.5.5"; }; rbnacl = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48"; @@ -506,6 +532,7 @@ version = "4.0.2"; }; rbnacl-libsodium = { + dependencies = ["rbnacl"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1323fli41m01af13xz5xvabsjnz09si1b9l4qd2p802kq0dr61gd"; @@ -514,6 +541,7 @@ version = "1.0.13"; }; recog = { + dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h023ykrrra74bpbibkyg083kafaswvraw4naw9p1ghcjzn9ggj3"; @@ -530,6 +558,7 @@ version = "3.4.0"; }; rex-arch = { + dependencies = ["rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1izzalmjwdyib8y0xlgys8qb60di6xyjk485ylgh14p47wkyc6yp"; @@ -538,6 +567,7 @@ version = "0.1.11"; }; rex-bin_tools = { + dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "01hi1cjr68adp47nxbjfprvn0r3b72r4ib82x9j33bf2pny6nvaw"; @@ -554,6 +584,7 @@ version = "0.1.12"; }; rex-encoder = { + dependencies = ["metasm" "rex-arch" "rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z"; @@ -562,6 +593,7 @@ version = "0.1.4"; }; rex-exploitation = { + dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gbj28jqaaldpk4qzysgcl6m0wcqx3gcldarqdk55p5z9zasrk19"; @@ -578,6 +610,7 @@ version = "0.1.5"; }; rex-mime = { + dependencies = ["rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a"; @@ -586,6 +619,7 @@ version = "0.1.5"; }; rex-nop = { + dependencies = ["rex-arch"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny"; @@ -594,6 +628,7 @@ version = "0.1.1"; }; rex-ole = { + dependencies = ["rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww"; @@ -602,6 +637,7 @@ version = "0.1.6"; }; rex-powershell = { + dependencies = ["rex-random_identifier" "rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0nl60fdd1rlckk95d3s3y873w84vb0sgwvwxdzv414qxz8icpjnm"; @@ -610,6 +646,7 @@ version = "0.1.72"; }; rex-random_identifier = { + dependencies = ["rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cksrljaw61mdjvbmj9vqqhd8nra7jv466w5nim47n73rj72jc19"; @@ -626,6 +663,7 @@ version = "0.1.3"; }; rex-rop_builder = { + dependencies = ["metasm" "rex-core" "rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy"; @@ -634,6 +672,7 @@ version = "0.1.3"; }; rex-socket = { + dependencies = ["rex-core"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0bkr64qrfy2mcv6cpp2z2rn9npgn9s0yyagzjh7kawbm80ldwf2h"; @@ -642,6 +681,7 @@ version = "0.1.8"; }; rex-sslscan = { + dependencies = ["rex-core" "rex-socket" "rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "06gbx45q653ajcx099p0yxdqqxazfznbrqshd4nwiwg1p498lmyx"; @@ -666,6 +706,7 @@ version = "0.2.15"; }; rex-zip = { + dependencies = ["rex-text"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7"; @@ -698,6 +739,7 @@ version = "0.1.5"; }; ruby_smb = { + dependencies = ["bindata" "rubyntlm" "windows_error"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jby5wlppxhc2jlqldic05aqd5l57171lsxqv86702grk665n612"; @@ -722,6 +764,7 @@ version = "1.2.1"; }; sawyer = { + dependencies = ["addressable" "faraday"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; @@ -770,6 +813,7 @@ version = "1.5.1"; }; tzinfo = { + dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl"; @@ -778,6 +822,7 @@ version = "1.2.3"; }; tzinfo-data = { + dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1n83rmy476d4qmzq74qx0j7lbcpskbvrj1bmy3np4d5pydyw2yky"; @@ -794,6 +839,7 @@ version = "0.1.2"; }; xdr = { + dependencies = ["activemodel" "activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m"; @@ -809,4 +855,4 @@ }; version = "0.3.0"; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 495b6ee48ea7..95f9bf16ebac 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.23"; + version = "1.8.24"; outputs = [ "bin" "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; + sha256 = "0s3mv6csbi9303vvis0hilm71xsmi6cqkbh2kiipdisydbx6865q"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 4acdd6cb897e..8168aa94b3d2 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: +{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses, cf-private }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ libiconv Cocoa ncurses ]; + + buildInputs = [ + libiconv Cocoa ncurses + # Needed for OBJC_CLASS_$_NSArray symbols. + cf-private + ]; installPhase = '' mkdir -p $out/Applications diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 398f88ccfb6b..17bbf982255b 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig -, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations }: +, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: stdenv.mkDerivation rec { name = "qdigidoc-${version}"; - version = "3.13.6"; + version = "4.1.0"; src = fetchgit { - url = "https://github.com/open-eid/qdigidoc"; + url = "https://github.com/open-eid/DigiDoc4-Client"; rev = "v${version}"; - sha256 = "1qq9fgvkc7fi37ly3kgxksrm4m5rxk9k5s5cig8z0cszsfk6h9lx"; + sha256 = "1iry36h3pfnw2gqjnfhv53i2svybxj8jf18qh486djyai84hjr4d"; fetchSubmodules = true; }; @@ -24,11 +24,6 @@ stdenv.mkDerivation rec { --replace $\{TSL_URL} file://${tsl} ''; - patches = [ - # https://github.com/open-eid/qdigidoc/pull/163 - ./qt511.patch - ]; - buildInputs = [ libdigidocpp opensc @@ -36,11 +31,12 @@ stdenv.mkDerivation rec { openssl pcsclite qtbase + qtsvg qttranslations ]; postInstall = '' - wrapProgram $out/bin/qdigidocclient \ + wrapProgram $out/bin/qdigidoc4 \ --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ''; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 20135895d766..0f9502a7ac97 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -4,8 +4,7 @@ }: stdenv.mkDerivation rec { - - version = "3.12.10"; + version = "2018-08-21"; name = "qesteidutil-${version}"; src = fetchFromGitHub { @@ -13,19 +12,11 @@ stdenv.mkDerivation rec { repo = "qesteidutil"; # TODO: Switch back to this after next release. #rev = "v${version}"; - # We require the remove breakpad stuff - rev = "efdfe4c5521f68f206569e71e292a664bb9f46aa"; - sha256 = "0zly83sdqsf9lxnfw4ir2a9vmmfba181rhsrz61ga2zzpm2wf0f0"; + rev = "3bb65ef345aaa0d589b37a5d0d6f5772e95b0cd7"; + sha256 = "13xsw5gh4svp9a5nxcqv72mymivr7w1cyjbv2l6yf96m45bsd9x4"; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - url = https://github.com/open-eid/qesteidutil/commit/868e8245f2481e29e1154e168ac92d32e93a5425.patch; - sha256 = "0pwrkd8inf0qaf7lcchmj558k6z34ah672zcb722aa5ybbif0lkn"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ccid qttools pcsclite qttranslations hicolor-icon-theme @@ -36,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.id.ee/; license = licenses.lgpl2; platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; + maintainers = with maintainers; [ jagajaga domenkozar ]; }; } diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 54303d0c177d..5bc8c7d945bd 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180927"; + version = "20181031"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1c9d505mw1wyga65y4nmiz55gs357z97wnycx77yvjwvi08qsh6w"; + sha256 = "1zz1lfrl1rihs47a0cirdp32p53297kjm0l27b4kvibb5b7pa3h9"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ba21fabe4350..dd2340668c49 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { - sha256 = "1bg044j3dv6kcksy3cyda650ara8s4awdf665k10gaaxa0gwn0jj"; + sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index c0210127d9f2..8e9fb6da5400 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz"; + sha256 = "18awz03mdzdbja1n9nm6jyvv7ic2dabh6c7ip5vwpam8c6mj4yjq"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index fa2d40949e53..91923e7e59b5 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.38.0"; + name = "rsyslog-8.39.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "0b52pcamj2g27zdg0szzk03kigm9lanj0v0w80alwy5fpk9qwcjd"; + sha256 = "1d3ac448b8gj58vg7n99ffv2rvpnhhin1ni5vyby73aksvz9c7y7"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 89319ac492f4..f53a649cd771 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.10.6"; + version = "0.5"; src = fetchFromGitHub { - sha256 = "18mz3f5aqw4vbdrxf8wblqm6nca73ppq9hb2z2ppw6k0557i71kz"; + sha256 = "0byml4rmpiaalwx69jcixl3yvpvwmwiss1jzgsqwshilb2p4qnmz"; rev = version; repo = "aha"; owner = "theZiz"; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 3e9511fefdaa..54591bf24424 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ansifilter-${version}"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "0gzfxfpic47cs2kqrbvaw166ji62c5nq5cjhh3ngpm2fkm1wzli3"; + sha256 = "0ssvc51x90l1s9pxdxaw6ba01dcalrp0b5glrnh1j43i2pskc750"; }; diff --git a/pkgs/tools/text/bcat/Gemfile.lock b/pkgs/tools/text/bcat/Gemfile.lock index c39ebc279109..fa67e6e28dbd 100644 --- a/pkgs/tools/text/bcat/Gemfile.lock +++ b/pkgs/tools/text/bcat/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: bcat (0.6.2) rack (~> 1.0) - rack (1.6.8) + rack (1.6.11) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES bcat BUNDLED WITH - 1.15.4 + 1.16.4 diff --git a/pkgs/tools/text/bcat/gemset.nix b/pkgs/tools/text/bcat/gemset.nix index 0654e35399d9..744c0e6e107b 100644 --- a/pkgs/tools/text/bcat/gemset.nix +++ b/pkgs/tools/text/bcat/gemset.nix @@ -11,9 +11,9 @@ rack = { source = { remotes = ["http://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.11"; }; } \ No newline at end of file diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 1dec03e985b3..3315d435afbb 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "3.0.0"; + version = "3.1.1"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "0m8p1nn4621fspcas4g4k8y6fnnlzn7kxjxw2fapdrk3cz1pgi69"; + sha256 = "1wklii24vbvq2vi5pqgp3z4lazcplh2i7r2w4d8lkm6pzbw0s8px"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix new file mode 100644 index 000000000000..a04a2c65e7c3 --- /dev/null +++ b/pkgs/tools/text/gucci/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gucci-${version}"; + version = "0.1.0"; + + goPackagePath = "github.com/noqcks/gucci"; + + src = fetchFromGitHub { + owner = "noqcks"; + repo = "gucci"; + rev = version; + sha256 = "0ksrmzb3iggc7gm51fl0jbb15d0gmpclslpkq2sl2xjzk29pkllq"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags=-X main.AppVersion=${version} + ''; + + meta = with stdenv.lib; { + description = "A simple CLI templating tool written in golang"; + homepage = https://github.com/noqcks/gucci; + license = licenses.mit; + maintainers = [ maintainers.braydenjw ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/text/gucci/deps.nix b/pkgs/tools/text/gucci/deps.nix new file mode 100644 index 000000000000..8e2cc5af3bf1 --- /dev/null +++ b/pkgs/tools/text/gucci/deps.nix @@ -0,0 +1,30 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.6"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } +] + diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 1ba3534e3f8a..70745266fe55 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -1,13 +1,15 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hyx-0.1.4"; + name = "hyx-0.1.5"; src = fetchurl { url = "https://yx7.cc/code/hyx/${name}.tar.xz"; - sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx"; + sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg"; }; + patches = [ ./no-wall-by-default.patch ]; + installPhase = '' install -vD hyx $out/bin/hyx ''; @@ -17,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://yx7.cc/code/; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/hyx/no-wall-by-default.patch b/pkgs/tools/text/hyx/no-wall-by-default.patch new file mode 100644 index 000000000000..48ee20eff179 --- /dev/null +++ b/pkgs/tools/text/hyx/no-wall-by-default.patch @@ -0,0 +1,11 @@ +--- hyx-0.1.5.org/Makefile 2018-06-02 17:14:37.000000000 +0100 ++++ hyx-0.1.5/Makefile 2018-11-10 09:25:49.569961762 +0000 +@@ -1,7 +1,7 @@ + + all: CFLAGS ?= -O2 -Wl,-s \ + -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all +-all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG ++all: CFLAGS += -std=c99 -DNDEBUG + all: hyx + + debug: CFLAGS ?= -O0 -g \ diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 04f9029e6e5a..59e8fd06ef2d 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -69,7 +69,7 @@ GEM public_suffix (3.0.3) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.5) + rack (2.0.6) ruby-enum (0.7.2) i18n ruby-rc4 (0.1.5) @@ -103,4 +103,4 @@ DEPENDENCIES pygments.rb BUNDLED WITH - 1.14.6 + 1.16.4 diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 8b960fa3d930..034ab174e8a3 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -307,14 +307,12 @@ version = "1.2.1"; }; rack = { - groups = ["default"]; - platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158hbn7rlc3czp2vivvam44dv6vmzz16qrh5dbzhfxbfsgiyrqw1"; + sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; ruby-enum = { dependencies = ["i18n"]; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 97dd885b7788..fa582d4594cb 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.10"; + version = "0.9.11"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "026vgg4v6wsq8j091yxg3xzh5953kqg5cyay87y7yidnzn39livn"; + sha256 = "1hscpm5lsqmiv1niwnq999wmcvj9wlajw8wd3diaaxcq207kvsvd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 701850758bcb..74f4c562102c 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, autoreconfHook, zlib, darwin }: +{ stdenv, fetchhg, autoreconfHook, zlib, cf-private, Cocoa }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; @@ -9,10 +9,14 @@ stdenv.mkDerivation rec { sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; }; - buildInputs = - [ autoreconfHook - zlib - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + Cocoa + # Needed for OBJC_CLASS_$_NSDictionary symbols. + cf-private + ]; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index c0b9954206ad..5ddf15e09fad 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20180905"; + version = "20181011"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "0095f000kgk2lc5p1y4080sbc0r7ly60a7i9id8hydfnkhqqz75n"; + sha256 = "1b3wyr412qh113xvs671dqnacidil61gisfvg79wbq6wrdwswkp8"; }; postPatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8f5e866ede54..8767d98ad0a9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ mapAliases ({ cantarell_fonts = cantarell-fonts; # added 2018-03-03 checkbashism = checkbashisms; # added 2016-08-16 cifs_utils = cifs-utils; # added 2016-08 + ckb = ckb-next; # added 2018-10-21 clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 @@ -85,7 +86,6 @@ mapAliases ({ docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 emacsMelpa = emacs25PackagesNg; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0e44d058498..4d963610ed6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -71,6 +71,26 @@ with pkgs; common-updater-scripts = callPackage ../common-updater/scripts.nix { }; + ### Push NixOS tests inside the fixed point + + nixosTests = + let + # TODO(Ericson2314,ekleog): Check this will work correctly with cross- + system = builtins.currentSystem; + rawTests = (import ../../nixos/release.nix { + nixpkgs = pkgs; + }).tests; + testNames = builtins.attrNames rawTests; + filteredList = builtins.filter + (test: rawTests.${test} ? ${system}) + testNames; + finalList = map + (test: { name = test; value = rawTests.${test}.${system}; }) + filteredList; + finalTests = builtins.listToAttrs finalList; + in + finalTests; + ### BUILD SUPPORT autoreconfHook = makeSetupHook @@ -128,6 +148,8 @@ with pkgs; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; + archiver = callPackage ../applications/misc/archiver { }; + digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; dockerTools = callPackage ../build-support/docker { }; @@ -499,6 +521,7 @@ with pkgs; alacritty = callPackage ../applications/misc/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL; }; @@ -573,7 +596,10 @@ with pkgs; gsl = gsl_1; }; - atomicparsley = callPackage ../tools/video/atomicparsley { }; + atomicparsley = callPackage ../tools/video/atomicparsley { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; autoflake = callPackage ../development/tools/analysis/autoflake { }; @@ -702,6 +728,8 @@ with pkgs; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; + gucci = callPackage ../tools/text/gucci { }; + grc = callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { @@ -1038,7 +1066,7 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix = haskell.lib.overrideCabal (haskell.lib.addOptparseApplicativeCompletionScripts "cabal2nix" haskellPackages.cabal2nix) (drv: { + cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix) (drv: { isLibrary = false; enableSharedExecutables = false; executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ]; @@ -1173,6 +1201,7 @@ with pkgs; codec2 = callPackage ../development/libraries/codec2 { }; contacts = callPackage ../tools/misc/contacts { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; @@ -1522,6 +1551,7 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; noti = callPackage ../tools/misc/noti { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -2008,7 +2038,7 @@ with pkgs; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; - ckb = libsForQt5.callPackage ../tools/misc/ckb { }; + ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; clamav = callPackage ../tools/security/clamav { }; @@ -3038,6 +3068,8 @@ with pkgs; groonga = callPackage ../servers/search/groonga { }; + grpcurl = callPackage ../tools/networking/grpcurl { }; + grub = pkgsi686Linux.callPackage ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; stdenv = overrideCC stdenv pkgsi686Linux.gcc6; @@ -3564,7 +3596,10 @@ with pkgs; kexectools = callPackage ../os-specific/linux/kexectools { }; + kexpand = callPackage ../development/tools/kexpand { }; + keybase = callPackage ../tools/security/keybase { + inherit (darwin) cf-private; # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 @@ -3917,8 +3952,6 @@ with pkgs; libiberty_static = libiberty.override { staticBuild = true; }; - libibverbs = callPackage ../development/libraries/libibverbs { }; - libxc = callPackage ../development/libraries/libxc { }; libxcomp = callPackage ../development/libraries/libxcomp { }; @@ -3929,8 +3962,6 @@ with pkgs; libzmf = callPackage ../development/libraries/libzmf {}; - librdmacm = callPackage ../development/libraries/librdmacm { }; - libreswan = callPackage ../tools/networking/libreswan { }; libwebsockets = callPackage ../development/libraries/libwebsockets { }; @@ -4752,6 +4783,8 @@ with pkgs; pg_top = callPackage ../tools/misc/pg_top { }; + pgmetrics = callPackage ../tools/misc/pgmetrics { }; + pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation ssh = openssh; @@ -4788,6 +4821,7 @@ with pkgs; }; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -4973,10 +5007,6 @@ with pkgs; esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { }; - qgifer = callPackage ../applications/video/qgifer { - giflib = giflib_4_1; - }; - qhull = callPackage ../development/libraries/qhull { }; qjoypad = callPackage ../tools/misc/qjoypad { }; @@ -5857,6 +5887,8 @@ with pkgs; untrunc = callPackage ../tools/video/untrunc { }; + up = callPackage ../tools/misc/up { }; + upx = callPackage ../tools/compression/upx { }; uqmi = callPackage ../tools/networking/uqmi { }; @@ -5972,7 +6004,9 @@ with pkgs; wal_e = callPackage ../tools/backup/wal-e { }; - watchexec = callPackage ../tools/misc/watchexec { }; + watchexec = callPackage ../tools/misc/watchexec { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; + }; watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -6216,6 +6250,8 @@ with pkgs; wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; + wpgtk = callPackage ../tools/X11/wpgtk { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -6468,9 +6504,12 @@ with pkgs; then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; - # no OpenJ9 for Darwin - adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; - adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + adoptopenjdk-openj9-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; @@ -7286,7 +7325,7 @@ with pkgs; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; - ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml-104.nix { }; + ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { }; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; @@ -7613,6 +7652,10 @@ with pkgs; kanif = callPackage ../applications/networking/cluster/kanif { }; + lumo = callPackage ../development/interpreters/clojurescript/lumo { + nodejs = nodejs-10_x; + }; + lxappearance = callPackage ../desktops/lxde/core/lxappearance { gtk2 = gtk2-x11; }; @@ -9040,6 +9083,8 @@ with pkgs; acl = callPackage ../development/libraries/acl { }; + acsccid = callPackage ../tools/security/acsccid { }; + activemq = callPackage ../development/libraries/apache-activemq { }; adns = callPackage ../development/libraries/adns { }; @@ -9543,7 +9588,10 @@ with pkgs; flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk { }; + fltk13 = callPackage ../development/libraries/fltk { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + }; fltk = self.fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9697,7 +9745,10 @@ with pkgs; glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; - glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; + glfw3 = callPackage ../development/libraries/glfw/3.x.nix { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; + }; glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; @@ -10998,6 +11049,8 @@ with pkgs; libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libosmium = callPackage ../development/libraries/libosmium { }; + libosmocore = callPackage ../applications/misc/libosmocore { }; libosmpbf = callPackage ../development/libraries/libosmpbf {}; @@ -11135,7 +11188,10 @@ with pkgs; libuecc = callPackage ../development/libraries/libuecc { }; - libui = callPackage ../development/libraries/libui { }; + libui = callPackage ../development/libraries/libui { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; libunistring = callPackage ../development/libraries/libunistring { }; @@ -11147,6 +11203,8 @@ with pkgs; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; + libunarr = callPackage ../development/libraries/libunarr { }; + libungif = callPackage ../development/libraries/giflib/libungif.nix { }; libunibreak = callPackage ../development/libraries/libunibreak { }; @@ -11583,6 +11641,8 @@ with pkgs; opencv = callPackage ../development/libraries/opencv { ffmpeg = ffmpeg_2; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { @@ -11799,6 +11859,8 @@ with pkgs; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; + protozero = callPackage ../development/libraries/protozero { }; + flatbuffers = callPackage ../development/libraries/flatbuffers { }; gnupth = callPackage ../development/libraries/pth { }; @@ -11812,7 +11874,7 @@ with pkgs; re2 = callPackage ../development/libraries/re2 { }; - qbs = callPackage ../development/tools/build-managers/qbs { }; + qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qca2-qt5 = qca2.override { qt = qt5.qtbase; }; @@ -12139,10 +12201,7 @@ with pkgs; schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { - openglSupport = libGLSupported; - alsaSupport = stdenv.isLinux; - x11Support = !stdenv.isCygwin; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; }; @@ -12163,12 +12222,7 @@ with pkgs; SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { - openglSupport = libGLSupported; - alsaSupport = stdenv.isLinux; - x11Support = !stdenv.isCygwin; - waylandSupport = stdenv.isLinux; - udevSupport = stdenv.isLinux; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -12306,6 +12360,8 @@ with pkgs; spandsp = callPackage ../development/libraries/spandsp {}; + spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; + spatialite_tools = callPackage ../development/libraries/spatialite-tools { }; spdk = callPackage ../development/libraries/spdk { }; @@ -12387,6 +12443,8 @@ with pkgs; ncurses = null; }); + standardnotes = callPackage ../applications/editors/standardnotes { }; + stfl = callPackage ../development/libraries/stfl { }; stlink = callPackage ../development/tools/misc/stlink { }; @@ -13298,6 +13356,8 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; + h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; @@ -13866,10 +13926,14 @@ with pkgs; xqilla = callPackage ../development/tools/xqilla { }; - xquartz = callPackage ../servers/x11/xquartz { }; + xquartz = callPackage ../servers/x11/xquartz { + inherit (darwin) cf-private; + }; + quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -13878,7 +13942,9 @@ with pkgs; # have created a cycle. xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { - inherit (darwin) apple_sdk; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; + inherit (darwin.apple_sdk.libs) Xplugin; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; @@ -14007,6 +14073,8 @@ with pkgs; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; + cpuset = callPackage ../os-specific/linux/cpuset { }; + criu = callPackage ../os-specific/linux/criu { }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; @@ -14273,11 +14341,6 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long - # https://github.com/NixOS/nixpkgs/issues/42755 - # Remove these xen-netfront patches once they're included in - # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755 - kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock - kernelPatches.xen-netfront_update_features_after_registering_netdev ]; }; @@ -14325,13 +14388,6 @@ with pkgs; ]; }; - linux_riscv = callPackage ../os-specific/linux/kernel/linux-riscv.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14701,6 +14757,8 @@ with pkgs; gocode = callPackage ../development/tools/gocode { }; + gocode-gomod = callPackage ../development/tools/gocode-gomod { }; + goconst = callPackage ../development/tools/goconst { }; goconvey = callPackage ../development/tools/goconvey { }; @@ -16208,10 +16266,10 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker {}) - docker_18_06; + docker_18_09; - docker = docker_18_06; - docker-edge = docker_18_06; + docker = docker_18_09; + docker-edge = docker_18_09; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -16326,6 +16384,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; @@ -16344,6 +16403,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; @@ -16353,8 +16413,8 @@ with pkgs; withGTK3 = false; })); - emacsMacport = emacs25Macport; - emacs25Macport = callPackage ../applications/editors/emacs/macport.nix { + emacsMacport = callPackage ../applications/editors/emacs/macport.nix { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; @@ -17210,6 +17270,8 @@ with pkgs; gtk = gtk3; }; + hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; + howl = callPackage ../applications/editors/howl { }; ht = callPackage ../applications/editors/ht { }; @@ -17633,6 +17695,7 @@ with pkgs; librecad = callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; + libreoffice-unwrapped = libreoffice.libreoffice; libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; @@ -17654,21 +17717,20 @@ with pkgs; }; }; - libreoffice-unwrapped = callPackage ../applications/office/libreoffice - (libreoffice-args // { - }); - libreoffice-still-unwrapped = callPackage ../applications/office/libreoffice/still.nix - (libreoffice-args // { - poppler = poppler_0_61; - }); - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libreoffice-unwrapped; + libreoffice = callPackage ../applications/office/libreoffice + (libreoffice-args // { + }); }); + libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libreoffice-still-unwrapped; + libreoffice = callPackage ../applications/office/libreoffice/still.nix + (libreoffice-args // { + poppler = poppler_0_61; + }); }); + libreoffice-still-unwrapped = libreoffice-still.libreoffice; libvmi = callPackage ../development/libraries/libvmi { }; @@ -18320,6 +18382,8 @@ with pkgs; osmctools = callPackage ../applications/misc/osmctools { }; + osmium-tool = callPackage ../applications/misc/osmium-tool { }; + owamp = callPackage ../applications/networking/owamp { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -18491,6 +18555,8 @@ with pkgs; pmenu = callPackage ../applications/misc/pmenu { }; + polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; + poezio = python3Packages.poezio; pommed = callPackage ../os-specific/linux/pommed {}; @@ -18977,6 +19043,8 @@ with pkgs; lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; + ly = callPackage ../applications/display-managers/ly { }; + slic3r = callPackage ../applications/misc/slic3r { }; slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; @@ -19104,9 +19172,9 @@ with pkgs; saslSupport = false; sasl = cyrus_sasl; }) - subversion18 subversion19 subversion_1_10; + subversion18 subversion19 subversion_1_10 subversion_1_11; - subversion = subversion_1_10; + subversion = subversion_1_11; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -19398,6 +19466,7 @@ with pkgs; }; vim = callPackage ../applications/editors/vim { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -20289,7 +20358,7 @@ with pkgs; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; gargoyle = callPackage ../games/gargoyle { - libtool = darwin.cctools; + inherit (darwin) cctools cf-private; }; gav = callPackage ../games/gav { }; @@ -22059,8 +22128,6 @@ with pkgs; lilypond = lilypond-unstable; }; - lollypop-portal = callPackage ../misc/lollypop-portal { }; - openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; mailcore2 = callPackage ../development/libraries/mailcore2 { @@ -22674,6 +22741,8 @@ with pkgs; openal = null; }; + yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; + yadm = callPackage ../applications/version-management/yadm { }; yamdi = callPackage ../tools/video/yamdi { }; @@ -22793,6 +22862,8 @@ with pkgs; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; + chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; + NSPlist = callPackage ../development/libraries/NSPlist {}; PlistCpp = callPackage ../development/libraries/PlistCpp {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 78ca0d20908d..b52afe98f7fa 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -66,7 +66,7 @@ in stubs = callPackages ../os-specific/darwin/stubs { }; - trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; + trash = darwin.callPackage ../os-specific/darwin/trash { }; usr-include = callPackage ../os-specific/darwin/usr-include { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 87adff4bf133..80dd1a04e73d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -5,7 +5,6 @@ let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ - "ghc7103Binary" "ghc821Binary" "ghc844" "ghcjs" @@ -43,7 +42,6 @@ in { compiler = { - ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { @@ -62,6 +60,11 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; + ghc862 = callPackage ../development/compilers/ghc/8.6.2.nix { + bootPkgs = packages.ghc822; + buildLlvmPackages = buildPackages.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_6; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc821Binary; buildLlvmPackages = buildPackages.llvmPackages_5; @@ -97,12 +100,6 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc7103Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc7103Binary; - ghc = bh.compiler.ghc7103Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc821Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc821Binary; ghc = bh.compiler.ghc821Binary; @@ -114,11 +111,6 @@ in { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc843 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc843; - ghc = bh.compiler.ghc843; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc844 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc844; ghc = bh.compiler.ghc844; @@ -129,6 +121,11 @@ in { ghc = bh.compiler.ghc861; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; + ghc862 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc862; + ghc = bh.compiler.ghc862; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2f6992e1c9a5..1d0c14914362 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -17,6 +17,8 @@ let buildOcaml = callPackage ../build-support/ocaml { }; + buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; angstrom = callPackage ../development/ocaml-modules/angstrom { }; @@ -735,6 +737,8 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + visitors = callPackage ../development/ocaml-modules/visitors { }; + wasm = callPackage ../development/ocaml-modules/wasm { }; wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b363736694d..9f0118a13c47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -166,6 +166,10 @@ in { agate-dbf = callPackage ../development/python-modules/agate-dbf { }; + alerta = callPackage ../development/python-modules/alerta { }; + + alerta-server = callPackage ../development/python-modules/alerta-server { }; + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; agate-excel = callPackage ../development/python-modules/agate-excel { }; @@ -202,6 +206,8 @@ in { autograd = callPackage ../development/python-modules/autograd { }; + autologging = callPackage ../development/python-modules/autologging { }; + automat = callPackage ../development/python-modules/automat { }; awkward = callPackage ../development/python-modules/awkward { }; @@ -356,6 +362,8 @@ in { gidgethub = callPackage ../development/python-modules/gidgethub { }; + gin-config = callPackage ../development/python-modules/gin-config { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -660,6 +668,8 @@ in { slicerator = callPackage ../development/python-modules/slicerator { }; + snapcast = callPackage ../development/python-modules/snapcast { }; + spglib = callPackage ../development/python-modules/spglib { }; sslib = callPackage ../development/python-modules/sslib { }; @@ -1140,6 +1150,8 @@ in { click-plugins = callPackage ../development/python-modules/click-plugins {}; + click-repl = callPackage ../development/python-modules/click-repl { }; + click-threading = callPackage ../development/python-modules/click-threading {}; cligj = callPackage ../development/python-modules/cligj { }; @@ -1686,8 +1698,6 @@ in { hupper = callPackage ../development/python-modules/hupper {}; - hovercraft = callPackage ../development/python-modules/hovercraft { }; - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; @@ -3225,7 +3235,11 @@ in { prettytable = callPackage ../development/python-modules/prettytable { }; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; + prompt_toolkit = self.prompt_toolkit_1; + + prompt_toolkit_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + + prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { }; protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; @@ -3245,7 +3259,9 @@ in { psycopg2 = callPackage ../development/python-modules/psycopg2 {}; - ptpython = callPackage ../development/python-modules/ptpython {}; + ptpython = callPackage ../development/python-modules/ptpython { + prompt_toolkit = self.prompt_toolkit_2; + }; publicsuffix = callPackage ../development/python-modules/publicsuffix {}; @@ -3619,6 +3635,8 @@ in { isodate = callPackage ../development/python-modules/isodate { }; + owslib = callPackage ../development/python-modules/owslib { }; + resampy = callPackage ../development/python-modules/resampy { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 59e3d5133bbe..9bdad5473d4e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -66,7 +66,7 @@ let jobs.inkscape.x86_64-darwin # jobs.gimp.x86_64-darwin jobs.emacs.x86_64-darwin - # jobs.wireshark.x86_64-darwin + jobs.wireshark.x86_64-darwin jobs.transmission-gtk.x86_64-darwin # Tests